Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Viktor Govako
1fc899fa85 [planet] New outdoor data from 231006.
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
2023-10-09 00:23:16 -03:00
a5d3389259 [android] Symlink outdoors map style files into assets
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-06 17:51:51 +03:00
f15b78fe6a [ios] Add outdoors style files
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-06 17:51:51 +03:00
f1bf6e0e06 [styles] Regenerate for outdoors style
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-06 17:51:47 +03:00
247a8bace2 [styles] Rebase and tune outdoors style
- integrated latest main style changes (railway types, isolines, etc.)
- made tracks/paths/railways thinner
- increased visibility of cliffs, highway=service
- more visible national parks, viewpoints, alpine_hut icons
- standardized font sizes for outdoors POIs
- reduced visibility of nameless peaks
- reduced visibilities of some POI labels
- reduced natural=spring visibility to z12-
- made isolines less thick compared to tracks/paths
- increased rivers and streams visibility

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-06 17:49:37 +03:00
9465ae471c [styles] Clone main style priorities files to the outdoors style
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-06 17:49:29 +03:00
8f5e85ac80 [styles] Add outdoors map style
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-06 17:48:41 +03:00
127c0aa8cc [core] Add outdoors map style support
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2023-10-06 17:48:41 +03:00
36 changed files with 229388 additions and 2316 deletions

View file

@ -0,0 +1 @@
../../../../../data/drules_proto_outdoors_clear.bin

View file

@ -0,0 +1 @@
../../../../../data/drules_proto_outdoors_dark.bin

View file

@ -12,6 +12,8 @@ cp ../data/drules_proto_dark.bin assets/
cp ../data/drules_proto_clear.bin assets/
cp ../data/drules_proto_vehicle_dark.bin assets/
cp ../data/drules_proto_vehicle_clear.bin assets/
cp ../data/drules_proto_outdoors_dark.bin assets/
cp ../data/drules_proto_outdoors_clear.bin assets/
cp ../data/editor.config assets/
cp ../data/faq.html assets/
cp ../data/fonts_blacklist.txt assets/

Binary file not shown.

Binary file not shown.

View file

@ -112,6 +112,7 @@
4285507
4311295
4340748
4408131
4470602
4473924
4495803
@ -171,6 +172,7 @@
7551546
7565931
7566195
7763302
7829367
8000018
8026746
@ -188,6 +190,7 @@
8408320
8421504
8440772
8487025
8505220
8550167
8916559
@ -218,6 +221,7 @@
11112295
11184810
11190117
11250586
11453035
11584112
11710882
@ -286,6 +290,7 @@
16064048
16088855
16118756
16119285
16308697
16311482
16391736
@ -351,7 +356,9 @@
862348902
863203947
863664762
863850275
864585864
864835622
864925824
865871792
868862139
@ -366,6 +373,7 @@
1292964096
1293171732
1293431320
1295201075
1295418140
1295727419
1296319556
@ -377,6 +385,7 @@
1301043238
1301133440
1301433013
1301714310
1304608947
1306780114
1308576652
@ -411,6 +420,7 @@
1931024665
1943327690
2147483648
2148602112
2149391645
2150246954
2152292681
@ -427,6 +437,8 @@
2579945899
2583691263
2787649562
2789826889
2790683990
2801593470
3003121664
3003473869

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -64,6 +64,14 @@
16.0 16.0
2.7 2.7
4.95 4.95
12.0 4.0
6.0 8.5 12.0 2.3
1.0 50.0
8.0 8.0
1.8 5.5
2.5 7.0
5.2 5.2
3.5 3.5
2.0 1.35
2.2 1.26
3.3 1.8

View file

@ -0,0 +1,192 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/include/Basemap.mapcss");
/* 6.WATER */
line|z10-[waterway=river],
line|z10-[waterway=riverbank],
line|z11-[waterway=stream],
line|z11-[waterway=canal],
line|z11-[natural=strait],
line|z13-[waterway=fish_pass],
line|z15-[waterway=ditch],
line|z15-[waterway=drain],
{opacity: 1; color: @river;}
/* 6.2 Line water(river,canal etc.) */
line|z10-[waterway=river],
line|z10-[waterway=riverbank],
line|z11-[natural=strait],
line|z11-[waterway=stream],
line|z11-[waterway=canal],
line|z13-[waterway=fish_pass],
{text-color: @water_label; text-halo-opacity: 0.5; text-halo-radius: 1; text-halo-color: @label_halo_light;}
line|z10[waterway=river],
line|z10[waterway=riverbank],
{width: 1.4;}
line|z11-12[waterway=river],
line|z11-12[waterway=riverbank],
line|z11-12[natural=strait],
{width: 2;}
line|z11-12[waterway=stream],
line|z11-12[waterway=canal],
{width: 1;}
line|z13[waterway=river],
line|z13[waterway=riverbank],
line|z13[natural=strait],
{width: 2.7;}
line|z13[waterway=stream],
line|z13[waterway=canal],
line|z13[waterway=fish_pass],
{width: 1.3;}
line|z11-12[waterway=stream][intermittent],
{width: 0;}
line|z13[waterway=stream][intermittent],
{width: 1; dashes: 2.7,2.7;}
line|z14[waterway=river],
line|z14[waterway=riverbank],
line|z14[natural=strait],
{width: 3.5;}
line|z14[waterway=stream],
line|z14[waterway=canal],
line|z14[waterway=fish_pass],
{width: 1.8;}
line|z14[waterway=stream][intermittent],
{width: 1.4; dashes: 3.5,3.5;}
line|z15-[waterway=river],
line|z15-[waterway=riverbank],
line|z15-[natural=strait],
{width: 4.6;}
line|z15-[waterway=stream],
line|z15-[waterway=canal],
line|z15-[waterway=fish_pass],
{width: 2.4;}
line|z15-[waterway=stream][intermittent],
{width: 2; dashes: 5,5;}
line|z15-[waterway=ditch],
line|z15-[waterway=drain],
{width: 1.6; dashes: 0.9,0.9;}
line|z17-[waterway=ditch],
line|z17-[waterway=drain],
{width: 2;}
/* Do not draw tunnel waterways */
line[waterway][tunnel]
{width: 0;}
/* 8.1 Pier, dam, cutline */
line|z13-[man_made=cutline],
{width: 1.5; color: @green0; opacity: 0.6;}
line|z14[man_made=cutline],
{width: 2;}
line|z15[man_made=cutline],
{width: 3;}
line|z16[man_made=cutline],
{width: 4.5;}
line|z17[man_made=cutline],
{width: 6;}
line|z18-[man_made=cutline],
{width: 8;}
/* 8.3 Barriers, cliffs */
/*
The triangles pattern uses "dashes: " parameter as a 4 values tuple:
dash length (===), triangle base (tb), triangle height, base height / dash width.
===\tb /=== - base height / dash width
\ / | - triangle height
Set width = triangle height + base height.
*/
line|z12-13[natural=cliff],
line|z12-13[natural=earth_bank],
{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.7;}
line|z14[natural=cliff],
line|z14[natural=earth_bank],
{width: 3; dashes: 1.5,1.5; opacity: 0.7;}
line|z15[natural=cliff],
line|z15[natural=earth_bank],
{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.7;}
line|z16[natural=cliff],
line|z16[natural=earth_bank],
{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.7;}
line|z17[natural=cliff],
line|z17[natural=earth_bank],
{width: 9.5; dashes: 4,6,8,1.5; opacity: 0.8;}
line|z18[natural=cliff],
line|z18[natural=earth_bank],
{width: 11.9; dashes: 5,7,10,1.9; opacity: 0.8;}
line|z19-[natural=cliff],
line|z19-[natural=earth_bank],
{width: 14.3; dashes: 6,8.5,12,2.3; opacity: 0.8;}
/* 9. ISOLINES */
line|z10-[isoline=step_1000],
{color: @isoline1000;}
line|z10-[isoline=step_500],
{color: @isoline500;}
line|z12-[isoline=step_100],
{color: @isoline100;}
line|z14-[isoline=step_50],
line|z15-[isoline=zero],
{color: @isoline50;}
line|z15-[isoline=step_10],
{color: @isoline10;}
line|z10-11[isoline=step_1000],
{width: 0.8; opacity: 0.6;}
line|z10-11[isoline=step_500],
{width: 0.8; opacity: 0.35;}
line|z12-13[isoline=step_1000],
{width: 1.0; opacity: 0.6;}
line|z12-13[isoline=step_500],
{width: 0.8; opacity: 0.5;}
line|z12-13[isoline=step_100],
{width: 0.8; opacity: 0.35;}
line|z14-[isoline=step_1000],
{width: 1.2; opacity: 0.8;}
line|z14-15[isoline=step_500],
{width: 1.0; opacity: 0.6;}
line|z14-15[isoline=step_100],
{width: 0.8; opacity: 0.5;}
line|z14-15[isoline=step_50],
{width: 0.8; opacity: 0.35;}
line|z15[isoline=zero],
line|z15[isoline=step_10],
{width: 0.8; opacity: 0.35;}
line|z16-[isoline=step_500],
{width: 1.2; opacity: 0.8;}
line|z16-[isoline=step_100],
{width: 1.0; opacity: 0.6;}
line|z16-17[isoline=step_50],
{width: 0.8; opacity: 0.5;}
line|z16-17[isoline=zero],
line|z16-17[isoline=step_10],
{width: 0.8; opacity: 0.5;}
line|z18-[isoline=step_50],
{width: 1.0; opacity: 0.6;}
line|z18-[isoline=zero],
line|z18-[isoline=step_10],
{width: 0.8; opacity: 0.6;}

