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 fd9d81489..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_dark.imageset/btn_isoMap_on_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/Contents.json deleted file mode 100644 index 9002a87f3..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_isoMap_on_highlighted_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/btn_isoMap_on_highlighted_dark.pdf b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/btn_isoMap_on_highlighted_dark.pdf deleted file mode 100644 index 30c9fbb59..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_dark.imageset/btn_isoMap_on_highlighted_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/Contents.json deleted file mode 100644 index 606912c62..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_isoMap_on_highlighted_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/btn_isoMap_on_highlighted_light.pdf b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/btn_isoMap_on_highlighted_light.pdf deleted file mode 100644 index 7e07c5c84..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_highlighted_light.imageset/btn_isoMap_on_highlighted_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/Contents.json deleted file mode 100644 index d8aa72c11..000000000 --- a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_isoMap_on_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/btn_isoMap_on_light.pdf b/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/btn_isoMap_on_light.pdf deleted file mode 100644 index db501a2e2..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/IsoLines/btn_isoMap_on_light.imageset/btn_isoMap_on_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/guides_default.pdf b/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/guides_default.pdf deleted file mode 100644 index 05586fa7c..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Menu/btn_menu_guides.imageset/guides_default.pdf +++ /dev/null @@ -1,446 +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 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 e97ff8e45..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_dark.imageset/btn_subway_on_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/Contents.json deleted file mode 100644 index e534edfc2..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_subway_on_highlighted_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/btn_subway_on_highlighted_dark.pdf b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/btn_subway_on_highlighted_dark.pdf deleted file mode 100644 index 78fed7434..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_dark.imageset/btn_subway_on_highlighted_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/Contents.json deleted file mode 100644 index 236598c31..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_subway_on_highlighted_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/btn_subway_on_highlighted_light.pdf b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/btn_subway_on_highlighted_light.pdf deleted file mode 100644 index 96837c9d5..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_highlighted_light.imageset/btn_subway_on_highlighted_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/Contents.json deleted file mode 100644 index ad690c8a7..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_subway_on_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/btn_subway_on_light.pdf b/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/btn_subway_on_light.pdf deleted file mode 100644 index 0efeae5c8..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Subway/btn_subway_on_light.imageset/btn_subway_on_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark.png deleted file mode 100644 index f99a2955f..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@2x.png deleted file mode 100644 index 4819ab6c0..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@3x.png deleted file mode 100644 index 0e83883b9..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/btn_traffic_on_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/Contents.json deleted file mode 100644 index 13cc4fdf7..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highdarked_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highdarked_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highdarked_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark.png deleted file mode 100644 index 84d9b74fb..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@2x.png deleted file mode 100644 index 5fd8d594e..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@3x.png deleted file mode 100644 index 68593e5bd..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_dark.imageset/btn_traffic_on_highdarked_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/Contents.json deleted file mode 100644 index 8ef97ce1a..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highlighted_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highlighted_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_on_highlighted_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light.png deleted file mode 100644 index 434d701d8..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@2x.png deleted file mode 100644 index 0b4169d0e..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@3x.png deleted file mode 100644 index b42cc49dc..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_highlighted_light.imageset/btn_traffic_on_highlighted_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light.png deleted file mode 100644 index 83f5e4e65..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@2x.png deleted file mode 100644 index 02c7e37cb..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@3x.png deleted file mode 100644 index 96b416c63..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/btn_traffic_on_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/Contents.json deleted file mode 100644 index 374ddef47..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark.png deleted file mode 100644 index 30d0cd817..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@2x.png deleted file mode 100644 index d73af0251..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@3x.png deleted file mode 100644 index 4757ee879..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_dark.imageset/btn_traffic_outdated_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/Contents.json deleted file mode 100644 index efa4725ba..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highdarked_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highdarked_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highdarked_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark.png deleted file mode 100644 index c90e58328..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@2x.png deleted file mode 100644 index 0b3a086dd..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@3x.png deleted file mode 100644 index 08ac81ee7..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_dark.imageset/btn_traffic_outdated_highdarked_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/Contents.json deleted file mode 100644 index a7fa6310d..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highlighted_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highlighted_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_highlighted_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light.png deleted file mode 100644 index 8482dac0c..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@2x.png deleted file mode 100644 index c1851c117..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@3x.png deleted file mode 100644 index 45edfd50f..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_highlighted_light.imageset/btn_traffic_outdated_highlighted_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/Contents.json deleted file mode 100644 index 473609383..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_outdated_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light.png deleted file mode 100644 index c2c8f269a..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@2x.png deleted file mode 100644 index f36b17a43..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@3x.png deleted file mode 100644 index d6d26905e..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_outdated_light.imageset/btn_traffic_outdated_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/Contents.json deleted file mode 100644 index 23c99bb15..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_1.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_1@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_1@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1.png deleted file mode 100644 index 7e6e040ff..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@2x.png deleted file mode 100644 index ec58b09e7..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@3x.png deleted file mode 100644 index e263d0cf9..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_1.imageset/btn_traffic_update_dark_1@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/Contents.json deleted file mode 100644 index bb2d9fac6..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_2.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_2@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_2@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2.png deleted file mode 100644 index 395f04184..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@2x.png deleted file mode 100644 index bd7a694d4..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@3x.png deleted file mode 100644 index ffbcd4585..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_2.imageset/btn_traffic_update_dark_2@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/Contents.json deleted file mode 100644 index 6b6b68b0c..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_3.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_3@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_dark_3@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3.png deleted file mode 100644 index 482730866..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@2x.png deleted file mode 100644 index 26868d0d4..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@3x.png deleted file mode 100644 index 17a360872..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_dark_3.imageset/btn_traffic_update_dark_3@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/Contents.json deleted file mode 100644 index 86654d291..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_1.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_1@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_1@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1.png deleted file mode 100644 index 7fe9f8634..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@2x.png deleted file mode 100644 index eea2a352b..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@3x.png deleted file mode 100644 index d5b50a0a5..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_1.imageset/btn_traffic_update_light_1@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/Contents.json deleted file mode 100644 index 06ba0b43d..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_2.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_2@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_2@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2.png deleted file mode 100644 index d2811b3de..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@2x.png deleted file mode 100644 index 9129e459b..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@3x.png deleted file mode 100644 index a00b5dc93..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_2.imageset/btn_traffic_update_light_2@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/Contents.json deleted file mode 100644 index 1d94d01d0..000000000 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_3.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_3@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "btn_traffic_update_light_3@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3.png deleted file mode 100644 index b1b0a1d4c..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@2x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@2x.png deleted file mode 100644 index 56d12b051..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@3x.png b/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@3x.png deleted file mode 100644 index b21706482..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_update_light_3.imageset/btn_traffic_update_light_3@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/Contents.json similarity index 65% rename from iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/Contents.json index 34383a88c..a226cbfd6 100644 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_dark.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_traffic_on_dark.png", + "filename" : "btn_bg_dark.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_dark@2x.png", + "filename" : "btn_bg_dark@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_dark@3x.png", + "filename" : "btn_bg_dark@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark.png new file mode 100644 index 000000000..09d221d50 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@2x.png new file mode 100644 index 000000000..06e1c44ee Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@3x.png new file mode 100644 index 000000000..6d4f856e6 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_dark.imageset/btn_bg_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/Contents.json similarity index 63% rename from iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/Contents.json index 7011bd6cb..17efe56c9 100644 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_guides_off_light.png", + "filename" : "btn_bg_highlighted_dark.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_light@2x.png", + "filename" : "btn_bg_highlighted_dark@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_guides_off_light@3x.png", + "filename" : "btn_bg_highlighted_dark@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark.png new file mode 100644 index 000000000..55d1c528f Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@2x.png new file mode 100644 index 000000000..2afebae3c Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@3x.png new file mode 100644 index 000000000..5df74ca01 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_dark.imageset/btn_bg_highlighted_dark@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/Contents.json similarity index 62% rename from iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/Contents.json rename to iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/Contents.json index 9ee20b8fc..f803618c4 100644 --- a/iphone/Maps/Images.xcassets/Layers/Traffic/btn_traffic_on_light.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "btn_traffic_on_light.png", + "filename" : "btn_bg_highlighted_light.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_light@2x.png", + "filename" : "btn_bg_highlighted_light@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "btn_traffic_on_light@3x.png", + "filename" : "btn_bg_highlighted_light@3x.png", "scale" : "3x" } ], diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light.png new file mode 100644 index 000000000..fd4a3d7a8 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@2x.png new file mode 100644 index 000000000..b2c2e153f Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@3x.png new file mode 100644 index 000000000..6ebc332fe Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_highlighted_light.imageset/btn_bg_highlighted_light@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/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 000000000..2e67b722b Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@2x.png new file mode 100644 index 000000000..6307550e3 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@3x.png new file mode 100644 index 000000000..ff3765d9f Binary files /dev/null and b/iphone/Maps/Images.xcassets/Layers/btn_bg_light.imageset/btn_bg_light@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/Contents.json deleted file mode 100644 index 8db999d9f..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/btn_layers_dark.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/btn_layers_dark.pdf deleted file mode 100644 index b4ff5eb01..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_dark.imageset/btn_layers_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/Contents.json deleted file mode 100644 index 76034bfcd..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_highdarked_dark.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/btn_layers_highdarked_dark.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/btn_layers_highdarked_dark.pdf deleted file mode 100644 index 98def3a12..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_dark.imageset/btn_layers_highdarked_dark.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/Contents.json deleted file mode 100644 index 032e4d735..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_highlighted_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/btn_layers_highlighted_light.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/btn_layers_highlighted_light.pdf deleted file mode 100644 index e64e1bd99..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_highlighted_light.imageset/btn_layers_highlighted_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/Contents.json deleted file mode 100644 index 42290ee19..000000000 --- a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "btn_layers_light.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/btn_layers_light.pdf b/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/btn_layers_light.pdf deleted file mode 100644 index 1cc9dea70..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_light.imageset/btn_layers_light.pdf and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark.png deleted file mode 100644 index 512ecc99d..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@2x.png deleted file mode 100644 index 97bc8f954..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@3x.png deleted file mode 100644 index f28145801..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_dark.imageset/btn_guides_off_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light.png deleted file mode 100644 index c39094bce..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@2x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@2x.png deleted file mode 100644 index 1cca1196a..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@3x.png b/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@3x.png deleted file mode 100644 index 908c646af..000000000 Binary files a/iphone/Maps/Images.xcassets/Layers/btn_layers_off_light.imageset/btn_guides_off_light@3x.png and /dev/null differ diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 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 @@ -