From bf75728e7d638ce7e0edcebd0c265b2cb7284aee Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Mon, 19 Jan 2026 21:43:39 +0100 Subject: [PATCH] WIP: Modes Signed-off-by: Yannik Bloscheck --- .../dark/colors.mapcss} | 2 +- data/styles/cycling/dark/style.mapcss | 9 + data/styles/cycling/include/basemap.mapcss | 2 + .../cycling/include/basemap_label.mapcss | 2 + data/styles/cycling/include/icons.mapcss | 2 + .../cycling/include/icons_label_colors.mapcss | 2 + .../include/priorities_1_BG-by-size.prio.txt | 1 + .../include/priorities_2_BG-top.prio.txt | 1 + .../cycling/include/priorities_3_FG.prio.txt | 10 + .../include/priorities_4_overlays.prio.txt | 1 + .../cycling/include/transit_systems.mapcss | 2 + data/styles/cycling/include/ways.mapcss | 52 + data/styles/cycling/include/ways_label.mapcss | 2 + data/styles/cycling/light/colors.mapcss | 2 + data/styles/cycling/light/style.mapcss | 9 + .../dark/dynamic_colors.mapcss} | 13 +- data/styles/default/dark/style.mapcss | 141 +- .../{Basemap.mapcss => basemap.mapcss} | 31 +- ...emap_label.mapcss => basemap_label.mapcss} | 0 .../default/include/defaults_new.mapcss | 24 - .../include/{Icons.mapcss => icons.mapcss} | 67 +- ...olors.mapcss => icons_label_colors.mapcss} | 0 .../include/priorities_1_BG-by-size.prio.txt | 14 +- .../include/priorities_4_overlays.prio.txt | 28 +- ...{Subways.mapcss => transit_systems.mapcss} | 0 .../include/{Roads.mapcss => ways.mapcss} | 0 .../{Roads_label.mapcss => ways_label.mapcss} | 0 .../light/dynamic_colors.mapcss} | 11 - data/styles/default/light/style.mapcss | 141 +- data/styles/driving/dark/colors.mapcss | 2 + data/styles/driving/dark/style.mapcss | 9 + data/styles/driving/include/basemap.mapcss | 2 + .../driving/include/basemap_label.mapcss | 2 + data/styles/driving/include/icons.mapcss | 53 + .../driving/include/icons_label_colors.mapcss | 2 + .../include/priorities_1_BG-by-size.prio.txt | 1 + .../include/priorities_2_BG-top.prio.txt | 1 + .../driving/include/priorities_3_FG.prio.txt | 1 + .../include/priorities_4_overlays.prio.txt | 1 + .../driving/include/transit_systems.mapcss | 2 + data/styles/driving/include/ways.mapcss | 2 + data/styles/driving/include/ways_label.mapcss | 2 + data/styles/driving/light/colors.mapcss | 2 + data/styles/driving/light/style.mapcss | 9 + .../{outdoors => hiking}/dark/colors.mapcss | 0 data/styles/hiking/dark/style.mapcss | 9 + .../include/basemap.mapcss} | 2 +- .../include/basemap_label.mapcss} | 2 +- .../include/icons.mapcss} | 2 +- .../hiking/include/icons_label_colors.mapcss | 2 + .../include/priorities_1_BG-by-size.prio.txt | 4 + .../include/priorities_2_BG-top.prio.txt | 1 + .../hiking/include/priorities_3_FG.prio.txt | 16 + .../include/priorities_4_overlays.prio.txt | 8 + .../hiking/include/transit_systems.mapcss | 2 + .../include/ways.mapcss} | 2 +- .../include/ways_label.mapcss} | 2 +- .../{outdoors => hiking}/light/colors.mapcss | 0 data/styles/hiking/light/style.mapcss | 9 + .../outdoors/include/defaults_new.mapcss | 24 - .../include/priorities_1_BG-by-size.prio.txt | 258 -- .../include/priorities_2_BG-top.prio.txt | 46 - .../outdoors/include/priorities_3_FG.prio.txt | 490 ---- .../include/priorities_4_overlays.prio.txt | 2514 ----------------- .../styles/publictransport/dark/colors.mapcss | 2 + data/styles/publictransport/dark/style.mapcss | 9 + .../publictransport/include/basemap.mapcss | 2 + .../include/basemap_label.mapcss | 2 + .../publictransport/include/icons.mapcss | 7 + .../include/icons_label_colors.mapcss | 2 + .../include/priorities_1_BG-by-size.prio.txt | 1 + .../include/priorities_2_BG-top.prio.txt | 1 + .../include/priorities_3_FG.prio.txt | 1 + .../include/priorities_4_overlays.prio.txt | 1 + .../include/transit_systems.mapcss | 2 + .../publictransport/include/ways.mapcss | 2 + .../publictransport/include/ways_label.mapcss | 2 + .../publictransport/light/colors.mapcss | 2 + .../styles/publictransport/light/style.mapcss | 9 + data/styles/vehicle/dark/style.mapcss | 142 +- .../{Basemap.mapcss => basemap.mapcss} | 0 ...emap_label.mapcss => basemap_label.mapcss} | 0 .../vehicle/include/defaults_new.mapcss | 24 - .../include/{Icons.mapcss => icons.mapcss} | 10 +- .../vehicle/include/icons_label_colors.mapcss | 2 + ...{Subways.mapcss => transit_systems.mapcss} | 2 +- .../include/{Roads.mapcss => ways.mapcss} | 0 .../{Roads_label.mapcss => ways_label.mapcss} | 0 data/styles/vehicle/light/style.mapcss | 142 +- .../CoreApi/Framework/MWMFrameworkHelper.mm | 45 +- .../CoreApi/Traffic/MWMMapOverlayManager.h | 66 +- .../CoreApi/Traffic/MWMMapOverlayManager.mm | 232 +- iphone/Maps/Bridging-Header.h | 2 +- iphone/Maps/Bridging/BridgeControllers.swift | 38 + iphone/Maps/Categories/UIColor+MapsMeColor.h | 1 + iphone/Maps/Categories/UIColor+MapsMeColor.m | 5 + iphone/Maps/Classes/Components/MWMButton.h | 1 + iphone/Maps/Classes/Components/MWMButton.m | 18 + .../MWMMapViewControlsManager.h | 2 +- .../MWMMapViewControlsManager.mm | 32 +- .../MWMModeButtonViewController.h} | 4 +- .../ModeButton/MWMModeButtonViewController.mm | 133 + .../MWMModeButtonViewController.xib} | 18 +- .../MWMTrafficButtonViewController.mm | 216 -- .../Views/RoutePreview/MWMiPadRoutePreview.m | 4 +- .../RoutePreview/MWMiPhoneRoutePreview.m | 4 +- iphone/Maps/Classes/MapViewController.h | 4 +- iphone/Maps/Classes/MapViewController.mm | 4 +- .../Theme/Renderers/UISwitchRenderer.swift | 3 - .../Mode Colors}/Contents.json | 3 + .../Cycling Border.colorset/Contents.json | 38 + .../Cycling.colorset/Contents.json | 38 + .../Default Border.colorset/Contents.json | 38 + .../Default.colorset/Contents.json | 38 + .../Driving Border.colorset/Contents.json | 38 + .../Driving.colorset/Contents.json | 38 + .../Hiking Border.colorset/Contents.json | 38 + .../Mode Colors/Hiking.colorset/Contents.json | 38 + .../Contents.json | 38 + .../Public Transport.colorset/Contents.json | 38 + .../Symbols/cycling.symbolset}/Contents.json | 14 +- .../Symbols/cycling.symbolset/cycling.svg | 103 + .../Symbols/driving.symbolset}/Contents.json | 14 +- .../Symbols/driving.symbolset/driving.svg | 103 + .../Symbols/hiking.symbolset}/Contents.json | 14 +- .../Symbols/hiking.symbolset/hiking.svg | 103 + .../Symbols/map.symbolset}/Contents.json | 14 +- .../Interface/Symbols/map.symbolset/map.svg | 103 + .../publictransport.symbolset/Contents.json | 12 + .../publictransport.svg | 103 + .../Maps/Images.xcassets/Layers/Contents.json | 6 +- .../Layers/IsoLines/Contents.json | 6 - .../btn_isoMap_on_dark.imageset/Contents.json | 12 - .../btn_isoMap_on_dark.pdf | Bin 9764 -> 0 bytes .../Contents.json | 12 - .../btn_isoMap_on_highlighted_dark.pdf | Bin 10164 -> 0 bytes .../Contents.json | 12 - .../btn_isoMap_on_highlighted_light.pdf | Bin 10246 -> 0 bytes .../Contents.json | 12 - .../btn_isoMap_on_light.pdf | Bin 9813 -> 0 bytes .../guides_default.pdf | 446 --- .../ic_layer_contours.svg | 33 - .../btn_menu_outdoors.imageset/Contents.json | 12 - .../ic_layer_outdoor_lake.svg | 29 - .../ic_layer_subway.svg | 29 - .../traffic_default.pdf | 382 --- .../Layers/Subway/Contents.json | 6 - .../btn_subway_on_dark.imageset/Contents.json | 12 - .../btn_subway_on_dark.pdf | Bin 8354 -> 0 bytes .../Contents.json | 12 - .../btn_subway_on_highlighted_dark.pdf | Bin 8855 -> 0 bytes .../Contents.json | 12 - .../btn_subway_on_highlighted_light.pdf | Bin 8830 -> 0 bytes .../Contents.json | 12 - .../btn_subway_on_light.pdf | Bin 8331 -> 0 bytes .../Layers/Traffic/Contents.json | 6 - .../btn_traffic_on_dark.png | Bin 2842 -> 0 bytes .../btn_traffic_on_dark@2x.png | Bin 6915 -> 0 bytes .../btn_traffic_on_dark@3x.png | Bin 11477 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_on_highdarked_dark.png | Bin 2669 -> 0 bytes .../btn_traffic_on_highdarked_dark@2x.png | Bin 6197 -> 0 bytes .../btn_traffic_on_highdarked_dark@3x.png | Bin 9915 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_on_highlighted_light.png | Bin 2371 -> 0 bytes .../btn_traffic_on_highlighted_light@2x.png | Bin 5660 -> 0 bytes .../btn_traffic_on_highlighted_light@3x.png | Bin 9576 -> 0 bytes .../btn_traffic_on_light.png | Bin 2510 -> 0 bytes .../btn_traffic_on_light@2x.png | Bin 2104 -> 0 bytes .../btn_traffic_on_light@3x.png | Bin 10498 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_outdated_dark.png | Bin 2770 -> 0 bytes .../btn_traffic_outdated_dark@2x.png | Bin 6842 -> 0 bytes .../btn_traffic_outdated_dark@3x.png | Bin 11277 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_outdated_highdarked_dark.png | Bin 2611 -> 0 bytes ...tn_traffic_outdated_highdarked_dark@2x.png | Bin 6047 -> 0 bytes ...tn_traffic_outdated_highdarked_dark@3x.png | Bin 9774 -> 0 bytes .../Contents.json | 23 - ...btn_traffic_outdated_highlighted_light.png | Bin 2317 -> 0 bytes ..._traffic_outdated_highlighted_light@2x.png | Bin 5569 -> 0 bytes ..._traffic_outdated_highlighted_light@3x.png | Bin 9358 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_outdated_light.png | Bin 2442 -> 0 bytes .../btn_traffic_outdated_light@2x.png | Bin 6012 -> 0 bytes .../btn_traffic_outdated_light@3x.png | Bin 10280 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_update_dark_1.png | Bin 2603 -> 0 bytes .../btn_traffic_update_dark_1@2x.png | Bin 6533 -> 0 bytes .../btn_traffic_update_dark_1@3x.png | Bin 10944 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_update_dark_2.png | Bin 2602 -> 0 bytes .../btn_traffic_update_dark_2@2x.png | Bin 6422 -> 0 bytes .../btn_traffic_update_dark_2@3x.png | Bin 10939 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_update_dark_3.png | Bin 2609 -> 0 bytes .../btn_traffic_update_dark_3@2x.png | Bin 6536 -> 0 bytes .../btn_traffic_update_dark_3@3x.png | Bin 10895 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_update_light_1.png | Bin 2329 -> 0 bytes .../btn_traffic_update_light_1@2x.png | Bin 5882 -> 0 bytes .../btn_traffic_update_light_1@3x.png | Bin 10208 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_update_light_2.png | Bin 2311 -> 0 bytes .../btn_traffic_update_light_2@2x.png | Bin 5783 -> 0 bytes .../btn_traffic_update_light_2@3x.png | Bin 10161 -> 0 bytes .../Contents.json | 23 - .../btn_traffic_update_light_3.png | Bin 2314 -> 0 bytes .../btn_traffic_update_light_3@2x.png | Bin 5865 -> 0 bytes .../btn_traffic_update_light_3@3x.png | Bin 10176 -> 0 bytes .../Contents.json | 6 +- .../btn_bg_dark.imageset/btn_bg_dark.png | Bin 0 -> 2826 bytes .../btn_bg_dark.imageset/btn_bg_dark@2x.png | Bin 0 -> 5598 bytes .../btn_bg_dark.imageset/btn_bg_dark@3x.png | Bin 0 -> 9226 bytes .../Contents.json | 6 +- .../btn_bg_highlighted_dark.png | Bin 0 -> 2724 bytes .../btn_bg_highlighted_dark@2x.png | Bin 0 -> 5572 bytes .../btn_bg_highlighted_dark@3x.png | Bin 0 -> 9011 bytes .../Contents.json | 6 +- .../btn_bg_highlighted_light.png | Bin 0 -> 2608 bytes .../btn_bg_highlighted_light@2x.png | Bin 0 -> 5398 bytes .../btn_bg_highlighted_light@3x.png | Bin 0 -> 9015 bytes .../Contents.json | 6 +- .../btn_bg_light.imageset/btn_bg_light.png | Bin 0 -> 2658 bytes .../btn_bg_light.imageset/btn_bg_light@2x.png | Bin 0 -> 5444 bytes .../btn_bg_light.imageset/btn_bg_light@3x.png | Bin 0 -> 9031 bytes .../btn_layers_dark.imageset/Contents.json | 12 - .../btn_layers_dark.pdf | Bin 8076 -> 0 bytes .../Contents.json | 12 - .../btn_layers_highdarked_dark.pdf | Bin 8578 -> 0 bytes .../Contents.json | 12 - .../btn_layers_highlighted_light.pdf | Bin 8550 -> 0 bytes .../btn_layers_light.imageset/Contents.json | 12 - .../btn_layers_light.pdf | Bin 8048 -> 0 bytes .../btn_guides_off_dark.png | Bin 2348 -> 0 bytes .../btn_guides_off_dark@2x.png | Bin 5361 -> 0 bytes .../btn_guides_off_dark@3x.png | Bin 8569 -> 0 bytes .../btn_guides_off_light.png | Bin 2922 -> 0 bytes .../btn_guides_off_light@2x.png | Bin 7263 -> 0 bytes .../btn_guides_off_light@3x.png | Bin 12356 -> 0 bytes .../de.lproj/Localizable.strings | 15 +- .../en-GB.lproj/Localizable.strings | 15 +- .../en.lproj/Localizable.strings | 14 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 118 +- iphone/Maps/Model/MapMode.swift | 84 + .../UI/AvailableArea/ModeButtonArea.swift | 21 + .../UI/AvailableArea/TrafficButtonArea.swift | 21 - .../BottomMenu/Menu/BottomMenuPresenter.swift | 14 +- .../Menu/BottomMenuViewController.swift | 2 +- .../Menu/Cells/BottomMenuLayersCell.swift | 107 - .../Menu/Cells/BottomMenuLayersCell.xib | 151 - iphone/Maps/UI/Menus/Mode/ModeSelector.swift | 165 ++ .../UI/Menus/Mode/ModeSelectorButton.swift | 60 + .../PlacePageManager/MWMPlacePageManager.mm | 8 +- .../SearchOnMap/SearchOnMapAreaView.swift | 2 +- .../SearchOnMapViewController.swift | 2 +- iphone/Maps/UI/Storyboard/Main.storyboard | 4 +- libs/indexer/map_style.cpp | 42 +- libs/indexer/map_style.hpp | 10 +- libs/indexer/map_style_reader.cpp | 30 +- libs/map/chart_generator.cpp | 20 +- libs/map/framework.cpp | 350 ++- libs/map/framework.hpp | 67 +- libs/map/transit/transit_reader.cpp | 5 + libs/map/transit/transit_reader.hpp | 1 + qt/CMakeLists.txt | 10 +- qt/draw_widget.cpp | 27 +- qt/draw_widget.hpp | 1 - qt/mainwindow.cpp | 128 +- qt/mainwindow.hpp | 23 +- qt/popup_menu_holder.cpp | 1 + qt/popup_menu_holder.hpp | 10 + qt/preferences_dialog.cpp | 5 +- qt/res/layers.png | Bin 405 -> 0 bytes qt/res/mode_cycling-selected.png | Bin 0 -> 6719 bytes qt/res/mode_cycling.png | Bin 0 -> 5898 bytes qt/res/mode_default-selected.png | Bin 0 -> 3560 bytes qt/res/mode_default.png | Bin 0 -> 2226 bytes qt/res/mode_driving-selected.png | Bin 0 -> 4349 bytes qt/res/mode_driving.png | Bin 0 -> 3130 bytes qt/res/mode_hiking-selected.png | Bin 0 -> 5160 bytes qt/res/mode_hiking.png | Bin 0 -> 4159 bytes ...ines.png => mode_options_contourlines.png} | Bin ...bway.png => mode_options_transitlines.png} | Bin qt/res/mode_publictransport-selected.png | Bin 0 -> 5057 bytes qt/res/mode_publictransport.png | Bin 0 -> 4156 bytes qt/res/resources.qrc | 15 +- qt/search_panel.cpp | 2 +- tools/unix/generate_drules.sh | 15 +- 289 files changed, 2698 insertions(+), 6484 deletions(-) rename data/styles/{outdoors/include/Subways.mapcss => cycling/dark/colors.mapcss} (53%) create mode 100644 data/styles/cycling/dark/style.mapcss create mode 100644 data/styles/cycling/include/basemap.mapcss create mode 100644 data/styles/cycling/include/basemap_label.mapcss create mode 100644 data/styles/cycling/include/icons.mapcss create mode 100644 data/styles/cycling/include/icons_label_colors.mapcss create mode 100644 data/styles/cycling/include/priorities_1_BG-by-size.prio.txt create mode 100644 data/styles/cycling/include/priorities_2_BG-top.prio.txt create mode 100644 data/styles/cycling/include/priorities_3_FG.prio.txt create mode 100644 data/styles/cycling/include/priorities_4_overlays.prio.txt create mode 100644 data/styles/cycling/include/transit_systems.mapcss create mode 100644 data/styles/cycling/include/ways.mapcss create mode 100644 data/styles/cycling/include/ways_label.mapcss create mode 100644 data/styles/cycling/light/colors.mapcss create mode 100644 data/styles/cycling/light/style.mapcss rename data/styles/{outdoors/dark/style.mapcss => default/dark/dynamic_colors.mapcss} (92%) rename data/styles/default/include/{Basemap.mapcss => basemap.mapcss} (99%) rename data/styles/default/include/{Basemap_label.mapcss => basemap_label.mapcss} (100%) delete mode 100644 data/styles/default/include/defaults_new.mapcss rename data/styles/default/include/{Icons.mapcss => icons.mapcss} (98%) rename data/styles/default/include/{Icons_Label_Colors.mapcss => icons_label_colors.mapcss} (100%) rename data/styles/default/include/{Subways.mapcss => transit_systems.mapcss} (100%) rename data/styles/default/include/{Roads.mapcss => ways.mapcss} (100%) rename data/styles/default/include/{Roads_label.mapcss => ways_label.mapcss} (100%) rename data/styles/{outdoors/light/style.mapcss => default/light/dynamic_colors.mapcss} (92%) create mode 100644 data/styles/driving/dark/colors.mapcss create mode 100644 data/styles/driving/dark/style.mapcss create mode 100644 data/styles/driving/include/basemap.mapcss create mode 100644 data/styles/driving/include/basemap_label.mapcss create mode 100644 data/styles/driving/include/icons.mapcss create mode 100644 data/styles/driving/include/icons_label_colors.mapcss create mode 100644 data/styles/driving/include/priorities_1_BG-by-size.prio.txt create mode 100644 data/styles/driving/include/priorities_2_BG-top.prio.txt create mode 100644 data/styles/driving/include/priorities_3_FG.prio.txt create mode 100644 data/styles/driving/include/priorities_4_overlays.prio.txt create mode 100644 data/styles/driving/include/transit_systems.mapcss create mode 100644 data/styles/driving/include/ways.mapcss create mode 100644 data/styles/driving/include/ways_label.mapcss create mode 100644 data/styles/driving/light/colors.mapcss create mode 100644 data/styles/driving/light/style.mapcss rename data/styles/{outdoors => hiking}/dark/colors.mapcss (100%) create mode 100644 data/styles/hiking/dark/style.mapcss rename data/styles/{outdoors/include/Basemap.mapcss => hiking/include/basemap.mapcss} (99%) rename data/styles/{outdoors/include/Basemap_label.mapcss => hiking/include/basemap_label.mapcss} (95%) rename data/styles/{outdoors/include/Icons.mapcss => hiking/include/icons.mapcss} (99%) create mode 100644 data/styles/hiking/include/icons_label_colors.mapcss create mode 100644 data/styles/hiking/include/priorities_1_BG-by-size.prio.txt create mode 100644 data/styles/hiking/include/priorities_2_BG-top.prio.txt create mode 100644 data/styles/hiking/include/priorities_3_FG.prio.txt create mode 100644 data/styles/hiking/include/priorities_4_overlays.prio.txt create mode 100644 data/styles/hiking/include/transit_systems.mapcss rename data/styles/{outdoors/include/Roads.mapcss => hiking/include/ways.mapcss} (99%) rename data/styles/{outdoors/include/Roads_label.mapcss => hiking/include/ways_label.mapcss} (96%) rename data/styles/{outdoors => hiking}/light/colors.mapcss (100%) create mode 100644 data/styles/hiking/light/style.mapcss delete mode 100644 data/styles/outdoors/include/defaults_new.mapcss delete mode 100644 data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt delete mode 100644 data/styles/outdoors/include/priorities_2_BG-top.prio.txt delete mode 100644 data/styles/outdoors/include/priorities_3_FG.prio.txt delete mode 100644 data/styles/outdoors/include/priorities_4_overlays.prio.txt create mode 100644 data/styles/publictransport/dark/colors.mapcss create mode 100644 data/styles/publictransport/dark/style.mapcss create mode 100644 data/styles/publictransport/include/basemap.mapcss create mode 100644 data/styles/publictransport/include/basemap_label.mapcss create mode 100644 data/styles/publictransport/include/icons.mapcss create mode 100644 data/styles/publictransport/include/icons_label_colors.mapcss create mode 100644 data/styles/publictransport/include/priorities_1_BG-by-size.prio.txt create mode 100644 data/styles/publictransport/include/priorities_2_BG-top.prio.txt create mode 100644 data/styles/publictransport/include/priorities_3_FG.prio.txt create mode 100644 data/styles/publictransport/include/priorities_4_overlays.prio.txt create mode 100644 data/styles/publictransport/include/transit_systems.mapcss create mode 100644 data/styles/publictransport/include/ways.mapcss create mode 100644 data/styles/publictransport/include/ways_label.mapcss create mode 100644 data/styles/publictransport/light/colors.mapcss create mode 100644 data/styles/publictransport/light/style.mapcss rename data/styles/vehicle/include/{Basemap.mapcss => basemap.mapcss} (100%) rename data/styles/vehicle/include/{Basemap_label.mapcss => basemap_label.mapcss} (100%) delete mode 100644 data/styles/vehicle/include/defaults_new.mapcss rename data/styles/vehicle/include/{Icons.mapcss => icons.mapcss} (99%) create mode 100644 data/styles/vehicle/include/icons_label_colors.mapcss rename data/styles/vehicle/include/{Subways.mapcss => transit_systems.mapcss} (85%) rename data/styles/vehicle/include/{Roads.mapcss => ways.mapcss} (100%) rename data/styles/vehicle/include/{Roads_label.mapcss => ways_label.mapcss} (100%) rename iphone/Maps/Classes/CustomViews/MapViewControls/{TrafficButton/MWMTrafficButtonViewController.h => ModeButton/MWMModeButtonViewController.h} (51%) create mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.mm rename iphone/Maps/Classes/CustomViews/MapViewControls/{TrafficButton/MWMTrafficButtonViewController.xib => ModeButton/MWMModeButtonViewController.xib} (77%) delete mode 100644 iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm rename iphone/Maps/Images.xcassets/{Layers/Menu => Interface/Mode Colors}/Contents.json (52%) create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling Border.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Default Border.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Default.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving Border.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking Border.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport Border.colorset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport.colorset/Contents.json rename iphone/Maps/Images.xcassets/{Layers/Menu/btn_menu_guides.imageset => Interface/Symbols/cycling.symbolset}/Contents.json (60%) create mode 100644 iphone/Maps/Images.xcassets/Interface/Symbols/cycling.symbolset/cycling.svg rename iphone/Maps/Images.xcassets/{Layers/Menu/btn_menu_traffic.imageset => Interface/Symbols/driving.symbolset}/Contents.json (60%) create mode 100644 iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/driving.svg rename iphone/Maps/Images.xcassets/{Layers/Menu/btn_menu_subway.imageset => Interface/Symbols/hiking.symbolset}/Contents.json (60%) create mode 100644 iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/hiking.svg rename iphone/Maps/Images.xcassets/{Layers/Menu/btn_menu_isomaps.imageset => Interface/Symbols/map.symbolset}/Contents.json (59%) create mode 100644 iphone/Maps/Images.xcassets/Interface/Symbols/map.symbolset/map.svg create mode 100644 iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/Interface/Symbols/publictransport.symbolset/publictransport.svg delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/btn_isoMap_on_dark.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/btn_isoMap_on_highlighted_dark.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/btn_isoMap_on_highlighted_light.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/btn_isoMap_on_light.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/guides_default.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/ic_layer_contours.svg delete mode 100644 iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/ic_layer_outdoor_lake.svg delete mode 100644 iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/ic_layer_subway.svg delete mode 100644 iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/traffic_default.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/btn_subway_on_dark.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/btn_subway_on_highlighted_dark.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/btn_subway_on_highlighted_light.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/btn_subway_on_light.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@3x.png rename iphone/Maps/Images.xcassets/Layers/{Traffic/btn_traffic_on_dark.imageset => btn_bg_dark.imageset}/Contents.json (65%) create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@2x.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@3x.png rename iphone/Maps/Images.xcassets/Layers/{btn_layers_off_light.imageset => btn_bg_highlighted_dark.imageset}/Contents.json (63%) create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@2x.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@3x.png rename iphone/Maps/Images.xcassets/Layers/{Traffic/btn_traffic_on_light.imageset => btn_bg_highlighted_light.imageset}/Contents.json (62%) create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@2x.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@3x.png rename iphone/Maps/Images.xcassets/Layers/{btn_layers_off_dark.imageset => btn_bg_light.imageset}/Contents.json (65%) create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@2x.png create mode 100644 iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/btn_layers_dark.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/btn_layers_highdarked_dark.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/btn_layers_highlighted_light.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/Contents.json delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/btn_layers_light.pdf delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@3x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@2x.png delete mode 100644 iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@3x.png create mode 100644 iphone/Maps/Model/MapMode.swift create mode 100644 iphone/Maps/UI/AvailableArea/ModeButtonArea.swift delete mode 100644 iphone/Maps/UI/AvailableArea/TrafficButtonArea.swift delete mode 100644 iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.swift delete mode 100644 iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.xib create mode 100644 iphone/Maps/UI/Menus/Mode/ModeSelector.swift create mode 100644 iphone/Maps/UI/Menus/Mode/ModeSelectorButton.swift delete mode 100644 qt/res/layers.png create mode 100644 qt/res/mode_cycling-selected.png create mode 100644 qt/res/mode_cycling.png create mode 100644 qt/res/mode_default-selected.png create mode 100644 qt/res/mode_default.png create mode 100644 qt/res/mode_driving-selected.png create mode 100644 qt/res/mode_driving.png create mode 100644 qt/res/mode_hiking-selected.png create mode 100644 qt/res/mode_hiking.png rename qt/res/{isolines.png => mode_options_contourlines.png} (100%) rename qt/res/{subway.png => mode_options_transitlines.png} (100%) create mode 100644 qt/res/mode_publictransport-selected.png create mode 100644 qt/res/mode_publictransport.png 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..fbff71982 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("../../default/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..dc1135142 --- /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("../../default/dark/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/cycling/include/basemap.mapcss b/data/styles/cycling/include/basemap.mapcss new file mode 100644 index 000000000..7808a4b14 --- /dev/null +++ b/data/styles/cycling/include/basemap.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/basemap.mapcss"); diff --git a/data/styles/cycling/include/basemap_label.mapcss b/data/styles/cycling/include/basemap_label.mapcss new file mode 100644 index 000000000..29a38def9 --- /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("../../default/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..8147d3caa --- /dev/null +++ b/data/styles/cycling/include/icons.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/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..994df48ef --- /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("../../default/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..1a31163a5 --- /dev/null +++ b/data/styles/cycling/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_1_BG-by-size.prio.txt") \ No newline at end of file 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..d73d356b1 --- /dev/null +++ b/data/styles/cycling/include/priorities_2_BG-top.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_2_BG-top.prio.txt") \ No newline at end of file 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..7ad2a9763 --- /dev/null +++ b/data/styles/cycling/include/priorities_3_FG.prio.txt @@ -0,0 +1,10 @@ +@import("../../default/include/priorities_3_FG.prio.txt") + +highway-tertiary +highway-tertiary-bridge +highway-tertiary-tunnel +highway-unclassified +highway-unclassified-area +highway-unclassified-bridge +highway-unclassified-tunnel +=== 400 \ No newline at end of file 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..01af3ef8b --- /dev/null +++ b/data/styles/cycling/include/priorities_4_overlays.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_4_overlays.prio.txt") \ No newline at end of file diff --git a/data/styles/cycling/include/transit_systems.mapcss b/data/styles/cycling/include/transit_systems.mapcss new file mode 100644 index 000000000..c46e6f3c5 --- /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("../../default/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..07e1bb280 --- /dev/null +++ b/data/styles/cycling/include/ways.mapcss @@ -0,0 +1,52 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/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;} \ No newline at end of file diff --git a/data/styles/cycling/include/ways_label.mapcss b/data/styles/cycling/include/ways_label.mapcss new file mode 100644 index 000000000..df58c7821 --- /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("../../default/include/ways_label.mapcss"); \ No newline at end of file diff --git a/data/styles/cycling/light/colors.mapcss b/data/styles/cycling/light/colors.mapcss new file mode 100644 index 000000000..8c329a58a --- /dev/null +++ b/data/styles/cycling/light/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/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..4a3f20025 --- /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("../../default/light/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/outdoors/dark/style.mapcss b/data/styles/default/dark/dynamic_colors.mapcss similarity index 92% rename from data/styles/outdoors/dark/style.mapcss rename to data/styles/default/dark/dynamic_colors.mapcss index 6e5b0cc51..80873d086 100644 --- a/data/styles/outdoors/dark/style.mapcss +++ b/data/styles/default/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; @@ -113,8 +104,8 @@ colors BookmarkYellow-color: #FFC800; BookmarkOrange-color: #FF9600; BookmarkDeepOrange-color: #F06432; - BookmarkBrown-color: #804633; - BookmarkGray-color: #737373; + BookmarkBrown-color: #8C4E39; + BookmarkGray-color: #808080; BookmarkBlueGray-color: #597380; SearchmarkPreparing-color: #597380; SearchmarkNotAvailable-color: #597380; diff --git a/data/styles/default/dark/style.mapcss b/data/styles/default/dark/style.mapcss index 55344b15e..992b19f9f 100644 --- a/data/styles/default/dark/style.mapcss +++ b/data/styles/default/dark/style.mapcss @@ -1,134 +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: #924ab5; - RouteRuler-opacity: 0.7; - RoutePreview-color: #FFFFFF; - RoutePreview-opacity: 0.3; - RouteMaskCar-color: #000000; - RouteMaskCar-opacity: 0.5; - RouteFirstSegmentArrowsMaskCar-color: #055FCD; - RouteFirstSegmentArrowsMaskCar-opacity: 0.0; - RouteArrowsMaskCar-color: #055FCD; - RouteArrowsMaskCar-opacity: 0.3; - RouteMaskBicycle-color: #000000; - RouteMaskBicycle-opacity: 0.5; - RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C; - RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0; - RouteArrowsMaskBicycle-color: #FF4B8C; - RouteArrowsMaskBicycle-opacity: 0.5; - RouteMaskPedestrian-color: #000000; - RouteMaskPedestrian-opacity: 0.5; - RouteFake-color: #A8A8A8; - RouteFakeOutline-color: #717171; - Arrow3D-color: #41C8FF; - Arrow3DObsolete-color: #82AAC8; - Arrow3DObsolete-opacity: 0.72; - Arrow3DShadow-color: #3C3C3C; - Arrow3DShadow-opacity: 0.24; - Arrow3DOutline-color: #FFFFFF; - TrackHumanSpeed-color: #FF9800; - TrackCarSpeed-color: #FFCA28; - TrackPlaneSpeed-color: #FFF5A0; - TrackUnknownDistance-color: #969696; - TrafficG0-color: #4C120F; - TrafficG1-color: #731816; - TrafficG2-color: #731816; - TrafficG3-color: #8C7012; - TrafficG3-opacity: 0.0; - TrafficG4-color: #376222; - TrafficG5-color: #376222; - TrafficTempBlock-color: #232323; - TrafficUnknown-color: #000000; - TrafficArrowLight-color: #C4C4C4; - TrafficArrowDark-color: #191919; - TrafficOutline-color: #383838; - RoadShieldBlackText-color: #212121; - RoadShieldWhiteText-color: #B7B6B6; - RoadShieldUKYellowText-color: #B49E0E; - RoadShieldWhiteBackground-color: #999999; - RoadShieldGreenBackground-color: #136C30; - RoadShieldBlueBackground-color: #294C88; - RoadShieldRedBackground-color: #9F1A17; - RoadShieldOrangeBackground-color: #B58E1B; - PoiHotelTextOutline-color: #000000; - PoiHotelTextOutline-opacity: 0.6; - PoiDeletedMask-color: #FFFFFF; - PoiDeletedMask-opacity: 0.3; - PoiVisitedMask-color: #FFFFFF; - PoiVisitedMask-opacity: 0.7; - DefaultTrackColor-color: #1E96F0; - RouteMarkPrimaryText-color: #888888; - RouteMarkPrimaryTextOutline-color: #000000; - RouteMarkSecondaryText-color: #888888; - RouteMarkSecondaryTextOutline-color: #000000; - TransitMarkPrimaryText-color: #888888; - TransitMarkPrimaryTextOutline-color: #000000; - TransitMarkSecondaryText-color: #888888; - TransitMarkSecondaryTextOutline-color: #000000; - TransitTransferOuterMarker-color: #000000; - TransitTransferInnerMarker-color: #888888; - TransitStopInnerMarker-color: #000000; - LocalAdsPrimaryText-color: #888888; - LocalAdsPrimaryTextOutline-color: #000000; - LocalAdsSecondaryText-color: #888888; - LocalAdsSecondaryTextOutline-color: #000000; - TransitBackground-color: #000000; - TransitBackground-opacity: 0.4; - BookmarkRed-color: #E51B23; - BookmarkPink-color: #FF4182; - BookmarkPurple-color: #9B24B2; - BookmarkDeepPurple-color: #6639BF; - BookmarkBlue-color: #0066CC; - BookmarkLightBlue-color: #249CF2; - BookmarkCyan-color: #14BECD; - BookmarkTeal-color: #00A58C; - BookmarkGreen-color: #3C8C3C; - BookmarkLime-color: #93BF39; - BookmarkYellow-color: #FFC800; - BookmarkOrange-color: #FF9600; - BookmarkDeepOrange-color: #F06432; - BookmarkBrown-color: #8C4E39; - BookmarkGray-color: #808080; - BookmarkBlueGray-color: #597380; - SearchmarkPreparing-color: #597380; - SearchmarkNotAvailable-color: #597380; - SearchmarkSelectedNotAvailable-color: #F06432; - RatingBad-color: #F06432; - RatingGood-color: #3C8C3C; - RatingNone-color: #249CF2; - SearchmarkDefault-color: #249CF2; - RatingText-color: #FFFFFF; - UGCRatingText-color: #B8B8B8; - SpeedCameraMarkText-color: #FFFFFF; - SpeedCameraMarkBg-color: #F51E30; - SpeedCameraMarkOutline-color: #FFFFFF; - GuideCityMarkText-color: #6639BF; - GuideOutdoorMarkText-color: #3C8C3C; - HotelPriceText-color: #000000; -} +@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"); \ No newline at end of file diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/basemap.mapcss similarity index 99% rename from data/styles/default/include/Basemap.mapcss rename to data/styles/default/include/basemap.mapcss index a2b1a787c..996b1c52a 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/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/default/include/basemap_label.mapcss similarity index 100% rename from data/styles/default/include/Basemap_label.mapcss rename to data/styles/default/include/basemap_label.mapcss 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/include/Icons.mapcss b/data/styles/default/include/icons.mapcss similarity index 98% rename from data/styles/default/include/Icons.mapcss rename to data/styles/default/include/icons.mapcss index 5070f962b..1b8094791 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/icons.mapcss @@ -22,7 +22,6 @@ 6.1 Craft 7.CAR 7.1 Parking -8. COLORED LABELS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -2374,16 +2373,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], @@ -2396,46 +2395,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;} @@ -2536,8 +2519,4 @@ node|z17-[amenity=motorcycle_parking], {icon-image: motorcycle-parking-m.svg;} node|z18-[amenity=parking_space][parking_space=disabled], -{icon-image: parking-disabled-m.svg;} - -/* 8. Colored Labels */ - -@import("../../default/include/Icons_Label_Colors.mapcss"); +{icon-image: parking-disabled-m.svg;} \ No newline at end of file diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/icons_label_colors.mapcss similarity index 100% rename from data/styles/default/include/Icons_Label_Colors.mapcss rename to data/styles/default/include/icons_label_colors.mapcss diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index 28be29a66..e521c4304 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -85,15 +85,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-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index b6444d421..567e252e3 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -374,11 +374,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-) === 4270 highway-services # icon z14- (also has caption(optional) z14-, area z13-) @@ -429,16 +429,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-) @@ -1650,11 +1650,11 @@ leisure-swimming_pool-private # icon z17- (also has captio # tourism-gallery # caption(optional) z15- (also has icon z15-) # === -5700 -# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-) +# 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-) # === -5730 # highway-services # caption(optional) z14- (also has icon z14-, area z13-) @@ -1705,16 +1705,16 @@ leisure-swimming_pool-private # 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-) diff --git a/data/styles/default/include/Subways.mapcss b/data/styles/default/include/transit_systems.mapcss similarity index 100% rename from data/styles/default/include/Subways.mapcss rename to data/styles/default/include/transit_systems.mapcss diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/ways.mapcss similarity index 100% rename from data/styles/default/include/Roads.mapcss rename to data/styles/default/include/ways.mapcss diff --git a/data/styles/default/include/Roads_label.mapcss b/data/styles/default/include/ways_label.mapcss similarity index 100% rename from data/styles/default/include/Roads_label.mapcss rename to data/styles/default/include/ways_label.mapcss diff --git a/data/styles/outdoors/light/style.mapcss b/data/styles/default/light/dynamic_colors.mapcss similarity index 92% rename from data/styles/outdoors/light/style.mapcss rename to data/styles/default/light/dynamic_colors.mapcss index 1b8a3c6e1..a679ef03e 100644 --- a/data/styles/outdoors/light/style.mapcss +++ b/data/styles/default/light/dynamic_colors.mapcss @@ -1,14 +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"); - -/* TODO: move to a separete base file */ - colors { GuiText-color: #4D4D4D; diff --git a/data/styles/default/light/style.mapcss b/data/styles/default/light/style.mapcss index ab819679d..992b19f9f 100644 --- a/data/styles/default/light/style.mapcss +++ b/data/styles/default/light/style.mapcss @@ -1,134 +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: #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; -} +@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"); \ No newline at end of file diff --git a/data/styles/driving/dark/colors.mapcss b/data/styles/driving/dark/colors.mapcss new file mode 100644 index 000000000..fbff71982 --- /dev/null +++ b/data/styles/driving/dark/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/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..dc1135142 --- /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("../../default/dark/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/driving/include/basemap.mapcss b/data/styles/driving/include/basemap.mapcss new file mode 100644 index 000000000..7808a4b14 --- /dev/null +++ b/data/styles/driving/include/basemap.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/basemap.mapcss"); diff --git a/data/styles/driving/include/basemap_label.mapcss b/data/styles/driving/include/basemap_label.mapcss new file mode 100644 index 000000000..29a38def9 --- /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("../../default/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..fcdd79a3a --- /dev/null +++ b/data/styles/driving/include/icons.mapcss @@ -0,0 +1,53 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/icons.mapcss"); + +/* 7. CAR */ + +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..994df48ef --- /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("../../default/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..1a31163a5 --- /dev/null +++ b/data/styles/driving/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_1_BG-by-size.prio.txt") \ No newline at end of file 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..d73d356b1 --- /dev/null +++ b/data/styles/driving/include/priorities_2_BG-top.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_2_BG-top.prio.txt") \ No newline at end of file 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..0cffc3448 --- /dev/null +++ b/data/styles/driving/include/priorities_3_FG.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_3_FG.prio.txt") \ No newline at end of file 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..01af3ef8b --- /dev/null +++ b/data/styles/driving/include/priorities_4_overlays.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_4_overlays.prio.txt") \ No newline at end of file diff --git a/data/styles/driving/include/transit_systems.mapcss b/data/styles/driving/include/transit_systems.mapcss new file mode 100644 index 000000000..c46e6f3c5 --- /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("../../default/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..50b3fcfdb --- /dev/null +++ b/data/styles/driving/include/ways.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/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..df58c7821 --- /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("../../default/include/ways_label.mapcss"); \ No newline at end of file diff --git a/data/styles/driving/light/colors.mapcss b/data/styles/driving/light/colors.mapcss new file mode 100644 index 000000000..8c329a58a --- /dev/null +++ b/data/styles/driving/light/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/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..4a3f20025 --- /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("../../default/light/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/outdoors/dark/colors.mapcss b/data/styles/hiking/dark/colors.mapcss similarity index 100% rename from data/styles/outdoors/dark/colors.mapcss rename to data/styles/hiking/dark/colors.mapcss diff --git a/data/styles/hiking/dark/style.mapcss b/data/styles/hiking/dark/style.mapcss new file mode 100644 index 000000000..dc1135142 --- /dev/null +++ b/data/styles/hiking/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("../../default/dark/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/hiking/include/basemap.mapcss similarity index 99% rename from data/styles/outdoors/include/Basemap.mapcss rename to data/styles/hiking/include/basemap.mapcss index 3cf53e82f..dacae50ba 100644 --- a/data/styles/outdoors/include/Basemap.mapcss +++ b/data/styles/hiking/include/basemap.mapcss @@ -1,5 +1,5 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Basemap.mapcss"); +@import("../../default/include/basemap.mapcss"); /* 6.WATER */ diff --git a/data/styles/outdoors/include/Basemap_label.mapcss b/data/styles/hiking/include/basemap_label.mapcss similarity index 95% rename from data/styles/outdoors/include/Basemap_label.mapcss rename to data/styles/hiking/include/basemap_label.mapcss index 14a074212..b88300973 100644 --- a/data/styles/outdoors/include/Basemap_label.mapcss +++ b/data/styles/hiking/include/basemap_label.mapcss @@ -1,5 +1,5 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Basemap_label.mapcss"); +@import("../../default/include/basemap_label.mapcss"); /* Barriers, cliffs */ diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/hiking/include/icons.mapcss similarity index 99% rename from data/styles/outdoors/include/Icons.mapcss rename to data/styles/hiking/include/icons.mapcss index cb27acfeb..33379e6e1 100644 --- a/data/styles/outdoors/include/Icons.mapcss +++ b/data/styles/hiking/include/icons.mapcss @@ -1,5 +1,5 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Icons.mapcss"); +@import("../../default/include/icons.mapcss"); /* 2. NATURAL */ diff --git a/data/styles/hiking/include/icons_label_colors.mapcss b/data/styles/hiking/include/icons_label_colors.mapcss new file mode 100644 index 000000000..994df48ef --- /dev/null +++ b/data/styles/hiking/include/icons_label_colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/icons_label_colors.mapcss"); diff --git a/data/styles/hiking/include/priorities_1_BG-by-size.prio.txt b/data/styles/hiking/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..0449f9a7e --- /dev/null +++ b/data/styles/hiking/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1,4 @@ +@import("../../default/include/priorities_1_BG-by-size.prio.txt") + +amenity-courthouse +=== 180 \ No newline at end of file diff --git a/data/styles/hiking/include/priorities_2_BG-top.prio.txt b/data/styles/hiking/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..d73d356b1 --- /dev/null +++ b/data/styles/hiking/include/priorities_2_BG-top.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_2_BG-top.prio.txt") \ No newline at end of file diff --git a/data/styles/hiking/include/priorities_3_FG.prio.txt b/data/styles/hiking/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..76fd88889 --- /dev/null +++ b/data/styles/hiking/include/priorities_3_FG.prio.txt @@ -0,0 +1,16 @@ +@import("../../default/include/priorities_3_FG.prio.txt") + +power-minor_line +=== 350 + +power-minor_line::dash +=== 340 + +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- +=== 15 \ No newline at end of file diff --git a/data/styles/hiking/include/priorities_4_overlays.prio.txt b/data/styles/hiking/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..8b10f229b --- /dev/null +++ b/data/styles/hiking/include/priorities_4_overlays.prio.txt @@ -0,0 +1,8 @@ +@import("../../default/include/priorities_4_overlays.prio.txt") + +power-line +=== 1000 + +man_made-utility_pole +power-pole +=== 230 \ No newline at end of file diff --git a/data/styles/hiking/include/transit_systems.mapcss b/data/styles/hiking/include/transit_systems.mapcss new file mode 100644 index 000000000..c46e6f3c5 --- /dev/null +++ b/data/styles/hiking/include/transit_systems.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/transit_systems.mapcss"); diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/hiking/include/ways.mapcss similarity index 99% rename from data/styles/outdoors/include/Roads.mapcss rename to data/styles/hiking/include/ways.mapcss index 85309d7c7..bda5e2e27 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/hiking/include/ways.mapcss @@ -1,5 +1,5 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Roads.mapcss"); +@import("../../default/include/ways.mapcss"); /* Make all roads more contrast */ diff --git a/data/styles/outdoors/include/Roads_label.mapcss b/data/styles/hiking/include/ways_label.mapcss similarity index 96% rename from data/styles/outdoors/include/Roads_label.mapcss rename to data/styles/hiking/include/ways_label.mapcss index cd8af148e..e16ffa80a 100644 --- a/data/styles/outdoors/include/Roads_label.mapcss +++ b/data/styles/hiking/include/ways_label.mapcss @@ -1,5 +1,5 @@ /* Keep here changes of the base map style file only. */ -@import("../../default/include/Roads_label.mapcss"); +@import("../../default/include/ways_label.mapcss"); line|z13-[highway=track], diff --git a/data/styles/outdoors/light/colors.mapcss b/data/styles/hiking/light/colors.mapcss similarity index 100% rename from data/styles/outdoors/light/colors.mapcss rename to data/styles/hiking/light/colors.mapcss diff --git a/data/styles/hiking/light/style.mapcss b/data/styles/hiking/light/style.mapcss new file mode 100644 index 000000000..4a3f20025 --- /dev/null +++ b/data/styles/hiking/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("../../default/light/dynamic_colors.mapcss"); \ No newline at end of file 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 3d8fbd877..000000000 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ /dev/null @@ -1,258 +0,0 @@ -# This file is automatically re-formatted and re-sorted in priorities descending order -# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) -# are generated automatically for information only. Custom formatting and comments are not preserved. -# -# BG-by-size geometry: background areas rendered below BG-top and everything else. -# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box). -# So effectively priority values of BG-by-size areas are not used at the moment. -# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature. -# Keep them in a logical importance order please. -# -# Priorities ranges' rendering order overview: -# - overlays (icons, captions...) -# - FG: foreground areas and lines -# - BG-top: water (linear and areal) -# - BG-by-size: landcover areas sorted by their size - -leisure-stadium # area z13- (also has icon z13-, caption(optional) z13-) -=== 250 - -amenity-place_of_worship # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-buddhist # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-jehovahs_witness # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-christian-mormon # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-hindu # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-jewish # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-muslim # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-shinto # area z13- (also has icon z14-, caption(optional) z14-) -amenity-place_of_worship-taoist # area z13- (also has icon z14-, caption(optional) z14-) -landuse-religious # area z13- -=== 240 - -amenity-doctors # area z15- (also has icon z17-, caption(optional) z17-) -leisure-swimming_pool # area z13- (also has icon z17-, caption(optional) z17-) -leisure-swimming_pool-private # area z13- (also has icon z17-, caption(optional) z17-) -=== 230 - -landuse-landfill # area z13- (also has icon z15-, caption(optional) z15-) -=== 220 - -leisure-playground # area z15- (also has icon z17-, caption(optional) z17-) -=== 200 - -amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-) -leisure-fitness_centre-sport-yoga # area z16- (also has icon z16-, caption(optional) z17-) -leisure-sports_centre # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-american_football # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-archery # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-athletics # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-australian_football # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-badminton # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-baseball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-basketball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-beachvolleyball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-bowls # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-climbing # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-cricket # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-curling # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-equestrian # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-field_hockey # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-futsal # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-golf # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-gymnastics # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-handball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-ice_hockey # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-multi # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-padel # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-pelota # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-scuba_diving # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-shooting # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-skateboard # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-skiing # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-soccer # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-swimming # area z13- (also has icon z15-, caption(optional) z15-) -leisure-sports_centre-sport-table_tennis # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-tennis # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-volleyball # area z13- (also has icon z16-, caption(optional) z16-) -leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-) -=== 190 - -amenity-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-, pathtext z14-) -highway-pedestrian-square # area z14- (also has line z13-, pathtext z14-) -highway-rest_area # area z13- (also has icon z14-, caption(optional) z15-) -highway-services # area z13- (also has icon z14-, caption(optional) z14-) -landuse-garages # area z13- (also has caption z15-) -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-, 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/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt deleted file mode 100644 index c3a60c241..000000000 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ /dev/null @@ -1,490 +0,0 @@ -# This file is automatically re-formatted and re-sorted in priorities descending order -# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.) -# are generated automatically for information only. Custom formatting and comments are not preserved. -# -# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays -# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature -# is layer=-10 (as tunnels should be visibile over landcover and water). -# -# Priorities ranges' rendering order overview: -# - overlays (icons, captions...) -# - FG: foreground areas and lines -# - BG-top: water (linear and areal) -# - BG-by-size: landcover areas sorted by their size - -aerialway-cable_car::dash # line::dash z12- (also has line z12-, pathtext z15-) -aerialway-chair_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-drag_lift::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-gondola::dash # line::dash z12- (also has line z12-, pathtext z15-) -aerialway-j-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-magic_carpet::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-mixed_lift::dash # line::dash z12- (also has line z12-, pathtext z15-) -aerialway-platter::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-rope_tow::dash # line::dash z13- (also has line z13-, pathtext z15-) -aerialway-t-bar::dash # line::dash z13- (also has line z13-, pathtext z15-) -=== 380 - -aerialway-cable_car # line z12- (also has line::dash z12-, pathtext z15-) -aerialway-chair_lift # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-drag_lift # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-gondola # line z12- (also has line::dash z12-, pathtext z15-) -aerialway-j-bar # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-magic_carpet # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-mixed_lift # line z12- (also has line::dash z12-, pathtext z15-) -aerialway-platter # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-rope_tow # line z13- (also has line::dash z13-, pathtext z15-) -aerialway-t-bar # line z13- (also has line::dash z13-, pathtext z15-) -=== 370 - -historic-citywalls # line z14- (also has pathtext z16-) -=== 360 - -power-line # line 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 icon z16-, pathtext z17-) -highway-steps # line z12- (also has pathtext z13-) -highway-steps-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-steps-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -hwtag-oneway::arrows # line::arrows z15- -waterway-weir # line z14- (also has pathtext z15-) -=== 330 - -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 pathtext z10-, shield::shield z10-) -highway-motorway-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk # line z6- (also has pathtext z10-, shield::shield z10-) -highway-trunk-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-world_level # line z4-9 -highway-world_towns_level # line z6-9 -=== 310 - -# highway-motorway-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) -# highway-trunk-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) -# === 309 - -highway-primary # line z8- (also has pathtext z10-, shield::shield z10-) -highway-primary-bridge # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-primary-tunnel # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-) -railway-rail-branch::dash # line::dash 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-, 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 pathtext z10-, shield::shield z12-) -highway-secondary-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary-tunnel # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-) -=== 270 - -# highway-secondary-tunnel # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-) -# === 269 - -highway-tertiary # line z11- (also has pathtext z12-, shield::shield z13-) -highway-tertiary-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary-tunnel # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-) -highway-unclassified # line z11- (also has pathtext z13-) -highway-unclassified-area # line z11- (also has pathtext z13-) -highway-unclassified-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-) -highway-unclassified-tunnel # line z11- (also has line(casing) z16-, pathtext z13-) -=== 250 - -# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-) -# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-) -# === 249 - -highway-living_street # line z12- (also has pathtext z14-) -highway-living_street-bridge # line z12- (also has pathtext z14-) -highway-living_street-tunnel # line z12- (also has line(casing) z16-, pathtext z14-) -highway-residential # line z12- (also has pathtext z13-, shield::shield z15-) -highway-residential-area # line z12- (also has pathtext z13-, shield::shield z15-) -highway-residential-bridge # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-residential-tunnel # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-) -highway-road # line z12- (also has pathtext z14-) -highway-road-bridge # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-) -highway-road-tunnel # line z12- (also has pathtext z14-) -=== 230 - -# highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-) -# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-) -# === 229 - -highway-motorway_link # line z10- (also has pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-motorway_link-tunnel # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link # line z10- (also has pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-trunk_link-tunnel # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-) -=== 228 - -# highway-motorway_link-tunnel # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-) -# highway-trunk_link-tunnel # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-) -# === 227 - -highway-primary_link # line z11- (also has pathtext z11-, shield::shield z11-) -highway-primary_link-bridge # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-primary_link-tunnel # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-) -=== 226 - -# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-) -# === 225 - -highway-secondary_link # line z13- (also has pathtext z16-) -highway-secondary_link-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-) -highway-secondary_link-tunnel # line z13- (also has line(casing) z16-, pathtext z16-) -=== 224 - -# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-) -highway-tertiary_link # line z14- (also has pathtext z18-) -highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-) -highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-) -=== 223 - -highway-busway # line z15- (also has pathtext z16-) -highway-busway-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) -highway-busway-tunnel # line z15- (also has line(casing) z15-, pathtext z16-) -highway-service # line z13- (also has pathtext z16-) -highway-service-area # line z13- (also has pathtext z16-) -highway-service-bridge # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-) -highway-service-driveway # line z16- (also has pathtext z16-) -highway-service-parking_aisle # line z15- (also has pathtext z16-) -highway-service-tunnel # line z13- (also has line(casing) z15-, pathtext z16-) -# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-) -=== 222 - -# highway-busway-tunnel # line(casing) z15- (also has line z15-, pathtext z16-) -# highway-service-tunnel # line(casing) z15- (also has line z13-, pathtext z16-) -railway-light_rail::dash # line::dash z16- (also has line z13-) -railway-light_rail-bridge::dash # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-) -railway-rail::dash # line::dash z15- (also has line z10-) -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::cycleline z13-, pathtext z13-) -highway-path-bicycle # line z11- (also has line::cycleline z12-, pathtext z13-) -=== 220 - -highway-footway-bicycle::cycleline # line::cycleline z13- (also has line z11-, pathtext z13-) -highway-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 - -# 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 icon z14-, pathtext z16-) -highway-pedestrian # line z13- (also has pathtext z14-) -highway-pedestrian-area # line z13- and area z14- (also has pathtext z14-) -highway-pedestrian-bridge # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-) -highway-pedestrian-square # line z13- and area z14- (also has pathtext z14-) -highway-pedestrian-tunnel # line z13- (also has line(casing) z16-, pathtext z14-) -=== 200 - -# highway-pedestrian-tunnel # line(casing) z16- (also has line z13-, pathtext z14-) -# === 199 - -highway-bridleway # line z11- (also has pathtext z13-) -highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -highway-footway # line z11- (also has pathtext z13-) -highway-footway-area # line z11- and area z14- (also has pathtext z13-) -highway-footway-crossing # line z16- -highway-path # line z11- (also has pathtext z13-) -highway-path-difficult # line z11- (also has pathtext z13-) -highway-path-expert # line z11- (also has pathtext z13-) -highway-raceway # line z14- (also has pathtext z16-) -highway-track # line z11- (also has pathtext z13-) -highway-track-area # line z11- (also has pathtext z13-) -highway-track-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-track-no-access # line z11- (also has pathtext z13-) -highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -=== 180 - -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- -=== 160 - -highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-footway-sidewalk # line z13- -highway-footway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-path-horse # line z11- (also has pathtext z13-) -highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -=== 155 - -highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) -highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -=== 154 - -highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) -highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -=== 153 - -highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-busway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-) -highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-) -highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgewhite # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-) -highway-road-bridge::bridgewhite # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-) -highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-) -highway-service-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-) -highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-) -highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) -highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) -highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) -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-) -=== 150 - -highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-busway-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-) -highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-) -highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-) -highway-residential-bridge::bridgeblack # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-) -highway-road-bridge::bridgeblack # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-) -highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-) -highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-) -highway-service-bridge::bridgeblack # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-) -highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-) -highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) -highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) -highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) -highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) -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-) -=== 140 - -building # area z14- (also has caption z17-) -building-garage # area z14- (also has caption z17-) -building-guardhouse # area z14- (also has icon z16-, caption(optional) z18-) -building-has_parts # area z14- (also has caption z17-) -building-train_station # area z14- (also has icon z17-, caption(optional) z17-) -=== 130 - -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-) -=== 120 - -building:part # area z16- -=== 110 - -barrier-retaining_wall # line z16- -man_made-embankment # line z16- (also has pathtext z18-) -natural-cliff # line z12- (also has pathtext z14-) -natural-earth_bank # line z12- -=== 100 - -boundary-administrative-2 # line z2- -boundary-administrative-3 # line z4 -boundary-administrative-4 # line z5- -=== 90 - -man_made-cutline # line z13- -route-ferry # line z7- (also has pathtext z10-) -=== 80 - -aeroway-runway # line z12- -aeroway-taxiway # line z14- -barrier-ditch # line z15- -=== 70 - -isoline-step_10 # line z15- (also has pathtext z16-) -isoline-step_100 # line z11- (also has pathtext z13-) -isoline-step_1000 # line z10- (also has pathtext z10-) -isoline-step_50 # line z13- (also has pathtext z15-) -isoline-step_500 # line z10- (also has pathtext z11-) -isoline-zero # line z15- (also has pathtext z15-) -=== 60 - -man_made-breakwater # line z14- and area z12- (also has caption z17-) -man_made-pier # line z14- and area z12- (also has caption z17-) -waterway-dam # line z14- and area z14- (also has pathtext z15-) -=== 30 - -landuse-military # area z12- (also has icon z16-, caption(optional) z17-) -landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) -=== 25 - -amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) -boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) -boundary-national_park # line z10- and area z10-17 (also has icon 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 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt deleted file mode 100644 index 65e216906..000000000 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ /dev/null @@ -1,2514 +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. -# -# 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 - -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-) -highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) -highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-) -highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) -=== 6750 - -highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-) -highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) -highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-) -highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) -=== 6740 - -boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) -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-) -highway-primary-bridge # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary-tunnel # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-) -route-ferry # pathtext z10- (also has line z7-) -=== 6200 - -highway-motorway_link # pathtext z10- (also has shield::shield z10-, line z10-) -highway-motorway_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-) -highway-trunk_link # pathtext z10- (also has shield::shield z10-, line z10-) -highway-trunk_link-bridge # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-) -=== 6150 - -highway-motorway_link::shield # shield::shield z10- (also has pathtext z10-, line z10-) -highway-motorway_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-motorway_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-) -highway-trunk_link::shield # shield::shield z10- (also has pathtext z10-, line z10-) -highway-trunk_link-bridge::shield # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-trunk_link-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-) -=== 6140 - -highway-primary_link # pathtext z11- (also has shield::shield z11-, line z11-) -highway-primary_link-bridge # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-) -=== 6100 - -barrier-border_control # icon z12- (also has caption(optional) z14-) -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-) -highway-secondary-bridge # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary-tunnel # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-) -=== 5600 - -man_made-communications_tower # icon z12- (also has caption(optional) z13-) -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-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-) -=== 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-) -highway-pedestrian-area # pathtext z14- (also has line z13-, area z14-) -highway-pedestrian-bridge # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-) -highway-pedestrian-square # pathtext z14- (also has line z13-, area z14-) -highway-pedestrian-tunnel # pathtext z14- (also has line z13-, line(casing) z16-) -highway-tertiary # pathtext z12- (also has shield::shield z13-, line z11-) -highway-tertiary-bridge # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-) -natural-strait # caption z13- (also has line z11-) -natural-water # caption z10- (also has area z1-) -natural-water-pond # caption z10- (also has area z1-) -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-) -highway-unclassified-area # pathtext z13- (also has line z11-) -highway-unclassified-bridge # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-) -=== 3100 - -amenity-water_point # icon z12- (also has caption(optional) z14-) -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-) -highway-residential-area # pathtext z13- (also has shield::shield z15-, line z12-) -highway-residential-bridge # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-) -highway-road # pathtext z14- (also has line z12-) -highway-road-bridge # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-) -highway-road-tunnel # pathtext z14- (also has line z12-) -highway-secondary_link # pathtext z16- (also has line z13-) -highway-secondary_link-bridge # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary_link-tunnel # pathtext z16- (also has line z13-, line(casing) z16-) -=== 3000 - -highway-primary::shield # shield::shield z10- (also has pathtext z10-, line z8-) -highway-primary-bridge::shield # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-) -=== 2975 - -highway-primary_link::shield # shield::shield z11- (also has pathtext z11-, line z11-) -highway-primary_link-bridge::shield # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-primary_link-tunnel::shield # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-) -=== 2970 - -highway-secondary::shield # shield::shield z12- (also has pathtext z10-, line z10-) -highway-secondary-bridge::shield # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-secondary-tunnel::shield # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-) -=== 2965 - -highway-tertiary::shield # shield::shield z13- (also has pathtext z12-, line z11-) -highway-tertiary-bridge::shield # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary-tunnel::shield # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-) -=== 2960 - -barrier-city_wall # pathtext z16- (also has line z14-) -historic-citywalls # pathtext z16- (also has line z14-) -=== 2957 - -highway-residential::shield # shield::shield z15- (also has pathtext z13-, line z12-) -highway-residential-area::shield # shield::shield z15- (also has pathtext z13-, line z12-) -highway-residential-bridge::shield # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-) -=== 2955 - -highway-cycleway # pathtext z13- (also has line z11-) -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-) -highway-footway-area # pathtext z13- (also has line z11-, area z14-) -highway-footway-bicycle # pathtext z13- (also has line z11-, line::cycleline z13-) -highway-footway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-footway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-tertiary_link # pathtext z18- (also has line z14-) -highway-tertiary_link-bridge # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) -highway-tertiary_link-tunnel # pathtext z18- (also has line z14-, line(casing) z16-) -=== 2950 - -natural-water-basin # caption z10- (also has area z1-) -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-) -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-) -highway-steps-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-steps-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-) -=== 2810 - -highway-track # pathtext z13- (also has line z11-) -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-) -highway-service-area # pathtext z16- (also has line z13-) -highway-service-bridge # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-service-driveway # pathtext z16- (also has line z16-) -highway-service-parking_aisle # pathtext z16- (also has line z15-) -highway-service-tunnel # pathtext z16- (also has line z13-, line(casing) z15-) -piste:type-downhill # pathtext z15- (also has line z12-) -piste:type-downhill-advanced # pathtext z15- (also has line z12-) -piste:type-downhill-easy # pathtext z15- (also has line z12-) -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-) -=== 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-amusement_ride # icon z17- (also has caption(optional) z17-) -attraction-animal # icon z17- (also has caption(optional) z17-) -attraction-big_wheel # icon z17- (also has caption(optional) z17-) -attraction-bumper_car # icon z17- (also has caption(optional) z17-) -attraction-carousel # icon z17- (also has caption(optional) z17-) -attraction-historic # icon z17- (also has caption(optional) z17-) -attraction-maze # icon z17- (also has caption(optional) z17-) -attraction-roller_coaster # icon z17- (also has caption(optional) z17-) -highway-construction # pathtext z15- (also has line z11-) -highway-living_street # pathtext z14- (also has line z12-) -highway-living_street-bridge # pathtext z14- (also has line z12-) -highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-) -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-) -highway-busway-bridge # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) -highway-busway-tunnel # pathtext z16- (also has line(casing) z15-, line z15-) -=== 2250 - -amenity-clinic # icon z17- (also has caption(optional) z17-, area z13-) -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-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-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-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-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-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-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-) -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 - -# -# 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-) -# === -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-, 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-) -# 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-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-) -# === -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-) -# === -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-amusement_ride # caption(optional) z17- (also has icon z17-) -# attraction-animal # caption(optional) z17- (also has icon z17-) -# attraction-big_wheel # caption(optional) z17- (also has icon z17-) -# attraction-bumper_car # caption(optional) z17- (also has icon z17-) -# attraction-carousel # caption(optional) z17- (also has icon z17-) -# attraction-historic # caption(optional) z17- (also has icon z17-) -# attraction-maze # caption(optional) z17- (also has icon z17-) -# attraction-roller_coaster # 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-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-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-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-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-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-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-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-, area z10-) -# leisure-park-private # caption(optional) z14- (also has icon z14-, 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 z16- -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 # icon z18- -=== -9991 - -# 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/publictransport/dark/colors.mapcss b/data/styles/publictransport/dark/colors.mapcss new file mode 100644 index 000000000..fbff71982 --- /dev/null +++ b/data/styles/publictransport/dark/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/dark/colors.mapcss"); diff --git a/data/styles/publictransport/dark/style.mapcss b/data/styles/publictransport/dark/style.mapcss new file mode 100644 index 000000000..dc1135142 --- /dev/null +++ b/data/styles/publictransport/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("../../default/dark/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/publictransport/include/basemap.mapcss b/data/styles/publictransport/include/basemap.mapcss new file mode 100644 index 000000000..7808a4b14 --- /dev/null +++ b/data/styles/publictransport/include/basemap.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/basemap.mapcss"); diff --git a/data/styles/publictransport/include/basemap_label.mapcss b/data/styles/publictransport/include/basemap_label.mapcss new file mode 100644 index 000000000..29a38def9 --- /dev/null +++ b/data/styles/publictransport/include/basemap_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/basemap_label.mapcss"); diff --git a/data/styles/publictransport/include/icons.mapcss b/data/styles/publictransport/include/icons.mapcss new file mode 100644 index 000000000..317778986 --- /dev/null +++ b/data/styles/publictransport/include/icons.mapcss @@ -0,0 +1,7 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/icons.mapcss"); + +/* 3.4 Bus Station */ + +node|z14[highway=bus_stop], +{icon-image: bus-xvs.svg;icon-min-distance: 1;} \ No newline at end of file diff --git a/data/styles/publictransport/include/icons_label_colors.mapcss b/data/styles/publictransport/include/icons_label_colors.mapcss new file mode 100644 index 000000000..994df48ef --- /dev/null +++ b/data/styles/publictransport/include/icons_label_colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/icons_label_colors.mapcss"); diff --git a/data/styles/publictransport/include/priorities_1_BG-by-size.prio.txt b/data/styles/publictransport/include/priorities_1_BG-by-size.prio.txt new file mode 100644 index 000000000..1a31163a5 --- /dev/null +++ b/data/styles/publictransport/include/priorities_1_BG-by-size.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_1_BG-by-size.prio.txt") \ No newline at end of file diff --git a/data/styles/publictransport/include/priorities_2_BG-top.prio.txt b/data/styles/publictransport/include/priorities_2_BG-top.prio.txt new file mode 100644 index 000000000..d73d356b1 --- /dev/null +++ b/data/styles/publictransport/include/priorities_2_BG-top.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_2_BG-top.prio.txt") \ No newline at end of file diff --git a/data/styles/publictransport/include/priorities_3_FG.prio.txt b/data/styles/publictransport/include/priorities_3_FG.prio.txt new file mode 100644 index 000000000..0cffc3448 --- /dev/null +++ b/data/styles/publictransport/include/priorities_3_FG.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_3_FG.prio.txt") \ No newline at end of file diff --git a/data/styles/publictransport/include/priorities_4_overlays.prio.txt b/data/styles/publictransport/include/priorities_4_overlays.prio.txt new file mode 100644 index 000000000..01af3ef8b --- /dev/null +++ b/data/styles/publictransport/include/priorities_4_overlays.prio.txt @@ -0,0 +1 @@ +@import("../../default/include/priorities_4_overlays.prio.txt") \ No newline at end of file diff --git a/data/styles/publictransport/include/transit_systems.mapcss b/data/styles/publictransport/include/transit_systems.mapcss new file mode 100644 index 000000000..c46e6f3c5 --- /dev/null +++ b/data/styles/publictransport/include/transit_systems.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/transit_systems.mapcss"); diff --git a/data/styles/publictransport/include/ways.mapcss b/data/styles/publictransport/include/ways.mapcss new file mode 100644 index 000000000..50b3fcfdb --- /dev/null +++ b/data/styles/publictransport/include/ways.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/ways.mapcss"); diff --git a/data/styles/publictransport/include/ways_label.mapcss b/data/styles/publictransport/include/ways_label.mapcss new file mode 100644 index 000000000..df58c7821 --- /dev/null +++ b/data/styles/publictransport/include/ways_label.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/include/ways_label.mapcss"); \ No newline at end of file diff --git a/data/styles/publictransport/light/colors.mapcss b/data/styles/publictransport/light/colors.mapcss new file mode 100644 index 000000000..8c329a58a --- /dev/null +++ b/data/styles/publictransport/light/colors.mapcss @@ -0,0 +1,2 @@ +/* Keep here changes of the base map style file only. */ +@import("../../default/light/colors.mapcss"); diff --git a/data/styles/publictransport/light/style.mapcss b/data/styles/publictransport/light/style.mapcss new file mode 100644 index 000000000..4a3f20025 --- /dev/null +++ b/data/styles/publictransport/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("../../default/light/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/data/styles/vehicle/dark/style.mapcss b/data/styles/vehicle/dark/style.mapcss index 3057c2490..dc1135142 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("../../default/dark/dynamic_colors.mapcss"); \ No newline at end of file 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 d94c1cda0..d6abf28b0 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 */ @@ -804,8 +804,4 @@ node|z19-[amenity=parking_entrance][access=private], {icon-image: parking_entrance_private-m.svg; font-size: 12.5;} 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 +{icon-image: motorcycle-parking-m.svg;} \ 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..994df48ef --- /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("../../default/include/icons_label_colors.mapcss"); 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..3b877247f 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("../../default/include/transit_systems.mapcss"); /*only render captions from z16*/ 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..4a3f20025 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("../../default/light/dynamic_colors.mapcss"); \ No newline at end of file diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index 948d0e72f..669cb3568 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -31,34 +31,43 @@ + (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 index fef6239d5..a5f3c8255 100644 --- a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h +++ b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.h @@ -1,42 +1,18 @@ #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); +typedef NS_ENUM(NSUInteger, MWMMapMode) { + MWMMapModeDefault, + MWMMapModeHiking, + MWMMapModeCycling, + MWMMapModeDriving, + MWMMapModePublicTransport, +} NS_SWIFT_NAME(MapMode); NS_SWIFT_NAME(MapOverlayManagerObserver) @protocol MWMMapOverlayManagerObserver @optional -- (void)onTrafficStateUpdated; -- (void)onTransitStateUpdated; -- (void)onIsoLinesStateUpdated; -- (void)onOutdoorStateUpdated; +- (void)onMapModeUpdated; @end @@ -46,20 +22,18 @@ NS_SWIFT_NAME(MapOverlayManager) + (void)addObserver:(id)observer; + (void)removeObserver:(id)observer; -+ (MWMMapOverlayTrafficState)trafficState; -+ (MWMMapOverlayTransitState)transitState; -+ (MWMMapOverlayIsolinesState)isolinesState; -+ (MWMMapOverlayOutdoorState)outdoorState; ++ (MWMMapMode)mapMode; ++ (BOOL)defaultMapModeHasContourLines; ++ (BOOL)hikingMapModeHasContourLines; ++ (BOOL)cyclingMapModeHasContourLines; ++ (BOOL)drivingMapModeHasTraffic; ++ (BOOL)publicTransportMapModeHasTransitLines; -+ (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; ++ (void)setMapMode:(MWMMapMode)mapMode; ++ (void)defaultMapModeSetContourLines:(BOOL)hasContourLines; ++ (void)hikingMapModeSetContourLines:(BOOL)hasContourLines; ++ (void)cyclingMapModeSetContourLines:(BOOL)hasContourLines; ++ (void)drivingMapModeSetTraffic:(BOOL)hasTraffic; ++ (void)publicTransportMapModeSetTransitLines:(BOOL)hasTransitLines; @end diff --git a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm index 3b9d0bd9c..385b2de53 100644 --- a/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm +++ b/iphone/CoreApi/CoreApi/Traffic/MWMMapOverlayManager.mm @@ -3,7 +3,7 @@ #include "Framework.h" static NSString *kGuidesWasShown = @"guidesWasShown"; -static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle"; +static NSString *didChangeMapMode = @"didChangeMapMode"; @interface MWMMapOverlayManager () @@ -28,31 +28,10 @@ static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle"; self = [super init]; if (self) { _observers = [NSHashTable weakObjectsHashTable]; - GetFramework().GetTrafficManager().SetStateListener([self](TrafficManager::TrafficState state) { + [NSNotificationCenter.defaultCenter addObserverForName:didChangeMapMode object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) { 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]; + if ([observer respondsToSelector:@selector(onMapModeUpdated)]) { + [observer onMapModeUpdated]; } } }]; @@ -72,139 +51,98 @@ static NSString *didChangeOutdoorMapStyle = @"didChangeOutdoorMapStyle"; #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; ++ (MWMMapMode)mapMode { + switch (GetFramework().CurrentMapMode()) { + case MapMode::HIKING: + return MWMMapMode::MWMMapModeHiking; + case MapMode::CYCLING: + return MWMMapMode::MWMMapModeCycling; + case MapMode::DRIVING: + return MWMMapMode::MWMMapModeDriving; + case MapMode::PUBLICTRANSPORT: + return MWMMapMode::MWMMapModePublicTransport; default: - return MWMMapOverlayOutdoorStateDisabled; + return MWMMapMode::MWMMapModeDefault; } } -+ (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]; - } - ++ (void)setMapMode:(MWMMapMode)mapMode { 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); + switch (mapMode) { + case MWMMapModeHiking: + f.SwitchToMapMode(MapMode::HIKING); break; - case MapStyleDefaultDark: - case MapStyleVehicleDark: - case MapStyleOutdoorsDark: - f.SetMapStyle(enable ? MapStyleOutdoorsDark : MapStyleDefaultDark); + case MWMMapModeCycling: + f.SwitchToMapMode(MapMode::CYCLING); + break; + case MWMMapModeDriving: + f.SwitchToMapMode(MapMode::DRIVING); + break; + case MWMMapModePublicTransport: + f.SwitchToMapMode(MapMode::PUBLICTRANSPORT); break; default: + f.SwitchToMapMode(MapMode::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]; + // TODO: - Observing for the selected/deselected state of the Outdoor style should be implemented not by NSNotificationCenter but the same way as for ContourLines with 'GetFramework().GetContourLinesManager().SetStateListener'. + [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil]; +} + ++ (BOOL)defaultMapModeHasContourLines { + auto &f = GetFramework(); + return f.DefaultMapModeHasContourLines(); +} + ++ (void)defaultMapModeSetContourLines:(BOOL)hasContourLines { + auto &f = GetFramework(); + f.DefaultMapModeSetContourLines(hasContourLines); + [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil]; +} + ++ (BOOL)hikingMapModeHasContourLines { + auto &f = GetFramework(); + return f.HikingMapModeHasContourLines(); +} + ++ (void)hikingMapModeSetContourLines:(BOOL)hasContourLines { + auto &f = GetFramework(); + f.HikingMapModeSetContourLines(hasContourLines); + [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil]; +} + ++ (BOOL)cyclingMapModeHasContourLines { + auto &f = GetFramework(); + return f.CyclingMapModeHasContourLines(); +} + ++ (void)cyclingMapModeSetContourLines:(BOOL)hasContourLines { + auto &f = GetFramework(); + f.CyclingMapModeSetContourLines(hasContourLines); + [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil]; +} + ++ (BOOL)drivingMapModeHasTraffic { + auto &f = GetFramework(); + return f.DrivingMapModeHasTraffic(); +} + ++ (void)drivingMapModeSetTraffic:(BOOL)hasTraffic { + auto &f = GetFramework(); + f.DrivingMapModeSetTraffic(hasTraffic); + [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil]; +} + ++ (BOOL)publicTransportMapModeHasTransitLines { + auto &f = GetFramework(); + return f.PublicTransportMapModeHasTransitLines(); +} + ++ (void)publicTransportMapModeSetTransitLines:(BOOL)hasTransitLines { + auto &f = GetFramework(); + f.PublicTransportMapModeSetTransitLines(hasTransitLines); + [NSNotificationCenter.defaultCenter postNotificationName:didChangeMapMode object:nil]; } @end diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index e41abb02b..24e2308eb 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -62,7 +62,7 @@ #import "MWMTextToSpeech.h" #import "MWMTextToSpeechObserver.h" #import "MWMTextView.h" -#import "MWMTrafficButtonViewController.h" +#import "MWMModeButtonViewController.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..35a753cef 100644 --- a/iphone/Maps/Bridging/BridgeControllers.swift +++ b/iphone/Maps/Bridging/BridgeControllers.swift @@ -18,7 +18,45 @@ import UIKit } } +final class BridgeCell: UITableViewCell { + private let hostingController = UIHostingController(rootView: nil) + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { + super.init(style: style, reuseIdentifier: reuseIdentifier) + hostingController.view.backgroundColor = .clear + } + + required init?(coder aDecoder: NSCoder) { + fatalError("Has not been implemented") + } + + func layout() { + self.hostingController.view.invalidateIntrinsicContentSize() + } + + func set(content: Content, parentController: UIViewController) { + self.hostingController.rootView = content + self.hostingController.view.invalidateIntrinsicContentSize() + + let requiresControllerMove = hostingController.parent != parentController + if requiresControllerMove { + parentController.addChild(hostingController) + } + + if !self.contentView.subviews.contains(hostingController.view) { + self.contentView.addSubview(hostingController.view) + hostingController.view.translatesAutoresizingMaskIntoConstraints = false + hostingController.view.leadingAnchor.constraint(equalTo: self.contentView.leadingAnchor).isActive = true + hostingController.view.trailingAnchor.constraint(equalTo: self.contentView.trailingAnchor).isActive = true + hostingController.view.topAnchor.constraint(equalTo: self.contentView.topAnchor).isActive = true + hostingController.view.bottomAnchor.constraint(equalTo: self.contentView.bottomAnchor).isActive = true + } + + if requiresControllerMove { + hostingController.didMove(toParent: parentController) + } + } +} /// Class for using the SwiftUI `AboutView` in the interface builder class AboutBridgeController: UIHostingController { 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 @@ static BOOL isNightMode = NO; + (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/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 @@ static NSString * const kSelectedPattern = @"%@_selected_%@"; [self setDefaultImages]; } +- (void)setBackgroundImageName:(NSString *)backgroundImageName +{ + _backgroundImageName = backgroundImageName; + [self setDefaultBackgroundImages]; +} + // This method is overridden by MWMButtonRenderer.swift //- (void)applyTheme //{ @@ -34,6 +40,10 @@ static NSString * const kSelectedPattern = @"%@_selected_%@"; [self setDefaultImages]; self.imageView.image = [self imageForState:self.state]; } + if (self.backgroundImageName) + { + [self setDefaultBackgroundImages]; + } return; } if (self.state == UIControlStateNormal) @@ -52,6 +62,14 @@ static NSString * const kSelectedPattern = @"%@_selected_%@"; [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/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 677a73eed..f56618705 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -22,7 +22,7 @@ typedef NS_ENUM(NSUInteger, TrackRecordingButtonState) { @property(nonatomic) BOOL hidden; @property(nonatomic) BOOL zoomHidden; @property(nonatomic) BOOL sideButtonsHidden; -@property(nonatomic) BOOL trafficButtonHidden; +@property(nonatomic) BOOL modeButtonHidden; @property(nonatomic) MWMBottomMenuState menuState; @property(nonatomic) MWMBottomMenuState menuRestoreState; @property(nonatomic) BOOL isDirectionViewHidden; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 728b3e1c9..46f66893c 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -6,7 +6,7 @@ #import "MWMPlacePageManager.h" #import "MWMPlacePageProtocol.h" #import "MWMSideButtons.h" -#import "MWMTrafficButtonViewController.h" +#import "MWMModeButtonViewController.h" #import "MWMMapWidgetsHelper.h" #import "MapViewController.h" #import "MapsAppDelegate.h" @@ -29,7 +29,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; @interface MWMMapViewControlsManager () @property(nonatomic) MWMSideButtons * sideButtons; -@property(nonatomic) MWMTrafficButtonViewController * trafficButton; +@property(nonatomic) MWMModeButtonViewController * modeButton; @property(nonatomic) UIButton * promoButton; @property(nonatomic) UIViewController * menuController; @property(nonatomic) id placePageManager; @@ -58,7 +58,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.ownerController = controller; self.hidden = NO; self.sideButtonsHidden = NO; - self.trafficButtonHidden = NO; + self.modeButtonHidden = NO; self.isDirectionViewHidden = YES; self.menuState = MWMBottomMenuStateInactive; self.menuRestoreState = MWMBottomMenuStateInactive; @@ -90,7 +90,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { - [self.trafficButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + [self.modeButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; [self.trackRecordingButton viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; [self.tabBarController viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; } @@ -120,7 +120,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; - (void)didFinishAddingPlace { self.isAddingPlace = NO; - self.trafficButtonHidden = NO; + self.modeButtonHidden = NO; self.menuState = MWMBottomMenuStateInactive; } @@ -134,7 +134,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.isAddingPlace = YES; [self.searchManager close]; self.menuState = MWMBottomMenuStateHidden; - self.trafficButtonHidden = YES; + self.modeButtonHidden = YES; [ownerController dismissPlacePage]; @@ -193,7 +193,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.sideButtons.zoomHidden = self.zoomHidden; self.sideButtonsHidden = NO; self.disableStandbyOnRouteFollowing = YES; - self.trafficButtonHidden = YES; + self.modeButtonHidden = YES; [self.navigationManager onRouteStart]; self.promoButton.hidden = YES; } @@ -202,7 +202,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.sideButtons.zoomHidden = self.zoomHidden; [self.navigationManager onRouteStop]; self.disableStandbyOnRouteFollowing = NO; - self.trafficButtonHidden = NO; + self.modeButtonHidden = NO; self.promoButton.hidden = YES; } @@ -214,10 +214,10 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; return _sideButtons; } -- (MWMTrafficButtonViewController *)trafficButton { - if (!_trafficButton) - _trafficButton = [[MWMTrafficButtonViewController alloc] init]; - return _trafficButton; +- (MWMModeButtonViewController *)modeButton { + if (!_modeButton) + _modeButton = [[MWMModeButtonViewController alloc] init]; + return _modeButton; } - (BottomTabBarViewController *)tabBarController { @@ -253,7 +253,7 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; if (!_isAddingPlace) _hidden = hidden; self.sideButtonsHidden = _sideButtonsHidden; - self.trafficButtonHidden = _trafficButtonHidden; + self.modeButtonHidden = _modeButtonHidden; self.menuState = hidden ? MWMBottomMenuStateHidden : MWMBottomMenuStateInactive; } @@ -267,10 +267,10 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue"; self.sideButtons.hidden = self.hidden || sideButtonsHidden; } -- (void)setTrafficButtonHidden:(BOOL)trafficButtonHidden { +- (void)setModeButtonHidden:(BOOL)modeButtonHidden { BOOL const isNavigation = self.navigationManager.state == MWMNavigationDashboardStateNavigation; - _trafficButtonHidden = isNavigation || trafficButtonHidden; - self.trafficButton.hidden = self.hidden || _trafficButtonHidden; + _modeButtonHidden = isNavigation || modeButtonHidden; + self.modeButton.hidden = self.hidden || _modeButtonHidden; } - (void)setTrackRecordingButtonState:(TrackRecordingButtonState)state { diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.h similarity index 51% rename from iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h rename to iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.h index f17ca3efc..f776fb1d9 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.h @@ -1,8 +1,8 @@ #import "MWMViewController.h" -@interface MWMTrafficButtonViewController : MWMViewController +@interface MWMModeButtonViewController : MWMViewController -+ (MWMTrafficButtonViewController *)controller; ++ (MWMModeButtonViewController *)controller; @property(nonatomic) BOOL hidden; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.mm new file mode 100644 index 000000000..1f438ec67 --- /dev/null +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.mm @@ -0,0 +1,133 @@ +#import "MWMModeButtonViewController.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; +} // namespace + +@interface MWMMapViewControlsManager () + +@property(nonatomic) MWMModeButtonViewController *modeButton; + +@end + +@interface MWMModeButtonViewController () + +@property(nonatomic) NSLayoutConstraint *topOffset; +@property(nonatomic) NSLayoutConstraint *leftOffset; +@property(nonatomic) CGRect availableArea; + +@end + +@implementation MWMModeButtonViewController + ++ (MWMModeButtonViewController *)controller { + return [MWMMapViewControlsManager manager].modeButton; +} + +- (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)applyTheme { + UIButton *btn = static_cast(self.view); + NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light"; + [btn setBackgroundImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@_%@", @"btn_bg", postfix]] forState:UIControlStateNormal]; + [btn setBackgroundImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@_highlighted_%@", @"btn_bg", postfix]] forState:UIControlStateHighlighted]; + [btn setBackgroundImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@_%@", @"btn_bg", postfix]] forState:UIControlStateSelected]; + + NSString *imageName = @"map"; + switch ([MWMMapOverlayManager mapMode]) { + case MWMMapModeHiking: + imageName = @"hiking"; + break; + case MWMMapModeCycling: + imageName = @"cycling"; + break; + case MWMMapModeDriving: + imageName = @"driving"; + break; + case MWMMapModePublicTransport: + imageName = @"publictransport"; + break; + default: + break; + } + [btn setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal]; + btn.tintColor = [UIColor iconOpaqueGrayTint]; +} + +- (IBAction)buttonTouchUpInside { + 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)onMapModeUpdated { + [self applyTheme]; +} + +@end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.xib similarity index 77% rename from iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.xib rename to iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.xib index 044bc8658..4bf10fd10 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ModeButton/MWMModeButtonViewController.xib @@ -1,37 +1,31 @@ - - - - + + - + - + - - - - 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/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.m b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.m index d7f046b86..927d9ae91 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.m +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.m @@ -73,9 +73,9 @@ return MWMAvailableAreaAffectDirectionsLeft; } -#pragma mark - AvailableArea / TrafficButtonArea +#pragma mark - AvailableArea / ModeButtonArea -- (MWMAvailableAreaAffectDirections)trafficButtonAreaAffectDirections +- (MWMAvailableAreaAffectDirections)modeButtonAreaAffectDirections { return MWMAvailableAreaAffectDirectionsLeft; } 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 @@ return MWMAvailableAreaAffectDirectionsTop; } -#pragma mark - AvailableArea / TrafficButtonArea +#pragma mark - AvailableArea / ModeButtonArea -- (MWMAvailableAreaAffectDirections)trafficButtonAreaAffectDirections +- (MWMAvailableAreaAffectDirections)modeButtonAreaAffectDirections { return MWMAvailableAreaAffectDirectionsTop; } diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index eb1f4d37e..a4b6caa62 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; @@ -60,7 +60,7 @@ @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 b84aba98f..9e9468903 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -122,7 +122,7 @@ NSString *const kAboutSegue = @"Map2About"; if (self.searchManager.isSearching) [self.searchManager setPlaceOnMapSelected:YES]; - self.controlsManager.trafficButtonHidden = YES; + self.controlsManager.modeButtonHidden = YES; if (self.placePageVC != nil) { [PlacePageBuilder update:self.placePageVC with:data]; return; @@ -220,7 +220,7 @@ NSString *const kAboutSegue = @"Map2About"; if (self.placePageVC != nil) { [self hideRegularPlacePage]; } - self.controlsManager.trafficButtonHidden = NO; + self.controlsManager.modeButtonHidden = NO; } - (void)onMapObjectDeselected { 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/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 Border.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling Border.colorset/Contents.json new file mode 100644 index 000000000..f322423b1 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling Border.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xCC", + "green" : "0x6E", + "red" : "0x6F" + } + }, + "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/Cycling.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling.colorset/Contents.json new file mode 100644 index 000000000..a61d46544 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Cycling.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "0.541", + "red" : "0.545" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xCC", + "green" : "0x6E", + "red" : "0x6F" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Default Border.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Default Border.colorset/Contents.json new file mode 100644 index 000000000..4b5a63e97 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Default Border.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x67", + "green" : "0x66", + "red" : "0x60" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x4D", + "green" : "0x4C", + "red" : "0x48" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Default.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Default.colorset/Contents.json new file mode 100644 index 000000000..8f250cb25 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Default.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.506", + "green" : "0.498", + "red" : "0.471" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x67", + "green" : "0x66", + "red" : "0x60" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving Border.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving Border.colorset/Contents.json new file mode 100644 index 000000000..3cc2eba7a --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving Border.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x12", + "green" : "0x79", + "red" : "0xC2" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x0E", + "green" : "0x5B", + "red" : "0x91" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving.colorset/Contents.json new file mode 100644 index 000000000..1f345ff3f --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Driving.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.094", + "green" : "0.592", + "red" : "0.949" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x12", + "green" : "0x79", + "red" : "0xC2" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking Border.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking Border.colorset/Contents.json new file mode 100644 index 000000000..46207a59d --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking Border.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x59", + "green" : "0xA1", + "red" : "0x94" + } + }, + "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/Interface/Mode Colors/Hiking.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking.colorset/Contents.json new file mode 100644 index 000000000..93dcdcf4d --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Hiking.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.435", + "green" : "0.788", + "red" : "0.725" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x59", + "green" : "0xA1", + "red" : "0x94" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport Border.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport Border.colorset/Contents.json new file mode 100644 index 000000000..557830634 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport Border.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x7A", + "green" : "0x50", + "red" : "0x25" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x6B", + "green" : "0x46", + "red" : "0x20" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport.colorset/Contents.json new file mode 100644 index 000000000..dc7752cd5 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Mode Colors/Public Transport.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.600", + "green" : "0.392", + "red" : "0.184" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "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/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/driving.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/driving.symbolset/Contents.json index cc95c70cf..1c00c9d88 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/driving.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "traffic_default.pdf", - "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/Layers/Menu/btn_menu_subway.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.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/hiking.symbolset/Contents.json index 195b8da6b..82ab0a211 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_subway.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/hiking.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "ic_layer_subway.svg", - "idiom" : "universal" - } - ], "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/Layers/Menu/btn_menu_isomaps.imageset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/map.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/map.symbolset/Contents.json index ab4e30aad..547443441 100644 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_isomaps.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/map.symbolset/Contents.json @@ -1,12 +1,12 @@ { - "images" : [ - { - "filename" : "ic_layer_contours.svg", - "idiom" : "universal" - } - ], "info" : { "author" : "xcode", "version" : 1 - } + }, + "symbols" : [ + { + "filename" : "map.svg", + "idiom" : "universal" + } + ] } diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/map.symbolset/map.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/map.symbolset/map.svg new file mode 100644 index 000000000..2af451d95 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Interface/Symbols/map.symbolset/map.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 map + 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/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 fd9d81489554af8f8fccf38019db13d65d5c8d0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9764 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

JqBcWhvb>{D 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 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 7e07c5c84324a7914a1b75d4baf8fbe39690c7cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10246 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 - /Subtype /Form - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 34.000000 33.000000 cm -1.000000 1.000000 1.000000 scn -10.000000 5.000000 m -10.000000 2.238576 7.761424 0.000000 5.000000 0.000000 c -2.238576 0.000000 0.000000 2.238576 0.000000 5.000000 c -0.000000 7.761424 2.238576 10.000000 5.000000 10.000000 c -7.761424 10.000000 10.000000 7.761424 10.000000 5.000000 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 31.032440 23.920410 cm -1.000000 0.725490 0.043137 scn -7.967567 22.079590 m -3.574227 22.079590 0.000000 18.505363 0.000000 14.112066 c -0.000000 8.659846 7.130192 0.655670 7.433766 0.317593 c -7.718907 0.000010 8.216743 0.000568 8.501369 0.317593 c -8.804942 0.655670 15.935134 8.659846 15.935134 14.112066 c -15.935048 18.505363 12.360865 22.079590 7.967567 22.079590 c -h -7.967567 10.103382 m -5.757168 10.103382 3.958926 11.901668 3.958926 14.112066 c -3.958926 16.322464 5.757211 18.120707 7.967567 18.120707 c -10.177923 18.120707 11.976165 16.322422 11.976165 14.112022 c -11.976165 11.901624 10.177923 10.103382 7.967567 10.103382 c -h -f -n -Q - -endstream -endobj - -2 0 obj - 1057 -endobj - -3 0 obj - << /BBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources << >> - /Subtype /Form - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 6.000000 21.000000 cm -1.000000 1.000000 1.000000 scn -10.000000 5.000000 m -10.000000 2.238576 7.761424 0.000000 5.000000 0.000000 c -2.238576 0.000000 0.000000 2.238576 0.000000 5.000000 c -0.000000 7.761424 2.238576 10.000000 5.000000 10.000000 c -7.761424 10.000000 10.000000 7.761424 10.000000 5.000000 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 3.032440 11.920410 cm -0.023529 0.666667 0.980392 scn -7.967567 22.079590 m -3.574227 22.079590 0.000000 18.505363 0.000000 14.112066 c -0.000000 8.659846 7.130192 0.655670 7.433766 0.317593 c -7.718907 0.000010 8.216743 0.000568 8.501369 0.317593 c -8.804942 0.655670 15.935134 8.659846 15.935134 14.112066 c -15.935048 18.505363 12.360865 22.079590 7.967567 22.079590 c -h -7.967567 10.103382 m -5.757168 10.103382 3.958926 11.901668 3.958926 14.112066 c -3.958926 16.322464 5.757211 18.120707 7.967567 18.120707 c -10.177923 18.120707 11.976165 16.322422 11.976165 14.112022 c -11.976165 11.901624 10.177923 10.103382 7.967567 10.103382 c -h -f -n -Q - -endstream -endobj - -4 0 obj - 1055 -endobj - -5 0 obj - << /BBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources << >> - /Subtype /Form - /Length 6 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 28.000000 24.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 22.000000 m -22.000000 22.000000 l -22.000000 0.000000 l -0.000000 0.000000 l -0.000000 22.000000 l -h -f -n -Q - -endstream -endobj - -6 0 obj - 234 -endobj - -7 0 obj - << /BBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources << >> - /Subtype /Form - /Length 8 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 12.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 22.000000 m -22.000000 22.000000 l -22.000000 0.000000 l -0.000000 0.000000 l -0.000000 22.000000 l -h -f -n -Q - -endstream -endobj - -8 0 obj - 233 -endobj - -9 0 obj - << /BBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources << /XObject << /X2 1 0 R - /X1 3 0 R - >> - /ExtGState << /E2 << /SMask << /Type /Mask - /G 5 0 R - /S /Alpha - >> - /Type /ExtGState - >> - /E1 << /SMask << /Type /Mask - /G 7 0 R - /S /Alpha - >> - /Type /ExtGState - >> - >> - >> - /Subtype /Form - /Length 10 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.894118 0.909804 0.921569 scn -0.000000 45.000000 m -0.000000 47.761421 2.238576 50.000000 5.000000 50.000000 c -45.000000 50.000000 l -47.761421 50.000000 50.000000 47.761425 50.000000 45.000000 c -50.000000 5.000000 l -50.000000 2.238579 47.761425 0.000000 45.000000 0.000000 c -5.000001 0.000000 l -2.238578 0.000000 0.000000 2.238575 0.000000 5.000000 c -0.000000 45.000000 l -h -f -n -Q -q --0.707107 -0.707107 -0.707107 0.707107 59.440681 35.809319 cm -0.839216 0.858824 0.647059 scn -0.000000 35.625000 m -32.526913 35.625000 l -32.526913 17.770555 l -0.000000 17.770555 l -0.000000 35.625000 l -h -f -n -Q -q --0.707107 -0.707107 -0.707107 0.707107 85.035797 14.964207 cm -0.635294 0.796078 0.858824 scn -0.000000 47.250000 m -32.350136 47.250000 l -32.350136 12.778564 l -0.000000 12.778564 l -0.000000 47.250000 l -h -f -n -Q -q --0.707107 -0.707107 -0.707107 0.707107 14.225543 31.274456 cm -0.635294 0.796078 0.858824 scn -0.000000 22.062500 m -14.407301 22.062500 l -14.407301 5.268713 l -0.000000 5.268713 l -0.000000 22.062500 l -h -f -n -Q -q -0.707107 0.707107 -0.707107 0.707107 30.784271 -29.034271 cm -0.839216 0.858824 0.647059 scn -0.000000 40.000000 m -30.228815 40.000000 l -30.228815 13.660273 l -0.000000 13.660273 l -0.000000 40.000000 l -h -f -n -Q -q --0.921057 -0.389428 0.389428 -0.921057 20.389870 17.088980 cm -1.000000 1.000000 1.000000 scn -0.000000 31.782532 m -4.891290 31.782532 l -4.891290 -0.655991 l -0.000000 -0.655991 l -0.000000 31.782532 l -h -f -n -Q -q -0.707107 -0.707107 0.707107 0.707107 4.409420 12.409420 cm -1.000000 1.000000 1.000000 scn -0.000000 58.817963 m -12.000000 58.817963 l -12.000000 -12.363205 l -0.000000 -12.363205 l -0.000000 58.817963 l -h -f -n -Q -q -0.707107 -0.707107 0.707107 0.707107 1.181637 30.848995 cm -1.000000 1.000000 1.000000 scn -0.000000 35.333679 m -4.891290 35.333679 l -4.891290 -9.744377 l -0.000000 -9.744377 l -0.000000 35.333679 l -h -f -n -Q -q -0.707107 0.707107 -0.707107 0.707107 37.000000 5.000000 cm -1.000000 1.000000 1.000000 scn -0.000000 59.396973 m -12.000000 59.396973 l -12.000000 -12.603027 l -0.000000 -12.603027 l -0.000000 59.396973 l -h -f -n -Q -q -/E1 gs -/X1 Do -Q -q -/E2 gs -/X2 Do -Q - -endstream -endobj - -10 0 obj - 2172 -endobj - -11 0 obj - << /BBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources << >> - /Subtype /Form - /Length 12 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 45.000000 m -0.000000 47.761421 2.238576 50.000000 5.000000 50.000000 c -45.000000 50.000000 l -47.761421 50.000000 50.000000 47.761425 50.000000 45.000000 c -50.000000 5.000000 l -50.000000 2.238579 47.761425 0.000000 45.000000 0.000000 c -5.000001 0.000000 l -2.238578 0.000000 0.000000 2.238575 0.000000 5.000000 c -0.000000 45.000000 l -h -f -n -Q - -endstream -endobj - -12 0 obj - 468 -endobj - -13 0 obj - << /XObject << /X1 9 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 11 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -14 0 obj - << /Length 15 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -15 0 obj - 46 -endobj - -16 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources 13 0 R - /Contents 14 0 R - /Parent 17 0 R - >> -endobj - -17 0 obj - << /Kids [ 16 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -18 0 obj - << /Type /Catalog - /Pages 17 0 R - >> -endobj - -xref -0 19 -0000000000 65535 f -0000000010 00000 n -0000001315 00000 n -0000001338 00000 n -0000002641 00000 n -0000002664 00000 n -0000003146 00000 n -0000003168 00000 n -0000003649 00000 n -0000003671 00000 n -0000006891 00000 n -0000006915 00000 n -0000007633 00000 n -0000007656 00000 n -0000007956 00000 n -0000008060 00000 n -0000008082 00000 n -0000008259 00000 n -0000008335 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 18 0 R - /Size 19 ->> -startxref -8396 -%%EOF \ No newline at end of file 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/Contents.json b/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/Contents.json deleted file mode 100644 index 8845a2562..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_outdoors.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "ic_layer_outdoor_lake.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} 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 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_traffic.imageset/traffic_default.pdf +++ /dev/null @@ -1,382 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /BBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources << >> - /Subtype /Form - /Length 2 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.894118 0.909804 0.921569 scn -0.000000 45.000000 m -0.000000 47.761421 2.238576 50.000000 5.000000 50.000000 c -45.000000 50.000000 l -47.761421 50.000000 50.000000 47.761425 50.000000 45.000000 c -50.000000 5.000000 l -50.000000 2.238579 47.761425 0.000000 45.000000 0.000000 c -5.000001 0.000000 l -2.238578 0.000000 0.000000 2.238575 0.000000 5.000000 c -0.000000 45.000000 l -h -f -n -Q -q --0.707107 -0.707107 0.707107 -0.707107 21.373661 79.626343 cm -0.839216 0.858824 0.647059 scn -0.000000 37.125000 m -36.592777 37.125000 l -36.592777 21.215096 l -0.000000 21.215096 l -0.000000 37.125000 l -h -f -n -Q -q --0.707107 -0.707107 -0.707107 0.707107 85.035797 14.964207 cm -0.635294 0.796078 0.858824 scn -0.000000 47.250000 m -32.350136 47.250000 l -32.350136 12.778564 l -0.000000 12.778564 l -0.000000 47.250000 l -h -f -n -Q -q --0.707107 -0.707107 -0.707107 0.707107 14.569136 31.430864 cm -0.635294 0.796078 0.858824 scn -0.000000 26.437500 m -17.589281 26.437500 l -17.589281 6.638510 l -0.000000 6.638510 l -0.000000 26.437500 l -h -f -n -Q -q -0.707107 0.707107 -0.707107 0.707107 30.784271 -29.034271 cm -0.839216 0.858824 0.647059 scn -0.000000 40.000000 m -30.228815 40.000000 l -30.228815 13.660273 l -0.000000 13.660273 l -0.000000 40.000000 l -h -f -n -Q -q --0.921057 -0.389428 0.389428 -0.921057 20.389870 17.088980 cm -1.000000 1.000000 1.000000 scn -0.000000 31.782532 m -4.891290 31.782532 l -4.891290 -0.655991 l -0.000000 -0.655991 l -0.000000 31.782532 l -h -f -n -Q -q -0.707107 -0.707107 0.707107 0.707107 4.409420 12.409420 cm -1.000000 0.725490 0.043137 scn -0.000000 58.817963 m -12.000000 58.817963 l -12.000000 -12.363205 l -0.000000 -12.363205 l -0.000000 58.817963 l -h -f -n -Q -q -0.707107 -0.707107 0.707107 0.707107 1.181637 30.848995 cm -1.000000 1.000000 1.000000 scn -0.000000 35.333679 m -4.891290 35.333679 l -4.891290 -9.744377 l -0.000000 -9.744377 l -0.000000 35.333679 l -h -f -n -Q -q -0.707107 0.707107 -0.707107 0.707107 37.000000 5.000000 cm -1.000000 1.000000 1.000000 scn -0.000000 59.396973 m -12.000000 59.396973 l -12.000000 -12.603027 l -0.000000 -12.603027 l -0.000000 59.396973 l -h -f -n -Q -q -0.707107 -0.707107 0.707107 0.707107 22.910267 30.910267 cm -1.000000 0.360784 0.360784 scn -0.000000 39.735291 m -0.000000 43.048996 2.686292 45.735291 6.000000 45.735291 c -6.000000 45.735291 l -9.313708 45.735291 12.000000 43.049000 12.000000 39.735291 c -12.000000 -0.944164 l -12.000000 -4.257870 9.313708 -6.944164 6.000000 -6.944164 c -6.000000 -6.944164 l -2.686292 -6.944164 0.000000 -4.257874 0.000000 -0.944164 c -0.000000 39.735291 l -h -f -n -Q -q -0.707107 -0.707107 0.707107 0.707107 -2.462124 16.537876 cm -0.286275 0.647059 0.917647 scn -9.350320 35.212570 m -11.051984 38.159939 15.306142 38.159935 17.007805 35.212570 c -25.759220 20.054672 l -27.245071 17.481104 25.811752 14.345741 23.158564 13.591854 c -22.369663 13.367693 21.542185 13.591232 20.789581 13.917118 c -14.768500 16.524323 l -13.754372 16.963453 12.603751 16.963453 11.589622 16.524323 c -5.568542 13.917120 l -4.815939 13.591232 3.988459 13.367693 3.199557 13.591854 c -0.546369 14.345743 -0.886946 17.481108 0.598905 20.054676 c -9.350320 35.212570 l -h -f -n -Q -q -0.707107 -0.707107 0.707107 0.707107 -7.098909 11.901091 cm -1.000000 1.000000 1.000000 scn -0.598905 26.612080 m --1.133146 27.612080 l -0.598905 26.612080 l -h -25.759220 26.612076 m -24.027170 25.612076 l -25.759220 26.612076 l -h -17.007805 41.769974 m -18.739857 42.769970 l -17.007805 41.769974 l -h -9.350320 41.769974 m -11.082371 40.769974 l -9.350320 41.769974 l -h -14.768500 23.081726 m -13.973782 21.246399 l -14.768500 23.081726 l -h -23.158564 20.149258 m -22.611916 22.073101 l -23.158564 20.149258 l -h -20.789581 20.474522 m -19.994862 18.639196 l -20.789581 20.474522 l -h -3.199557 20.149258 m -2.652908 18.225414 l -3.199557 20.149258 l -h -5.568542 20.474524 m -6.363261 18.639196 l -5.568542 20.474524 l -h -15.275755 40.769974 m -24.027170 25.612076 l -27.491272 27.612076 l -18.739857 42.769970 l -15.275755 40.769974 l -h -2.330956 25.612080 m -11.082371 40.769974 l -7.618269 42.769974 l --1.133146 27.612080 l -2.330956 25.612080 l -h -3.746207 22.073101 m -2.292789 22.486082 1.523806 24.214056 2.330956 25.612080 c --1.133146 27.612080 l --3.297698 23.862965 -1.200050 19.320211 2.652908 18.225414 c -3.746207 22.073101 l -h -24.027170 25.612076 m -24.834318 24.214054 24.065336 22.486082 22.611916 22.073101 c -23.705214 18.225414 l -27.558170 19.320210 29.655825 23.862959 27.491272 27.612076 c -24.027170 25.612076 l -h -18.739857 42.769970 m -16.268394 47.050671 10.089734 47.050678 7.618269 42.769974 c -11.082371 40.769974 l -12.014233 42.384007 14.343890 42.384010 15.275755 40.769974 c -18.739857 42.769970 l -h -21.584299 22.309849 m -15.563220 24.917051 l -13.973782 21.246399 l -19.994862 18.639196 l -21.584299 22.309849 l -h -10.794902 24.917051 m -4.773823 22.309849 l -6.363261 18.639196 l -12.384341 21.246401 l -10.794902 24.917051 l -h -15.563220 24.917051 m -14.042027 25.575747 12.316097 25.575748 10.794902 24.917051 c -12.384341 21.246401 l -12.891404 21.465965 13.466716 21.465965 13.973782 21.246399 c -15.563220 24.917051 l -h -22.611916 22.073101 m -22.569902 22.061163 22.477919 22.046043 22.298891 22.076780 c -22.112097 22.108850 21.877630 22.182833 21.584299 22.309849 c -19.994862 18.639196 l -20.861448 18.263952 22.230606 17.806414 23.705214 18.225414 c -22.611916 22.073101 l -h -2.652908 18.225414 m -4.127515 17.806412 5.496675 18.263954 6.363261 18.639196 c -4.773823 22.309849 l -4.480493 22.182833 4.246025 22.108850 4.059230 22.076780 c -3.880202 22.046043 3.788218 22.061165 3.746207 22.073101 c -2.652908 18.225414 l -h -f -n -Q - -endstream -endobj - -2 0 obj - 5558 -endobj - -3 0 obj - << /BBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources << >> - /Subtype /Form - /Length 4 0 R - /Group << /Type /Group - /S /Transparency - >> - /Type /XObject - >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -0.000000 0.000000 0.000000 scn -0.000000 45.000000 m -0.000000 47.761421 2.238576 50.000000 5.000000 50.000000 c -45.000000 50.000000 l -47.761421 50.000000 50.000000 47.761425 50.000000 45.000000 c -50.000000 5.000000 l -50.000000 2.238579 47.761425 0.000000 45.000000 0.000000 c -5.000001 0.000000 l -2.238578 0.000000 0.000000 2.238575 0.000000 5.000000 c -0.000000 45.000000 l -h -f -n -Q - -endstream -endobj - -4 0 obj - 468 -endobj - -5 0 obj - << /XObject << /X1 1 0 R >> - /ExtGState << /E1 << /SMask << /Type /Mask - /G 3 0 R - /S /Alpha - >> - /Type /ExtGState - >> >> - >> -endobj - -6 0 obj - << /Length 7 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -/E1 gs -/X1 Do -Q - -endstream -endobj - -7 0 obj - 46 -endobj - -8 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 50.000000 50.000000 ] - /Resources 5 0 R - /Contents 6 0 R - /Parent 9 0 R - >> -endobj - -9 0 obj - << /Kids [ 8 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -10 0 obj - << /Type /Catalog - /Pages 9 0 R - >> -endobj - -xref -0 11 -0000000000 65535 f -0000000010 00000 n -0000005816 00000 n -0000005839 00000 n -0000006555 00000 n -0000006577 00000 n -0000006875 00000 n -0000006977 00000 n -0000006998 00000 n -0000007171 00000 n -0000007245 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 10 0 R - /Size 11 ->> -startxref -7305 -%%EOF \ No newline at end of file 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 e97ff8e45dee265d57a45f831efb14440df058a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8354 zcmbt)2{=^m+rKpoNhNzsGPW>_u~qi1LD{meGYm!;&DeKB)@(@>q6LW*Qnn~U_Uy@) zeThPLd1ox&>gW4=-~V;}$GPS_b3gZa&VAp{y`9ei(o#|phKh&+KsDowy587%z z0N_9f5R0-0T)YSbYoMKMUF?8j1duO&sWp!Om5DeBu~GwW&>!|GCx8eVeiASHqEs zj2dmV(lxKo{R6F<)qY+t4Qjgs1c=v#-GWVRw){fM-lZz@-dvgJ;c`mfk>Q-1pJ16Q zTkV;dseSh|X>;=ZcA@WTf4K|Z;|o`%%+C5|yNn<2vlD#&566e*G~HGk1$tL4w0N|4 zB-1zbm)*tP?p>FpVpg9IM}+fQ_uyzQYZM^C3$AsZvqklKJEj*%b?ovO#o2)& z@0bAI%qQtu6vhp=reqoo65sM#DvtAC^*bJO9JRIJAx_opq4mVB{KT>1MYe+Yng!Ao zS&lPkFo%)o_xKFj0^3lPP3E@L%^MY!UAX0y6=OM#BMe-R(BJ(}6%`06vjt}8Ue8HA zNB?!X`L?ik9HnggfRJ|v-*kM?y`-y~wMsD?di^hh&lfucmzLlosXG&sX0oUsfndP% zAD#Vjee&B8QEX{-H~Lmo&-CPOLjx3#-%#eHV~U)zV;K|Hdn~2dHEw!RhA&Ai{!R)k zuf($Kbqc<5E={TM+2$ZG!oIH{H{{M!wZ$pLmg4vuMFF=>^QB0paeg~32rCBk`))92}Z;9MO0tGT#DD3yi7k3R3rX?2S^FZRr%{udhJe0daBPLX6IvqQNhfG?xe8$##R)XiV8 z=1ihugBfZuavFh<*tNE&5O$;0;!LwIf@4PzAcoI@6OV2SUQLLkx{Z5+%+O{SpFyye zB#-3h*Q>Hu;)jL8y+C=QeECg$Q$C@l?HeycZ0_ehzIFOPBkb z-tS$jR|SOQ6TK2}m#d4@q|N1qx-az6=DW1YbLR@&(F-t%-&{JM>;M9twXZ0k(Pg-W zLEy}7=dw^_vKls|yl0ehEhQE-^FLg{q0g81*bkJ79M$xhzfF%-(-oCNN9vslV5R9C zXB1r>7J`sX1Wy;qc;}5=p6qH>-kvKicy%j^^OW7W2e%ZU2_)QO4`w6Z(S{qFPC)QD z0fay(&dpQ&%ruZ^v64nR{!(Ow7&AJrCp$x%?Y4<)Q-&6xlrE_zSPL6>N!MsHIR$8< zrql&2zK)d3;&{NQOY=F|kk4fCtktEn9j7&>1zo(JB)rqpxxexPUDubRS3CC80Yy)C zub&^}{O0Z}_r$QK`Ki}B(7hrcBLf5*YNG7XRxZ1jARM7UN#b$HXAXwwKwV}lAAyhS09M;u&S43SP_$m(Rgm*>~ z_Q%STU@Ki9bk|k@Faqd;b0zGZI?x8`fG5_yze=B2^aVfwgn`mq6IvWndM2Ezpy1U< z(i$!$dAz@~LG05lrz0TD zV`Z?8TeXEb3_b;cmQ!+&$K)HBib7b$mG_*1hn;TMPDI;5A+Q4{*;VVnp8w$`|GPH; z4|xL|2;JM;zjlmBI=I39hDq(2^1p4(u5$vx1{iB%GXVpFFQGBEb}qX^1i{&H&RAkg z0oXI~9}c_cs9@d8Nc=S*bpI|27#F-28mEYLbjCUn14;5J>zLVDQfL@9{si%I=s@&nQzEfZ`n5dN#T{%J+^5ONK0KiLB|BwZ{3W(4u{yv9sjTkG zoi8nQa@ZNKGmL0!Y+A(?Kw>4k+gh5uv#*mK&nnf%(GI8l3Jfb0x;XtaZj6*d_|sC) z(5GuU7Uo6Sj5EHO-{;hI8^z%5W8-H~M;~}I_}`#57!XaXjN@Sr+mdL!%G9HN9HpP8 z6jP3?r5}XXsjMuL6eDm~0k}}!5BB)7}Qf{S> zQUH}62Y)_S*c$?C^@#`y2N#ZWZG}(=9rm1EpCG!9sQB-2{WF^O;^%ix23sM45D|$# zvn4S*9|Yeac13vtJ0Su5kzEh!645me@$W7#4*!$?&+h+U`Tu18vmos;?OqiU$%>#qVI)FI#&Q zLg6Du7~zkouo*$BKLmpj>&JnW_EQvWKiyv;)LpPV@j=FkSoZb@ zps$g+l?eIr3SsJ?PhQpCRGT_ETKev@-25^{9`gLl$|XN8Bv|tr+22FA`Yde^tz#$C zSu+ER6)N&KPi2DMi{l%z7r(SyeXKgaK7EGmkv5x9w!U(7aZ%t%lH6aFk z^9~CJ*f;D#ICaqC09B=aQ735lq*7p^{XkLpk9H!sCr7g zek7q)xYQr$TK}}=^aoeE;g1R^f0-;LZobCXVSjGu=EEFT{oFq5SVfQ`oReI`9jr z1m5WYqedEOT&$WhrzS}Z`CIe6(@auTSMc%M zU^xu5ZBkO0%3)aFCdw^>dLdbI-)rP%$efxCCFk{Ir+e!y=C4dY(LcGcp($vi_8qlQ zTsq&xkE2~{R=Lu7%P_DZDESiEds|>*v}e0!;Ju>Za|~H*!YI9l2bXpDRS^+ijrmUA zIe~d}W268F;cz!=4lZoX6!eHrxz+qG#r5{LRI@wGe;g36`S*eZDx6;|zk;qrfJDa^i{jE>>=mh2jR^S(^zFOM$%JjH1d6%9F_i+NM z^|v;L)t??9vws`L<|t^nO&P&vlz+1_UnoZW!^K9{CCbYciywxhD?Swz&Is~uoc9_t zmp-<|^qSMKwv@Bi*_S^sos50WL={_ZY@b%qfxfQ8cBQC0tKW;sOphXQrlkesBCpt7 zo;49}&XshuPAg^RwcKPA*7KtCFGjfD`-d95UkH(<+YzY{ z_7(I6r6$QFi6n5F#fqp|s1K=esaw3>C~J=OUg3c;<3Wo|9bI_^B|Ucyr3A4_Tz5tn z>DRSAyY&PX!!Cld#>@&F+*_OPVIP;^mdE)sT{rQQhF^`^O*JLShqmvMG)MMIkT2C6 zJ{?H1a zJ-)_WckXOyGQRR=rK7>c7Qaxt9Se_D--YXSY)a>t+UrL-B|_cD$rnzfdMh~IZGI)Y zxL$eorJDDu8GH~!* z0EI~W?jeY+4l!jB8hV7Hq5=|+wg&FzF&&`UL8AftGy5Opwf!Fb|0A!Z-f_RG+sAaX zwL+qz?F2Uvw9Mv31N?O1(kTkS!gh?n-Zl8<8c9f>#J3ysyDfo822JKO?$Mg(4l7v`=gJ!HCh?ACuo<)VFJ-%5n6O>r!@UBpy#}$08`g5vV7}d+uV!r|NAseiZ7iqoC(*zrQ>Z=AqHL zTts&Z!W{4%dqMVt~vD~~_PdZMn>)I>+0)M~xG%CIw9C535j zcrSE6y^8rq$dsP;)NPvJaJ#aQi-Cr*BG!Ol|E>{#7I8i*R=?D1jCQUTB)%b1TCWjQ z^;l^V#k1r*PO@HPzOyC_P(XcUxm{k|b9@ZU>(}H47p-Z8(};#Vx9-FWU5qsjlqtme za46WJn(Ra@mCFMFJWvEeCS-Y(BS6%dd=N+y9B_$&{0_OuB{Ga0#Y=gaUJ`&jw3pQF zhP^XMXP{Rb#g!m&=Od;R231F$Y3Tw~JZYwKn!)zcZO4$@=s%#9vw?o=w@Iy zruI~n*OFu;uT>0>Wr&wsZ{y8o5xns~Eqk#a$mGKXNkzd6$Lh1MBEbqo@&-KC&C72I;zM zbyr`5c|zQVK{RkZ=rOA6#S=rmXR>ZI;>Yhr3)kpd##ovZB)uT-Mb2H|ps%Z9{mS9& z_nO5N<|LL+QF5#&sw`mk{m~KLA0Fj`gNzG7$Exw)Q9frX0sb8RoI^2OAKvoC(il@* z3p#e@4v@!z=PCmm^(6In@bPzW?Z9kJ7w%97&l*#dz>8bG^5qB)-YW@=h)^D89Ug(? zqQI*Ndu}scY2J!62@U71RdFmva^{-(Jn29S(6M+~t=s&(jGAg3$_jl~q}1NXdCGYz zKGr#!?bK=b^loXYv1WymubMAdH9<6KDQUDJFCjPXTHe;>2=ZNqVu28pCPAJB_3^dBuv*Xb4^t&)1X0UlX3oWj&Zi}!jC#f-a#za zM0HpnMR>~##dGb23>oe8y!1zJRo|NUf2?W)ezuI1zgL}| z5s~p0nTC8gVs-XuTyDGIL*s`RK1f=4W$~j2(%n+c}Ppg{GGW|m<88< zedIL6T+B+A0WIipjrKXKG}cBAQXPxPc)jbqI~uXNw`>&arj%@Fxo%(@rKbg)K$5kc%{8bY`bE@GK%i@MpYp zp0D*h{5;$#gi*>$iZx}IV(LHDt42mMsWZ8&G^o}pcd1@h_Et_(R!=e%GAbNXi877? zK9OePVn5~0*xL^UM0476nlZseYegLjAY??rIWtjdz6$Vr_(O ze!P)Q+1*>eG=5%+;<*R9VMJSK|8me)6`lT3yXpAE@>t54Q{(A|rG`yEF&i;=SKCUr zU!hyoV)NJN^Fq4wP5a+maW|_j9r;-~8{-Icywvx-QKc~&%|7H5G1#g7K)ayQ(ynk} z;)B8)1?`av;T98mhgyeI4&MfB3iIsyleo>>f1(<{Mts!-eTknPGV(Q8A81+${#NmL zBzJF)0%jGu|cNQa{)A_q-i)^zR^zCa7&glNq9scT(IL2GUduTeKBlUF4 zX<^xWJ3h-%E6FK^A8plJ<62JLzbBRM?zgD$A>>D7IP=Z(1}-wCMPr{*^9%9^8v~P` zoBw!&%jvJ!+|o7PN=o0! z4YN(~;7Y0Q_^q8(cJjz08}lNS-aF=Bq^Ercx7(?5j+x6gc}Z^DZClNaX7T|v1=F6& z=52Sa_1NT8EYCgYv1~02vyBOTtq9&pTz{_lp0YKk^_)tP%8Y8BYHQSb)PUEE<=XF! zQAr)6A#VkKy;@Cd&rSDp->k4jHPn2+);^mot2UTjDYenP;y7tNHP+#dS$L8aF_>E^ zyArsav1zqj7dJhpxu%(z9xdzcL$kH$!Ru%Cn75NhafgPY4{EkQ~OH6`sY5n^Nx=`v4EqjA;qmFWB~s+%Px9H_%8xN80|W*gt({# L00dIjQ~~@CrU$f) 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 78fed7434b081f4201ef688806a9cd8f63432f5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8855 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 Dn=>!O 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 96837c9d59a1104e99210120f9ca5a57860010ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8830 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 bXCbu%2^$53X-S$4QiQMrfx)UeYM}oDn0qR0 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 0efeae5c875d85fbbc79d9a13cc370d8d1a8cbf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8331 zcmbta2{@G9+qW;Hq!NXgWNcwpTe1(b@3J!(jBRR+oh;dxY#|C+DiSHmzAq73%96?! zQiv?s)i+~#-+I0O|My+jH=b*rXYO;K`6eh-iqQc(~p1P6ecrA1>eP zX>J7|fDjV{OntDJg&}9*0Ib z13XF7liOX`L>WRCd;u9p!<+otUneI5Wysok8tkm^A*mE`r4+IwQWmFtyuF=34AB^b zk;1d&x}R3vH+C#J9+%yJFX6SwHaT@>d&yw9aA&=Bq`<|+r}`;}!uX>dCyx}(hPg~9 z8G6u7oj10trDau_nL#@f?dFUou_#!#g;xES)HK6IvSi@GY=<$YBL9RrrK; zd8N9HZYhD{foE6TF(y3N`1#Psp(vJ=a@f_@ME&D^iE0Bfnjd;2k5Wbdfa(foA05Hc zhav(1~lbG}n??DI!anGCft)uZsD#lpmjHXr}cZKgJ_O<@^8VN&Dg zBbT#^^#RoOm-tvio;?Zw;44j9dvoj7SSZO#^BRf0Im!1Ui-Y9$&yrWBB!KVhMArgp zs;Oi)%q&z!c}N#YwFByCN&@X$!`C$I?z_(k(7fqJzL-;B-jqG2yaTT9QzVw1(HJq~O95^f4bpX%Aym{r5voBZB&pRiriWpq+i*CyE zEsnRA{Pd*qxL@LAxa7K?cvO)BcY?Z#pf*Qp%0-$a@pCAtoAE~zsNlwqjet9mQ8BSm zYTnUCJmP(dyhAPQu$`@=maCR7&SQ#>Ly58;BX&|69*@qy`rP_`EDHRfhQ~#{;#cMM zA2hc;C0gSB7|C45qy|}9Kk`^y#HYq3934(duC{{fq-47@%iX$13Z;A_Ga+AKG)B#D zQ82$$tHp{)LYB9da^Kg>O7pdp;hPRV$Hg#pG7*M4f4r#ZG`I75SD=EtV6MDILZVjk zN%HbMeE}&){t7DJEagJvIi(e@3F<7m@e@D7GRWkk807;n>NGd}W==3)H8~;o$c0X< zeE9uj`m|oQGn^~=;#fU#6q|O}G+B1vGzw2(}E%yk7)T4XD%1X_T3ouX%xnt_1 zMDyuuX>VmJ0O^ucA$2qZ@pj4}L-wpXTaLNu?Nkb>?vh*0Q^z*xMjs7pc8reslR8Ua zY5`~$n|*jAJP}cm2!+Hu6b2U|mJ**~zagfc*HttStc9}M{l=kP@Id$;dg`EEv2HkP zv@1|#PauzV!4t||fkedBAtLF%J!1I*0&C&0*1Bjs(1c(VsR#rsI}=RH?ce41@5(?k zAXpyjgvIGzMOmYPMCg`xg#twn41*Os@k+XQ0&MS=DY?Rd(EV;H5%i#YJpe1Y!hp~{ zu$Phof(!(K(>@EF3ti0x`Q5lZ()NU-tu zpmu8H@)fIFyU)RTN= zZBb6H#QgS0iW82J00hf0AeSXuqC|VXq7;u=S~^XVQu*HtTHR@INx9Fi|2?7dba`AT zqgZwHa7W+#kI}&=(H0uHZrKdy*P8A5^{(Cq84}}8)2;H09KcDr0 z`Jd)yH#&jfD;OK%t^o!FUq)l>?D4yg%7kdgUBwdj4uCx${}!=(kqXvTN4Yuzq5G}K zVeqb6Xq-IO`6||hxRS*Fbq@mgeGl@j2TDppLehBeho&uX}@;^OP zQ&VvilaL;EIwNW*Bl_>($=+soiJeoeFf(D@n1|*JgaK;UK~0?LHamA z#;7GpvkqwbON4KykwZkl>u0Q#FB2}aXvFCN@1>vdQ0RMRsguvjc#UCPTW!laz8DfG zHqg`6>63Sj?D)eiJiGLW&=xEA^m#7o81rC4w*@AXy1 z`klV~%KmqCVZ`s|f6qvJ`unKwrG|0E1Hrm@FQ>iKvRAtI`)|zFwMW@t zJ%C_MTU*!NWCn#G01#r<(m~l^++2YKsQ7y^?B}gL2_f?lR~X?>h=6!zgkJsDF&Hs{ z95{6!qG0=YuR%z>U|Hgc#f6yn_7|9r5+Qm1?*|zVJ>4Ouun!ho;L0hwK*o1}jOlwu2}d@rI-Uh%7_K`Pl~36DK>G*T_yYkkT8H){ooT zQYft>$@;cyBvVuKF1MDf&I<+DRDBSr)8cj=_~jqZDJsuJMFLRh7rAtun|X@tmTpPQ z8Q3q1S1U<;uuv$BDT_AyG3P|{6Q|XOpD$Fk-%jD4%wjR>I#Z3vh_2EaNdt}NL{ns$ z-Uf}?<@i#gYxI=UNT$|!-@aYHt40E0Ott8o=FW18fGIGZnU7c^BcZv~EMASHkJ=Eo z&mi%9U^f{_5ut4L;P~Ke%+!}Q+s(xi-3=?~gZbFy?o?w#|NI^!< zsrK>T3faDWGaC48zfm_d%6?sUN3zX(OMj7jt~*0EI>TtxY3?z&hKXdA%lOXOlG-GF zl2T_XnW^!|nhQXZB}$Ugk-N+6p-$!r&7Y3&&_&J7Ik}Q%ItpF*BD$3sgnd;PD!!K5 zF~4OX@qk%6@VxRVI9g%q!NUit$j;6q^eNpoJ8KNTChEm8uiKjh?q=3AFNS>4*Zy*g zHaNn*D&$h2VVsZ+AlScu-2b!)5A~Vr>5h!{ZWbhdA>vx)%G7OGNfP<<G9*OFX0k7uc*F}tyOkGcnlpxPnz3qF3E>@Di(JCYXxL&XwoG)j#f zV@S_acd41{Ka8uCGfB~xH8PL0ekTzKv1m-Bk!hnL?^QIUVO>PZ#Tjyu9zW+8&zVb> zuaFi;pUYYib2+JaM$f6plg1&Lso6oVfHDSZJnc zc7l&LBD4eZH1V9F3|`HqR(wxyzLTw1X5-dKWK<62V%Fi}ODzr5Q+D7qbBYbJ z6vs;&B}0@I(z27R!mZM*BCKwF5^m83RVM@{l%3Gbm-$-!26X=%i`?7$UT?}v)k`nF zN56-hRT9nJdYkyQWrgEQ%?d3Vgf^Mtono6}nJRguL)8eeT!-tNxgVVvT@@X>jQCv9 zJ<?1XOY(Hav`XlE@ntc!lZU>aZki%BLP(e)h z!)}j^?sN;pugUGOnc~U_@A6HDA5AloGl?u|EVV3WSoB#^5Us*z(p=Ko)27m<5id*a zjp?3K7*82bKR1UYrOtQi*@8-<#Ip*EzC9G|mC7A1kSw&$D>1ao(J1LUX_g>lA}U*E zTBhqEr>P1y1Y11OUdWQt&MeH#ty8Kq@qbm{1AK28C3~kKFDo*u4wZq*8Mi+FD88VV zKgT#nqE*cL#kI&qsR3qGol9qmH=Eu!r#YHg`@IZx zn6NJCdNBO?d11cbsC(TvKZ!K6;$fyLjjHZd`c=*??ky;_WSD1I4gK0XygP4IuwVc2 z*)QYeU5n8Z)I2^sPv0s(98EXs;_Euvl|y%g`8#u;;Avd%wefN`T)dEtP_%{T)vP}K z4@ncovzwjjgE7uRJMBShHGi zSa>LPQ7S?zM(Sj(du@RqcpbGvw&T7zygc}QdUJ3~lR}K*G3^&XE`=h60ksqzjP?Yj z8%0wCX+u>I2l$NzmuVjpncTL#d&nhP;Ui|JHeF8(2_PPG&v}*WdtUeSpb)fDK*~2) zU5;&g)20*^!=%dOq1dj}qR_9TuHd7PqM({$C}31FsTge>4SXQU#KC&Xhszz8zxHNW zHEd$;6JTOq2yU8OGWQ<$d@8@AyC}}0!RQ)4J1fW8QHEa;CmZvp)QVOtDmtp9S|KQ<}{ptd)zDPbp83Y05qyb9-j76gZiGEACbfA3VP| z|1~DKbiMSg90(Oze8CJZ$x{PvLgYZ?D_>#y=k-r!%k;*p@wyt>R^7h&Q|-s)Xs$b; z8%A^`4$nsHl+c;4v^$S~UYSgrbm=(TzTCcbUD#IG!_BVN{b%TQgYdi~ePPHzk?DsD z4G*)1%JCnyv$4)V=gULiI}|%&(5#~_kt2QD_q2;^E$vGdKDWwM$Z3z)2zHs!JGD5S za{4xGTTU%kKOG3HL=@p1TT<+5R_ zm67>SPtllJ;Z)~R_EK5ZmAP62l*u*AW0+W**iu;Dvl^8r4odwGXL4r(Sz^;Z*Ub2o zeM^7;^21==sI&iD(irjzC*o6wMR8CDIs^(E4=Z+Dq)t*bjN1lLcS3;5ilR6k_MZ7eBpR=UB)% za%spb((ln%o}J9q7d^(2##sX&2O?hNieP-yd`7-B z-SJ(g?%om4^tiqx*BY`I6~P>K@d{q5vUKuIdQoxFNJn7G6Z6FiT>giet!@330=pt{ zGYP+RznX8MJ23<7RT;?^bJsCnpD#Gqe7#z-lRQy)vzF3tdedwRJhEEpH+Az@IxBe; z)#kiVtkCI>gMs|9s^N*QJcY2HM*zZ`+O=R-`H2E_gNf++)uMgVh*R0Il8?@{$ z3Ac+4Etd!XO4@j$*+ki$-+e)`RB=YBP^mk5BYN2T=}OD@j_8!P6CrhcKVPgR^%i7a z_t>hjvubbt?$|qTItomovbbEm6!2f=QP(f zlQLtZJ$z}mmpr+hZ9k8$1ut*?%NgK+6@rOC|2hN^kGaI{DuK;WmY0`9xuR`=yL(t2 zpxMDe0rvYr;b2d@Ptg27_Ov1TCgH65r++4jw*#uW-oEcA5Rf%^zADuhr-tvBrkNy` zISvNINldiqoa5?Jdqd~PAM`1zpjKJ7x<-&D=#6*70QHtmzLtT6yrqx5*01U>ZhSq*lB>-k zkY^y7@Ve{7b-4>gJ9Q?~ahi}TJo8QqSFjbV0ytIB(lB+cL1`ao>?AU<#9_EJf-1B@ zlcQ{wEQ&2uor`8WyM9U}G$xe!!@96iVt30uaXNv5B)Q|Bl%Bp%!@z4}?(|yqnhC5Q z`}7o6I2{L6(z?#d`&5KgD0zvN=Zb2TEPn`eYkSmnw$<&(^Ew@YX37i-b8Wf^@iC=< zC&JG|)Tl>`KJ>DEw?_Uv0C)?LK zGu^_|-pUdUqeb6KzhJ{J>mVf33A$ecj5=r~ad9dN?3yI8Ivl+Jaz&VAio{E*-^&SrknNyLXWWSc` za%ZE<{DtWo`Ueu5n*6pZ->nv&SI&3x;^@|2D{A!JGz@GHO1(_hWC!es@#@tKyi+=M zf#D&Gpp}06J#`&kCFRIZ#ylsJPhfIyj2Gh|Y#wH>gG;)z`8{LOZoY0zbG!8|-KQOe&U$DvK0!M{TNE^<~k>-0R!*sEU?57RqhZf3HuqEIiGe{H=J_|W}e=m_5& z-zq|){*$HMJE=hrCZEbv5xy=!l@Hw=;caJ!$sFp!S)BPTcPJxSjEcf)iv(gtS}%2+ zS*BF4S!x}Xta(#hGQ-ckdC_~)T=Lj9Q#rd~OC|fetA4zJnPjZ%CQ8_9V~32Ix9Dp+ zEE=T)4?lP_ndws`&2)8v@Urr+s~>)jFy~0o@ZY${?3|SD^K+)>{#%f>SD&>4^Ljz5 z$(f7r`KRL?P5z-*nifK&kNgs<5%lBt1Er@(r3fW*n#BpJSg4MwaHv|8Z&tmI^I7GB zF}s46nBMjm7MBg)HWcT_rf?)rEYWXhdkyIGErnkKJ)ATvcJkUzzG!8&>OlBJ8uMK81 z*Gvju9~<+(@g?Xd$GuEn{eOYA16l$K5&fGN`&V4sBbfifwclZFpFBb0q=Uiyc?i# zt{AKf5DXRioz;LHuo}G1C~Hk!;DH*Hz%(F$ro3`)7$+M7F)9m(BJ551fZA>-9Nrs9 zpy79!drv&yUp+Y(KQHnk3<4E{h(h2{CIPd!l>f-qx$%HR-@!)?HY z57mWtehKu|^=)b+A}Gkmx<)yAov=TP$Ji?L8w2tM8HsOvDPx<)Ja4^RA>e5T6=6;R~gTJ_}Z=$CvoC9PSezRwMp9av8L%CXye^(V*)mTh7b>- zX%dJDCXhg4AWcZ6VuMmD*g%z#5E>hgX&TbRfOe%@*XGqUk2dY5E=}`v;wG`1G=AL& z-_P~AyLKJt+D$`O?MTP>_}=e)=l8qkJKy=vIk%wT!}P&^1Ke$bZ`5lnXKGF}+%%RA zxAQNq)OaqMnJ!$B`Lt^$T_B`VHeMM?cFk1J^gRa3bcGCpj1VIwkPKg0Sy@q1?%8CK z1Ru|dbsWc)a$G?%>T6m-NYk`=Rg;I~F=Zrpb^2Yu-# z0x7YkromU_a<*GU>63yW+IWFicwSHio(FLB>y2K~5g@UYbbM7JT8i2rB$-VIG$gX zaigg!7mYXN`FK1o#bU9Z!Lwb@lkPBO^rq>t39x1oBPTi>4p+f)iMiL}OYdXH{72 zD&NaX!r($Mc#Rr1Wi=}iWaLDU^SHhH*V)&}f*_buzMAaOn-)>ztdeaXFNwWGGDP}U z?8$5d894!FiJk+w)p8{Hkf*t{fE=1EN%s2|LUV7Dxkgtaxsor(b9+N`>r+;%mH&T| zV=n|4fCZR^jy=1o05}EtteH&*{>4SOM685m+f_;1rZP(7ykKK3g`oq8d-Fb>U z67HK!h0J(a}OASm1O%UvnWTe%50b206BqH z1@(>+=iXc#%U8errN+j_hVqu?&Cbs5Gc$^!6nx>4&u!ecZCfRjM*k1b4dp}Z%OjA+8rT2yx8K9M}m^u_qwOe?pFBF=aC;1eI zlTI)(_Nr@r`zTte!%}CZ2H5kS-m_P?G&MPWzKyP?rcKW7o}R$a&^w`q`r5+s^73`h z|NcndiMLJ$#>U3OJ!g7nE8K3ex_Z46B#VoSZODZVhtxkf7#O)SdY$Ptchxvf;35J4 z)DX!7vmO8#38MEB1lLz@{EpRXQ}K4pCh9S*tLIDrBx`GZuBOeKiaNWx0v(+_Gw$+o z@%4Wnoigf@<+!}3eYY3)X!W4=^$+-;d;Z9|^A|2649h7IPFhx~b^gim*Qg@QR8Q#y z1zL%Fi%ZKN%*8yJwsev$O`D5OcXrQopXr@rGVI#Y+*I7Ub&ES5iz^47IoN&djsNOG``ba6Db)T`yd?7;0>+PdFabBP8TxoE({J2{O3{btVu%5S>#3BO2Di z^wh)&D#8L2j^<{9>#HB8@h9a=@Ud@vt+}PSxq`fD3CJ;&jARFm$FsCWP*iI}S*9OlG z1y6T$O?ljI$y4bmBoC+kbpL@fTbi5od6JRz`D)gkJb8NT$RGarF3o>SMqRm;iC{d2 z9?VX#va0&yw_>6UR3s8nX+bLQZrfE!@gi*=$fq<>&=ekr^ZpAUv|USN|46~jy6<5y>fjTNhD?j`BFVC`N)WYH- zO<8grp&Fhul5jj%XXkPz2OSjhNr9=cmnc$8*-}g&gDOsWa1esCf_&5H_(b?uho2jI z@h^WvbYBn-M`T1dMt!rhvl0A{MWf2-=-50n*YvQ?SZBF%@?0ZgIHA%-jRax4$SO{G za1f$PM2NMfsM`5AVy0s-`(c9kERspp%cGPDN{(A6MNCGP`lRCUa#slj0&6>oY zn;O(imY%lypj3$)<9N)=Kp#W)6`EaCM?aMA0j`ZSG0 zA>W7w%I2vD$(gu{ii)h53mY2hT|2gK^I$cP=h(7%`&7p`LNhG2K(eW^vG9!(CnhGR z{0S3=T(*RhC^-_1T)a5&XOe^8Ko9CE#f{Tl{6`jPBd4vTq~uAP&7O1Mt7~6_LL?Hl z27|#vbe4$yQASWFX&i%q!|YeV;UmuHaD=r6IP+=(*nly4P|D&@og9=d2Of4D$KfM| zTT))FuR$eX14dw_oHF)U^O*>;H=y8Tl?HH6EEdJa>K&DU3D}aSzswmj>^jzTC!;?| z7Bt%X@5kXI&gYV60_ieq{-4ZJpm{Yg(A)V8H4Y!ariYubWFyENkb;v{96sWF?pD0& zO|9o~174F>D%zzB13xAcT}YB!R#P^Dtdd5GVmMjF;Ul?w`htRSXCiBJ1-Wo|$vzX9 zdU`Gpz&2z?$6`cdh9KlM92?_g6^D;xs`Tm0>U>dQ1e2`{vqaB<+~ml}Ws<#VO2|~- zEJ4&&acqo}RcEQIjs83HU2$XrlI;F zh~70H;~7aZqDIq2uih1(Q)VJ+B#fSA;M1&07*qoM6N<$f{~hOo&W#< 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 4819ab6c0345c8f3839f42052a97ca203017b55f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6915 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 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 84d9b74fbbe8ec095f5c452173e28edd8ef2adae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2669 zcmV-z3X=7SP)PxRA>e5T3c)!R~erB?0DDfjlFAoeZklGl9l7)kd`17UW!ydP$5zJLXdzr zE)P^(B+7FoP^wU>HXv0f4+tbEio{K#ffAyov9TMciQ_14LWtX}9mm)8b!TU1hX0@S zznq=Duk9$QdZgKN|IhdB|DXSyIcGTTfydr?;W41rJM(O}jzu$T7dBaczRCibyI& zNOpBAmNhsejASicH@COBnW?FfHR!b~qAb{A2(X^oW6XDVcYA9>p*9hisj2`#$|aR= zNQ2XLOE7_HY++&M)~#Ec&=NIBTBJCifOI(lP8SqNP+N?}p`l}KlBNa(L9k?buZU%i zZWsnkJcMrNSagonscoY~2hBhaqmtSq%dt;wLZ9!c~l5K0;(OIn!)i9~`= zn(+i^^L@~!0o`d_it|bo^Va;og2-jLs`tuHMt zC7~F}5jJd=GZZ680(c~+`Rn?8KGhaQC8x0cEJTtx6D(e-uc@wz0ZG&(2Ev%ixqb@~ zq>heRqUMm?-Z>H%l9I9_2hI$1snvNs%F^=kGJ04Hgf*38eg!6-D~TONXU<6yr1!^} z!Xjz;b@Q1e+7Vhdh^~Ax+I=g#!N5~7fw@huna@6K18X6js zKlj;Vo>yOcecdqd#Q8ow zxYNl9xipAtUX|t#gkV80dF~zm%5&bH&Q7JbzegS$pU^GK9b|<8k}k zxwp42j*Z5XmS8tE)=L5yR(pG^ba-$;e)7rBsQ7q1Rov~{x3hp|pw7sE7QtEis#JDu zOt;8IPzZN+h7?Klq6w55#>X!wBK?Qtj<#00_aKnGG@;+PaWmQ3-5~{QYsFKqpI$rv z_Jza;A4aW96B9;#T}WtYX+q8N0l#0w$LIG8SFT=5%*=dH20>W-!A?zyH}B8RZh*WD zrLYXhc7@jPCpuwafVOOPVXCOH(eZb6hh#^JC$C#P>|1_mNBKHx97g@uK(HHz~vq3goEXmkn0rcIq?ks{dK9EQamG|N^Yl+wc2zJ9#= zP*0EA-r6c7IqF3u$?=ePg{6YWw)DiebZheZ^|Boe9^K%JF%Tq2;|$HRNI4ns-9Qj3 z*(!orJRTVx(>0%FH-^I!EOd^!p!1lE&L=xu-jztA)RmPL^URq)Z~o=YH#59#@e!$o z#laDWI2VoHgOUOoY-wrS4MFgV+~nl-K3+WW(rSNCuk0q-(bg`W ze`hp)`d6nn|9kgth6g0*rNs_Gz9_-Q=H}pTOq9TEZ|htf&H*3))F)L?C7(#@_OE~Q zyG{2xd2w_!fjgJ7CmjuxjvW&<-6rbxqOcOeiSs^$XNHHp-~IMCtKk&e(NdSoyY9)5 zIk2alKzaZ;PKQ5UgK3zy<8)mKi5GtKeSb|&jWdBgQl@yYemMB{n-H9XBqI5JJ=HWVNcMoP8)Ow5_>C>^|6~ zRKf8!9xYJa<;h9?r!Tz{`^UL+`g@a8`p{zo3Z52|cg4Ny)oWA6_Qr<25{s4n=fa=H zC)Q(2^YimtG$zJwf;HuIa(XkPxb?BNf^&{^Vo~wS)n- zQ+C`)TDVoiJdwmDWN~G=qH)2w3HN3{jDqZpCB{7mZM@~dix7^hd@A0FMy;2Bern_Q zXU?o6felzDh#clIz_Fj>SK_c2b+&c8nv({Hn3)@@)FAN75~P35##B5(-esuB5gXto){W(v}eMylHR*kND{FkW)Pg_K!{lr#WH8kz(&zht9-#q&6I?P z!$INbk<=>@zWDkyuU#9g;h%nbSUY-T(0Ns|K!bn%+u1n#s)ZW>cne9{GYKmYqj_$v zEJeX8vijsC2o23}LpUU>xD#xe}K~gEO|`*5u@SQ4pEcC++2Suu-0eL#Kc@pmu_% z%j&e#_MwP$*kEt2>bK!8k2bkM++#RhEi;^J0p@%@`OZ{miW$Wfdn zwirR|;E;s1F^M;;c=?E*dOT=zMYGiPB!}eSI~v?j6Df+b$YDV#1hE~Gw1K37H>(PK zUGX62B+a?l;{1(LHHV-vINC`ii~dquj31fLNJ`Zpu_ux?-mK!~qpT^_c!dRTS70jT ziX*Y^7(WC`3i#>B>iv7LOSy_CW#}!*94U5p%*qqstcn5!Y#&U+o5DxuQ!bWw7SWH& z$9ODBOuLC<9xrho`Ohf}5oL+9e}KCW=4n1rOl{nGDlaQ8Hh5XWn8uaL-4jv_j*pX% b{6FwNT^yA)dlv%S00000NkvXXu0mjf?Xoc$ 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 5fd8d594e63bdc7bf791191596e54daf1f9bc185..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6197 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 TDaEcF00000NkvXXu0mjfB03WN 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 68593e5bd918f42c1558d1c908fc18827c1ef3e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9915 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 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 83f5e4e65e2a5771b5a094de35fdc2f1b82fe20f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2510 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 an*2ZrY6wQgB~s9tOe)OLn6i)O2 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 96b416c639bc989ca245bf7229e97bb1abf4af25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10498 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 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 30d0cd817ab6763a66272de20e16dc1a16fc5fcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2770 zcmV;@3N7`CP)Pxe5T3c*fM;YF8-JAE~OMF?c*Bf7QF_g44N};L(rD~&62`C_nL{*Sb zACM5@9Ul797oK?Ip$|x{0)Z-}5h_AOp@fP;64!C!_!eK{n8aSMZ@a$ko-6;i-Z?$H z-q`1?osdQyX>?}i%>46x=l|!Qe`eO>`7C|9zW{fS;M?We%aw*RZI$-2t-AW+ZiBm# z%w*w-%$GeY$pRsRvi-?OvS+1!j_VjG#~ms(WP}(gf!grR&CQL`hNeT3EF^hO?BF=A zmg77T^fygU)-=s!!_+2KMW4zn%-u+(QfYbxvU>3ef-F<9y0jO9tS>YLQeq;}l?>H| zPe`Ktj39_UUf^|}7Yu>t0UUbW(u!Houtzrx-Y|6D&<#P?wVbLc=U10jE=^C5Pf=@) zG9ydHVqcV8BnHw&mo0GAff18Bk9_`EBv|t*Cy7B(6m%k|aU5PdPo`;jh@_}#x?rl> zdUk#7jfs)#S4o0OxoVH zRKET^7*CYDIF zMcUij0>i_jS;H_qUpe_yWA~x1S_oJ3s&?seZ)#v*a8cI{y`iB#;32=?+}sp6)ZJb4 z=&>)CjEXFY$7JHoLS;ok|=|Il;o*iyus$qG+W9TOCKEP@~Zs zn!2^o8f*4Nqfy^G@1C3Nzji&Fo}bT;-WXerMk0J;o`ri zu6u?@Z)6H2TZv>_JTN>mnz=qWoQ;G-!o|xUFWF_$*2wr=&(XR<9hoYTUOxM$bGL3y zPjA@UIVlrP+EyAJshQjFQG1xFmC6YUv=eWM)HZzGjd?O@`ZDc7K?>m`rdbva5i=s_4W1glTSX;j5?aDMk+n;(j@KDw#vW^?DVT- zEIYx1i5AXKT+F@gLwP)QlC7r`z-)igNFMyr;gOf$F+(gBe zSlf#<|3Yr&pB>bR@LYX;oj)87dEt2AU8inMZ^Yv*1;?}1kMjfr zey;OivIf~O4U;wst|KQf(o{{Do4s>^iq>+monUMHMVfzdwFJNM!t-s(j%2hY)=~p< zj65SbG&GzU92&_o?@Dnchqf%|HgoFDsaxx;pW~-#a+;ZVW%BaJeTySE#xvbrogpu^Vcr!>$k@c>T8BfL3lh~W*27IRhAbcA)xT+72cd!M_Ni}xBi+YOb~)J_lpkPY1O;3C9o zRb^p)eZ3Ho_yazv<6wKqruXQPBU@K#hHk~K)sh5OUAMxznAr?@3L)Y%o5B+(3qLgJUdbfTfB=STx&k#o^M`uD|o`&Ntgls;^; zoQ_4-AuXpDPt%5Xf%=q~UOB-+bB9VsDRhZ<#Oiu@U>r(iQ+J;qG>YG zI}v1UOcJEvW)+u@6kpOmC>VFv~ z>{JJbf;k7XENadXImmQF5ba^E`MH_fAL8sHj;>onnh(0ub#sQO zP8gbH^Ob44ybnSv7KN}U3%A&_ypOBjcN^H1kP40Ma_!{`O-uG~`$DSHAfMHJTED>m Y0Jc6EoAk8U?*IS*07*qoM6N<$f(0mCt^fc4 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 d73af0251bf6e81d7f5f9ba91b59635809a98fee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6842 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 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 4757ee87955489e0045b1aedb2bf96e15260a894..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11277 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

2l=M-@p8pb9kl zEHAGY5<>%Gyti8-keiP_HDd#DAsh;cGq?Vpd9b)xNG6lk^4eM<6zSl4x;i8{eDHyQ zCgAJ$2l>^FPmSHZy(R#{<_~&mO1!zhy?qA!mI;MLK)Ndo#0H09V}QPFb8V<7v4_iR z1`Bc#B)Pn>Sb!rU|IyqWSvrT1t?S(6eYRY`_8Voj>19-=BM6 z4c)VNs<2Y|@9#G)HI^Rck!R%HUGE0SJ9jAVUQL#3f&9VuzoY#Ax4#JleZI!^ zzrp#R@?KI;9L7%KsAw!6k7=3$+Xvg!;0)01TT@f=yZ!~wGc=$JY-$*5(oRzo5^SF&p!LSY#kAe+9?2pgE0Uk zL*sNWF#x5ak?HS`13)OUO|?n0t)DC`8KNw3-MzgcGLLPz2ks@4CT$^Zkl5$=EN9-m zb2s6=L-dUa{Q`-qO=R9_0JFP z2WiY{_gF!{lQ?s`EYRZE*sh%jfz1v06U*(^SsFu$eXujGPt$8 z@y3tUbo#`;d-q<^TQ3`3yWrfC1Mlu$tR-;_LU$yh$g01+89$UI8tv&21`-2s?`}d89E31X^i7`=ujfAW#I_MiKD`q;Y+v#+=>5prgCa?jIdlw{Fj5|M9`UFo?os zjVu5v*Sgfvkpsj4XS9}EhvVx%28TQ|5vtM<79f2&8>2iF`6=~mA(PHz9E0Kq$6;h} zkkuA$?AoNWKtZ^6J>Rw7)W|FH4E;(NXiV9pQ0c6hNL!nw`h#7qswolg=x7rr$BRdz z(TS^)0`-R1&r7~3`nqDcYXXfZ|3oe7p z)dV_w0)&octS1(gRRI9IyLe6ET?esE`|9wBW*WEF#tvZl0Q2n$YEpeoIhBeL!k z{|HnN@UJ7s`@7(!e1bP+Xe~({DRmF5C=>rS&FniWt+mRk{}fis9qy>`VUz{tv$h VneY^^ 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 0b3a086dd06861793653eed98ce16747c3814c9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6047 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 Z_<#QCM~yyly}ked002ovPDHLkV1o8|zm5O^ 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 08ac81ee7fcbec7c19fba17d234ca97460e74992..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9774 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 P00000NkvXXu0mjfW)i~2 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 45edfd50f72cc6353eff05726dd3abb3f7a1ae1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9358 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 IM6N<$f~LK#uK)l5 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 f36b17a433d0db936c320f076999853a9d7698a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6012 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 N002ovPDHLkV1niz0qp<) 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 ec58b09e72858ecdc06af1c41e91ec5eb46079fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6533 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 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 e263d0cf931f7886af6d7ce8baa31cae606614e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10944 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 PNd+j#s7lvMnuYuycF#00 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 395f04184d34e6d7e901bd5f39828334278ca9f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2602 zcmV+_3f1+AP)Px;e5T3c`%R~eS}Cdrm<$+jHdYaGXE?qr&p2cRi*h79Em=)|PJTOSx0 zN(Y!>pbvf^425RWGQ;#CFHE7u<&r6#;e|ow=Cn$t{$=Dex6{Oo#- zJJHN^Aw}ehQY&2`q*64ej3i5~>e()1plnyL5M+cHDV}7w=H}+6K;x!fQR2Hex6ti& zyMu1Gs}A)w&9$Uy+M=q-lew%i6}x$3EF2Ec(<_iw@+k&+5JNML8`=4=(LbV|93XzlDZoIZ1G);98NkNts zUdzeLOUub)6CYl@KpJus%O>iSAmkB&UTp8~?rErRdPWe0W{>2_x;d^Q<3>|ecP5*W zWLXX`MCXrPo17e{_CS=4SKIA4A;`#~JNkC*?fZ@-N&7@m%<_V8s|(VLN(M!ixm+$M zWwY7g(ep#EknR*kSkv~{1Xw$PkrS$`tLwM#d1S!j_4IhW-Yi!kt6717Zb1}fH|K5( zZEE>Ua%pjx2xm#wwgv4FWaPxwuCDIRt}TbXUT?K1N|*%hN}w^V(q!eYt8e@gC-I|+ zSS(Hr+v+vz5oF{9klPe$Ib7wdl6juDrM!~tVNFpG+#bn$fRluCL~@DruWQM*2r_a! zx+N?Ja+R7$${|l{sf#8wS(1E@C6=ORsJmv?Be~vOj`zNvZM%Nv@p!mA<(Yb!dmr=ff8+38_>n_v-Io zzx4k34`L-RZ599{u#)%(6xlAvs9oG=b#inn*b-`O9`Jg7n1*eKt-U?|r@r>p%`}_q zdh3J1s%pPqf`YklIC1*)J2S}d-~YLemgeRf7lY;@mojkAtvuoNlN%93&WU~+SfSf+L zw6#Cmf{Kd)R{B0oQsn?+S_VqeCYZ|MlRm?@9_HzOqZf4+C!b4zP7g3 zT9jqd>D-AEZ%@5)?AYb#V$AW3O*rXTsdk5Ful=3W6?~v#3+g9v+WUFwJeOvGoTQmd zPCfp&w`Trv;^gde&wh7TM@L7Xwyw6oqR_|6W@ct$M_>N!XmWYE0GN|DarOje+#=A; zz;&u?tcxYHD6ScB5_i&ol`H^9ql@}S+PY;+X#eLw8)9Qp#LtM}Z$hFP?u)bD^ z=!E0*q2%?ZBTHdRTgZ05GDxEwNeC&&v8kLqhAWGX_AFzeWh5SCaFH_jweT_m@mM~pR$xvL995h#+H z`gk_UY)ElYqY9*b@v5hp7C*ZEv2j94K`s};91+mZ{>OZ&x>!T=%JR)SVA%_lD&q)dw0I*XX ztlV|)#pChi_SP1^uc}HvCS4i(C^Gn`zf3WG z|C^p!>Fw>QZftDOheC8=VdeOnZ;k!#)z`+MgULBbbJ?5}nVT6*CX)qMie?K!p9(Ke zb9+}Bz5?v=$_cR4JO6s`=8vCyc4znIPc_7s;w8r}RyH|tb>Y`XU%rS9csXsMPTsGP zHhHKFRb~cg08xdP2aXU!s*DT(Cz1*MWI*S{2Hb=(HOQk3&yd*&Ip_dZV5ThVp2o*2 zCV>|UTv%Rj)suptA0DBjtUz;y-Vn}xKmEy%_L>j8D1%ZaQ&t1{O7KVlGd-ev8|3i1 zm>|kj_~#l!jmw&(iW|8L9U2)!V?8|Ti&Nw za!4p%(D95Y&_&L^Kp^k~r`HzcfZRwOTvxp`3V19-X~yseQ&bVEqS`3i;SH6 z&#wpp)>yVYlmJ?bAe(>`cvj(jgny1giITfnfLSx0PHW?rN1mrHn#hw|6~bBsStX4W zW#L(c^AY~JdqooDQmGZ+d}MAQ8i~viK+B1R0Y_?wAmlW-jp12^^O3qLU4c~Q9~Dq; zC!kxxav(Q5HFcHhlq?BWdh8NJT@`L)cvfqJ_50|#mhK`gXD+LTHd2NO1!E4~GH*Fs zd}AkwnU@&xk%Sf5tPDWJJwf7gl{B{!VE{)JzzbW#g4uySNUv zR%{o-QnuYlD#&#N`;NQs58S+6;7AzE-itq3WrMm{O~xPF2E1K@>{|MFsGHvj+t M07*qoM6N<$f-C?Du>b%7 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 bd7a694d49462e59f55ef22be92d7673ad2e3aa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6422 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 HOauNGDU~oC 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 482730866de64ccd2028d5574089afd44497ee0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2609 zcmV-13eNS3P)Px;>q$gGRA>e5T3c)!R~g=&+wR(Hd)M~*x^|82TpY&?2r|OQxus~WQCXIY%-HgpNxf< z&P_~=j8p3@Wk!~YIa!o!BnHxk$SrUrz=(-m+js7+sq{YM6opDb;AJA0bvp6bdQw%z zK_rE2R_4`Ac6o6*esuK8@I}&)pa^ZNoEyAT+roSK7&OWtlgs zqBv9Ol$6b8Lkr=#qc_IJMyNj!W%Jc?KXwQ*au|-Dz6T%vo+L?oL{Uuhf^cgH(t~m) zIh*A&nT(W9rw4{EoO^?GCn&?3mggqGT1kwYP+3`7yJPo5{Vunw+vRqrxiVSJ3kpUu{rnZ(XXoVmnC$@BSbhdYFIplV`D@9SlB5+3%&1r=eD{oD0 z{Z}}NABshzOVqKYQL_<2Mos{^#z6C-3Qt9r=Xp!Y%gG+r6a~TQlHB__NjOg=7fJty zmRye@BgbP{!g3&2u7#u&^0b#aXhF+LlIM}wV)zUV*VINNH(JZ_+|%9D_hXmK#obME z?1caWumBUVQC^qBS{8)$ASlsl`2#E{cXG~Azw4&l!d6{Z-x!<=O$|`vHK&Xjdyqro zvCm;EkR%uOpnEC-6R-gz0b_<@*mbOC1o05{A~tdCb9(E0tN?7l2&|M%xfE9F3k!~4 zIHBCGO}rfM3fO=VSVK_dhoNpr@nKr*W>Zv4HuVC@ns3AxtqtMFD;xmX>p zi_vJ}r$2x7LMoNgR=W@W_2JE*^uP4E8lTUD7r|rK`+i?rTbr-CraI4}(8uZ~CnuvvUjNlle0ez!n4LcH z?Fr2AB9Lcbie&YDv1k>An*m?qb~-R?3&7!UM0-iwwrmOP{n8f#tR2dz!#&z;h8)ug z%)n0fdBe_VL2Za?J`{2@Fu`(M>2t^NdwqN&g8SZz3Q=;ow7${i z;DIMPP_HP8dh*>l^xz3JE&k{krwY{%=c5v**iuAL*b2ab71N z_p?_H4@^zXXhXKOwRz%4FaB^3NCp}L-bX2;H*!^|m#EnX4nhoAT=V_9`k-d z%0{|4IJ|iH$S(&*M@ID(6XKWtdu5K1!#&EVLzyMWKo&Y!ovkZj*02`{6XS=qFqD@)I5oQfL>m+wAvLHOp^sKU=-KK6a z*D&YUumoYY$ZSe+fp89cUTq;k74CHMIJXO&{k?GauAMdC{?>sWT8gz1;Bk9&{UFrd z6>LE7MshoPdIGP$d`Mf^sB`tVzdv@llzFIm$q75D*UzEoO9zm9pdePDxMdo;g6++I zW;&EuNhUJvAdL=?2)N_TpBNxfG2SggymPo~B?& z60riD@k&Xj&weof{y#sw`Qi)D?dC6BLj4RtRTvRK#1O|gaQD^;xX;ZU`L?WAv#w_1j?vGLYvKygAQN?W-7AbslTj3 z5_ljZgynWud{q#%k4NYzDbbptbyQbfCp_Er{N%e+C$+8OvDSS_s?&xqYg1AOIUz)( zfSGPFymfMTTu2ag3gUD1f%;`tQpC;pLeHHWnBBf@Ydu^R!MZl_sk*1x{L;w5Wq~&6 zwA6%16vAz}m}1dKLgC!NJ+eTKoIO6D?|Hj!i&BA>DhGE(G#Y)4Vu|pNGIxb;MdKVq zA9#Q)Blw8;970%la4#lc1IApSlnqav95Am19;VJ9_=x!2y+{t2fDIT?q+B#S(Z-A* zdjm2es|Y@((MtKJuXr!*sKBn->4 z`O2(aD1)OFJB6?-J8rRSp^UBjwK}$?#H6uNud!^>H17koETqgj`Lynn`Ud_Fw!n~} TJ>ghc00000NkvXXu0mjfT&nyE 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 26868d0d47a7ae370e0cb66e31ebd8b5723ec8c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6536 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 TlkfA9Fa^j-DNELhn*{$K)C52N 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 7fe9f86347b448544c7852e504680b21a74a1b1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2329 zcmV+!3Fh{RP)Px-(@8`@RA>e5T3b(5M-<+i8+b$lVwD04sI9G9tAT{jYGO)w;6;=AVoZ!l6Kzbx z8%4W>k})HKz~9g#wz+=O$Z-#2HklfC!ZaBhf5 zUCEqTduFXQ>zm7(*|U$Py{1>Y2hv`U`$oG)-mbZ6L!ps36erKdYCI9kVv9MG!;;(C zBA^hGF&B`M+v&w!CQikzU?V7i1e9~<&YiA{7cZ{Q&(GhIo}OOfa5##PvY?x(>yL#( zp%J8xsi~>9-rn8^hYlTjeCyV&0P2HC0-7LG0-6dy(d9@vYiepTYHMq^ysY#2d_VW~_1&qft9wviUq6X50Sh*wOFnKAC*xLtpy()I zyLRnLzjEcuN7>ogpXf%$kuz}=5+T}KswZuDc=(3{2M+vr?b@{|lqC&RoQ>BJ$}>3% z3k%(M@7^s({wbb00s}~#Vsk+*7+HZd(cRsBp`xOq5xF1F#;F@uJM6W1Nx(TVg|ge) z+P((3S}3!J`;g`e9Q~m!+MHq=Y>RE;nbTVQ02`Yq91n?6*X`T43%76Iei};boZ)zs z=Rk(wLU-=mIl5!Vj&AVmfVcusJOBlpyS=@=w5X`)D2)Gu!~im%#AUF&qod<=adB}I zcuv`vAY)BY0q4@eoq*APr1=JiCRLmL=-?Cd1^LZ86LT$2=-i3m^yl)ZcR)`4f}=icQI+9q&$IqoIcZc=qMbbYmGb(zKQEX$@HX_k&zMFw{PE5INOXf zqgq=-S{i%RL{df>%2J2ACZYHrsF$YuZo*`Gpb)PakS9EPR$p++2x4vVl%X~Ge1Sjm z^1DTbJj?h@8Olms3i*WYyD6@yHK7}2g@bn}$azwqOG>-oP9I#k_U%C$?Z?^!nH*t3 zisaLM=b+KHil#<@w4cTcBIHROsGmK1=5AgwwLRjXDd)4@L7cT>k%0c!f~*HGB4#D3vy1^^a7%hU+L zojP^uH*7s>$|9uq9y@mIJ%U81cyVCnyB=wJ^XAPXNdgSQceM?LO@)80YmlXxNT$s) zEE@Z_tgLMGo2qz-jy!&sgGPoL?#iK0f(RGY*D9G!rp zf8M`;Kl9S1OKS%Q2bb8HnVt^!VQy~j^MeNuKH0Wy+nAkPs%3T~$c9W)ESW~=a7jst za=IC74%3ncVnyUzT3T}XK$$rLN1vlQDQX0HH1e`X=yU+a4BAZAHm)?uq`jZrn4v)MF>6H27sHuCk(KlpkT`D^#*!+ zdLr9{4rH3&9x5veOC~NG1n2kgW&{s7}kegzM5d=X^^Ai@o@_@Ha zGZe*7Tu(S-suM|TYisu8ehqr zM~d3CQ8u5%2)q(sdu#Buw+p=O+7pLn14tPG$q%4q{P>8nUZj@=lHl@jG5r;8<9G+k ziz|+t?dYL=))8bqNkA^jPuK(~J>+MvacZE9o9lcA9=7FT+xp0H-HBgdXQr8gj8#L7 z1vu}|oH8R5P8l1e|z9RymiN9E4T~&00000NkvXXu0mjfvSw`m 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 eea2a352bd6221665ae3efbbfd34a3ab60ff2fa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5882 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 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 d5b50a0a5fff0556d1522c625a575e8f380a9485..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10208 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 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 d2811b3de344706fd00de90208e157e754c84340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2311 zcmV+i3HbJjP)Px-!AV3xRA>e5T1#k@R}`MiOeT}bgTw?)^E6cvt+j*%LTUu9WRXpTx(R{^1uZTD zE>fh5NTph&QIITb6$|2~8#itOidHaIA`PYzv{Y^0F^0s1yfewn^!sl9GyUhEKbiR_ zF~-ybckcP`J@?%6-N(7FvDrS*``rR@Z^?YUUOjJCT|k$p=XJ@kvym#dqFHn?X0RJ# zGhGDaN6^OtQev}mQKyMfQ5P@~6hH#Xv1`{Z=jF?nH)dyNZ%;@_D74${1qi7qo2-=| z^ZWfH2p!YY(`~)Iy-yAwKK$a|y?e9B_aO*qf?O2P#Q>DD>?uc0O^v&@wsw0~R#v&o z<=TNX=1(AawLrtgSmrqpTw3rj&+GL*=yeo zMggm;s!F(a?b;V%=#Qwb%hRGEq1h5~a@j_wVPHmzSSGAvVr% zG=-NyhT!~-jg2RE?%df8o(&L{1BwQqfQxT$Z!az=C^!M-ZxHA}mXkOQ)^v1qoLRqq zeKU9t*@z$`4N(E-)WDsB(td>H28SwDo&9LwQ?v!&oTp+R^G#_XfKu4OVX5_8FSO9@ zzbj(hy|jfkfsZ&RDKH-qpmHeH)zx+2>H4`gy=&r8f-$guU1uGUC#+&F9C7S(%AO--qnE?wF0BwcMzhQ$;M;PL8%zDs?#k3S&>Kh1K>b<8=pL(uezg~c2kg{!HV8A^#HpUZ! zEhi^utfHbq>AQXVc2-YMPcqY!lasxfnVHHv<49#YaNt14)~#EuuCrO4ot-~o`DlVl z=|!qni=|?;9|Csp$b*=zVTsTqeu5eq8Bw65Fow_6*|TS#x!rDseE06%Lr0Gu{S?zc zHGniiYHF&NI;5P1cwDpj50ud#%R(lmntwd3YUer20O7KyFiig3yLWFV3}s6y+O}=m zuz+I%d8WPty%-Ay-c+)%@BaB$GQl*%<-Ud?uP z8nGyEss~89I9?DTj%h>v`t|GhhK7ctbnOuV%ZdoBBvbfHv*+YiKUp+AjdP0Wb%pLMkD+bJgt| zGCX4nVAW^IqsM+-|B@ilC?0H>dDbHZ;Cx161n7h9YS_=In)@}*L8fwj3Rx`YL?i!} zl$4B~K7G1%^XAPV4YXs6-zDIvg*?;r8d-*AsY9P`fv3%CZPk|v>p^{HEIbUIfT4ds ze*8H3%9Sf0W4Kh_XggxPx$fwr}>2el|me4c)mX;P??>Rl1?L6P zfn@yp`1pu#-i`1|Zlw}!o6u~P;kjTB5{UF_JWdCnWBAk}t%n&akaBRVU6+@a_d9Hp zBUT7NV-FI82>AH2iuuE3LwP)At{_UMZL|?K$&G;69yHSoATufG=dF;nG$2(A7O|s`qdk^Ug_8{{~0&-P8VH2RV z&%<+=OPYEz44Lepk9`|4A=MOk3d!d3P{H6eaCA1D;I$YN#iJ>tLe{p0#ITZwu}{6 zzVh%&;(h-+r2v#zdQ<=ttbmq0k(HRvOLid=GmRwi+*gdh^Hm(9x?nNAUOgWa&@p-- hdR`~;f&Krsz`ql$$-wWwBrE^`002ovPDHLkV1h5+StkGh 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 9129e459bb263d99b8ed3b1cd36b3934145faca7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5783 zcmV;I7HH{-P)Py0QAtEWRCodHoq3E^#h%A+ci%?nZuY$q8bM`Iz)=XsjR`(=GHBGiF>VQtiJ2Lr zCNI$!XNJ*X%;=0d6G#06{KMx!f+qSVYFzTvr=x#pVh{#+vIx?#S!4&<8fbc%@8|US zUFx2D&Rx3i*7W@)b*oODs$W%ozo*tybx$l-kqQD81S$wr5U3!~KM|He#QOXkj z)%V?Z-+(1cmNZFb4;nORo(P(m&+LleO{Y$sTHVspvfb%{SYm-$*nY!f+!l zd9J(rZjpWsv?3*!NXAVUw`(BKGm!TD^Uu#2GiJYxrD&Ie$L=Hg4oONsfHew?=ZkOfan3ApLGq#3|9 zqeqXf{^E--rd)E#B{yAg!3Dok92eZvx^9&@C4)O(fRX+{nL#pjzFU?jZD-D$`Qx^2 z+df;kaAEU-0|y|nLk8OjG~0{d`CF7ue|lvTfhI|haVu(CDI7>L+9<`GJT=8 z3uQebY@h{hx@m!4Cu)iEhi_x{01waly^2Vqcl7KZ!Wqulee$uNtqt_S)an)YMG( z!_$`?k)g(wqfjG<%g~3$IyySGeEs#;|FvMjf}gpRF%pePf*}PXky=nFG4hPK8YP5@ zKk~>U^%}-6zTt)&miy%K6z`R3kttX5lr=AJtxq_{`u$Q7cN}*?{d@BSYO8+?tGMiDiq6k z5O-Mf*}uQ>#vAv@9c)tNm7gxdKu2M3#PlSQ_uY5jO;vO9oD|c%&}7p2GeSF`g@+ds zy)vuY_{X_(=Wf?^K}a;NQOdhF+7^lb zBof!_IfTcclIQh%G@E|SL+>G({z@L@r|e)50~4^3lj#&#VO$J#nY;9qKsRBl zeQ^dXexFCPNzG$^*WU#Uz#c3isZ7?|(`e%T4ro z%<(GHjQ|5U=8Fv%U3Ag4!-fs}-%mdIgx6r!|C!w#I)`5)B8MnR)!tiO(ImZ=xlcSE zpCd(NmU&S{QW0pBS6zF1`})f-zx_Ps-PnFNWg58Oq>;)hK7d!k-JwTQxx_@5(Kig>8!Byhk0I4@Ul2O*kI(X z*npj!HmI@6!R@Rimp;%E!1kI>t-#kk@W2Bv>Y5b@MqDRkDv}-nY8*t?Y4^cAZLIpk z>eZ|9L#+8Uth;^F{AL|cItXiqQB<7QDBAY$S8`YSJ%Ny;c>STaYy4h2>Q*W)Bw`@Z zjGXBu+a}bA#wJcRFJpc3NTD*~1clth!wd|;Qc*ozWxH5s)R--SD6-mD&8s2ar2E== zpLagIRq%^bGz-kYE(VrhDkppx&fLl<*%0VH5x8sE!{WS2uT0i6!WtI&)wvA}AQ11yi^7BS);A2|yrBS(%rlZ$q}4e8Vow9P^C(19QK2$PG>T=S5N?m$>D1zYb#mTap$ zfndp(Q3MhhF(uU;@#^*}Uf=i7Ll5n|?z-#tR#jDnHXnX|64ouZ+_HP} z9((MumKR=lVf__XT#<3kdF7Q?CN-O3`O{nROkui6i!>j7^wAdb5T>UF!UOfH>G8`hyNqr6G_CZ9JV+@IQ@TNnkyypC zW<^FyS+E$uKJ&~oTi2~y*B~M%X>>WbJ6qkqKmGL6Aie2M+d}9FHLt#sM5EQ?B5sFj zUO6mGfbl>d^R03l4=LnPh;&UT_mOJ7?wH^0^g3DJSvm`#@4ox)l)h>0+O0T8SycB9JAp z9^hlYSME^q2$+sQ?pN_AIyfYKg23*q#$qg;MJ=CMm@>A#r8^({b?NdM)ttb%XZQys zUqLa}1JmWTKi%^xi;sPRi!cDfswRFA%N(#)2l?OHC+RjEZQ(@*0|k`LoPT~ zhrzvM(Vu2qlHw3gbNGzt+n zT_0%a*#d85(_{gQVFR#MRJN#=GzZgTv>EgZUWbK27dp#`Jj2?s4;CYFosmEdWo>mo zW7ve&A~>{v z*%yKyPiZEF`Mj@}uY=!z|NTatp|dA4p1wQ-jrgBS6RSbiT1b&^_b_o3YvqF`JxjzXU?1>xf0lujlJoZArI;97wDdc zHP}nP)xglCc;gThn}g77Rp}on+V8pNp1b8HY*7oNop2|$v9?uPA?mYfGI@Kjbm`KK zvu4e*fmfnzT9P|6d-m*KzWnk_4v|FEc3q2IPSKw>%HkvfF0<~hx zmMy%AfJ9p#Ds|k9@HYxpokejvG&{s)h zB4u!ZXFxjnqKWU9_zV6(n1WscB=6*Ol4!l`7VX$d8E}w+-fZkeC%XMKN<|*U@G$l< z53O|sGD%0EwY^<@j>eA=+1Z=ILfU#m-Kq7;y#jfi&Xw;ArZsu;FKK*d%+ZJ+kC98@}$KuY8pW#y9ddPr#aI6cUoThOS$QP ziaIA$dP%Zj!-fWtby7^$GvbI)I0`&&HRRwM5jJxuZBH3>2MF+Z46cpbBOk-dyE34*{ z@Yyt>goDJ+h5CM;CYW301~jj|mR%C5tE=nO;m@r)%?kLTPiKaV@i!x_=s;J7u!X)2 zmT|BJW4VpMjOki485Pj(Lo}w=`A2%HcuQ2oihoWBG%0kg^UwBR3yJn%MLwXJYM@2L z#&q!ULp>=F$BKEzT~i8Ek@N_FVJ(<~t=!B<4R2x^2e?xt6M+`N6n5(EKnEW`^lyxk zZMD?*s#rN70Cr#)15>b-)0)q;#1RL{hCowfBzExSNzulVnQv;SYNBDNGm%yPzhhif}j97d1)mQ(yJXjWDgq5tV|7_j!4* zc?Mulrx6xEXj`9X{#`n{)yg+xRgkILp3jrXG=rz`d|R=hxn!PK%{-5(g3jJE3eVes zMY>WX2zW|>9(b5e8`x0GYxHlsaWyA*I$!&wX+0pr+vmP4%y~JCLamGOX;mia{@Vo` ztmL)XBpnk2+phCvn_g@q(i@@j*-@>XE|EV^EJE|jg19xq`1J*$Tuc${e`}6tZSy&; zZE}_{*koGS%+6c+^3?|hGh`XX#_$AEsCE`_^>6Th!)p{>BLL7O)4)X^5%Nl&J@P1v z%JjD(3)5D9iiJDxVl^f2ihYHyeyfQ*G+wjHmn-@Bp-vx7_rueiQX7x?*X3r>e^cwc z7udW>=Vk1I1q(RR<~EmZlSvs0LLQ1;fVnP&xM|={B9gw5k00{=JPmSqsu4Q=qcWUL z$6ZQcMTsfFP#N4YHXyNwg>4Ydn{-Gs;#|U9H_`JdF1UGB9HPuk%SbevL5}xr!YNax zEEbWMI`KI&MvY`~9Ds@;v=AILp~fXnJh5-Hxw&~IyT?Rau%9#XEPn+h&JuA!HNQgI zZhE*~<29@LMxpnaJHFzjZT!Dd81KBepDCsuj9wuXcfLR(AI#w(i_xSzS8Y=t_eXY2 zFVv=6ecKPBthpq8*XYudeC5mZMcOW)k%0Y{;ss? z!VLW<27t{NkV$%VpFRx3!(m3wgmiMmi&H`zG;xl4xq3@VoaNL7()@~PyXl)7l5k_p z?S1}Ehfs9DwrRG`Gt74eK6%M60}`FH_?DBg9IkXogD8kI!f+$@a0K1n&0_r+XvIn| zDjhc;=Eio7k%?cm&a=n)u7dsoWjz1xE>fHH54)^{(0A3VAH}w*$qDse^r4>N-={=Y z3;)ByUwJHBw(N-hpW9YUT%ycvwp5e{abyHBu)42G{~OGYU1Ph3oVwTMHh=6Wv6^F~ zxHfUzYd5T`&-`7#lDH{&xk@l^cAd$lJQgNcHWzqvXR=L)g|q9ju%ilE7MXK05tUEZ z-*r1tBb_cGuG@_eo(qfeHc@1S$wr5a`zk{6D$f VD~i{`w{8Fc002ovPDHLkV1kbmjfemM 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 a00b5dc9309c7b281cc22474e2f99916a46d2e67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10161 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 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 56d12b051171830d46d11ad8dad0a2e4a9ec24e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5865 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 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 b217064823ae7b13224238c34fa83b01d2dfe260..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10176 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6d4f856e6d0342d2a61678174333ebdf07054579 GIT binary patch literal 9226 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5df74ca014776d45dda994bcc817bc96aaf58196 GIT binary patch literal 9011 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fd4a3d7a854c9884eb1023a865a1a9b03a226ca1 GIT binary patch literal 2608 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

fhn?NJWjgTQi@Eq-Z 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 Rzx&e&OkQ2CPSzsye*iio6xsj) literal 0 HcmV?d00001 diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_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/btn_layers_off_dark.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/Contents.json index 668fc54dd..c3e3b9c0a 100644 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_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_guides_off_dark.png", + "filename" : "btn_bg_light.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_dark@2x.png", + "filename" : "btn_bg_light@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_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 0000000000000000000000000000000000000000..2e67b722ba0f3c6a7e3104ec9b6d69fb21ec5eca GIT binary patch literal 2658 zcmZ`*3p|tSAAd2q6mlz<9CM4D*oGr!cK(@bn7L(>Fvn=v#x|Mi)5Rr(T#idcq9`RI zaw`&*nlc@dj!Wt+i^EhxQvBcHl;hO%exB#|d!O&``@1~P@BMtW7<001cm zduumPnhB=(I&dvLZt)W+&XDj9LC(&AKB$WW>xAS05l|BXA3#V25M9y%V7HL!SKU`g zZ^cF!v_Syi3MhgzD1i(>R_qUfQZVen33^(VI5LYAMj`&DHyy+PC8wi{ppXc+ColkDy}V!w0cY}+06-*+?15+Eot==s(I|$*Kw1FFkVOd> zumBVb391wllL%!|!l(=+%Tja60txDZZI~u>$%Gkdsfl;SK`}Hs32JHxH-u}VC81C# ziXIq*bhEZyp@VOhn){f{a3l;C6%}O|Wo$^J2g4BN=H@WC5zNTQ0JJb*L{phWmI0Na zwd~{{Kh`A1Z*+1vlT4#R1%8PEv`D6Ph25k^155lA?E+0DOfSNRbf2omo`V$i}O1=on)VFU*U3?W!iu>Zhoso$8MR5BB7 zv_e_4y_QAzhJP>MYIrTxg-#}c&A5~+VkO$@y%l>DOwf<3`g6JYmv+JKM@xdo^3Ruq zmaMpS?<4?-&Nx`_^w=jlaptk3ww==b$e=B4d=-;8|IeFdZskHY$%{&G)02Z~R?;Kd zTz_ezj3d-hI)Zr59R>Nk`4$AVJ!b3mbRU%1=adYa^I`jSI>%1&o?VVA<&Q>q*Lej$ zYR0+y(VC`FUv_(WdO2g-R4-5Jc6~fEJiq@7(rpq^9%y4w#v0X zkHNX#NlPuh7cn81t6X|lDnKDMJ%cSRBf|>{4yHvhnFC}hmCp$@YLcXtO&B~|h_1pP zx>y;(WY*MHS63s^=!N-LuU=J+xhSNVX!|9-Dce|6%hI<%Al~(Ix!kieGc$J%p%<&z zrN4UU)dS%oj(c}&OtwmmNyfKwZr;4v;qLBUW^8P{So-LJJ|V;rS*7&gu2k_pig19I zmeykigK@5=w)QYTu8z`d?wRUR4|`XXtd zSY;|MO7Ra(v7f?-Q;Fy|$>{80ysETL*?P9a-IS4>oSepWVq)s0vNAlV!(R$asF#ng zZ}ScllbUi98R!#8R$O65sJEZrVqsm~Y(dImNehI2x;6A|=l%QlW1E|sUt|S6*sVjL zB&syzYeo6lp40a+HIG#OFy|rj5slB{S^jdUr=3lJlt<(cM^SZJKReBP>3nDs*#zIV zclxY#QRe^Pr*O7*c9*h(#)2u0A;gDf{L#_5nv#;&?^;`hf6p(!M(Tsg>Sk3da8KW% zHw?_P{d(i%5_BuBPJjIPk+ZO{aP3CiFkz3CRbvFE$3B?Av*y=&_o$fLZ#gQJva8?T zWV}aA&My7L1`CC{#OkBZu8bd(y(+BKp~F6f(x|(Ad+~Jt;i}=@>owJaBb#@CcJ#KJ z^`?g9t2KDf6j*++tc)Rux+Y{RLWa5n4tQ1fc!l8p9x~3H$ji%n5jw{@FFX~1+dK`0 zR3Cb;7epxC9Q_jB--vIWkdO1xQZM5ltf&x=Q63Ku*MN@77em`}>)p*JXMOzNo;cj{ z=bOp|vv?!Dh)0F>1-F7ZAG(O`u{!T0+%jHnut8W%d)V+`$C~!#2k43>s9|+7(K|nd zaF5zYTu}|Ne@KmW>Ev`rNV!VEbpUfuSS5y2LBqfSAe z--#)g4|>FKo!<4@wJ9zd9&4!`0l`R;1K;}Rd+4WiH|-<%a5$vxCMV03uZ<+tf2t?$ zDLm6T~SLu z)qPxhvNB;r<{VVfhA*jb2@AK;%yxRMHq({c=^o|Qk zC3?|gp`I-V#wrtLx}H3jv+?;-vY$8Zuvp<~E9+y>c-s5v?uiWc1fY*gIv~M08y;VB zDzD%`MxL~>MWu0qUfhWRj(N}_zo(55CAE>Rw-6RHF;my4AEP^1IeE>x$_>BXzX zmuX5gNUJ#=xv*!*FS`~qgrB^;;3VUgrt~m0I$mmLf%Hoqm(-#nljOfiSk#B?3p8GX z_3Tv0?<@>OJ5703Mjf3${N8oKLeZCpOq#%cI`1;u>8X|z;+`2Y>F@AFC#=5rvHG!2 z$BhNO$91+I99&?(-lA-+asJsThlO_d!!#^O7ay_=o){9c4T=i0*veRweFj;ZjASqv`!d$-j}WpwyDXtXSt|Q3hO8k= z_UyY#SsL^o_5SbmfB*mgH=ld&nS0Ln+;h(T-uwB@MBdO*XQV$z4*&odH8oW9$)n3j z1JaOt;_MeBc}T~hHLbO^0hh@#5I{r00yssMD99fG#W?`=4;cV3rr`QZHlw)srwt|9 z1`Z(i05)>74#xwi{$F`8$lKwaRe;b+tIf^zz$bpO7S0|7c>#fwh5mYe#)l)4Z@3kffK|Z~ za0=ouacMCaTudBh2$w*>;RyIu5f~f+gZ*^#AGW{vIVlMOt&ekecJMgaNQEonF!BS1 zpY(Fj|5E=G`ZvAdsQ^!zc-ac%j-Qmm?U!3tipES(S?^b{bma8OFbfN zHoPTORqTO{+-`o}-ut14vwd0eq&KTWPiRl`DI5+o`jZp_wrZ9iILDuW~-!(Aos>Z|%T=#f4 zwCPaxrFE|f`|D!0e1Q0t!`!K|hr#Uu!zEwR++MQq$tQh~u<6_Qw(+vx%=gQH`ixE| zYSUt(5C1Sbwr=Z*lBc``E^a9$!8(X^7HT$08n-WfUVZ#+{fZf3Ky}7A{mkSLLgA8^ z*69Y(=FY&%N$#2&y%hF^o|||4zjl$fo0{^PngYM)UJnPmYMh>-8fT)jsQy~=?NZL| zUJc?`Z?VXH;RVUKe4K4jbeydIG$Sy`uE=c5GL*$XtZ7!1KbvfK z^&E0DRzPQ&WEObz^}_mSX<&6}={AugyL=;+Tg>S)z1U}c8RFZl+}zyn^`D4bfsP9E1wvbnl;?)sF=@Nw^kJ5Y_iGea9*`%sKn1v`b2xwd2ZI) zklB=BVOS!>^k%?O$0k?ywrIz&eSajY@NvDtrm>IUta@C0vDfL2AHt1=o3@8< z-f1XmYWnUqxN0Xi0uPtv!&P2x-;|4xEjrlf->To~i!B)SETq3|(+OMQ;Eo;ZyZCw9 zcl~+Nnod>%wwApXMH5)^w$J86KSN}0-#O_3*KV<@jUm^Y8j>I9Dc(uzf4*Gn?z%%J zz+UxlJI+=Ldxeu>=WjlJ(ZffpxIg=QhlkB74?!k2ikD$?-H>GQaY9!np>@^Z^EZ`g zllZ+1+b`}1Sicp?M0}=Gd>3y?rRp41b#4LyskksWDVt>SxwTroiW9@@8QXdL>4IM1 z+G!ejb4qFbG@W2JNc)ZOP2>}*$DDOvjjGKfEqSMe#9|Mo!XV~=vutG)f&>}XRExsd z-O#}6!gHu2U3!DCyW0(WOya~%A)?%p_boN%S;_|obBFe&4W36K)C|W5pSz(u96j^d zNAY8hhv^a03DI`DAGYobtxBYk3@;~Dh^t`J*m0au%`DWtJlx!VcYD*Nng*@1W%4^z z5^Vz=))4%gEGzr_uM~jKxD^8q@46=R8I1%k_U#ph6ph6Py_a%h+ZyZ1R{ZWf*x`Y@ z-=dSR1>TcRloe%fl`Cbf&%CE7%@HOmZ7w{_F6G3X>2zzH^VCC%fE9!XZNS!J?ToAu zxEHv34gpCifK$G@8j)E%Oj~7#9Y)G}ZJqzkbr1hcU772!l3PzY!oI`EFs$RE$?ix0 zRi8;#praNCQ-$e#sfk{d5uP7J8|kUfg)F}PG?FN+4P~+v^jU~2y?QNIo-Q?*AAK3$ zY!qXW; z#F*1pBAklZqy^u82e5J^AGZ%%5-1LeUNTnFKMMJ93x>N@@TJlOD?#~YXyNONm1K_$ zDlNBBnUL$8O%%v7YD-Rs8n#MhFm-5KnFRt;yXfY1xs*4rXGpWzjoIN=5@d=>`uTN1 zO8dHgv*bGUs5_DsnS!sPl$s?i94HM=uZ`QQfa!{+grVteUTnZ+{Pkov5HK|aj_xLi zMS8ePy#A__E=M!m70wsneR6;ECid0Q)2?6W#Llak7mD`CxXd=Qo?NXNgPcX)CVJjB zkDpSfqZ7xvMa;xQ7s{Qf!krFj90W%y#NK8`cU46w2^hV})9l#W0WOQ>icVbvn=_0& z_soj{=0^mpOh+f_n2xx+3CknBm;o5rR!nLgh;3;kLP9>q3!OPzR)nJ~$op0^g<*ai?lgrdxor_uFrcL1zSM^K?>= zN(7kCA=?_eR2#UXfX|3A*`;$=S<$Km>srl-mPXiXYpT}c`c#DOECW{bD72i0^q}^J z)yXn|_A7AsTViAT+HjMefo15strp0Z29S~7}{tpgHp7R;~_Vk2zS z7$}O$)I}*!K4)G@vf*VFZhE&INEcmE4t?foKsle{1b-{(goPZakc;z-b%SB(ia`5O z8Q-k*eN5^#g#i#HaeOQz3Qpv9?TO@2Qs%;+t?E=e?aW7E$+#P~fE@ubyqrDt;nVqT zZ<{m@D#{VM-LRUoAmDn-Do=B8DuNXav|JTN8;`M;m%8aeQv@h^_PDc`Vrg5R>RL4w z14D@{<=fQ^j6E+)m4(WRt%fCd$#t0)D>JKag};54ZD|l4s?@K$cCI_P01O}oH%Is< zMfr|I0r@kxl8oNJ{NlJW^Fr#}EWY>n`JiG_ zcWDY;D5SIfg-_V7<9Oj{PgY#tAbo706>V-_{!=NLN8c%4J5aG1e3okcL2a(`T~%aP zd#Y&^5G6>%^1dAzYzl&RzOcB8tN{jH8q11A*L{-gDR|0oA->Ma&t9gWBc>#blN=dZ+d>y;p>qd__XFCEkG2 z1(?gICaPQV=?GA?Z4PI!v^h)o*x`-uXO_Yy;m);oMX+VRR$$Nv6pR|PTEQm;qkW** z<*b$?n9+>&EV0^o?QIe7cW0yR=ZzMOWg_2t?~*Zmt0w&9D=qPATVIkxz|$|$VKpMu zZ~CY+;$xWe(nkEBBfG0JT!{d!rHrX%7ryOXZ2;sFdH8 z$?!A*h;l!ZW+;s$5& z{b%n!`yHpDB=*^}oV^@YAZg2A#rrLba{7hb+04eNqa0%5O`1DYR=~~D{@Cjx+m>Ds z58=J@b^e1Dya^21No(Nj!h}$nZ3`Kb+f0~Zam`p=cDd=KamR$%c5_m-=#1wl?eotY zVja~zwh1o@$K}8&kt=OejI7c;p}wEwpmHn;fv7#{?7@cKhCzF%vFR1kefZCwBq;gRNcX~mOeRx&f!wFS)Y{<|+a7A94 za*<3O_d+h{vep{?I1~$seS{~kh)~OKg-h^&p|#di4q5p-FwfWb80*_JJyY;0nmo12 zy!Q-(WVY_*`{cw5B$UUW986tynZsfb%`tSroA#8yc$lmfiVhNgeH%-`Vvk1C#LH=h zOR}bre^j1_8tJR2CRDea$WwsJgjx2MH;!@b7o>i9za1 z)gM2buv+CS?oct^ylV3~;yxj%I$l)hF*O2uXu={>$uM=9v|LWjRp;H_TiLo!8~_?H zm6-9fHHgMtJmr41bIwluVR6;~#~!`NV^YP6bjbw4OY^vJ2pjjJ3wJjxfZi6H56RTn zkqX}B7r$DW{hs`;V6w|{AM>3#tBaFo3?48ynN%P~Ibl>c$obmkP-Y|F7>6$P-kcNT zHB!~tZv3I)oax{hjd1P!>?LQOoB`L7yZnipwqpaKF&gAO*YE14jx?M0NxWj| zQzK43s)sgZI$3xT*CV9|Q zvG@rduyzse>oE0UUzL(GLR0g|_rvMeRb%&Jg?pdO85r4hFU?yke09wnuPtcCI4@1y zn?LZ@+E-249Er9lLjC8U(@kQSt*yZ(#! zzIX4t|Mz~s&u?aS&iS4>GjrxQ^E+oF)l}qgu_>_u006Fnyo?4iFTQ&)(UGb9)51Dr zmSLr*V6ChSU`3WO0qDSc02E{ih`a$nN&wpLG60|hr22Q+7|8r54+zP_13;z#669kY zZU;d9liv@S-(B*^2Px@~T+PnQ%E8gh-PskQ=IRXL<9x))gQS7-K>x-S=b`*nM$!P5 zsmDIZ3=1Z&?*;&XiS8aCAR~($06=lF)6#R-Q&tkOaCYQ0vvfAM;`DNa-Jt-YULwe% zqm{cE#LLma$xXydjP5sw2(o-v%|!?K&Eo!Cj80Ek4I=IAY6TJGc7E?!;^BnO9^x0Ab>7l)G@ z{U1X9B}c}}&BE0V=5FWg1i6!IX72pLU5t+IuAzTlf9PrDW%pN0PHum83)w-gI|>&M zCpXuBgCRTnZ~guQ;KW#9pw+$@4@&(N6|YCM1D`AzKortm6IE?KTsY) zA<^Hu{XfcIz55$d?|&lyM)?~O*)b7mSF1at(QO@p{lNSR!DRFtt-!;t^K|3 zPkvFZJB$3Ah5ljwziW~955-0f%fHqV6uV56NfrROKdm4mspSRSc@|i%J)XSw`SMI% z;;rJFydh`-R-ep#w0w9pL1YQJmQwg;U8n6k{^Ra~3M{1}gEu@ctPLV#l#3k|l~-u% z=tpEjWPUOX*)p(t3>7G9pt4>-QZ#Z%R)M>p&*6syjryLgZokA%;l2yk^}02?#=biy z&nvI9{ZHm?a^2+KU=y+E^ki^W z!iajXd&)PIhWoqmCa2yw#7jAt+WRe$nr*~wT@ z5UKw{wLDv`+5VBgMmoIZZTn_kn8u8zUk$$8e1zz8e9geA$zQkP&FDO{7=LqZIha27Zbv28aJIps#$K`G@k6x(>b?FxwG~pY)lEzLE@B+ z++@NOIw+Zp&>tiei5GY@EXO5!eKb0|+q?^JeIUtGRf9vD79doTlhHReETEk)@k8N4 zUm~gz;UHI}Y+P;rMVXu<^{vCaj{kB`k4oVRM{Q2zXpozEDnHFeNAV}S>x<*T6?4%r z_Y4m`L_#B8n`o(F9wQK`c((}sCCtm?;_g*F&D=)UF=WQof zwOv&Y>6#vMwEzJxwi+B~a||0CrU?s()OIRNL^F3nNAUTS`+IjgGuVjP7PlU%^{q#2 z$oBVVJ~FAY>`frid&Q+<3vm7(_-e(mB|W0?R<#2+UDblj^m3xYaB>0GflEtgoJVZB zBfp6hH92PtC9toEtBh?wqJdbzuN!8as4mAeRj&`v_E&Dvcnh_uVnQEqH%-}DFE4M3 z3V|j@5RpVoH|xKecW;jQ21Pp_hXL$?Y!ZFC0pjfE5tji)F&{zirA)}eDn^TYwY@Kq zU7Q%7o<3JDFk9EVAP;^A%d%;>=Mtc3_|qMJn+V;{DMOsO)ErQ#rx+Z zn!LZ79-3T2qfZ2x5DoWRwaczIRD<2rTleP%*1fS0NN;R}KJ*!;f84yqF`AEvn!Vxt zHXPXEcYe?c;lwSj%S3zsgW}OL19!C7m-kX-p=S>o-9!Vv?ab6~eNsqdtdKEomRMxX zLacI#4e5jT900-gwCG32M@QwEkDTXUdzEjBJ3z>>j1rJ?Ff8QuCOwWYb*Qup2{n#c zw?p|nZ?8{P{eCsA-{86_J5li%cM7kWebi~rF1vo^H?QEcXsgRnFw^~p>d|hF@2@6Q z4Bdd+k*8eeh7Obvho((3HYy&d!rS=bxk_ExJZI+(Y60Bn%r}Ye@bhj}a#7jb6 zg7qS5Wi%~o;V7G{SW|v60Mw5EN6$uVP5`+==~Jj$so|{YMnJa0;N)gRfJuq zpp>Trk9S2EgA*Iyoi2fdh;TC1WoC!Neod%QjZV}Fuf|_5m5K9vNv!tlN|UMMS~INY z1$2ygQG|Y~6TjN)SQouHTZvs(+gnIScY8IDJGsf`Zjn%)-tj`){%4?{8x^x|0_u zt}YzlJ5NY3GIxT-u&NlOM9m+&0ieh$; zOeV`MEIx6f7~eb>wwn&IT2MBsvsIrAM!^UO_hwm<2NgZ*orTjX34B{nB(wcWuevU) zA`0JL)CBJqQ@2s*Y;|n+uv)Ee=75VLyexN-*6vRn`$QP6s?0ZJ3^aZan*Q~wK8Upz zGqpeEM`$8s2ccfM^|?FMEO#`$(kZ>gUjy3Q9p6os$06A_to4Bv@(@<~gtTC|gaJRx zPl{M@sm$uSFZnCf+~i3obQOyaRmf`es2@*7{gdLgmOY+5$u|^6s`kUI#(5vMQxWg4 zkd32DQ|7CQX0$V7GW^8o_xWcLGgqTUs<&JXd38?mp9&3?xDEBS;-%DT`>GdL$G=#( zWqHoWdaox}hs~&9vz^p@Dz{D-N>dKs%0o|!g~y!#3?xpEWdx>9^Cbo)3rkB$8KQfG z_&`iobI9E*#eCoZH!*frq5tN6p`DXvHT4rNo!3?G&o)+j6B{Al+PX~mS*EKb6d}0b zelXr`i9WKqWzPsLjCEdMR*me+`S#;Sv{nl>u@6S`3T{qa)IFX$O8y|uztT{OTHCXS z{Tg~Jy})OvIH$OrqLJ6t2x!d7KSpiLd9RXv;omZn#UEvVlw{)iHJmR5JFAo*zrfG= zdr+d?8J>FHT2;{2(-WRc%Kni>2I{Gl3%zO=wDTo^7TVJX>xZvtvqNdM)hOZi1b9I` zly7!xxxSY@+J1f_Y>9^wMyvDu>yw6lIb&VbBOxLaj2l*C!W+eM3f-N+5H{bm*soZ| z{`x`JH~JrKwPOdjudq!@ZXUKPH2T;X^P-164$)9(!YsIo)4i%-VEHmD*&D^;wzo9_ z+Sc?ev&pU9eK2bJ&}fJ&v#;0TFfLV!TI_LE@FmB$r=;DKF48%bc&PTq;Jp^xqjVbf zw1(LGViyW8y(i0i8b)EVY9X4OAePoaJ4EEqT3vFK;EWNF6S36-5sGagI>%CIfWDT! zY-Uaiair{EB9rPoNgzs2-yQ`gekiJa0N5ykQPyO9<9s`P zpi{SrppNI>__#!c8E|s46Hpyw{e179%Fk4#LTe453k`@tlf}^$WzwZaIZ)M-mQ_D9 z?rl8B;#xlWlfY2*BQjg1nJDOCep3>m)?xu+@8j;kQGn3-58?P(`b5Z?vNP~;6em67 zka>7~S}GxX3d7SQJ|=#WVvUf;8NSOy2;MBB7QPP;L`RhPUp&S9POnDoa3h>E?krWd zW0XW+B&&LkhO60!X%BXV{K&NgW=&@HaQjeN)RAvpV>C{AB zP>0kV!yq-Zq2*^A$pnEJFt`kJL16I9ZR3Yk6&9?Jg&ILQ*@2 z)%2qyax0%ZTxPnI_q$HId=?ynW(zbAPJ_IOtj-@ES+?bV61-3j&|YF^Ej2yao=#17 z?U+d5ku{|U3n_K#?FZZOB-_`R1L|KDhxBxB*nM6fXzyrD)=-|SA;cr%(K*<&C^zS^ z?hJL{3A&)jSFCyw*D);)XMX6a`x>>)*&8W^fUOgUoi5H=P(>$bCS>;RI8P%Wvzw1t zPYHqcrZz3dRc&xcDA_ib(04`4K7Cyj64nD!Bk2pt57`&aF`U3mT*QjC(6@4JcpuIjgT>73Ed?F z73T`FdL3_$`w1(88Jv2oMZ7l2NZUEgfacQpFcI_ZswD-8GQT`&Pz^W9RD)?-2v|ws z7dB4~0v)Ue7K-kia?z8b+ZXh|pNp2)M?ex*xplyGDB~3KKyoh>O%%yNzD!Ov~Th>wNf}W zDmV+NPegcjEekg6AqxN8GFXpK=Ak|UIM$(}G4r4%0T^{}8Bnsyn1Rs z;UUIXpslNdBqh5V8W_1YE-|W}Fg0lp2@_B2{buPMi$Ve;Ia{w;ScO}8(Oa$97rB?s zm=b|TYf2^Ym_*NfNs_X}pNl+Dc@kN)W!n#QccFJ>dOU*zHkmc1r^@W0GBun-%116p z7;-^ou!1Ghhe<`N?8i$(<2Di*sk>@ZI%+`mVQ3Lp-P>I$S>v7y_~}qp%t^UlO#<8Z^?NP(#4JQpIp5AI02JChu^iva$^Xd?RfJ+lY!5)N*(ir3KL>Dk%KOqZ3eYmnLe^3xe(sf&o3x#eV? zfcf#gyKjA6RKG`cRQjfdUqN^%Jc0*%8l@~XprqtD2diP(t&zf~3!zz5#|%!(%{#B; z?*$n2g0_9lgWQF>(0Se|doP9Ww-cXhA-A|zfc9A6YEOJ{EcD_hTH@kp7{0@EeZ;XC zkEBE1Ice5I!*|p{2CH(|za0VUeCy;4P)S&k9-YFO9U8c5@c5{htLr7A zxyY1`sO0Di=~F*}X?U|`6sAL>fhpw-iSjOMwNS#FJ_^a?RNYXwt;xzjC>~!x+t^GtIr@nelm@8v83?l zY%aN&N$13fDuK%5rcP38_;{*F$OYOgTS4G#gX3WJNm_ALPPZcI)mkm!QV7J9NopbC zrn=P8Fw-6PhN^v*&_&)d3b97P8?~JEvk|7^?vj;COSz@O!W5C&0do2k>6Sa|^6OB6 zzl`o3Q@`dWW}oN{NnY8@fZIEFK_-7zYSPsteGgGF4?6<>!fo*5E}Njw2&xA^`xgem zT=A$in8b0}N_Xt7q7kI>y?EO>g0m1F*Kos*2)Jc8a{qSF8A;UIZbEZ&Z>g?3!$Go_ zoY@9dxio@gbboWB_3~G9Anq+QbtJA3*K)fmpMH>kDIY>^1sZ!n>$=p|&}a$ct);6UvY+){9Rnw_1EA4>KaLlz_JAvnOoAZS*Rui)b5`jWPb%;pAvDJmw1 zy%l+&^S)-2(p7dR>CY7pd}NYh-kt`fXFS7o22Q4KTbu|OXzdRt>QLfIR3slF6s-2C z8v;k)D~qE$(*}RCsTXuxr0N50OP|Uo`hSCmeG^$So5HPa+;9cgTH!Q}(?0fa*eFm) zgqvXp(q1VL;W@161r5$}rF;?-6BEC)c+!__0nc@5lF22(^PB7anWuD4C?_OV&=*7T z>>Gqv7ma|+Xn!)o%OwBTL9zn{>Z9GVS&y4_S@NdT$0p`Ij(!fSpB)|URyM6=e2G}B z2qr@_0iRJB<#kmfw2J!z=xO}-+AwH+ZqC$VqxP>JEdPk6l+}l4N1Mh8lZX< zx0J0xvD3NAOl+?-20z|z@&Y`4sEuc%2er%%#RRcv-T(&oE7?J_g?T$Ls7S+-WJJxG zYABr0{dMDUXV~*6dMsj6!pTT;>LTl*R3F zply?$>)D<++&5_@#A|b5RIS0AUqRbMC(1J0d?z%Q1fby26PGMre3XRb9bNnQRkplY zF@Hg+C3R=`xwZIB?S67uCHx{6vc41Qa^#Jji;J)23*N(|X-s?>+Yu{z(Bqlwcc74? zLL?!ur{~C0#;gz=MHJir7* zs6{!orw&t9W&-faPUri!s|A$-3Ha(idO;;4g|juiUkRi6rG6Er8fSQnYwNmLRqlXQ zTAJcj#fN$fgXq_vz(6*;U%6VZc3y$WJfy94w^0kJry@#0T3|YDEro>?XP{!7ti<=v zzNhQ!1KF1-F9kA231|_oLLYLsW8PcOLM__DQ0j({j*lP9^|%{OVv5i$TF!C=k$*s+ z7QqfaQrG$rpA;s9TC@w*mabG=(+9)q2ha#Ha5cCP=Moid3Qr0M&h6uAE?)fDP%K!G zlit$-!I^YIeD>|vTKLsoa7ZA%JMB{Vm-+V*z1B}z4(OjmLVk#1B)Wu*!Ljm~j+U>I;%Aoa#qc8HHqy}bG4MCxq5E0lSV%G_| z9jR=m9=wsfr<;0ZKcn!msy&=AOtNLl`{|@#AaO3icb9IO*v`wW;X3gCc5Frn(J>h+ z&PtgiRK6aTKgfdd%n5n=7N%Cz+Z1aqf-c2jRjA$nL33eB=+`jNow`p%*K9CZyb+re z@KIEmckQ4pfoHZV@%)%Em>=Z_f zf}j^lb_ckEl^)w)m>zZX7(6TeLKn$#K-E{3<;253Lver0XE7M#CKh8*qG*nuA`-%6%oMUlii_kS>+1`u*z5bu9(G208fZE zqmI=vfokqRaMIPCd(;H!C>C3DCfA1Oo}+HsVHu3Aha@1z$i(URU=KRU=2Ey!282a} zZL?*S-`5A#iLS_Ip@tDw3cW>oYk^vDl+7d-%^4Hlo%#<00|U?zrXWXFa@>O4nV`k5#}>6WbelI>_)xrrPVJ#ZIoz5QEh zjcm9v<&z)J`K>;Yef)fM0g9NbnIlFU<+MzNQtxYdqY!ikrlJ zG`IJ_5|tjvq=p@Lko+d#J3v$MTq3UJzMsjXSM+L9k{8SL2=f?$A2Y}p7cVrwnIWcj zXYps-;d}Sbg89K-P9F|~(XyX0*I=QXd2QG5p_^t9}HE?4-t3}MZ)F;QcIOw^JHLKxzaMNIAzi_dIe6(vbh+;Fm+nC zY24@UxzE}V#NeE5BKs^PQIQdd(1qV`hv#6AHV%O5cOsc`gfOxj$W`BckQ4D`Zf}Sz z3z)wVCdnHlEK2DV+&k$veB}S3FYzb$?dGf7_bv=|onzE;9O!mz3< z=sA_~#Fk#8)Ay{6(V{??Z)rRx5*JcIaoAbt1jVTAH0!mfFL%fG$AVv6#Ejxj$jO<` zD7&K)VcpvLZ))E>=e|uN*>zJV19IagjYz{egcPh-wxV>qCz3TNk`+dt@m{#H$F!i7 zEbm2&H+t;MytW?9@uz^}`91Uiej-Rk*dK}3=f zra>6?gZRC3$=e{7FXL~qALZwcq4$=n!t*+QW*F95_q&VgJT$dg{z&^BXSIyfc5sn; z%@=kF=<)ZuI{O`EGf!H@t*(BMA`h5`iRMf=8O&%5Jj!lQ4n4vu(u@1qd> zBS^UaaI-F64N(AJMiYERBDcU)c>DvGL|d8}Xq37%9@KgDf`hf~ zGUjPNRA2k0)9rNVk+RtAvCBKO6`AD>mZ_P~( zZzCyPp-wxPJ?{$Nhwil>-~&0$ORK*&J4ZX0Hxi3u)4u+Cy9XL+9ZwMDSg0LSEc)$K zvaPdL`t`XS!TpX6YTGfk&3bvb8AiU;v_5y;zVWq7k~tF!P35i<>~N`c(-ra9jTvQO z99MU7fOzGG>H0JC(03_@D9PrF89iv@U)c*!C~ea}V>Eu%pRs(SmUlMnx~==EEuqcs z9KrrRBDdSTWf`$(nk15J#!BCF<>jU?=O1k|jBbI{Aopq87eXJus0~((cTHGylzyVD z8(ktyr0mNog%>nSULm_t zQk+BKQYB>ty}Pd7+v6EvRI$>cJQIJP9Q8vu z01htxDY=J}H$xm(N@;q!9r($}ukm{;UIen7+9>|9dqZNRvtO>1As-)StQm!0F152Dm9@~&)98xz zxt;)XMkMS-{^USjIK3JX9idcQ5(&8C@sRRRlnzf1|0`msqC}~xgZXT7vyDuMZ^5TR z9ks?1^SOJWYN0aQL&e$~HAFQzBJnM!O%A)Pi7`P(>i2~rzOV$|-fF2nJ%6quL;4WC?+HZq7Ljd5zZo!=S0pNok0AbjB zzz29IAprpDs+-xMkS_bTDA|Jn!Z>qeKn3h27<6bF+bs;*5ruKF#tsbkTn#&H>%j=I zHvS&e{vAi7I)qj*c;CvuVk_{#lSh33!d=Z=_I;~>#@J(F82gLUAOiz{GBRinfC2WQ z*h2t>J+R*R+uLAVc(4Et!=POq_qzxO0JSj)2WLkFHa9efJy)tj4L*F zDgXo}p(dy*Y^ z^(#=-4S(jlCsS_UO*q$qLExht*&o%BJO7a+|2-K1Cz3$`06qxq9|6OOjvjCrFOdUJ z{-?<7=OzGn%i0`QHX#6@BFfs*%4Ppj37hK}M>MW@k{x*XSiTd0Mdz=1C-JTp6B88~Ci%)opf(~T*pDwCM zPO%i?;h%Imt{1rB3yS>Z@*~l)#R24C9{k5-{ckS$+W}-iIh30<5(UE`u-SObRfoy= ze{{tknVO=b7uyIpO>MaJnP{}S+w~4Z(_(& zM@{h>wAj9V5A|->vkATX;WZ<1bF3o6jc6@EdJ4U}eD7;htvp6*C#rEx)oo-{>)FXXHO>H~gwF7Q{q;b&PR3XpWc; zK1fvtZ}+q301JowYE5CD>X5#lT1D)>JZ*9Sa{`w-{6dhwa_9KM@?ie_4aq=RX#j{1JEM=G(PP!A?ACkT06S{fN&R2yMw}V(0cIyZ^VXMA+e^SM?4jm=+9MI{&woeBe!k5XPHyzvDz&$tpW~KJ{IDB3tdk zRjE>PaX7m;$sn%Smf`hKAB}WTT%39P9BYT_M{*x-|F7ZCYm}s`s;`~)|9HE;pJZDr zPeaFj_6ny&v4=G0s(k5^Xq-8_o=q~U(|cuibQAq8jXu-wjZAgH_Qg!LcS6psxyxU= zk?-rSZ~nN<@I;e=H&;hI_Cv?{J2E^4yR`;LG0oE zDj2vv=5|)2PCb_KORu*4>J{65<)n^FvR>uE8z&T|JVrHjAhvdx;;}XMFPbg9shDr)#E@@%P`J^1U)QhIKT(n3 zoh6_x(z9FLFS&S(hbo8Rn%T|PbTutbm{QnReU1wc&s#saH(rPVF}WLk2q@~zesobk1gJHAq47z!SvG;ouIVo+C_tO{{5r`7n zz3oBX&z(<)D7fah)&xZBzM5JNN({KucvV~s^>zR#f9`AxX}L5^U{f2yV9#y3OB}|a zR}frNz#AphB-Td1LabK3+%zg){jsoUhMRrs`t3<$ampQ%vk z7`jT|CbhZ;<)p=Mqqslk^KBZVn?&(59UW{g(y||_a;8I#SrTseZl=@P$ESGxp6SZ& zVMBWMBIRi}o+ld6U+15HHO}(RH|W;8g+NJ)J-+H|KHNTRDG3q@d~sKdqWP3fR7RCq zR7}dYDnCSft+7IAo!ORYdiwGUO9vk5ig2S7SRPI+pWW2-?7zvi93sY+Gig+4=id1t z8J%5^tq2*q_$`-QlHypX^_ zY87!Duq&J8uNx%3!yjN+OT%Yv)!_}f3pG7Wh#xPdQCa`so@A)(uI7%m64>~ zX1&p&Z>0l6mJ2=u6?hsu{zPwGbn)*BWav`Q&(<5BztGmOPC!S6e^wX2Zrs9x2(}?d z(7RJDo|u@c*i^JO&v)0n@-uI(2D@|ro^Q+*s4VL#JTmz{A+bB`v{M8R;6;t}kUgUJ ztMOcrATWd`gEaHSm5GLzc56A)Je94F64)m*81y>ms{~RbDm6xu*v7LWh%yWxv5i?~ zd6S^3wUv_arq(%odNv-b;(@3WP1?V)XV`^8F4woTn;s?d=q26FSXz*Qxd<>O`zRw7%ngoK{D>6!`t7=JyAr0ijlv zfnt8T(R}7)0lt0XzH~wyB=mPuY^kkWP4IjIMKsEkNLtY1c(PXsSsf&A6Zp&;P=U!> zYO1XAV_rH(L2m#4w#7nj80IjpDt!e$y+#pbj$zB>rOz4-u&XCHA5G$tPA1^T2O{7# zJ;QXD-;r~9`#i2(Mk8^y^eyc;<02k!pvl{~(^4&`3A+_^Pctsb$wce2;-9;08*}9eL7se4 z^w}qj<&lapPLqVEf-?}0=xCbgCxZ1N#?5pP{btIbzDLMMI;ynOLKal~ew+T;W__=o z>TD_>H zZv`~{a@Ad~1W|c57@Bdtx<4pgrNqR3BaT`rh?Q20l`FB>Pg}|6iV?dwd-dhG*6Zdl z44s~ov3db(8o-2&GFDRK0Vg}Px-yfz%+L)H<#H)cDNosKtuwg}y}HjHRix;vSIhY* z`v75a{0S=w6Rr7i&tq)kXA`{G)E^8axF?wKrE!>C_ErAUmN>3O}-CUuKZ$$@ctMR;*Th{S)dF z=n@S2WV8X_v%$r6dTH5igSu-ieakgz1FF>Akz(gE&A+;xQNP#s126~2@3<&~Fg7iraNv%m!N#6vTi>>s@ z-w^3f>3@4;42n;jZ`Zb9D+(9M$S?SrbFEwA$?$XWd}MBsu4UGZqK*qjv3v$l=~BZ| zxVwzH3Q!kl@=|jlLqanxKkZ2^tk%HyeO(velWDkga(!+_SVk=(6_GWLy!tHWc{g{K zewJvHFtWrcY)N9mfW0s@MJZM(vQ-T}*gK+aTG3hDNntx}#V+t%u(CO`@Qa?_3x)o4 zk#}M(-dUc>n>^&=;kw}|G{ZC|ygzy2*JgQH^tkkhb?u913b)>UYDls*Li#iZ*-Rjd zI-U+szsb+LHtJUU(?>MPsBoC3@t6|=Vrf; zmvt;fOptJRalGnL${9`3>)`4*(~(6^LAyxXdyNj$?KED-go)uZ=Zi4$aLnkv`8j?< ze|D=~Z6NZSTZ4VW@Syn6ZrL^ur3z&XEWG(aPTV(!PIBXrgqOEsZoMpxT{l~>S;&#N zE)gmbDRH63t>(E8a09VRu2b%yo#>jGyqs)9rD9ae z#}-(4B#jDo-x0JBba%C^ar+&#Q!hAgdp19?zrgTw`3-lY z`ik*iHM3Fn0DHxu#WsbuNEG9!L)b{KX1Zo!jj2`9!gP~Nxs2v`^|cOzvv!Sk7wvuy zTNLHnd``Gx-2Ka}?Q7Uqb+#|Dv!i-Gw>F2{*8+Z4XRl>%yN|h@cKH zsHCco; z&7TKqN9}!k@FNKuNhFx5nW}tS)-`PNrR^ILU&dd&>zvJ;si?K|HSv}Eskju=2@8Z} zH@}T??Gx=CfaXFU2)&JrZF)7~)QsL8`z7mj;rR~@{;cv1BH_y-OJAEeSQb(##D+Y> ze4hQ_*iBn2>Cz9=&*=ZsA6oK6$l6QQYxKw6o|H=+m##@B?|H9AtR*HDy|+~9jOn=e zI9Vjk{m!yXQ{Yl~C~ffdTP_k6#giXX3JMEG+WZn;8ZVV&@;+B@@7zpyZdo8=BfKHKAgzEUqkHkZOdpIII>pZGj)G2g^@7))Yd#- zjn|&>7x5oHBfH%sd6dSI?YD(@t#*-f6PX-j>fEW%B=dLsHU=#6s#oXI2TVJQLM)?# z%4C6i@tZHz-w}7_b@C__E6l+1VVx115yQ7%tu`*UMI`i01lDr>E?JN7ex7#6eY@Jy zthHg$wtF^FQh6k|Mr5mh&HkJD_sJf2>xHK|VI$9LB-i|QGq#bd%`rdb)Hl@Q(;_9^ zy-9bLJ=pCnrbpKUR<{3TQG3K=K!m`5ksJTIrahpS|60=?U(z0O2v{Q9830s6nOh_F z30&N3zMv5H*yk@@v5X&<+f}hPcgB(c2XFPb_y4~Z$tM{SS%eG14sCfrzdIlC?m8%p zvo+cQ00i?LXEh*4tOln&0;vuM9I1h^OoITxkWq6@a8ayY&Ma!84)q0Nu~|9kiz7?cH;LxBjBf&Tgcgaifo1pyX-Lm3nzj13p= z18_K!fk7fz8uL#X6oh-@_)`V~;h2;^WnhpnHb(!DfuSet35f_}yZ;Y8VF)&0f65^L zW{+Rw{79rQ pQ~)d_fC7Q|El?6<|GUaQdxzaG$4;aDmZBt)qKIr+A|aJ6 z$xgOp$u9rTSiUX#Jea|Q&~z&YCxZ9$>{Ne2X0v2!Hi2*A}5L&PcJEb&%2kcR?uz~?okZG|zT-9VEv~!E05@5BgTRWqASjf? zMF&;|5ee>q3)Ml^7)LkKj?kj=4@bCQP69_&&cVD7#K#aHz> zG-~C3K;xW|$65q81FP$cvSAZ7%sf$|;poe`k?bewO@GPPUl)gmd)NFAxx*iC&VBRq^Gfur)YL70m0dGCIiFscK0FS$&{a@l!qrSmzP?8RrhPE0Y)jo zUQ{2p-H=v#@USc>^fZtD%gaG|v*c8$geT}{`W)W{Ce5{<#1gawDjRIHFzYjZ`3E}u zTspeFc)5K>M6pl9`V^-wQ7SZEpnPJ`e^-GOYZL6VLO(G&FTdznek||PbV9AT++Zfx z(e=KP&xQ)|KDPIXru=TNj^Fb6{yOdow&fauJMn2lJi)F;Q@3|*^zO}%?LDyIvWoeP zcjY&)(V)zYrZ1+*MJw&kh-a8DAJUD!25~M)yH@jk<^G`0cR%8{7-CHpD+eFB-NRXwaccFiEN)UXpD!h^ZO1lcoONn;KdEN|IT53^%m88aA0kQ! z)bf4gYZvG1ex@^g@9r%|2BjxqI8iCv#}D6k5i7OIP8YCA9}RF7O1hI9H-AmM&{c$y zIjpIUN?9lJIAa1fe?Lz%Uk{VcQkp+|tfS>r*wch{Nq1;wIGH7xtPW)`i_k@z5|Yc$dy@>oFIR`zBhU0+hw5+eI>cR+(;9(x+E zwu#R$v^^%YKQbcm$^#o#gn&&!`e8mz8B;k4KGVUnkPaq(hI&bCjslACAl8poPj9fA>4`@24C6Ol!akaw*3SBa8s7@Ed2WO@MIA0a zdw$R{#OI6K#d*h%em_E{E=sQbXd2`$P#Esqi?$?aBB7OpxY#Z{l7M6v!2W1y z{+7@F$H)u_1KtP-@cs>$q1#CU{C|SXqETgZ0T4z?-%6}Ky=ECdB5U z&vb+ukptAeaKg}uydga{Rg9p(k00wTdV~R~Ht|^@jeDld5m!oE54zP~O0t6UlW@2y{0}wyfH9=O1D6--N^794iWfZN&=R zb{^WDG17eR4zW99+sXVtPR>?H&fao>a5YZKuCq zf_5iZ!Md6lHwO@Gr>Ib{Bf4qf2#RNHtK6s{_$6->O>UE~)m*Es9dD(mb$y4$)TWeOilZUgUtt|PbiROU8#(H#bWaNDo zarf&ILu|v=86T6s#SeM~%H{i5pP3$sB{J6H6LW+d&0=dK)07^anRt8zA7XiWZShbU zDn`~fQ%5{ve-`2NtejAgJdXuL6KoLIXl;ySP?I)v1$9!KU8y<~1HVl<16)qfk3!o$ zGRWQ%G6l(ButhsvV-v?tKiBQ-aebkU7NN{^l^%0^e(=1rlzo`>#8~#XT>Wa@Bg(PQ z7hlgm>s;<1=cQQH8BI##?dbN+y!=MmP=55nBhb9YanRb-9bChi6W<4MX?2pX&&&&` zY4{}zZ<1wi&=B^9%~m{+VgxQK{%_onaCJ9swu{c6l`dFO9t05qmcY+4b_<{XBfljE zkoJ>#YxVw@%p%BN*tZJm|C$~CEBmh*X^-k8RYb%PzwmFN|L@{=a)h^rof{DZ)+Ks7 zZl|ejY1{w*ti5$@F;;j_5EyN3?Y6ZyfI<*-5K@-Y!C2Y3yMX{)`MGX(^V~KG*h!E) z4g8V(X$GkEt7f~Kn_sq6u$>%q4%o^zWAJPsXdDJ{noeV>OuM|mSlvXEMZ z^F4v?4G&t5)w>^fTB##cOO-}>L7P5Yq8}CTNc3s226bP4PaEeqOQj#FQ4@ZYUPzY* zR$RBJL%1uA?6OLiQ*{&83;T-$H|q`GaE?!z>E^Nds7h7$<$o*sf)6{ZgOExEc*g^b znrNj7F>1GKl$s0`mus@~&6So5&rIJj+>=^G3tFpv!_GV{{rZNV zK)>9qa_+-5!@$PN$!95QY(Py>-fif>n??Pn8ME1ivHFb}nmYU_)vJTXr;a2Zw#&LQ zP(XlidYUx{6}H|H^omNk*8DQX{rYsOS)Kx}V85AXkzkzyxAwj?!3FBBtCPC7*}k&( zzup|mPHl?1md?(B!8~K#T5g}DIXkpVO)9K0LTgn{n=L}NoX>AH? zIMz#HUm3>kBxtcgb(P&HKeQrWC|a!kOw-YMD$Vk_`abFMcLjwLf_$rzKEoHJ53RG5 za2eK>a&@`*^9QC=a4egk@Gp$*)5_oDTy@yb6?J6y_^_DiQzlHbwD1z;6`NmVkA`31 zPC9pKC4MO_6e8e?foV z)FhcCk$4`n7!fsd^*%Ljb@P(dvgR1y#gi~rH{Lmx_w9KF#ho_{B?R$F+=)YT3@h5+ z9r^-uVP|-=hs_EcJzJY^;_ns{7Do8*xUad584en?nWDw_^=;fBYmVqb?wfBg%pCe= zcc%~g`G6#?(@cD4PFQdklR7^6s~vRStgl)L!W9{F_|vglwCAV}(SGtzyi#UyvpVHV z^TGK6!BxQ#G1=o4rQ(Ru4$2Q|9dDC{ie?HX6> zsXKL|G})~pw8H89nU;$owwvZ&Oa3#iuh^ANv$Qn~aUnxINA}GePW4rAy3zbhc5bEO z#1l2&CGn+-+x(x+Ws8lGvs@fr5w`Qq29xPaCV9<=`Y&Dia`^{$M!KK=U(&{IV+0C8 z{#$Qsbqq*g3Uo+R6%`dQZa6CtY`gk4`!~7#rRf3NDe(UnxR#pesi)h`653jhEPs2L z2gJL;?n4WDCv}#YQafBVK#L+Ih|fcbN`>hk0Rt<&DsogPkEJpb{gunuPTDy}t@>(h zCFPOcNC(=PJkj~jDI2eh`nt!8JG*UW{5wm@wAL?Ez9brw2Ow@6GJTz_Ha&c#sdkBi zjgg$eki2TZ+L{uztVHo)y<9pu`Tp7Z!o{y50aj%_LX}#4ZXKJKVtJ5?C-;-lDYuKA zxyZ*lLUCQUum~Q0*hf#q813WsNtI_=az@8?_vLfk=xi z)B2pkJCGSkdE4{`Z@*2ZA2qIAPc?;XWQqU%`{i32WDurg^EYFBw;jV_%1lSUhR;!u z(Oj>UctK!@Sdp+zBlEgvGkldYTorropUxY0BVQVZtz*tpXHlsO_PsIGwO4kdI&CO zAzM6YeDhdgMS?zAk<)&;k%5Qk84%eV6WrbR$o95IOw? zxt4wz|GF|nVkx=l>zaYoJyzMk6RON`obt%M?0f1;Z{8eWNNTm(SYq59s*t)q%;@-JHxnSVF5rmAU~h zO{REa-$`d#9}53T6GkXqL&Xc*yx2!>(J-GMW2@ZsrdOQ@G~{`7M;8x7TM>Bg2p!Gr z3v#TcI2=Pw%%DRAia;oYEDmx8z+Luz29X5?oMqgXxKHFPg`FJb6M2~~GCFx^7rDn3 zdl#|~fj)03&s`RC*>6gDzUrV0{eb|K99>AYI)walpdHQSZ;Z@$r!x$&G@|N#Do8XlPw-vRd7fuk_OKHrmtY%QZ1tIotkoyPybA#eN z=3p1uvw-dbDNY*H%cg!MFXmg+tW`Y&Y9%Z(48<>52ROcw2?d+KjHi)npxM`^Vo1X= ztE3QPc#`~|;|{SrSrj?SDKQLL9M7Z9#<~vg+aG!xbAyeg{^(GsQRD#D0Mmh0gS6kU zykVfhIx1$(2oGGjd>7mP_@3dZhq4~DV*lKX60S9{h_)~(NP4`l3o|9f$?&S`=pd)d z#S%7Cn6qd;W$~fT$g+URnu7y;vtBO*KQql-K2+`Y4eNKjg6t2=M+#r-?0*Td zScdByy&D-HSr!>Rj~IR4I@H=D_Q>wS<_m#@6+ve~zXYBH>jd(I=m#45_;#lD)CW!v z&>tZ7eD)aoZu_-%k=&@(>{idT)>L!E=J0yxL_uk|PsytN_nHamiFo!D_6qi+?E36U zhz*ZO(v^1S31w~ zexadF=DEU_BW7_TCP?{W(_&pu1++TY5N!TPd*-%`c6wfVRwb&^y z@87<9yAqRz$sDje@gO$0O)%3qQ>tFv@|o+^S(zadzJl;n)i~9tMorzW51;icN?VIs z4>*k4@*#3X%U<0n_+(`CP^BY7qUKD4U#9oXmDBXn5rz?|EWIq|LeoOJ!jnSWMgm4u zhE7Ej1*7Hwmh|X+?DL%;APAP#fHaf?|kRCvDMBsG^IG@ zL)tHNS(GZ22Glb2FxtaZ?vypv}+(yy9QK56pK2Gr%EHLPPrYWsqCwqq^zD~C}dPPtP*J) z3A!iE!p*_#d(wlDv-GZ4J#=VlkZ$O!2;4NWaOxxB=}1mfYkrJ*wUMhJ7YFyTKE}=P zBQJACH1ZeBpL>o_cE*>5uEmYjpB{^vHCx85$5JK*Jqc=4N~$#rw^YqnWmX-cK+8Yv zcYk6&7dV`AJ?46*06eEHr`ay3Xu0UU0x#xj!D%zN^r>=i4I&ewSo+$o{j2_wJ92HY z8vJfX)@3)Y{m}S+HuB_6-YZ7*h4xQA+n{jiueIO&GrBOGGVI)RtZ}|^?V_l)sHeM4 zg~yMO^=i?t4h(t09r>m`&(C?9RhJHYub7N>0y&-S{???@6oupHbH4idgLZ~?L4}2F z;ml~g!gB@ffpXy%69&gRM`p+AUhBd<`<^783vJ)AO@mhl(Y&AHCi{&1&#&~pSqz#k zzq@#M&9mQw#`9C}ch7zT(eCY1A3Bluk=MmuM#a@X9&&w!-{}9Y=zAo0 zTnnE0e3?@GxWw$>t7Yz)v;$|ly|4N|7(caJ`D*y~jR(9> zJ=SteSoY?o-$LYKa!TQA8}-)M7Uo+wCDJ`F&MDLf&qjo^hDx3%%9Iujze~+8$p73F znDpqv>~lg+Px;!qep0SYzJ!^Sf2x1^bjU_j2Ul5IqWRQCyYZ(pPUYh+g&T=OdDkka z{Kr!zxTA8xtD$Q zb8dy~V&KN@HOqxpvEx(dWpqM%l&q&8?fRS-pOf`y-%`;0+Fy#=-3~WQ3<}$=SGSsd zdy3laKJC9n?XTU(?LGnN*wGCH*2G!aVYUwANc;TVlQ>1ZJJ25l&gsHtb?T#T3eL%pu=GIZD7g1nW6F8|qz9mUX5(a^aLy!B8(xBQ^5OQ&Rxc>&N=~aAQ6*BtVoN4K)Wlo;`u|V! zy$CpKpo;>B(Lw%wfy6{b;i4dG&<+iWgaDfm(hKCgO9Rvb=J0nK5`h4=AivWf5K z9(&;sQm^`taS?m{j1U8&_YXdV7;?{iAmQS`3jJLkQk2v_`;#WIXWo!vzxt0zz}PwB z2wOjF(6#dcVi#!W>EQ81(AE+Kf>_nr8V{`Htsgt6Dgmqc3>*oC;;eDvI0O;{vx17j tB(S0wthhJ^DGtMlLo8+J{(F|Kb|7$204&R`#ehVLL+N;VmC-76{|`bjxp@Ep 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 e64e1bd9913e1d8ecc121c563ca683e867371ba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8550 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 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 1cc9dea700e3bfbd378d5f70ce28065291fcf61c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8048 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 V$A!^>^TNc$z?3{ZO4`bl{{vyT1}gvn 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 512ecc99d99b4429a5d38191f1bd52265aa29a83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2348 zcmV+{3Dfq8P)9{(k|tS_DoGPBcAmEHk8^J9^!gd!Ysbr^ zexxhg_vQP&=kYtg2f%ec-Y_T(O!LV#`#CH#0^}FQIcL%PO1Q}l4GpHcx;hhnH{)h< zI-Qo-_vj`^&!ubf{=)NiLlTCFC`LqXu$SI=pD2lqc&G{l)`+$$#p5NKEBZNye!S4f zdBit8H*+*NKHhuz^5w83NlGXbq8sLH;aml>*49?q#9KU`8*QedCj>!g#s}L9M&P_l ziG-hJ56u0m6iDOUW*AQ+B=oG0}APE!KZ@RtCW;MSGjBS8| z!25#JfiI!kz6aObHY>y|&tuU|zOCtwU1pQ{Ai9hj3I;2aCG!qPWo6IM2Ll&DM_gvr zOkjqj4|#J_bE_oE`NiZgDR{KG?R_3KSEj{vl##%6BB;O3k)nKi*eWRO1v2c<$u@h*@6nW>1Rap&NSwprh!c6w z7r&qi)MB+-;Wm#){od2l3;BUDt64rUK0Y4N?oAXZRIaJ7Gs)6VK_?`JL?wzmccFXH za*2?|H+wdz=j7_LR2$18`|a@X@HA-LG)`bkON*!|@D)K6?gImm$p2k@51O~$0d~86 zQDmpjmsTWMlg=k{wI&yYOIVC|g2qkb1mbXkSXouQQ($Z}7=Q#kylbcW&_uQ(39@Ew z%^G+gMH;jw)+4O1)L#77=;-L8n`#A8ij`dM>hBuq3ekf<`pCnoC@p$K(lJUv@AvjX zAP@xIa6Z!6apupk&}URhYzJv%z)(NWirJDfW-2HqzxBvN>N&3-`U{-#cBH*eSy>qv zg$Zg0Jl1zrNwT2Rz2=u-08078!$VMCUk|b*B^}Skk~8R<&%gK*^!E>d5jaY)nxtQ8 zGieHe)jtA*jEs&!Ckj}HZWfC}Ety1)PfWlw&+S*+N28zs^Q3=#pWp9atTf^TR##U` zwvsZ#0_hEr70zSYFJDy-pIE&*>6}y|C;SuehZkOgU@)i(HWYtR&iOj`f+hyz1fp`O z(pCKg#-RmtLZ#RbzyBoQpe+i#pb8+tlpPaE6xkUq3aGi*`Sl0U-6srNQW9V<>PVYp zXf*jlFu&A`hek#LA991e5 zZ%wyv!56Sjjah9>rs`^C36Ch@7qC?GLb_TM5$wg*A#1VyJCFnPkd$a*NrpDEXira% zD(G(PVNk5n_hapEtL0*=#BtzEu%$vrc6c-50j?8V(?tL-5p?O`gkaY=4^;FW`Fqpl?; z((QJ^;Wz%NyRo013qCoL;GRUfVMCmU*t$m)r4>J_M&PL0fm6qi?t+D({5aAL8%CzX zbHBkk7ekGHf#H$4sl7OC7)f<7-LN-zS5(X~Q7Xbgw!FmRauMPDXJ<~Hcnt^3lvKwv zjcil#ZT?hc)k(~#jj$r&eOEr{yScZwcP`z6g-nw#90i60Q?n1CtLABZFMrT81%e;m zO{+38t;WbWGlLf^qgMv~4wrKb2UiVOH_HHzgy(mi^`34AP2HJ_Y^JdJ&_KVh(p4qm zn`(v?fTBe9O-)Yh$H66P)H6*1q zM79Fed*je}dxgt=9*5`d%2yGPEfjMRCG_pnC)$4vSxjBW&}#{G+=iysY(@4r@n;nj z0?vK&GlBa%7FItk>6TjbF2!re(ng9iIAfMTg(d5m@$cP|XOKZ#~;ZBi> z8`LU@K@}z@SL{5s#$|kxE8K?<&==w0kXGaf%OU_5mL z@pPKDnP9g~8b6>UsC7DyNjotZWJxw)1W2}k3Q0&pNIWEQC!M5|?smWa|Et~Oblh8e zdnef6%s0EI+uJ*Rzx}_z2O$Ow7%*VKfB^&35Db~7pp-HI^_;x^`s>V|J$nK#!wV=L z;XSJU@r^g$ARdoLehv4ae%BdD1dt#AqaLBL&^T=C*RSW{$X8TU2x^1ZrhsM+crCCj z%PXJdc%EnRf$(p{fF@wb9l})7u+vpiEXBpecua$4g_e#jH#au}j&hqdYgQ&6@o#hH z%)$4qAa&NcbLZk`EJ`y0p(^?EgQ1d2Qd~==>W^dm8+0t=bUNAA)>a>(B_$=<))_hF z94|b~ag3dzj17pf!Mj<|?^&Q-v;1!e!s`TW>4ak!yl_%NyF`h0N?vc%uxGT%dHuTM z#*G^iT#AhVq0-v5YiVt5E#0+i7k%xu*QlbhQ%cpQ5`m20kyVc%DJc#hl1$fW59P@i>F^d1}=9j|R_I&%exlsY>*rDe;O z(M_8+A)!Q(%A}H+Yyu}q8#E5=6k9NF{#ujS{Horhg#wkNBcj)H@XYDYKZM^TEn2il zymaZ3w0ZMpdid~RDVZcDgTO#lDHB&(TAGuQle<;mx$T;(N3B3{ui4>KF#7W9g zHxl(Ga8eAnbonFe%og+8DJyZ207QBv@7^hu7N@}(!QQ$~oAxj-(JUFY> z%Juj63yU9KvQ4m94zVorFu6y-u*@Hr&6W*w3LbRzba#E_a=Cm7faAxHW15d73JHBY zlzgR}J%Nzmf$a1dKV(_%1#%BVl*Ikc;lUrZG&c5whVi08xKrSTx5)hs2Kr$C%15epk_i$yrH?d|M6C!^ zs|IX-e!egV$YXhaA2EPnpfC0UiQj{BELWjQWh@qpCeo+{fs@o`fxT#(V2~FGnM6>h z+t4dV{{W;>6DgePO?>2G`x+Q+w0XopC{VY{wWhD{`dKJMd+O@yq^Sn`Qz6io8pBW_ zEh}q5R%Z6^?kjII4uIBl3=KP~MjVbds55#%l}e+dqa@xqaVjcQCJ@qNtjT10z#uO= zfUsrHNY6TgeFmiQP+MeiKo*G;@ut#zNok00_&E>S-T>$7>%>5GV3=%ETDtk#)y`uV zFJ2_Mxw#Z_#3UZXC4uVbFbEg80(&cwb@D(d7pAk&=eWpbVP`7(@qoeP}Co5L0@Kje{lmk1A^7_|f{gKoLG^NY6{ z(w6{0$t}a2z7@}6k;16FP>?=3*9j_=w-*-u3ce$u^}U>&9P-Szr$}4-72Gsz{^B zl6JYL`)VVJkQWVW13`Vt_Kzi;F7_`NqP2-AMR;9LPY;O)%PW@2_e8at0)Wg6R|WM} zwQwF1A>Tyf+0f81akC^(M46eBO{|Ipsz?Nh6CUt$DdFJYIso0>-7J8F8-5th!@=ob z{P_6z>{)qpuaYDI1M+Yk8Z0bGgJ2#*5jCES2PqJ4(1Dvh^IBS3`pBK2{w{>Hftb9m zsj1=YMJ12$JpUxo8JJOd_OG7t1>m8ewN3QDFD3>M$qN1%j{n4B5;`0XM@UB|6oFVa zl2d3lTj4iBhw3_D302w79WO*JL5U&}p@tjH%@^c*>Is%GUk4jE+?dg?+TSoV(VIO{UMDF-_kO&g-^Z1)|hm!e1Pc+C%j50zI z=v&JL9|KMr4VBZ5G^Bz_=ImPRxPOEW{3_02=Tjl^ z_eYPBciuaY+|-)9@**XWP>J0J;#hr1W|L$CJN#Yf$d92z<3T7A-+BLFQ0d0^uzDZw z_ay+amy;j^E|32l85!Yb&YJxyNdaKlr?aKmC&+tOt}ptd zpdg>v=FNk@_mN}(350_fs;m@}K=?=4jEoE}duHwq9K%m^gsS%b>`%V|&Xk*UUA>cv z#ZIrQ|BP56)rQg-3&N3j^3-YKa=9j5zqo9XJjMpod1#OIt{LJg!`H5M`~y)|MkFy1 zh_MGdJUqNy>{AZ=5r6R=SK?gVmbz(4)ymaYOl9!ivT0c?w}NfC-!lnf*`Pm4jr0UbbOwD z6{x5cL`U4d?I7o&lHl(lBGeL3FuRDA2mHa2MyKI}At-7wnkoif|G{tmTeiD;gHq|} zwX0pf$5nwPNut44Jq${qvP7a>PRe_5-a?MmfBw7bT;zinI5R*>LfOS|p#~E1i+}$m zIey~PsK?mYZ1c#$L%&K^SV5^MeIW4cNzgJ9@DY7MS7DmPL})=?emctwx)*d2*r5## zXM;*ss9}M@LXB&Xb&<0#%Aloa2TGlR?;aX*kz`?feEcWgarc#hfq|F{y6Al|;CZp* z<6}c<>6w2+k_ee3@HlODn@{~A)M0^vV@1_a1MOq`l`G`K-yWG1BH;V@_tmRb`TiE` zFn&ESIB@f2FlWO%cI=QsjSUT%O2c)ZTU%RcOG}Fb$k*MG2?Tna!73E!g#2LV_efP` zzFV%z=3J_xC<*+ul+ZcW1k=? z0PNhqfQo%_5N8Dw(2;VO=mZ6Z2!Tk2`4bYA4xX<6^f@vyph;aY_AZ1UbI7vDq9jsU zOHu^bss93<8;mH7-<}4^3MN4q+ahtn$ZKnFk9sbKPN0$~*5UG7>({Rjdtpc$h>i>t z5ebe>92;?6vu4alsvQhOD7!d&cJ5uaOdTYpW_SF7QhT`izoMRtp%;cnhF-dP{rW&h zM~81iu3(6igObOFUc7iwSo!GM|4o&xaQqQ$IvN6FMJ&kTLUJpXSI81L>3u949j=y% z3wN(%s8cXswO#Ek-+<(W2eL5o##^DTjX1#*SEj%n#H^WFImw6zBOz40Cg9P)j+y_UBquNcpBSSk+*3~Q~cVa&=(kG%K5H|#dr$Js?d3N61?;9)9Cj`{v z^=xlAS^qAadzBV(otUUrYEt%Gr??}RV|3^Myoi|MF%TMwpY2mu?u`nuEH|kR zs*&t=yXbX~8S7+g1Be{FICK#A~cMU*iMCov@pl&a^|xC??O-AMx%OBB$3tXLIoMn3k`udXr;u|91n? zLXyP&r$4KGkxV!(DuFStTtB5vkRN~iaWXbGM#e`+8q(4;HUp>G#6T3Foo<)&+c$39 zz>IpxVe`>oDtjl<>gs92m9MGXjcfF5~fO^92;)hv`GXKz0SVtXFcPd z?ZhB47$Do?+3x7;J=fjc?KPQ9qB8G&N_{nz{R92M;)WHarKKG1E3smA<@Y&G_>qS9 zpYFg^*(;|{*8MX|9uVh+fPKp3AvEh?zrEwpF%p2pod$_AWb(c^RsYjPixzp|0gv0` z3ejMNyR3*~TrnaTjND|B~omB9iNSQ{AyM5L#|Sj=*e!T8Q-abhf|eb`4jd z+f42=$Xm<7|K5N7+B?KA)`P+_)rvfX)vW#!nWx3?GaduPsJh;e_BNIQpIx2wK7 z|HZkkt}a}lKvYtYnmc!iRBf_4U9w~ed-m*EuB4=7=8Oks|B##5?em^hshDALj=KI% z92)9xZ*LdHiG6hNt%P{yJV_i-ol1fr&~@w9(VCi?{=B@w7auGvYT`NEJnP=7C8Emo zik?@%-n|DeMI2SOd-rZBk>nu~E(xl4ihB>@{&={NNO}3n`KEO9t1Kf=n3?v{C`r;s z<0FGFoj-pbXPkIdV=68#W?NfZc?dVQ3OxVvbRiN4b>X-m2+V&* z6ptIEPTI9=7sVBoh>l2BXUXL#$OX!qO2Rn@PcCO$@DLCwyp*~`(oT<8d~0an=7E-$ zmI0!K20$LwOJxQknVrP=H)WG8+_{onzH;?r94|Zp1;-73*Cq`(TWD;|z3=>)Q#CkW z5;7_xWK`5Lkfi*+q~w27;VGAY1Fn(}Za1qetthM5B}-Nnau#kK&k29&H?>Wd-wdSH zQIUS+7`T1_r#eIJPEJtZq}R=xH=~_PxQ7`HQb|quRtd&szQD8d5sCZu=I7fA`7~1% zOSm=iMkLIn%}6x(KWLXE(mDv+YKI)RehW3u+jhHMvRbVYNE=mc+`fJLsFta)sUjsE z2EW8Ol8M`Lv*6`1ZEbDp7Ts(~d3p8>OGY^hMB?i1(3^IaA=wnynWoGPzlCa*m4}Iw zFmw>Q-65|&#ga}iTU`vHO@jlsns6}(RF6O!Rc6KdhEb9`Qf8FNVuVZ>Zi5HsEbiqC zgbHvjKxdnvnW0(0eNTg<6 zg%AhtE!$$8528FQMoCNq_|&T^fk-A23!W?wozG+EV?!d45V!^jmX8WCcrGYS{tSK= z?}Jbt5`!$g;3pj_sXl2{C00H9H~-H;X@^lZmNJMlV8DO@0|pEj&=da;D{@CDEYyM& P00000NkvXXu0mjfpM@0x 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 f28145801ee4458377292c73df39c2d3f66ab2c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8569 zcmV-afdEc{*eSLHZW4pBuranl*cSel?%ngey05qrmUQ)H z-7DSSIj^rQ=}NNiPtW)Byo8uAVZww76DCZUFk!-k2@@tvm@pAHIAS7N;Qve}5&n0w zEEA3kc#5n#*Mvs!#Ke3+B5^=6|M8h;p27bWE_NG_9D6QX%6&YLle_P}`*_u3yz0mY zpGQn#VImY55y|x=;(=rW9N7}@xZ@5HkIKqY9kZI7o3q&MrAwD)v)e)E396%@ygsk~ z0uYn184Y^jnG{sW$%x2~j8Ked*~-yUUtdpGO-+rpva-?!_gU2o?`KE0l*cTpMPE}* zXf=V^XCW%GqRC()eL+d7mXwSHK@u@rSx6#AESs`&VCCX+I2?G)FD)(2!v(i-<(HI{ z|9(nMsS717S;PR$?TV|>7f_Dyu6$n931pZE_lqImseOVSS`!Ju&m~IzKWBH9ZbwBc!phh>8knPUUt%- zGVvWH*(nprDamr5*W+=zuUzUnbLPwy_GD!dAgm;cq70u&1}RJLYj1Ct;q%Mzx#{y% zPFPxt*0dz3a`C9cqBt!GdQ?cs0SUNs=g#>F36hX2a5#zz^XwZ$QCLo7t`SaI&iP50 ztj|iu;AfXCOI?!3b7XGD)7jDSP9Hu5pG}6(MhOXD6hC3>>gpsQDgnac7fniMvZfV5 zQH6i!JKy1+e)?(o{`>Fe@gkBSFB;S;*WceyZ`U_A78Y7_TX<1y;dy>TXi2!hkmW83 zNb8-OJ1{mqak!_ma}>xb34$QQXGaoBM3J~EsmdUcG(uVs6p5*dIjX(!0CIwqPk9+Fsk?xKTl&%t*0iXdWNl~hz34pgjW6(v?M4B3! zplVf)zq1%5E~di4DdF=`b%Uf7va%mD3MoSY$?5^JwjXPKi6~MO$(oasBiU>=MpQ|8 zE`DZX{i;GEbX10nb~u)?f7AG%|7)iM^yO|EJ9R~0;9lC z1Pvx9EJ0D_8A;4wp!%Pgncl7RSv2BXy&xk5P_DqI|hWyGauSj~2pX$1r31gbXR~aM#F;SfhKu($h zTz%{Mf3@c2wwmM&4PM|sZ_h7!Z}qJ$Tj5s`VyV=D93CD zR~0Gh9PP~8tyb$U-2~N*0$FyBxvy*pQu}Hfl@J{|QM!_#>|3nFGpW=hN?96^@`jt& zwtUZOwH+|Y83Q0ZWiKf10?qRjxmG^Ns-{?F7b~dI4RrHiFqVnlB~v@-2wlE>SpW}R zXlPtjYtPT!3;*Qh#6$uhJ155{HgtBj^};V+5Cqb)Wy?^i5>|{tbRtRhKu~oSh`j## z>w*&3#3eM}vi{4WAU>JwqK%A$OvWUyXZwj`N1rD?mCxd){ye|`nJI)W2#TsjDemwS z6W8jsE#HN#$rfTFY4A$kUGKboM?rIWK|rWUnwbPu1>Lc1j6-tP*VpqC6B9yV zVOg!cxbS6Dr7sXmJ~Q ztQ{sfQ;#{%+?MuZt-Fbeq_|iZa3M?h7Fxyo^Xa%4Ih$`;yO|fWcA4bV2eRN=G~cpr zGf~A#vB#hDVL`J_3q{a?Vh`dgC|1HqYd2?!**l2|UBO4vwGTQR4oXn)69lE{a6#Lk z7fQtkw_h-|P9-NXp<6I@4+6ytNfT7{Oywhz&eEhyP*v)Tk&_NaShix-3X`1rhX{Vb z3bP z<*rNaD|b!1T$jOoLv_#8d_q-y!c@G{E}&NJd}(Q^u!go6nB+`5aNP2uJo{E<5E}|2 z|G4x-wv8l=pqQjZj}E+cf3~Qkyu5}J#3zV}v;^9t*u+>~UhW^(#`5)vLc$1&cIT;6 zr#NhB#c3aKmtZd_GK2AH4y(nw3*w>zL~2-3375z$Q$k)uQSD63D}C!NPYHtXBr%cp z@OnKv-uc7Pe z{;D-AYqYGajJRAb+ART`An_s*5>!3Ni?#{hyzaIi^Blj4n8+B&l62ts+lN0(0t5K! zo~D?P2pg29Gx3O1=CFs|BxmM<s)xbt7>{WrggjK87+$qw*UM4af ziWEHvwx}1>z1mrd+F^>v2IbD4J?l?v@)nD39izX!?=xgo^GcFTSglslvVI*|wzPp1 z6%~<821-#(bE7Q^4m61eB8eXUIq~i7?ey5t&{PAS`{#)c!N|!7+SdLqNhBCCKk@Ou z^xt>o$`$h8`~HWVIonGz5jcvyq@to)6vbZ5EGl=$6mp6>P_LS)#4DQ@2z7t98~k$@$S`ODTCS3=Wb+0EzkVgPX~ck9;KHew)n(@7qjopUqH`W{KHju1mv5`}+FW z<_+?}g9l}>N27Y3s0oT$BMcwpSLmcIV2 zYt|5u5@DWKM^?jUc<*#K*k#islK>jEQS!|G9I{IE567AKxVLDu1dZATWdpx(mtd@7 zsjhF>q{ni)GiT3+d@NR*6m3g9_e)=Vl#);DIa|N^FXXROCO}4jBli5_(iReDpgvj& zN^MT1q)xzEz^dxnXZ5&)8%ju&lqfOhLo|{U?aVvxxSf3V{?CxAszoFgAfZw6qFtIP z(p2CD$H4i%y>L@TfdPUabaYez=cv}2W7|P=ibRmKqN1E^0f~vv4X4hv zpctenzRna7G*Nc2o`HhPnl0`EH9tjsP7?Ab`2^uqv|SkJ{{VOsb&Y6LDjq~Mhp|sQuX0h{KkG3#9|?LTDZU;C{t;;>O*w9O;Jov9 zB!=y6w8lZzgTUzG4ME;uFwm@@s+7r&5J`Fv$RRZeN9 z(l;u~`F?S`2cg7)SY9(l+wf#QK4NNU({6bLk%C2MDI zZ|~H~l`Ey;;bCI2Scu2t345C6FcUgRc+4*tB6bb7`Cwq}nEBK#j0|oi;mK zFUZZcSKoBgO$4`F|MaInO)%UP=^QNt^&7MhVj_Z=T}=!Ev^kUE0qcpRMuK3qELS{v z`PElnMQsq#QPM(C%5tp_uhLi{Xazt z*heI&dM_M@!-3uKhLNE74@f3SQccouT?2Xqa;L1UjA~?%pj>`_e*6*?XMQ#}H`5oA zBnbZV#tAQBVQ{iZk}8tAXy@p!h>?JM6buawQ7+wf+ihg))~ylGiAd0W`}X-|FqTTi z)nJkWEQBOmXp)|SsLFHy{zLlOhJs4C;b_M0?(T>Ido3y+y)HtSv&0d@1?cfYejhGq zGF9S2kreauFTD7YAYumnX93wxP^Uf<9=cKmw(fuvsKWRTQF&-+OlR5tmz z)6>(#DO#D{8Sad*1jUd5ieYe)NKH)*Nf)4+{N?W5NwZ56Nz#D}7wGdZTu7TPP<3Z# z#2rB*r8=qIIXF0oZN|Pz`l_0=*cf4WolZi-+qQu>`2Hf}&lBBp3nvb3QQJu&B6*l$Dl}L_&*AdIU_3aP}q+dwBGbhbT!CJxX#xAj{5~ zsfp*YifQG_l`{A?vNEqJBqG*>VzKg@Z@x(@>akcEoTSH$L{RKK!ogn%bVyb-HPPFl zYAKN{9UYzYo0-TmJwzmuhO3Q44e;nA4-?2=2fQ9;mE3NFI8huK``}Nfch=X}dm)7` ziJ~Y&`aJ9@5ecenDdL~WRJo|;0g%%UVgT5zR`Sq;o3FbciHF^oXCbo`iWE47ZgB7d zsj8|L&H1kQ(JV7mxE+{K2^YbYYsm|cdn9%1MBL+dF zay!=H8Lne8S)nK`Bt>#Y8hqRKu5q$Uvg8wPLBaX3k)enx9%nM)i{L~%i^akf6c()j z4{SX#2+sEQ(i!rh)U?))NmQfLQ&VKgl8=x?A(FaxT^S7<%zy3m1JnjJ3M5(D4>sr# z;F5&X?udrY&WHrXVv$ntXfIy8$UB`*zPz%!R`887F$B55psdiM==arPqx(DX3|ZbaG&Fb9 zqMFByHn@QSiGp@pB)b&1m_dY-RN+EVsD^*`^Irs%$i+MQ5ns!wxp{Q1J5RRbeg;TR zjDbQ3R7waz5$f6W+@h-LPZ)9Z4MVhcX}CD!d{t4X(trB%7v?2eB6lA#7UZ^p^L;N7 zUnP_Dt#5rx#~GkE_|$mOGCK6vOby&X={ zA^Gsj5o&Z}I+9eDr2_-!oxg>f((Sk3F2C@?3kg&4H28^ID&KhHjU0$(KF?lwqrmHX zcMq*dlwFFz$0DgVNGkkH@laXGo62X-oPjH8oRp^)U`vIswc~smd^!?5+EF~|KvK}a zUBmtT&c%xtOIT)y_NUeXwo&c!K~%FsAz)w4bDW{=&|pMkmwt3vOpwe-=-o|_X z#$Qnt3h4D`g%}NKbaf9Y&fkCdLHBF$H=z9~z4X#cvK9{>5!Egqs>N4SR^%9M8yc<9 zVwa-#AIUC7Y5A2eZ;7bV(Yf07UdnUS2l0z(GuwIG^!DGn*a=c|Eg8TXP87sf(hAph0>{WVRmrfUdlc4GXWhK7bF zK`Tj*KKiJ1=bd+IJ~x^kBTCHX=4QUVy&Z`yu32~cZ@`u?OyNi@pkDXpP1scs_IVgY zZ)*0=r|ZhBQq(t5t;dDyaV zFB%yng1?^6h29>eHhXqskAyX*z1ld%TTkG82Lhxl-+Lx zlFDAs9+rF8yg8Bz(ROJv6)#p+RtmD!dc&d{E68qd*Y<0R(xrnW z9d}*%==k{Mvkr&D1Dcl=h-j9ev24dp$1%SD{` zRw5Tmaj}s}>hXHEd*^041_lPu?v%g%?Qd(!zpD`~K@sZeCQh(fFBRk#{Jl}Dn__|1 zcqsx&iG?Ha>2iOBmsGt;k6OiWOMYH2Z^4>66hL5KeS z`|s!X?c0Y07aAH@Ew&frb&(7O=Ggyk^8^0sq;Mgmc%gQj^h!>|*tlzXcW37r@K12# zShjgAJ`|M%jcwaCz_Mk_Xxk`lfEqgATaf?fN7Fqf8VZ=l$B{Mli)$ecY9sHRI-Rt_ zV&=7DtW~e%lw@h|rNO~-7+%8E=8+>u*h5i=nPMd&K?TYe6HQV9hq*awu zG(bXPAN@kWmlV)%cxiTKX3wQdm!yV<2C1~PRF0-NBpC5bt7FcRP*YPQoI7_eBQi@S z!UI(Kk+UD1zRO~4}JHzxWWK1*mxR&dh8hCNdf`Gt)b;=Lk~1 z(#DM&rC2xbWr#(I<>FWXweTaJxr$FwY%rPvYCK zi^PlgU*X#8usNb=i)O94wPh7stmy)24@ zEiVa?oD2ygDEr1>|2!P1!vsgKYiMvAus351NzxXe+S`t`ZiDO2$SI-p)H;wsD-z`- z1-~A1mS_OKp>b7RL4Mv*+|ZtwFg!p4jgF7ITHG$z8O#{<^z`^^K1l+lCnA=5(5L{O z9oO^z>9LB6o91{y_&70Pcz_f1OxL?@zjeFabd!tE;^$SFWUz6RVX-63B^27C~iYcMur^_(UOV?+1VShG~x) z7;x=QynW;waLbD!rMkL0s@4_1BPmF<4H^JnD?P^pNpZFlt-fz+T3u_)&v}DwZg0XU zkey?fNADUP9qt_*9Aw2HnrF?&ie##I1eKoHECnQ`s=lM+o!%+;K1Ajzv5+$S* zYmZU1NVWt;_`hw6%|a#V$&+m-J#%wU5EHtF$2<4L;Nba_YI2fmg&;{KCt@K8iolKQ z{k5YYNhwL&Pqglyo0)x#n9wC8&)k;wW39V~hKBs)WQiEEKv)PBAMk!k1wP)UfqaL< zAyn2belSbS-bqa821w2m$68+`N}e5viAT&7Cf)8-V?hauQk3)Q1~$r(yL|aFHrxr# zx2)SN3Ryc$n>4jRn-kSKN>2C{9U^bg&@Yapu>@7WCnYK5?0IERdSMwjPI;!|lrm6< zXl8oD$+lxB>+9=1cDr3t$SEnpWxyLtvBmPQvg|Z zj=Qd`8$9285`ObQew{hBRHY}PIzASpf}jX$XtVq+#7HSYM@B~Gy1P4RoYc%XEg;~3 zJ?8QS;n5)iwJw3LK&z92$|x5csUj%CAF9CV6L6H2V7>=~`91HSS|>}A={O}Bm|H*A z`qo+u!sq7Z(&)-P_uS)EA}(?&)Vdm}k=xfJUsKvFL@VPO^2xZAW#6ADo2<5#b& z19JWde)Hh}np_JdNy#dmiv@a-pbP;XzH$`G%gcGlWC*KoUB6WjL^Jyo2heP~e06kt zPiLo#T+0mkGeqoZL?_T2K^X#6KDkz*FZ}uP=GsDg-hQ(hDq6@+&zxsV+ws=7$TdQG z!5NZql%}d=PB-L4=$WAGh?_R>Q&Usi z{@8X5M;rSa+A!XX3%ebZjoIkaiH>0ef+9FYn$p`Oh^QWqhXaW!tXQ??HjBmjWTp}o zi8(VpwPV29`<5t*5`1~F{oAW-qb?C8Iiku6>6)AfqY#vV6)I3wue6f*)&AVv91ocg zZWR!f&$4Xdh0IX>l$bNq+i_3^*qKO7wO1a{4xFl-daN)SK`E48C%ozR_JOPf`<}4P z8Jqyl;c)N{$D&$me$JCTm8j|E^)u&Z+&#LdyR-8g2@DnaiHY7hE~62X!H@)1A;3OW zFJ_~HqribwFWfLdxn~bjhQCfQDW_OLbMh?5(?kn)ON$|JI=$T`$5STslHL@9w zm<&cID1{;&XjTjz09ef9_eTIg^>JXU@+B2D)j7887EurlLsm*kuXq30 zR9e>8*ZX%_!KI36DyJD!YO0YI1XUqmn?~ixtA1A#m#=SZEG)FiK?l5!W^==6BJU1P4H{qWgPN(Qv{ z;xIOw%_isP=d%r2=WF{-8)7n~D?u6je;<&Pk(E=te}XM1AcdHOrP38l0Ss`{=i(85 zFXXdrjRGfB^P;eb@xLAtQh6Uyd4ECmnYekDi3~%4x37{^ylM%m6)bW6l2;}D0+w1T;zG%dOZCN| zWSmDznuIhF2!$jJe$wDENYygp`U$L<4F3BW5g8ekbNz%=ub}reVIq12lb6gd^$5Fv zzQ;@=nlNF)gb5QSOqeiX!h{JECQO(xvEcZBAI_oLanxVN00000NkvXXu0mjf6-IR? 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 c39094bce1c46efb7ef2e66b1378a63a756f93b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2922 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 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 1cca1196a9032c305c2339d43805b0a9483cd404..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7263 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 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 908c646af2b797c472405aa9c4216339a215826a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12356 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 b(+}lL`k(ws)4c^U^p66Tg~(J$83z6jIw^5{ diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 4ec7931a5..a0378ff53 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -788,9 +788,6 @@ "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"; "title_error_downloading_bookmarks" = "Es ist ein Fehler aufgetreten"; "popular_place" = "Beliebt"; "export_file" = "KMZ exportieren"; @@ -912,7 +909,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öhelinien"; "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" = "Topographieebene ist für dieses Gebiet noch nicht verfügbar"; "elevation_profile_diff_level" = "Anspruchsniveau"; @@ -999,8 +995,15 @@ /* 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"; +"mapmode" = "Mode"; +"mapmode_default" = "Standard"; +"mapmode_hiking" = "Wandern"; +"mapmode_cycling" = "Radfahren"; +"mapmode_driving" = "Fahren"; +"mapmode_publictransport" = "Öffentliche Verkehrsmittel"; +"mapmode_option_contourlines" = "Höhenlinien anzeigen"; +"mapmode_option_traffic" = "Verkehr anzeigen"; +"mapmode_option_transitlines" = "Verkehrslinien anzeigen"; /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */ "bookmarks_export" = "Alle Lesezeichen und Tracks exportieren"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index f632cb850..8bcb473f1 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -815,9 +815,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"; "export_file" = "Export KMZ"; @@ -939,7 +936,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"; @@ -1026,8 +1022,15 @@ /* 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"; +"mapmode" = "Mode"; +"mapmode_default" = "Standard"; +"mapmode_hiking" = "Hiking"; +"mapmode_cycling" = "Cycling"; +"mapmode_driving" = "Driving"; +"mapmode_publictransport" = "Public Transport"; +"mapmode_option_contourlines" = "Show Contour Lines"; +"mapmode_option_traffic" = "Show Traffic"; +"mapmode_option_transitlines" = "Show Transit Lines"; /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */ "bookmarks_export" = "Export all Favourites"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index b916439c4..fd06dd8cf 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -836,8 +836,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"; @@ -964,7 +962,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"; @@ -1051,8 +1048,15 @@ /* 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"; +"mapmode" = "Mode"; +"mapmode_default" = "Standard"; +"mapmode_hiking" = "Hiking"; +"mapmode_cycling" = "Cycling"; +"mapmode_driving" = "Driving"; +"mapmode_publictransport" = "Public Transport"; +"mapmode_option_contourlines" = "Show Contour Lines"; +"mapmode_option_traffic" = "Show Traffic"; +"mapmode_option_transitlines" = "Show Transit Lines"; /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */ "bookmarks_export" = "Export all Favorites"; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 04cd96cd6..f2a8d9e85 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -21,6 +21,17 @@ 272F1F462E0EEF9400FA52EF /* SafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F452E0EEF8B00FA52EF /* SafariView.swift */; }; 2752B6CA2E31197500887CC4 /* MapLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2752B6C92E31197000887CC4 /* MapLanguage.swift */; }; 2752B6CE2E3121D900887CC4 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2752B6CD2E3121D800887CC4 /* Language.swift */; }; + 276581802F1E57CB002478CD /* drules_proto_hiking_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 2765817C2F1E57CB002478CD /* drules_proto_hiking_dark.bin */; }; + 276581812F1E57CB002478CD /* drules_proto_cycling_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 276581792F1E57CB002478CD /* drules_proto_cycling_light.bin */; }; + 276581822F1E57CB002478CD /* drules_proto_driving_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 2765817A2F1E57CB002478CD /* drules_proto_driving_dark.bin */; }; + 276581832F1E57CB002478CD /* drules_proto_hiking_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 2765817D2F1E57CB002478CD /* drules_proto_hiking_light.bin */; }; + 276581842F1E57CB002478CD /* drules_proto_publictransport_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 2765817E2F1E57CB002478CD /* drules_proto_publictransport_dark.bin */; }; + 276581852F1E57CB002478CD /* drules_proto_cycling_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 276581782F1E57CB002478CD /* drules_proto_cycling_dark.bin */; }; + 276581862F1E57CB002478CD /* drules_proto_driving_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 2765817B2F1E57CB002478CD /* drules_proto_driving_light.bin */; }; + 276581872F1E57CB002478CD /* drules_proto_publictransport_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 2765817F2F1E57CB002478CD /* drules_proto_publictransport_light.bin */; }; + 2765818B2F1E67BB002478CD /* ModeSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2765818A2F1E67B1002478CD /* ModeSelector.swift */; }; + 2765818D2F1E7EDC002478CD /* ModeSelectorButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2765818C2F1E7ED7002478CD /* ModeSelectorButton.swift */; }; + 2765818F2F1E7F53002478CD /* MapMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2765818E2F1E7F50002478CD /* MapMode.swift */; }; 2765D1D02E13F9C20005CA2B /* BridgeControllers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2765D1CD2E13F9BC0005CA2B /* BridgeControllers.swift */; }; 27697F742E25177600FBD913 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F732E25177300FBD913 /* AboutView.swift */; }; 27697F7F2E254A5500FBD913 /* CopyrightView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27697F7C2E254A5000FBD913 /* CopyrightView.swift */; }; @@ -94,8 +105,8 @@ 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 */; }; + 3463BA671DE81DB90082417F /* MWMModeButtonViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3463BA641DE81DB90082417F /* MWMModeButtonViewController.mm */; }; + 3463BA691DE81DB90082417F /* MWMModeButtonViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3463BA651DE81DB90082417F /* MWMModeButtonViewController.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 */; }; @@ -202,7 +213,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 */; }; 408645FC21495EB1000A4A1D /* categories_cuisines.txt in Resources */ = {isa = PBXBuildFile; fileRef = 408645FB21495EB1000A4A1D /* categories_cuisines.txt */; }; 44360A0D2A7D34990016F412 /* TransportRuler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44360A0C2A7D34990016F412 /* TransportRuler.swift */; }; @@ -391,8 +402,6 @@ 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 */; }; @@ -626,10 +635,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 */; }; @@ -772,6 +777,17 @@ 272F1F452E0EEF8B00FA52EF /* SafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariView.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 = ""; }; + 276581782F1E57CB002478CD /* drules_proto_cycling_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_cycling_dark.bin; path = ../../data/drules_proto_cycling_dark.bin; sourceTree = ""; }; + 276581792F1E57CB002478CD /* drules_proto_cycling_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_cycling_light.bin; path = ../../data/drules_proto_cycling_light.bin; sourceTree = ""; }; + 2765817A2F1E57CB002478CD /* drules_proto_driving_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_driving_dark.bin; path = ../../data/drules_proto_driving_dark.bin; sourceTree = ""; }; + 2765817B2F1E57CB002478CD /* drules_proto_driving_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_driving_light.bin; path = ../../data/drules_proto_driving_light.bin; sourceTree = ""; }; + 2765817C2F1E57CB002478CD /* drules_proto_hiking_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_hiking_dark.bin; path = ../../data/drules_proto_hiking_dark.bin; sourceTree = ""; }; + 2765817D2F1E57CB002478CD /* drules_proto_hiking_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_hiking_light.bin; path = ../../data/drules_proto_hiking_light.bin; sourceTree = ""; }; + 2765817E2F1E57CB002478CD /* drules_proto_publictransport_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_publictransport_dark.bin; path = ../../data/drules_proto_publictransport_dark.bin; sourceTree = ""; }; + 2765817F2F1E57CB002478CD /* drules_proto_publictransport_light.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_publictransport_light.bin; path = ../../data/drules_proto_publictransport_light.bin; sourceTree = ""; }; + 2765818A2F1E67B1002478CD /* ModeSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModeSelector.swift; sourceTree = ""; }; + 2765818C2F1E7ED7002478CD /* ModeSelectorButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModeSelectorButton.swift; sourceTree = ""; }; + 2765818E2F1E7F50002478CD /* MapMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapMode.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 = ""; }; 27697F7C2E254A5000FBD913 /* CopyrightView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyrightView.swift; sourceTree = ""; }; @@ -890,9 +906,9 @@ 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 = ""; }; + 3463BA631DE81DB90082417F /* MWMModeButtonViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = MWMModeButtonViewController.h; sourceTree = ""; tabWidth = 2; }; + 3463BA641DE81DB90082417F /* MWMModeButtonViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMModeButtonViewController.mm; sourceTree = ""; tabWidth = 2; }; + 3463BA651DE81DB90082417F /* MWMModeButtonViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMModeButtonViewController.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 = ""; }; @@ -1110,7 +1126,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; }; 408645FB21495EB1000A4A1D /* categories_cuisines.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = categories_cuisines.txt; path = ../../data/categories_cuisines.txt; sourceTree = ""; }; @@ -1289,8 +1305,6 @@ 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 = ""; }; @@ -1710,10 +1724,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; }; @@ -1929,10 +1939,28 @@ 27AF185B2E1DB64B00CD41E2 /* Settings Types */, 270C9C252E16AB6300ABA688 /* Profile.swift */, EDFDFB472B7139670013A44C /* Social Media.swift */, + 2765818E2F1E7F50002478CD /* MapMode.swift */, ); path = Model; sourceTree = ""; }; + 276581892F1E679B002478CD /* Menus */ = { + isa = PBXGroup; + children = ( + 276581AA2F1FA9E1002478CD /* Mode */, + ); + path = Menus; + sourceTree = ""; + }; + 276581AA2F1FA9E1002478CD /* Mode */ = { + isa = PBXGroup; + children = ( + 2765818A2F1E67B1002478CD /* ModeSelector.swift */, + 2765818C2F1E7ED7002478CD /* ModeSelectorButton.swift */, + ); + path = Mode; + sourceTree = ""; + }; 27697F882E255D3F00FBD913 /* Help */ = { isa = PBXGroup; children = ( @@ -2366,14 +2394,14 @@ path = SideButtons; sourceTree = ""; }; - 3463BA621DE81D760082417F /* TrafficButton */ = { + 3463BA621DE81D760082417F /* ModeButton */ = { isa = PBXGroup; children = ( - 3463BA631DE81DB90082417F /* MWMTrafficButtonViewController.h */, - 3463BA641DE81DB90082417F /* MWMTrafficButtonViewController.mm */, - 3463BA651DE81DB90082417F /* MWMTrafficButtonViewController.xib */, + 3463BA631DE81DB90082417F /* MWMModeButtonViewController.h */, + 3463BA641DE81DB90082417F /* MWMModeButtonViewController.mm */, + 3463BA651DE81DB90082417F /* MWMModeButtonViewController.xib */, ); - path = TrafficButton; + path = ModeButton; sourceTree = ""; }; 3467CEB3202C6F7F00D3C670 /* Notifications */ = { @@ -2621,7 +2649,7 @@ 34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */, 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */, 345C34661CE9D32500BB2224 /* SideButtons */, - 3463BA621DE81D760082417F /* TrafficButton */, + 3463BA621DE81D760082417F /* ModeButton */, ); name = MapViewControls; path = CustomViews/MapViewControls; @@ -2672,7 +2700,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 */, @@ -3027,8 +3055,6 @@ children = ( 349D1AC61E2E325B004A2006 /* BottomMenuItemCell.xib */, 9989273F2449ECC200260CE2 /* BottomMenuItemCell.swift */, - 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */, - 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */, 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */, ); path = Cells; @@ -3587,6 +3613,7 @@ F6E2FBFB1E097B9F0083EBEC /* UI */ = { isa = PBXGroup; children = ( + 276581892F1E679B002478CD /* Menus */, 27768FDA2E20199A0086784A /* Routing */, ED9857022C4ECFFC00694F6C /* MailComposer */, ED43B8B92C12061600D07BAA /* DocumentPicker */, @@ -3943,10 +3970,14 @@ FA46DA2B12D4166E00968C36 /* countries.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 */, + 2765817C2F1E57CB002478CD /* drules_proto_hiking_dark.bin */, + 2765817D2F1E57CB002478CD /* drules_proto_hiking_light.bin */, + 276581792F1E57CB002478CD /* drules_proto_cycling_light.bin */, + 276581782F1E57CB002478CD /* drules_proto_cycling_dark.bin */, + 2765817B2F1E57CB002478CD /* drules_proto_driving_light.bin */, + 2765817A2F1E57CB002478CD /* drules_proto_driving_dark.bin */, + 2765817F2F1E57CB002478CD /* drules_proto_publictransport_light.bin */, + 2765817E2F1E57CB002478CD /* drules_proto_publictransport_dark.bin */, 4554B6E81E55F02B0084017F /* drules_proto_vehicle_light.bin */, 4554B6E91E55F02B0084017F /* drules_proto_vehicle_dark.bin */, 6B9978341C89A316003B8AA0 /* editor.config */, @@ -4184,7 +4215,6 @@ 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 */, @@ -4224,6 +4254,14 @@ 6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */, 6741A9511BF340DE002C974C /* MWMDownloaderDialogHeader.xib in Resources */, 6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */, + 276581802F1E57CB002478CD /* drules_proto_hiking_dark.bin in Resources */, + 276581812F1E57CB002478CD /* drules_proto_cycling_light.bin in Resources */, + 276581822F1E57CB002478CD /* drules_proto_driving_dark.bin in Resources */, + 276581832F1E57CB002478CD /* drules_proto_hiking_light.bin in Resources */, + 276581842F1E57CB002478CD /* drules_proto_publictransport_dark.bin in Resources */, + 276581852F1E57CB002478CD /* drules_proto_cycling_dark.bin in Resources */, + 276581862F1E57CB002478CD /* drules_proto_driving_light.bin in Resources */, + 276581872F1E57CB002478CD /* drules_proto_publictransport_light.bin in Resources */, 34D3B0241E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.xib in Resources */, 34D3B0271E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.xib in Resources */, F6E2FDB91E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.xib in Resources */, @@ -4242,10 +4280,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 */, @@ -4254,7 +4290,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 */, @@ -4286,12 +4321,11 @@ 3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */, 272CA4492F127221005A3F5B /* subtypes.csv in Resources */, F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */, - 3463BA691DE81DB90082417F /* MWMTrafficButtonViewController.xib in Resources */, + 3463BA691DE81DB90082417F /* MWMModeButtonViewController.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 */, @@ -4484,7 +4518,7 @@ 99A906E923F6F7030005872B /* WikiDescriptionViewController.swift in Sources */, ED79A5D62BDF8D6100952D1F /* CloudDirectoryMonitor.swift in Sources */, 993DF11023F6BDB100AC231A /* MWMButtonRenderer.swift in Sources */, - 3463BA671DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */, + 3463BA671DE81DB90082417F /* MWMModeButtonViewController.mm in Sources */, ED79A5D52BDF8D6100952D1F /* SynchronizationError.swift in Sources */, 993DF10323F6BDB100AC231A /* MainTheme.swift in Sources */, EDC4E34D2C5D1BEF009286A2 /* RecentlyDeletedTableViewCell.swift in Sources */, @@ -4533,6 +4567,7 @@ EDB71E002D8B0338004A6A7F /* ModalPresentationAnimator.swift in Sources */, F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */, 34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.m in Sources */, + 2765818F2F1E7F53002478CD /* MapMode.swift in Sources */, 990128562449A82500C72B10 /* BottomTabBarView.swift in Sources */, F6E2FD711E097BA00083EBEC /* MWMMapDownloaderTableViewCell.m in Sources */, F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.m in Sources */, @@ -4628,6 +4663,7 @@ 34E776331F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */, 462452E92BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm in Sources */, 993DF12D23F6BDB100AC231A /* GlobalStyleSheet.swift in Sources */, + 2765818D2F1E7EDC002478CD /* ModeSelectorButton.swift in Sources */, F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */, 27697F742E25177600FBD913 /* AboutView.swift in Sources */, 3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */, @@ -4651,6 +4687,7 @@ 2765D1D02E13F9C20005CA2B /* BridgeControllers.swift in Sources */, 99A906E123F6F7030005872B /* PlacePageButtonsViewController.swift in Sources */, 998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */, + 2765818B2F1E67BB002478CD /* ModeSelector.swift in Sources */, 27697F832E254AA100FBD913 /* EmbeddedSafariView.swift in Sources */, F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */, F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.m in Sources */, @@ -4658,7 +4695,7 @@ 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 */, 2793675A2E1BE17300AA5C3D /* SettingsView.swift in Sources */, @@ -4792,7 +4829,6 @@ 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 */, diff --git a/iphone/Maps/Model/MapMode.swift b/iphone/Maps/Model/MapMode.swift new file mode 100644 index 000000000..5ea6d6f92 --- /dev/null +++ b/iphone/Maps/Model/MapMode.swift @@ -0,0 +1,84 @@ +import SwiftUI + +extension MapMode { + /// The description text + var description: String { + switch self { + case .default: + return String(localized: "mapmode_default") + case .hiking: + return String(localized: "mapmode_hiking") + case .cycling: + return String(localized: "mapmode_cycling") + case .driving: + return String(localized: "mapmode_driving") + case .publicTransport: + return String(localized: "mapmode_publictransport") + @unknown default: + fatalError() + } + } + + + /// The color + var color: Color { + switch self { + case .default: + return .ModeColors.default + case .hiking: + return .ModeColors.hiking + case .cycling: + return .ModeColors.cycling + case .driving: + return .ModeColors.driving + case .publicTransport: + return .ModeColors.publicTransport + @unknown default: + fatalError() + } + } + + + /// The color + var borderColor: Color { + switch self { + case .default: + return .ModeColors.defaultBorder + case .hiking: + return .ModeColors.hikingBorder + case .cycling: + return .ModeColors.cyclingBorder + case .driving: + return .ModeColors.drivingBorder + case .publicTransport: + return .ModeColors.publicTransportBorder + @unknown default: + fatalError() + } + } + + + /// The image + var image: Image { + return Image(imageName) + } + + + /// The image name + var imageName: String { + switch self { + case .default: + return "map" + case .hiking: + return "hiking" + case .cycling: + return "cycling" + case .driving: + return "driving" + case .publicTransport: + return "publictransport" + @unknown default: + fatalError() + } + } +} diff --git a/iphone/Maps/UI/AvailableArea/ModeButtonArea.swift b/iphone/Maps/UI/AvailableArea/ModeButtonArea.swift new file mode 100644 index 000000000..a54b73069 --- /dev/null +++ b/iphone/Maps/UI/AvailableArea/ModeButtonArea.swift @@ -0,0 +1,21 @@ +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) + } + + override func notifyObserver() { + MWMModeButtonViewController.updateAvailableArea(areaFrame) + } +} + +extension UIView { + @objc var modeButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return [] } + + var modeButtonAreaAffectView: UIView { return self } +} 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/BottomMenu/Menu/BottomMenuPresenter.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift index 9fdcc3879..8e99c2331 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift @@ -101,11 +101,15 @@ extension BottomMenuPresenter { 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) - } + let cell = tableView.dequeueReusableCell(withIdentifier: "ModeSelector", for: indexPath) as! BridgeCell + cell.set(content: ModeSelector { + UIView.performWithoutAnimation { + tableView.reloadData() + tableView.invalidateIntrinsicContentSize() + } + } closeAction: { + [weak self] in self?.onClosePressed() + }, parentController: view as! BottomMenuViewController) return cell case .items: let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)! diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift index a13a32122..0dd49add8 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift @@ -31,7 +31,7 @@ class BottomMenuViewController: MWMViewController { tableView.dataSource = presenter tableView.delegate = presenter tableView.registerNib(cell: BottomMenuItemCell.self) - tableView.registerNib(cell: BottomMenuLayersCell.self) + tableView.register(BridgeCell.self, forCellReuseIdentifier: "ModeSelector") NotificationCenter.default.addObserver(forName: UserDefaults.didChangeNotification, object: nil, queue: nil) { _ in DispatchQueue.main.async { 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/Menus/Mode/ModeSelector.swift b/iphone/Maps/UI/Menus/Mode/ModeSelector.swift new file mode 100644 index 000000000..40224fea4 --- /dev/null +++ b/iphone/Maps/UI/Menus/Mode/ModeSelector.swift @@ -0,0 +1,165 @@ +import SwiftUI + +/// View for the modes +struct ModeSelector: View { + // MARK: Properties + + /// If toll roads should be avoided during routing + @State private var selectedMode: MapMode = .default + + + /// If toll roads should be avoided during routing + @State private var hasContourLines: Bool = false + + + /// If toll roads should be avoided during routing + @State private var hasContourLinesForHiking: Bool = false + + + /// If toll roads should be avoided during routing + @State private var hasContourLinesForCycling: Bool = false + + + /// If toll roads should be avoided during routing + @State private var hasTrafficForDriving: Bool = false + + + /// If toll roads should be avoided during routing + @State private var hasTransitLinesForPublicTransport: Bool = false + + /// If toll roads should be avoided during routing + var layoutAction: () -> Void + + var closeAction: () -> Void + + + /// The actual view + var body: some View { + VStack { + HStack { + Text("mapmode") + .font(.title3) + .bold() + + Spacer() + + Button { + closeAction() + } label: { + Label("close", systemImage: "xmark.circle.fill") + .labelStyle(.iconOnly) + .imageScale(.large) + .tint(.primary) + .opacity(0.3) + } + } + + VStack(spacing: 0) { + HStack { + ModeSelectorButton(mode: .default, selectedMode: $selectedMode) + + ModeSelectorButton(mode: .hiking, selectedMode: $selectedMode) + + ModeSelectorButton(mode: .cycling, selectedMode: $selectedMode) + + ModeSelectorButton(mode: .driving, selectedMode: $selectedMode) + + ModeSelectorButton(mode: .publicTransport, selectedMode: $selectedMode) + } + + VStack(spacing: 0) { + Group { + if selectedMode == .hiking { + Toggle("mapmode_option_contourlines", isOn: $hasContourLinesForHiking) + } else if selectedMode == .cycling { + Toggle("mapmode_option_contourlines", isOn: $hasContourLinesForCycling) + } else if selectedMode == .driving { + //Toggle("mapmode_option_traffic", isOn: $hasTrafficForDriving) + Text("Coming Soon") + .frame(maxWidth: .infinity, alignment: .leading) + } else if selectedMode == .publicTransport { + Toggle("mapmode_option_transitlines", isOn: $hasTransitLinesForPublicTransport) + } else { + Toggle("mapmode_option_contourlines", isOn: $hasContourLines) + } + } + .tint(selectedMode.borderColor) + .font(.body) + .padding(.vertical, 12) + .padding(.horizontal, 16) + } + .background(alignment: .top) { + ZStack(alignment: .top) { + HStack(alignment: .top) { + if selectedMode == .default { + selectedMode.borderColor + .frame(height: 4) + } + + Color.clear + + if selectedMode == .publicTransport { + selectedMode.borderColor + .frame(height: 4) + } + } + + HStack(alignment: .top) { + if selectedMode == .default { + selectedMode.borderColor + .frame(width: 4, height: 8) + } + + Color.clear + + if selectedMode == .publicTransport { + selectedMode.borderColor + .frame(width: 4, height: 8) + } + } + + RoundedRectangle(cornerRadius: 8).stroke(lineWidth: 8).foregroundColor(selectedMode.borderColor) + .clipShape(RoundedRectangle(cornerRadius: 8)) + } + .compositingGroup() + } + } + } + .padding([.top, .leading, .trailing]) + .onAppear { + selectedMode = MapOverlayManager.mapMode() + hasContourLines = MapOverlayManager.defaultMapModeHasContourLines() + hasContourLinesForHiking = MapOverlayManager.hikingMapModeHasContourLines() + hasContourLinesForCycling = MapOverlayManager.cyclingMapModeHasContourLines() + hasTrafficForDriving = MapOverlayManager.drivingMapModeHasTraffic() + hasTransitLinesForPublicTransport = MapOverlayManager.publicTransportMapModeHasTransitLines() + } + .onChange(of: selectedMode) { changedMode in + selectedMode = changedMode + MapOverlayManager.setMapMode(changedMode) + layoutAction() + } + .onChange(of: hasContourLines) { changedHasContourLines in + hasContourLines = changedHasContourLines + MapOverlayManager.defaultMapModeSetContourLines(changedHasContourLines) + } + .onChange(of: hasContourLinesForHiking) { changedHasContourLinesForHiking in + hasContourLinesForHiking = changedHasContourLinesForHiking + MapOverlayManager.hikingMapModeSetContourLines(changedHasContourLinesForHiking) + } + .onChange(of: hasContourLinesForCycling) { changedHasContourLinesForCycling in + hasContourLinesForCycling = changedHasContourLinesForCycling + MapOverlayManager.cyclingMapModeSetContourLines(changedHasContourLinesForCycling) + } + .onChange(of: hasTrafficForDriving) { changedHasTrafficForDriving in + hasTrafficForDriving = changedHasTrafficForDriving + MapOverlayManager.drivingMapModeSetTraffic(changedHasTrafficForDriving) + } + .onChange(of: hasTransitLinesForPublicTransport) { changedHasTransitLinesForPublicTransport in + hasTransitLinesForPublicTransport = changedHasTransitLinesForPublicTransport + MapOverlayManager.publicTransportMapModeSetTransitLines(changedHasTransitLinesForPublicTransport) + } + .accentColor(.toolbarAccent) + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} diff --git a/iphone/Maps/UI/Menus/Mode/ModeSelectorButton.swift b/iphone/Maps/UI/Menus/Mode/ModeSelectorButton.swift new file mode 100644 index 000000000..6b2b1df70 --- /dev/null +++ b/iphone/Maps/UI/Menus/Mode/ModeSelectorButton.swift @@ -0,0 +1,60 @@ +import SwiftUI + +/// View for the modes +struct ModeSelectorButton: View { + // MARK: Properties + + + /// If toll roads should be avoided during routing + @State var mode: MapMode + + /// If toll roads should be avoided during routing + @Binding var selectedMode: MapMode + + + /// The actual view + var body: some View { + ZStack { + VStack(spacing: 0) { + ZStack { + mode.borderColor + .padding(.top, 16) + .padding(.bottom, selectedMode == mode ? 0 : 24) + + mode.borderColor + .clipShape(RoundedRectangle(cornerRadius: 8)) + } + .padding(.bottom, selectedMode == mode ? 0 : 8) + } + .compositingGroup() + + Button { + selectedMode = mode + } label: { + Label { + Text(mode.description) + } icon: { + mode.color + .aspectRatio(1, contentMode: .fill) + .overlay { + ZStack { + RoundedRectangle(cornerRadius: 8).stroke(lineWidth: selectedMode == mode ? 8 : 2).foregroundColor(mode.borderColor) + + mode.image + .resizable() + .aspectRatio(contentMode: .fit) + .padding(12) + .foregroundStyle(.white) + } + } + .clipShape(RoundedRectangle(cornerRadius: 8)) + .compositingGroup() + .padding(.bottom, 8) + } + .labelStyle(.iconOnly) + .animation(nil, value: selectedMode) + } + } + .clipped() + } +} diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm index 484c99e9f..cd8cd68ec 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm @@ -45,8 +45,14 @@ using namespace storage; [MWMSearch clear]; [[[MapViewController sharedController] searchManager] close]; - if ([MWMMapOverlayManager transitEnabled]) { + if ([MWMMapOverlayManager mapMode] == MWMMapModePublicTransport) { [MWMRouter setType:MWMRouterTypePublicTransport]; + } else if ([MWMMapOverlayManager mapMode] == MWMMapModeDriving) { + [MWMRouter setType:MWMRouterTypeVehicle]; + } else if ([MWMMapOverlayManager mapMode] == MWMMapModeCycling) { + [MWMRouter setType:MWMRouterTypeBicycle]; + } else if ([MWMMapOverlayManager mapMode] == MWMMapModeHiking) { + [MWMRouter setType:MWMRouterTypePedestrian]; } MWMRoutePoint *point = [self routePoint:data withType:MWMRoutePointTypeFinish intermediateIndex:0]; 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/SearchOnMapViewController.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift index ff223501a..350c17ac4 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) } } diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard index e3c2b9a5a..c97d122c2 100644 --- a/iphone/Maps/UI/Storyboard/Main.storyboard +++ b/iphone/Maps/UI/Storyboard/Main.storyboard @@ -83,7 +83,7 @@ -