View file

@ -0,0 +1,24 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/include/Basemap_label.mapcss");
/* 9. ISOLINES */
line[isoline]
{text-position: line;}
line|z10-[isoline=step_1000],
{text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline1000;}
line|z11-[isoline=step_500],
{text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline500;}
line|z13-[isoline=step_100],
{text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline100;}
line|z15-[isoline=step_50],
line|z15-[isoline=zero],
{text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline50;}
line|z16-[isoline=step_10],
{text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline10;}

View file

@ -0,0 +1,277 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/include/Icons.mapcss");
/* 2. NATURAL */
node|z11-[natural=cave_entrance],
area|z11-[natural=cave_entrance],
node|z11-[waterway=waterfall],
area|z11-[waterway=waterfall],
node|z11-[natural=peak][name],
node|z12-[natural=saddle],
area|z12-[natural=saddle],
node|z12-[mountain_pass],
area|z12-[mountain_pass],
node|z14-[natural=spring],
area|z14-[natural=spring],
node|z14-[amenity=water_point],
area|z14-[amenity=water_point],
node|z14-[amenity=drinking_water],
area|z14-[amenity=drinking_water],
node|z14-[man_made=water_tap],
area|z14-[man_made=water_tap],
node|z14-[man_made=water_well],
area|z14-[man_made=water_well],
node|z15-[natural=hot_spring],
area|z15-[natural=hot_spring],
node|z12-[natural=geyser],
area|z12-[natural=geyser],
node|z14-[natural=beach],
area|z14-[natural=beach],
area|z13-[natural=bare_rock][name],
{text: name;text-color: @poi_label;text-position: center;text-offset: 1;font-size: 10;}
node|z11-[natural=peak][!name],
area|z13-[natural=bare_rock][!name],
{text: none;}
node|z11-[boundary=national_park],
area|z11-[boundary=national_park],
node|z11-[boundary=protected_area],
area|z11-[boundary=protected_area],
node|z11-[leisure=nature_reserve],
area|z11-[leisure=nature_reserve]
{text: name;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;font-size: 10;}
node|z10-12[natural=cave_entrance],
area|z10-12[natural=cave_entrance],
{icon-image: cave-s.svg; icon-min-distance: 20;}
node|z13-[natural=cave_entrance],
area|z13-[natural=cave_entrance],
{icon-image: cave-m.svg; font-size: 11;}
node|z16-[natural=cave_entrance],
area|z16-[natural=cave_entrance],
{font-size: 12;}
node|z10-12[boundary=national_park],
area|z10-12[boundary=national_park],
node|z10-12[boundary=protected_area],
area|z10-12[boundary=protected_area],
node|z10-12[leisure=nature_reserve],
area|z10-12[leisure=nature_reserve]
{icon-image: nparkf-outline-s.svg;icon-min-distance: 20;}
node|z13-[boundary=national_park],
area|z13-[boundary=national_park],
node|z13-[boundary=protected_area],
area|z13-[boundary=protected_area],
node|z13-[leisure=nature_reserve],
area|z13-[leisure=nature_reserve]
{icon-image: nparkf-outline-m.svg;font-size: 11;text-halo-opacity: 0.9;}
node|z17-[boundary=national_park],
area|z17-[boundary=national_park],
node|z17-[boundary=protected_area],
area|z17-[boundary=protected_area],
node|z17-[leisure=nature_reserve],
area|z17-[leisure=nature_reserve]
{font-size: 12;}
node|z10-12[waterway=waterfall],
area|z10-12[waterway=waterfall],
{icon-image: waterfall-s.svg; icon-min-distance: 15;}
node|z13-[waterway=waterfall],
area|z13-[waterway=waterfall],
{icon-image: waterfall-m.svg; font-size: 11;}
node|z16-[waterway=waterfall],
area|z16-[waterway=waterfall],
{font-size: 12;}
node|z10-12[natural=volcano],
area|z10-12[natural=volcano],
{icon-image: volcano-s.svg;}
node|z13-[natural=volcano],
area|z13-[natural=volcano],
{icon-image: volcano-m.svg; font-size: 11;}
node|z16-[natural=volcano],
area|z16-[natural=volcano],
{font-size: 12;}
node|z10-12[natural=peak][name],
{icon-image: peakt-s.svg;icon-min-distance: 10;}
node|z13-[natural=peak][name],
{icon-image: peakt-m.svg;font-size: 11;}
node|z16-[natural=peak][name],
{font-size: 12;}
node|z13-15[natural=peak][!name],
{icon-image: peakt-s.svg;}
node|z16-[natural=peak][!name],
{icon-image: peakt-m.svg;}
/* ToDo: Make the same as natural=peak when we will have -s,-m icons */
node|z11-[natural=saddle],
area|z11-[natural=saddle],
node|z11-[mountain_pass],
area|z11-[mountain_pass],
{icon-image: mountain-pass.svg;}
node|z13-[natural=saddle],
area|z13-[natural=saddle],
node|z13-[mountain_pass],
area|z13-[mountain_pass],
{font-size: 11;}
node|z16-[natural=saddle],
area|z16-[natural=saddle],
node|z16-[mountain_pass],
area|z16-[mountain_pass],
{font-size: 12;}
node|z10-12[natural=geyser],
area|z10-12[natural=geyser],
{icon-image: geyser-s.svg; icon-min-distance: 24;}
node|z13-[natural=geyser],
area|z13-[natural=geyser],
{icon-image: geyser-m.svg; font-size: 11;}
node|z16-[natural=geyser],
area|z16-[natural=geyser],
{font-size: 12;}
node|z12-14[amenity=water_point],
area|z12-14[amenity=water_point],
node|z12-14[amenity=drinking_water],
area|z12-14[amenity=drinking_water],
node|z12-14[man_made=water_tap],
area|z12-14[man_made=water_tap],
node|z12-14[man_made=water_well],
area|z12-14[man_made=water_well],
node|z12-14[natural=spring],
area|z12-14[natural=spring],
node|z12-14[natural=hot_spring],
area|z12-14[natural=hot_spring],
{icon-image: drinking-water-s.svg;}
node|z15-[amenity=water_point],
area|z15-[amenity=water_point],
node|z15-[amenity=drinking_water],
area|z15-[amenity=drinking_water],
node|z15-[man_made=water_tap],
area|z15-[man_made=water_tap],
node|z15-[man_made=water_well],
area|z15-[man_made=water_well],
node|z15-[natural=spring],
area|z15-[natural=spring],
node|z15-[natural=hot_spring],
area|z15-[natural=hot_spring],
{icon-image: drinking-water-m.svg; font-size: 11;}
/* 4.TOURISM */
/* 4.2 Apartament */
node|z11-[tourism=alpine_hut],
area|z11-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
node|z13-[tourism=viewpoint],
node|z15-[tourism=chalet],
area|z15-[tourism=chalet],
node|z14-[tourism=camp_site],
area|z14-[tourism=camp_site],
node|z14-[tourism=picnic_site],
area|z14-[tourism=picnic_site],
node|z16-[leisure=picnic_table],
area|z16-[leisure=picnic_table],
node|z13-[amenity=shelter],
area|z13-[amenity=shelter],
node|z14-[tourism=caravan_site],
area|z14-[tourism=caravan_site],
{text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
node|z11-[tourism=alpine_hut],
area|z11-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
{icon-image: alpine_hut-s.svg; icon-min-distance: 24;}
node|z11-[tourism=alpine_hut],
area|z11-[tourism=alpine_hut],
node|z13-[tourism=wilderness_hut],
area|z13-[tourism=wilderness_hut],
node|z15-[tourism=chalet],
area|z15-[tourism=chalet],
{font-size: 11;}
node|z14-[tourism=alpine_hut],
area|z14-[tourism=alpine_hut],
node|z14-[tourism=wilderness_hut],
area|z14-[tourism=wilderness_hut],
node|z15-[tourism=chalet],
area|z15-[tourism=chalet],
{icon-image: alpine_hut-m.svg;}
node|z16-[tourism=alpine_hut],
area|z16-[tourism=alpine_hut],
node|z16-[tourism=wilderness_hut],
area|z16-[tourism=wilderness_hut],
node|z16-[tourism=chalet],
area|z16-[tourism=chalet],
{font-size: 12; icon-min-distance: 0;}
node|z14-[tourism=camp_site],
area|z14-[tourism=camp_site],
{icon-image: campsite-m.svg; icon-min-distance: 12; font-size: 11;}
node|z16-[tourism=camp_site],
area|z16-[tourism=camp_site],
{font-size: 12; icon-min-distance: 0;}
node|z14-[tourism=picnic_site],
area|z14-[tourism=picnic_site],
{icon-image: picnic-m.svg;icon-min-distance: 10;font-size: 11;}
node|z16-[tourism=picnic_site],
area|z16-[tourism=picnic_site],
{font-size: 12; icon-min-distance: 0;}
node|z15-[leisure=picnic_table],
area|z15-[leisure=picnic_table],
{icon-image: picnic_table-m.svg;}
node|z16-[leisure=picnic_table],
area|z16-[leisure=picnic_table],
{font-size: 11;}
/* need a small icon */
node|z13-[amenity=shelter],
area|z13-[amenity=shelter],
{icon-image: shelter-m.svg;icon-min-distance: 10; font-size: 11;}
node|z16-[amenity=shelter],
area|z16-[amenity=shelter],
{font-size: 12; icon-min-distance: 0;}
node|z14-[tourism=caravan_site],
area|z14-[tourism=caravan_site],
{icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;}
node|z16-[tourism=caravan_site],
area|z16-[tourism=caravan_site],
{font-size: 12; icon-min-distance: 0;}
node|z11-12[tourism=viewpoint],
{icon-image: viewpoint-s.svg;}
node|z13-[tourism=viewpoint],
{icon-image: viewpoint-m.svg; font-size: 11;}
node|z16-[tourism=viewpoint],
{font-size: 12;}
/* 5.5 Others */
node|z11-12[man_made=lighthouse],
area|z11-12[man_made=lighthouse],
{icon-image: lighthouse-s.svg; icon-min-distance: 10;}
node|z13-[man_made=lighthouse],
area|z13-[man_made=lighthouse],
{icon-image: lighthouse-m.svg; font-size: 11;}
node|z16-[man_made=lighthouse],
area|z16-[man_made=lighthouse],
{font-size: 12;}
node|z14-[barrier=border_control]
{icon-image: bcontrol-m.svg;}
node|z14-[highway=ford],
node|z14-[power=tower],
node|z12-[man_made=flagpole],
node|z13-[man_made=mast],
{icon-image: dot-m.svg;}

View file

@ -0,0 +1,317 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/include/Roads.mapcss");
/* 7.4 Service 15-22 ZOOM */
line|z13-[highway=service],
{color: @unclassified; opacity: 1;}
line|z13[highway=service],
{width: 0.8;}
line|z14[highway=service],
{width: 1.2;}
line|z15[highway=service],
{width: 1.8;}
line|z16[highway=service],
{width: 2.5;}
line|z17[highway=service],
{width: 3.3;}
line|z18-[highway=service],
{width: 4.2;}
/* Reset back to the main style. */
line|z13-14[highway=service][service=busway],
line|z13-14[highway=service][service=parking_aisle],
line|z13-15[highway=service][service=driveway],
{width: 0;}
line|z15[highway=service][service=busway],
line|z15[highway=service][service=parking_aisle],
{width: 1.2;}
line|z16[highway=service][service=busway],
line|z16[highway=service][service=driveway],
line|z16[highway=service][service=parking_aisle],
{width: 1.6;}
line|z17[highway=service][service=busway],
line|z17[highway=service][service=driveway],
line|z17[highway=service][service=parking_aisle],
{width: 2;}
line|z18[highway=service][service=busway],
line|z18[highway=service][service=driveway],
line|z18[highway=service][service=parking_aisle],
{width: 3;}
line|z19-[highway=service][service=busway],
line|z19-[highway=service][service=driveway],
line|z19-[highway=service][service=parking_aisle],
{width: 4;}
/* 8.OTHERS ROADS 13-22 ZOOM */
line|z11-[highway=track],
{color: @track;opacity: 1;}
line|z11-[highway=path],
line|z11-[highway=footway][sac_scale],
{color: @path;opacity: 1;}
/* 8.5 Construction & Proposed 13-22 ZOOM */
line|z11-[highway=construction],
line|z11-[highway=proposed]
{color: @construction; opacity: 1;}
line|z11-12[highway=construction],
line|z11-12[highway=proposed]
{width: 1.2; dashes: 3.6,1.8;}
/* see base style for other zooms */
/* 8.6 Track & Path 14-22 ZOOM */
line|z11[highway=track],
{width: 1.1; dashes: 6,2.5;}
line|z12[highway=track],
{width: 1.3; dashes: 6,2.5;}
line|z13[highway=track],
{width: 1.6; dashes: 7,3;}
line|z14[highway=track],
{width: 2; dashes: 7,3;}
line|z15[highway=track],
{width: 2.5; dashes: 9,3.5;}
line|z16[highway=track],
{width: 3.2; dashes: 9,3.5;}
line|z17[highway=track],
{width: 4; dashes: 12,4;}
line|z18-[highway=track],
{width: 5; dashes: 12,4;}
line|z11[highway=path],
line|z11[highway=footway][sac_scale],
{width: 1; dashes: 3.5,2;}
line|z12[highway=path],
line|z12[highway=footway][sac_scale],
{width: 1.1; dashes: 3.5,2;}
line|z13[highway=path],
line|z13[highway=footway][sac_scale],
{width: 1.3; dashes: 4,2.5;}
line|z14[highway=path],
line|z14[highway=footway][sac_scale],
{width: 1.6; dashes: 4,2.5;}
line|z15[highway=path],
line|z15[highway=footway][sac_scale],
{width: 2; dashes: 6,3.5;}
line|z16[highway=path],
line|z16[highway=footway][sac_scale],
{width: 2.6; dashes: 6,3.5;}
line|z17[highway=path],
line|z17[highway=footway][sac_scale],
{width: 3.3; dashes: 8,4.5;}
line|z18-[highway=path],
line|z18-[highway=footway][sac_scale],
{width: 4; dashes: 8,4.5;}
/* 9.RAIL 11-22 ZOOM */
line|z10-[railway=rail],
{color: @railway; opacity: 1;}
line|z15-[railway=rail],
{color: @railway_dark;}
line|z15-[railway=rail]::dash,
{color: @railway_dash; opacity:1;}
line|z10-[railway=rail][highspeed?],
line|z10-[railway=rail][usage=main],
line|z10-[railway=rail][usage=branch],
{color: @railway; opacity: 1;}
line|z10-[railway=rail][usage=tourism],
{color: @railway_tourism; opacity: 1;}
line|z15-[railway=rail][highspeed?],
line|z15-[railway=rail][usage=main],
line|z15-[railway=rail][usage=branch],
{color: @railway_dark;}
line|z15-[railway=rail][highspeed?]::dash,
line|z15-[railway=rail][usage=main]::dash,
line|z15-[railway=rail][usage=tourism]::dash,
line|z15-[railway=rail][usage=branch]::dash,
{color: @railway_dash; opacity: 1;}
line|z12-[railway=rail][usage=utility],
line|z14-[railway=rail][service=spur],
line|z15-[railway=rail][service=service],
{color: @railway_light; opacity: 1;}
line|z16-[railway=rail][usage=utility],
line|z16-[railway=rail][service=spur],
line|z16-[railway=rail][service=service],
{color: @railway;}
line|z16-[railway=rail][usage=utility]::dash,
line|z16-[railway=rail][service=spur]::dash,
line|z16-[railway=rail][service=service]::dash,
{color: @industrial; opacity: 1;}
line|z13-[railway=construction],
line|z13-[railway=preserved],
line|z13-[railway=disused],
line|z13-[railway=abandoned],
{color: @railway;opacity:1;}
/* 9.1 RAIL 10-22 ZOOM */
line|z10[railway=rail],
{width: 1;}
line|z11[railway=rail],
{width: 1.2;}
line|z12[railway=rail],
{width: 1.4;}
line|z13[railway=rail],
{width: 1.7;}
line|z14[railway=rail],
{width: 2;}
line|z15[railway=rail],
{width: 2.6;}
line|z16[railway=rail],
{width: 3.5;}
line|z17-[railway=rail],
{width: 5;}
line|z15[railway=rail]::dash,
{width: 1.2; dashes: 4.5,4.5;}
line|z16[railway=rail]::dash,
{width: 1.8; dashes: 5.2,5.2;}
line|z17[railway=rail]::dash,
{width: 2.8; dashes: 6.3,6.3;}
line|z18-[railway=rail]::dash,
{width: 2.8; dashes: 8.1,8.1;}
/* Reset styling inherited from railway=rail. */
line|z10-11[railway=rail][usage=utility],
line|z10-13[railway=rail][service=spur],
line|z10-14[railway=rail][service=service],
{width: 0;}
line|z14-15[railway=rail][usage=utility]::dash,
line|z14-15[railway=rail][service=spur]::dash,
line|z14-15[railway=rail][service=service]::dash,
{width: 0;}
line|z10[railway=rail][usage=main],
line|z10[railway=rail][usage=tourism],
line|z10[railway=rail][usage=branch],
line|z12[railway=rail][usage=utility],
{width: 1;}
line|z10[railway=rail][highspeed?],
line|z11[railway=rail][usage=main],
line|z11[railway=rail][usage=tourism],
line|z11[railway=rail][usage=branch],
line|z13[railway=rail][usage=utility],
{width: 1.2;}
line|z11[railway=rail][highspeed?],
line|z12[railway=rail][usage=main],
line|z12[railway=rail][usage=tourism],
line|z12[railway=rail][usage=branch],
line|z14[railway=rail][usage=utility],
line|z14[railway=rail][service=spur],
{width: 1.4;}
line|z12[railway=rail][highspeed?],
line|z13[railway=rail][usage=main],
line|z13[railway=rail][usage=tourism],
line|z13[railway=rail][usage=branch],
line|z15[railway=rail][usage=utility],
line|z15[railway=rail][service=spur],
line|z15[railway=rail][service=service],
{width: 1.7;}
line|z13[railway=rail][highspeed?],
{width: 2;}
line|z14[railway=rail][highspeed?],
{width: 2.3;}
line|z14[railway=rail][usage=main],
line|z14[railway=rail][usage=tourism],
line|z14[railway=rail][usage=branch],
{width: 2;}
line|z15[railway=rail][highspeed?],
line|z15[railway=rail][usage=main],
line|z15[railway=rail][usage=tourism],
line|z15[railway=rail][usage=branch],
{width: 2.6;}
line|z16[railway=rail][highspeed?],
line|z16[railway=rail][usage=main],
line|z16[railway=rail][usage=tourism],
line|z16[railway=rail][usage=branch],
line|z16[railway=rail][usage=utility],
line|z16[railway=rail][service=spur],
line|z16[railway=rail][service=service],
{width: 3.5;}
line|z17[railway=rail][highspeed?],
line|z17[railway=rail][usage=main],
line|z17[railway=rail][usage=tourism],
line|z17[railway=rail][usage=branch],
line|z17[railway=rail][usage=utility],
line|z17[railway=rail][service=spur],
line|z17[railway=rail][service=service],
{width: 5;}
line|z15[railway=rail][highspeed?]::dash,
{width: 1.2; dashes: 10,10;}
line|z16[railway=rail][highspeed?]::dash,
{width: 1.8; dashes: 13,13;}
line|z17-[railway=rail][highspeed?]::dash,
{width: 2.8; dashes: 16,16;}
line|z15[railway=rail][usage=main]::dash,
line|z15[railway=rail][usage=tourism]::dash,
line|z15[railway=rail][usage=branch]::dash,
{width: 1.2; dashes: 4.5,4.5;}
line|z16[railway=rail][usage=main]::dash,
line|z16[railway=rail][usage=tourism]::dash,
line|z16[railway=rail][usage=branch]::dash,
line|z16[railway=rail][usage=utility]::dash,
line|z16[railway=rail][service=spur]::dash,
line|z16[railway=rail][service=service]::dash,
{width: 1.8; dashes: 5.2,5.2;}
line|z17[railway=rail][usage=main]::dash,
line|z17[railway=rail][usage=tourism]::dash,
line|z17[railway=rail][usage=branch]::dash,
line|z17[railway=rail][usage=utility]::dash,
line|z17[railway=rail][service=spur]::dash,
line|z17[railway=rail][service=service]::dash,
{width: 2.8; dashes: 6.3,6.3;}
line|z18-[railway=rail][usage=main]::dash,
line|z18-[railway=rail][usage=tourism]::dash,
line|z18-[railway=rail][usage=branch]::dash,
line|z18-[railway=rail][usage=utility]::dash,
line|z18-[railway=rail][service=spur]::dash,
line|z18-[railway=rail][service=service]::dash,
{width: 2.8; dashes: 8.1,8.1;}
line|z13-[railway=preserved],
line|z13-[railway=abandoned]
{width: 1.6; dashes: 6.3,6.3;}
line|z16-[railway=preserved],
line|z16-[railway=abandoned]
{width: 2.2; dashes: 8,8;}
line|z13-[railway=construction],
line|z13-[railway=disused]
{width: 1; dashes: 1.8,5.5;}
line|z16-[railway=construction],
line|z16-[railway=disused]
{width: 1.7; dashes: 2.5,7;}
/* 10.PISTE 12-22 ZOOM */
/* 10.2 Aerialway 12-22 ZOOM */
line|z15-[power=line],
{color: @powerline; width: 1; opacity: 0.6;}
line|z17-[power=line],
{width: 1.3; opacity: 0.7;}
line|z15-[power=line]::dash,
{color: @powerline; width: 4; opacity: 1; dashes: 1,50;}
line|z17-[power=line]::dash,
{width: 4.5; dashes: 1,80;}

View file

@ -0,0 +1,13 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/include/Roads_label.mapcss");
/* 8.OTHERS ROADS 15-22 ZOOM */
line|z13-[highway=track],
line|z13-[highway=path],
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
line|z13-15[highway=path],
line|z13-15[highway=track],
{font-size: 8;}

View file

@ -0,0 +1,2 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/include/Subways.mapcss");

View file

@ -0,0 +1,24 @@
way|z1-12::*
{
linejoin: bevel;
}
way|z13-::*
{
linejoin: round;
}
way|z1-15::*
{
linecap: butt;
}
way|z16-::*
{
linecap: round;
}
*::int_name
{
text-offset: 1;
}

View file

@ -0,0 +1,162 @@
# 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 z15- (also has icon z13-, caption(optional) z13-)
=== 250
amenity-place_of_worship # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-buddhist # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-christian # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-christian-mormon # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-hindu # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-jewish # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-muslim # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-shinto # area z16- (also has icon z14-, caption(optional) z14-)
amenity-place_of_worship-taoist # area z16- (also has icon z14-, caption(optional) z14-)
=== 240
amenity-doctors # area z14- (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 z15- (also has icon z15-, caption(optional) z15-)
=== 220
sport-multi # area z15- (also has icon z17-, caption(optional) z17-)
sport-soccer # area z15- (also has icon z17-, caption(optional) z17-)
=== 210
leisure-playground # area z16- (also has icon z17-, caption(optional) z17-)
=== 200
amenity-fountain # area z16- (also has icon z16-, caption(optional) z16-)
=== 190
amenity-grave_yard # area z14- (also has icon z17-, caption(optional) z17-)
amenity-grave_yard-christian # area z14- (also has icon z17-, caption(optional) z17-)
landuse-cemetery # area z14- (also has icon z15-, caption(optional) z15-)
landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-)
=== 180
highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-)
=== 170
highway-footway-area # area z14- (also has line z15-, pathtext z15-)
leisure-track-area # area z15- (also has caption z16-)
=== 160
aeroway-terminal # area z14- (also has caption z15-)
=== 150
leisure-golf_course # area z12- (also has icon z17-, caption(optional) z17-)
=== 140
landuse-flowerbed # area z16-
natural-scrub # area z12-
=== 130
landuse-grass # area z12-
natural-grassland # area z12-
natural-heath # area z12-
=== 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-parking # area z15- (also has icon z16-, caption(optional) z18-)
amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-)
amenity-parking-fee-lane # area z17- (also has icon z18-, caption(optional) z18-)
amenity-parking-fee-street_side # area z17- (also has icon z18-, caption(optional) z18-)
amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-)
amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-)
amenity-parking-no-access # area z15- (also has icon z16-, 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-)
=== 100
natural-wetland # area z11- (also has caption z16-)
natural-wetland-bog # area z11- (also has caption z16-)
natural-wetland-marsh # 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-field # area z12-
landuse-meadow # area z12-
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-pitch # area z15- (also has icon z17-, caption(optional) z17-)
natural-bare_rock # area z12- (also has caption z13-)
=== 80
leisure-garden # area z12- (also has icon z16-, caption(optional) z16-)
leisure-garden-residential # area z12- (also has caption z18-)
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
landuse-churchyard # area z15-
landuse-construction # area z15- (also has caption z15-)
landuse-industrial # area z15- (also has caption z15-)
landuse-industrial-mine # area z15- (also has icon z15-, caption(optional) z15-)
landuse-quarry # area z15- (also has icon z15-, caption(optional) z15-)
landuse-railway # area z15- (also has caption z15-)
=== 50
amenity-college # area z15- (also has icon z16-, caption(optional) z16-)
amenity-hospital # area z14- (also has icon z14-, caption(optional) z15-)
amenity-kindergarten # area z15- (also has icon z17-, caption(optional) z17-)
amenity-school # area z15- (also has icon z17-, caption(optional) z17-)
amenity-university # area z14- (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 z15-
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-
=== 30
natural-land # area z1-
place-islet # area z10- (also has caption z14-)
=== 20
natural-coastline # area z1-
=== 10

View file

@ -0,0 +1,47 @@
# 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-
waterway-riverbank # line z10- and area z1- (also has pathtext z11-)
=== 20
natural-strait # line z11- (also has caption z13-)
waterway-canal # line z11- (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 z11- (also has pathtext z13-)
waterway-stream-ephemeral # line z13- (also has pathtext z13-)
waterway-stream-intermittent # line z13- (also has pathtext z13-)
=== 10

View file

@ -0,0 +1,467 @@
# 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-
=== 360
power-line # line z15- (also has line::dash z15-)
=== 350
power-line::dash # line::dash z15- (also has line z15-)
=== 340
highway-cycleway # line z13- (also has pathtext z15-)
highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
highway-cycleway-permissive # line z13- (also has pathtext z15-)
highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-steps # line z15- (also has pathtext z16-)
highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
hwtag-oneway::arrows # line::arrows z15-
waterway-weir # line z14- (also has pathtext z15-)
=== 330
barrier-city_wall # line z14-
barrier-fence # line z16-
barrier-hedge # line z16-
barrier-wall # line 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 z7- (also has pathtext z10-, shield::shield z10-)
highway-motorway-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-motorway-tunnel # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
highway-trunk # line z7- (also has pathtext z10-, shield::shield z10-)
highway-trunk-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-trunk-tunnel # line z7- (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 z7-, pathtext z10-, shield::shield z10-)
# highway-trunk-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-)
# === 309
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) z12-, 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) z12-, pathtext z10-, shield::shield z10-)
=== 300
# highway-motorway_link-tunnel # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
# highway-trunk_link-tunnel # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
# === 299
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
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-)
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
# highway-primary_link-tunnel # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
# 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-secondary_link # line z14- (also has pathtext z16-)
highway-secondary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
highway-secondary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z16-)
=== 260
# highway-secondary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z16-)
# === 259
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-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-)
=== 250
# highway-residential-tunnel # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
# highway-tertiary-tunnel # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
# === 249
highway-tertiary_link # line z15- (also has pathtext z18-)
highway-tertiary_link-bridge # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z18-)
highway-tertiary_link-tunnel # line z15- (also has line(casing) z16-, pathtext z18-)
=== 240
# highway-tertiary_link-tunnel # line(casing) z16- (also has line z15-, pathtext z18-)
# === 239
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-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-)
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-)
=== 230
# highway-living_street-tunnel # line(casing) z16- (also has line z12-, pathtext z14-)
# highway-unclassified-tunnel # line(casing) z16- (also has line z11-, pathtext z13-)
# === 229
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-)
=== 220
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-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-busway # line z15- (also has pathtext z16-)
highway-busway-bridge # line z15- (also has pathtext z16-)
highway-busway-tunnel # line z15- (also has 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 z16-, line::bridgewhite z16-, pathtext z16-)
highway-service-busway # line z15- (also has 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 pathtext z16-)
=== 190
highway-footway # line z15- (also has pathtext z15-)
highway-footway-alpine_hiking # line z11- (also has pathtext z15-)
highway-footway-area # line z15- and area z14- (also has pathtext z15-)
highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
highway-footway-demanding_alpine_hiking # line z11- (also has pathtext z15-)
highway-footway-demanding_mountain_hiking # line z11- (also has pathtext z15-)
highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z15-)
highway-footway-hiking # line z11- (also has pathtext z15-)
highway-footway-mountain_hiking # line z11- (also has pathtext z15-)
highway-footway-permissive # line z15- (also has pathtext z15-)
highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-path # line z11- (also has pathtext z13-)
highway-path-alpine_hiking # line z11- (also has pathtext z13-)
highway-path-bicycle # line z11- (also has pathtext z13-)
highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-path-demanding_alpine_hiking # line z11- (also has pathtext z13-)
highway-path-demanding_mountain_hiking # line z11- (also has pathtext z13-)
highway-path-difficult_alpine_hiking # line z11- (also has pathtext z13-)
highway-path-hiking # line z11- (also has pathtext z13-)
highway-path-horse # line z11- (also has pathtext z13-)
highway-path-mountain_hiking # line z11- (also has pathtext z13-)
highway-path-permissive # line z11- (also has pathtext z13-)
highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, 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-grade1 # line z11- (also has pathtext z13-)
highway-track-grade2 # line z11- (also has pathtext z13-)
highway-track-grade3 # line z11- (also has pathtext z13-)
highway-track-grade4 # line z11- (also has pathtext z13-)
highway-track-grade5 # line z11- (also has pathtext z13-)
highway-track-no-access # line z11- (also has pathtext z13-)
highway-track-permissive # line z11- (also has pathtext z13-)
highway-track-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
leisure-track # line z15- (also has caption z16-)
=== 180
highway-bridleway # line z14- (also has pathtext z15-)
highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
highway-bridleway-permissive # line z14- (also has pathtext z15-)
highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
=== 170
highway-construction # line z11- (also has pathtext z15-)
railway-abandoned # line z13-
railway-abandoned-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-abandoned-tunnel # line z13-
railway-construction # line z13-
railway-disused # line z13-
railway-preserved # line z13-
railway-preserved-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-)
railway-preserved-tunnel # line z13-
=== 160
highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, 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 z14-, line::bridgeblack z14-, pathtext z16-)
highway-service-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-, pathtext z16-)
highway-steps-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, 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 z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
railway-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 z14-, line::bridgewhite z15-, pathtext z15-)
highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, 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 z14-, line::bridgewhite z14-, pathtext z16-)
highway-service-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-, pathtext z16-)
highway-steps-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, 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 z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
railway-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 z16-)
building-garage # area z14- (also has caption z16-)
building-has_parts # area z14- (also has caption z16-)
building-train_station # area z14- (also has caption z16-)
=== 130
piste:type-downhill # line z14-
piste:type-downhill-advanced # line z14-
piste:type-downhill-easy # line z14-
piste:type-downhill-expert # line z14-
piste:type-downhill-freeride # line z14-
piste:type-downhill-intermediate # line z14-
piste:type-downhill-novice # line z14-
piste:type-nordic # line z14-
piste:type-sled # line z14-
=== 120
building:part # area z16-
landuse-garages # area z15-
=== 110
barrier-retaining_wall # line z16-
man_made-embankment # line z16-
natural-cliff # line z12-
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 z16-
=== 70
isoline-step_10 # line z15- (also has pathtext z16-)
isoline-step_100 # line z12- (also has pathtext z13-)
isoline-step_1000 # line z10- (also has pathtext z10-)
isoline-step_50 # line z14- (also has pathtext z15-)
isoline-step_500 # line z10- (also has pathtext z11-)
isoline-zero # line z15- (also has pathtext z15-)
=== 60
highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
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 z15-, line::tunnelCasing z17-, pathtext z16-)
highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
=== 50
highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
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 z15-, line::tunnelBackground z17-, pathtext z16-)
highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
=== 40
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
boundary-national_park # area z10- (also has icon z10-, caption(optional) z11-)
boundary-protected_area-1 # area z10- (also has icon z10-, caption(optional) z11-)
landuse-military # area z12- (also has icon z16-, caption(optional) z17-)
landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-)
leisure-nature_reserve # area z10- (also has icon z10-, caption(optional) z11-)
=== 20
man_made-bridge # area z14-
=== 10

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,41 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/style-clear/colors.mapcss");
/* ~~~~ CONTENT OF COLORS-DAY ~~~~~
1.BASEMAP
2.BOUNDARY
3.NATURAL
3.1 Main natural
3.2 Vegetation
4.LANDUSE
4.1 Main landuse
4.2 Aerodrome
4.3 Barriers
4.4 Buildings
5.ROADS
5.1 All roads
5.2 Bridges
5.3 Tunnels
5.4 Piste
5.5 Transport
6.LABELS COLORS
6.1 Main labels
6.2 Natural labels
6.3 Place labels
6.4 Road labels
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
/* 5.ROADS */
/* 5.ROADS */
/* 5.1 All roads */
@construction: #ABAB9A;
/* 5.5 Transport */
@railway: #818071;
@railway_dark: #767566;
@railway_dash: #F5F5F5;

View file

@ -0,0 +1,129 @@
@import("colors.mapcss");
@import("../include/defaults_new.mapcss");
@import("../include/Basemap.mapcss");
@import("../include/Basemap_label.mapcss");
@import("../include/Roads.mapcss");
@import("../include/Roads_label.mapcss");
@import("../include/Icons.mapcss");
@import("../include/Subways.mapcss");
/* TODO: move to a separete base file */
colors
{
GuiText-color: #4D4D4D;
GuiText-opacity: 0.86;
MyPositionAccuracy-color: #000000;
MyPositionAccuracy-opacity: 0.08;
Selection-color: #1E96F0;
Selection-opacity: 0.64;
Route-color: #0087FF;
RouteOutline-color: #055FCD;
RouteTrafficG0-color: #9B2300;
RouteTrafficG1-color: #E82705;
RouteTrafficG2-color: #E82705;
RouteTrafficG3-color: #FFE500;
RouteTrafficG3-opacity: 0.0;
RoutePedestrian-color: #1D339E;
RoutePedestrian-opacity: 0.8;
RouteBicycle-color: #9C27B0;
RouteBicycle-opacity: 0.8;
RoutePreview-color: #000000;
RoutePreview-opacity: 0.3;
RouteMaskCar-color: #000000;
RouteMaskCar-opacity: 0.3;
RouteArrowsMaskCar-color: #033B80;
RouteArrowsMaskCar-opacity: 0.2;
RouteMaskBicycle-color: #000000;
RouteMaskBicycle-opacity: 0.5;
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;
RoadShieldBlueBackground-color: #1A5EC1;
RoadShieldGreenBackground-color: #309302;
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;
}

View file

@ -0,0 +1,30 @@
/* Keep here changes of the base map style file only. */
@import("../../clear/style-night/colors.mapcss");
/* ~~~~ CONTENT OF COLORS-NIGHT ~~~~~
1.BASEMAP
2.BOUNDARY
3.NATURAL
3.1 Main natural
3.2 Vegetation
4.LANDUSE
4.1 Main landuse
4.2 Aerodrome
4.3 Barriers
4.4 Buildings
5.ROADS
5.1 All roads
5.2 Bridges
5.3 Tunnels
5.4 Piste
5.5 Transport
6.LABELS COLORS
6.1 Main labels
6.2 Natural labels
6.3 Place labels
6.4 Road labels
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
@railway_dark: #434343;

View file

@ -0,0 +1,128 @@
@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;
RoutePreview-color: #FFFFFF;
RoutePreview-opacity: 0.3;
RouteMaskCar-color: #000000;
RouteMaskCar-opacity: 0.5;
RouteArrowsMaskCar-color: #055FCD;
RouteArrowsMaskCar-opacity: 0.3;
RouteMaskBicycle-color: #000000;
RouteMaskBicycle-opacity: 0.5;
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;
RoadShieldBlueBackground-color: #294C88;
RoadShieldGreenBackground-color: #136C30;
RoadShieldRedBackground-color: #9F1A17;
RoadShieldOrangeBackground-color: #136C30;
PoiHotelTextOutline-color: #000000;
PoiHotelTextOutline-opacity: 0.6;
PoiDeletedMask-color: #FFFFFF;
PoiDeletedMask-opacity: 0.3;
PoiVisitedMask-color: #FFFFFF;
PoiVisitedMask-opacity: 0.7;
DefaultTrackColor-color: #1E96F0;
RouteMarkPrimaryText-color: #888888;
RouteMarkPrimaryTextOutline-color: #000000;
RouteMarkSecondaryText-color: #888888;
RouteMarkSecondaryTextOutline-color: #000000;
TransitMarkPrimaryText-color: #888888;
TransitMarkPrimaryTextOutline-color: #000000;
TransitMarkSecondaryText-color: #888888;
TransitMarkSecondaryTextOutline-color: #000000;
TransitTransferOuterMarker-color: #000000;
TransitTransferInnerMarker-color: #888888;
TransitStopInnerMarker-color: #000000;
LocalAdsPrimaryText-color: #888888;
LocalAdsPrimaryTextOutline-color: #000000;
LocalAdsSecondaryText-color: #888888;
LocalAdsSecondaryTextOutline-color: #000000;
TransitBackground-color: #000000;
TransitBackground-opacity: 0.4;
BookmarkRed-color: #E51B23;
BookmarkPink-color: #FF4182;
BookmarkPurple-color: #9B24B2;
BookmarkDeepPurple-color: #6639BF;
BookmarkBlue-color: #0066CC;
BookmarkLightBlue-color: #249CF2;
BookmarkCyan-color: #14BECD;
BookmarkTeal-color: #00A58C;
BookmarkGreen-color: #3C8C3C;
BookmarkLime-color: #93BF39;
BookmarkYellow-color: #FFC800;
BookmarkOrange-color: #FF9600;
BookmarkDeepOrange-color: #F06432;
BookmarkBrown-color: #804633;
BookmarkGray-color: #737373;
BookmarkBlueGray-color: #597380;
SearchmarkPreparing-color: #597380;
SearchmarkNotAvailable-color: #597380;
SearchmarkSelectedNotAvailable-color: #F06432;
RatingBad-color: #F06432;
RatingGood-color: #3C8C3C;
RatingNone-color: #249CF2;
SearchmarkDefault-color: #249CF2;
RatingText-color: #FFFFFF;
UGCRatingText-color: #B8B8B8;
SpeedCameraMarkText-color: #FFFFFF;
SpeedCameraMarkBg-color: #F51E30;
SpeedCameraMarkOutline-color: #FFFFFF;
GuideCityMarkText-color: #6639BF;
GuideOutdoorMarkText-color: #3C8C3C;
HotelPriceText-color: #000000;
}

View file

@ -15,6 +15,10 @@ MapStyle MapStyleFromSettings(std::string const & str)
return MapStyleVehicleClear;
else if (str == "MapStyleVehicleDark")
return MapStyleVehicleDark;
else if (str == "MapStyleOutdoorsClear")
return MapStyleOutdoorsClear;
else if (str == "MapStyleOutdoorsDark")
return MapStyleOutdoorsDark;
return kDefaultMapStyle;
}
@ -33,6 +37,10 @@ std::string MapStyleToString(MapStyle mapStyle)
return "MapStyleVehicleDark";
case MapStyleVehicleClear:
return "MapStyleVehicleClear";
case MapStyleOutdoorsDark:
return "MapStyleOutdoorsDark";
case MapStyleOutdoorsClear:
return "MapStyleOutdoorsClear";
case MapStyleCount:
break;

View file

@ -9,6 +9,8 @@ enum MapStyle
MapStyleMerged = 2,
MapStyleVehicleClear = 3,
MapStyleVehicleDark = 4,
MapStyleOutdoorsClear = 5,
MapStyleOutdoorsDark = 6,
// Add new map style here
// Specifies number of MapStyle enum values, must be last

View file

@ -11,6 +11,8 @@ std::string const kSuffixDark = "_dark";
std::string const kSuffixClear = "_clear";
std::string const kSuffixVehicleDark = "_vehicle_dark";
std::string const kSuffixVehicleClear = "_vehicle_clear";
std::string const kSuffixOutdoorsClear = "_outdoors_clear";
std::string const kSuffixOutdoorsDark = "_outdoors_dark";
std::string const kStylesOverrideDir = "styles";
@ -33,6 +35,10 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle)
return kSuffixVehicleDark;
case MapStyleVehicleClear:
return kSuffixVehicleClear;
case MapStyleOutdoorsClear:
return kSuffixOutdoorsClear;
case MapStyleOutdoorsDark:
return kSuffixOutdoorsDark;
case MapStyleMerged:
return std::string();
@ -49,15 +55,17 @@ std::string GetStyleResourcesSuffix(MapStyle mapStyle)
#ifdef BUILD_DESIGNER
return kSuffixDesignTool;
#else
// We use the same resources for default and vehicle styles
// We use the same resources for all clear/day and dark/night styles
// to avoid textures duplication and package size increasing.
switch (mapStyle)
{
case MapStyleDark:
case MapStyleVehicleDark:
case MapStyleOutdoorsDark:
return kSuffixDark;
case MapStyleClear:
case MapStyleVehicleClear:
case MapStyleOutdoorsClear:
return kSuffixClear;
case MapStyleMerged:
return std::string();

View file

@ -581,6 +581,10 @@
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_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA637ECC29A500BE00D8921A /* drules_proto_outdoors_clear.bin */; };
FA637ED329A500BE00D8921A /* drules_proto_outdoors_clear.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA637ECF29A500BE00D8921A /* drules_proto_outdoors_clear.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 */; };
@ -1554,6 +1558,10 @@
FA4F29DE28BC1B35001754FC /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = "<group>"; };
FA4F29DF28BC1B36001754FC /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
FA4F29E028BC1B36001754FC /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ca; path = ca.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
FA637ECC29A500BE00D8921A /* drules_proto_outdoors_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_outdoors_clear.bin; path = ../../data/drules_proto_outdoors_clear.bin; sourceTree = "<group>"; };
FA637ECF29A500BE00D8921A /* drules_proto_outdoors_clear.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = drules_proto_outdoors_clear.txt; path = ../../data/drules_proto_outdoors_clear.txt; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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; };
@ -3518,6 +3526,10 @@
FA46DA2B12D4166E00968C36 /* countries.txt */,
4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */,
4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */,
FA637ECC29A500BE00D8921A /* drules_proto_outdoors_clear.bin */,
FA637ECF29A500BE00D8921A /* drules_proto_outdoors_clear.txt */,
FA637ED129A500BE00D8921A /* drules_proto_outdoors_dark.bin */,
FA637ED029A500BE00D8921A /* drules_proto_outdoors_dark.txt */,
4554B6E81E55F02B0084017F /* drules_proto_vehicle_clear.bin */,
4554B6E91E55F02B0084017F /* drules_proto_vehicle_dark.bin */,
6B9978341C89A316003B8AA0 /* editor.config */,
@ -3731,6 +3743,7 @@
6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */,
471A7BC22481D44B00A0D4C1 /* BookmarkTitleCell.xib in Resources */,
6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */,
FA637ED329A500BE00D8921A /* drules_proto_outdoors_clear.txt in Resources */,
F6E2FE6D1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */,
F6E2FE701E097BA00083EBEC /* _MWMOHSubCell.xib in Resources */,
4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */,
@ -3793,6 +3806,7 @@
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 */,
@ -3801,6 +3815,7 @@
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_clear.bin in Resources */,
47CA68F2250B54AF00671019 /* BookmarkCell.xib in Resources */,
337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */,
@ -3851,6 +3866,7 @@
677A2DE21C0DD50900635A00 /* resources-default in Resources */,
F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */,
F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */,
FA637ED229A500BE00D8921A /* drules_proto_outdoors_clear.bin in Resources */,
6741A97F1BF340DE002C974C /* resources-mdpi_clear in Resources */,
6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */,
6741A9981BF340DE002C974C /* resources-xhdpi_clear in Resources */,

View file

@ -59,9 +59,11 @@ agg::rgba8 GetLineColor(MapStyle mapStyle)
LOG(LERROR, ("Wrong map style param.")); // fallthrough
case MapStyleDark:
case MapStyleVehicleDark:
case MapStyleOutdoorsDark:
return agg::rgba8(255, 230, 140, 255);
case MapStyleClear:
case MapStyleVehicleClear:
case MapStyleOutdoorsClear:
case MapStyleMerged:
return agg::rgba8(30, 150, 240, 255);
}
@ -78,9 +80,11 @@ agg::rgba8 GetCurveColor(MapStyle mapStyle)
// No need break or return here.
case MapStyleDark:
case MapStyleVehicleDark:
case MapStyleOutdoorsDark:
return agg::rgba8(255, 230, 140, 20);
case MapStyleClear:
case MapStyleVehicleClear:
case MapStyleOutdoorsClear:
case MapStyleMerged:
return agg::rgba8(30, 150, 240, 20);
}

View file

@ -2640,10 +2640,14 @@ bool Framework::ParseDrapeDebugCommand(string const & query)
desiredStyle = MapStyleDark;
else if (query == "?light" || query == "mapstyle:light")
desiredStyle = MapStyleClear;
else if (query == "?vdark" || query == "mapstyle:vehicle_dark")
desiredStyle = MapStyleVehicleDark;
else if (query == "?vlight" || query == "mapstyle:vehicle_light")
desiredStyle = MapStyleVehicleClear;
else if (query == "?vdark" || query == "mapstyle:vehicle_dark")
desiredStyle = MapStyleVehicleDark;
else if (query == "?olight" || query == "mapstyle:outdoors_light")
desiredStyle = MapStyleOutdoorsClear;
else if (query == "?odark" || query == "mapstyle:outdoors_dark")
desiredStyle = MapStyleOutdoorsDark;
if (desiredStyle != MapStyleCount)
{

View file

@ -31,17 +31,25 @@ done
# Building drawing rules
BuildDrawingRules clear clear _clear
BuildDrawingRules clear night _dark
BuildDrawingRules outdoors clear _outdoors_clear
BuildDrawingRules outdoors night _outdoors_dark
# Keep vehicle style last to produce same visibility.txt & classificator.txt
BuildDrawingRules vehicle clear _vehicle_clear
BuildDrawingRules vehicle night _vehicle_dark
# In designer mode we use drules_proto_design file instead of standard ones
cp $OMIM_PATH/data/drules_proto_clear.bin $OMIM_PATH/data/drules_proto_design.bin
echo "Exporting transit colors"
echo "Exporting transit colors..."
python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \
"$DATA_PATH/colors.txt" > /dev/null
echo "Merging default and vehicle styles"
echo "Merging default and vehicle styles..."
python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
"$DATA_PATH/drules_proto_clear.bin" "$DATA_PATH/drules_proto_vehicle_clear.bin" \
"$DATA_PATH/drules_proto.bin.tmp" > /dev/null
echo "Merging in outdoors style..."
python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
"$DATA_PATH/drules_proto.bin.tmp" "$DATA_PATH/drules_proto_outdoors_clear.bin" \
"$DATA_PATH/drules_proto.bin" "$DATA_PATH/drules_proto.txt" > /dev/null
rm "$DATA_PATH/drules_proto.bin.tmp" || true