organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

WIP: Outdoors: emphasize hiking routes, increase bridle/cycle/foot-ways visibility #6790

Draft
pastk wants to merge 6 commits from pastk-outdoors-hiking-routes into master
pull from: pastk-outdoors-hiking-routes
merge into: organicmaps:master
Conversation 0 Commits 6 Files changed 13 +279 -147
13 changed files with 279 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/mapcss-mapping.csv
View file

@ -184,7 +184,7 @@ amenity|recycling|container;[amenity=recycling][recycling_type=container];;name;
leisure|garden;110;
landuse|commercial;111;
railway|station;112;
highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113;
highway|path|hiking;[highway=path][sac_scale=hiking];;name;int_name;113;
amenity|hospital;114;
waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
@ -1679,3 +1679,7 @@ amenity|compressed_air;1592;
leisure|hackerspace;1593;
railway|station|subway|singapore;[railway=station][transport=subway][city=singapore],[railway=station][station=subway][city=singapore];;name;int_name;1594;
railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;name;int_name;1595;
highway|path|hiking_route;[highway=path][route=hiking];;name;int_name;1596;
highway|track|hiking_route;[highway=track][route=hiking];;name;int_name;1597;
highway|footway|hiking_route;[highway=footway][route=hiking];;name;int_name;1598;
highway|bridleway|hiking_route;[highway=bridleway][route=hiking];;name;int_name;1599;
Can't render this file because it contains an unexpected character in line 7 and column 16.

6
data/styles/clear/include/Roads.mapcss
View file

@ -608,14 +608,14 @@ line|z14-[highway=raceway],
{color: @track;opacity: 1;}
line|z15-[leisure=track][!area],
{color: @sport;opacity: 1;}
line|z14-[highway=path],
line|z14-[highway=footway][sac_scale],
{color: @path;opacity: 1;}
line|z14-[highway=bridleway]
{color: @bridleway;opacity: 1;}
line|z15-[highway=footway],
line|z15-[highway=steps]
{color: @footway;opacity: 1;}
line|z14-[highway=path],
line|z14-[highway=footway][sac_scale],
{color: @path;opacity: 1;}
line|z16-[highway=pedestrian][tunnel?]
{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;}
line|z17-[highway=footway][tunnel?]::tunnelBackground,

6
data/styles/clear/include/priorities_3_FG.prio.txt
View file

@ -260,6 +260,12 @@ highway-service-parking_aisle # line z15- (also has pathte
highway-service-tunnel # line z15- (also has pathtext z16-)
=== 190
highway-bridleway-hiking_route
highway-footway-hiking_route
highway-path-hiking_route
highway-track-hiking_route
=== 185
highway-footway # line z15- (also has pathtext z15-)
highway-footway-alpine_hiking # line z14- (also has pathtext z15-)
highway-footway-area # line z15- and area z14- (also has pathtext z15-)

6
data/styles/clear/include/priorities_4_overlays.prio.txt
View file

@ -694,6 +694,12 @@ highway-ford # icon z16- and pathtext z16
natural-rock # icon z15-
=== 2850
highway-bridleway-hiking_route
highway-footway-hiking_route
highway-path-hiking_route
highway-track-hiking_route
=== 2830
highway-footway-alpine_hiking # pathtext z15- (also has line z14-)
highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z14-)
highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z14-)

14
data/styles/outdoors/include/Basemap.mapcss
View file

@ -6,9 +6,9 @@
line|z10-[waterway=river],
line|z10-[waterway=riverbank],
line|z11-[waterway=stream],
line|z11-[waterway=canal],
line|z11-[natural=strait],
line|z12-[waterway=canal],
line|z12-[waterway=stream],
line|z13-[waterway=fish_pass],
line|z15-[waterway=ditch],
line|z15-[waterway=drain],
@ -19,8 +19,8 @@ line|z15-[waterway=drain],
line|z10-[waterway=river],
line|z10-[waterway=riverbank],
line|z11-[natural=strait],
line|z11-[waterway=stream],
line|z11-[waterway=canal],
line|z12-[waterway=stream],
line|z12-[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;}
@ -32,8 +32,8 @@ 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],
line|z12[waterway=stream],
line|z12[waterway=canal],
{width: 1;}
line|z13[waterway=river],
@ -45,7 +45,7 @@ line|z13[waterway=canal],
line|z13[waterway=fish_pass],
{width: 1.3;}
line|z11-12[waterway=stream][intermittent],
{width: 0;}
{width: 0; text: none;}
line|z13[waterway=stream][intermittent],
{width: 1; dashes: 2.7,2.7;}

131
data/styles/outdoors/include/Roads.mapcss
View file

@ -47,15 +47,6 @@ line|z19-[highway=service][service=parking_aisle],
/* 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;}
@ -65,12 +56,28 @@ 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=footway],
{color: @footway; opacity: 1;}
line|z11-[highway=track],
{color: @track;opacity: 1;}
line|z11-[highway=path],
line|z11-[highway=footway][route],
line|z12-[highway=footway][sac_scale],
{color: @path; opacity: 1;}
/* TODO: change color to be similar to cycleways. */
line|z11-[highway=bridleway],
{color: @path; opacity: 1;}
line|z12-[highway=cycleway]
{color: @cycleway; opacity: 1;}
line|z12[highway=track],
{width: 1.3; dashes: 6,2.5;}
{width: 1.3; dashes: 5,2.5;}
line|z13[highway=track],
{width: 1.6; dashes: 7,3;}
line|z14[highway=track],
@ -84,31 +91,109 @@ line|z17[highway=track],
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|z11[highway=track][route],
{width: 1.6; dashes: 5,2.5;}
line|z12[highway=track][route],
{width: 2;}
line|z13[highway=track][route],
{width: 2.5;}
line|z14[highway=track][route],
{width: 3.2;}
line|z15[highway=track][route],
{width: 4;}
line|z16[highway=track][route],
{width: 5;}
line|z17[highway=track][route],
{width: 6.2;}
line|z18-[highway=track][route],
{width: 7.5;}
line|z12[highway=path],
line|z12[highway=footway][sac_scale],
line|z12[highway=footway],
{width: 1.1; dashes: 3.5,2;}
line|z13[highway=path],
line|z13[highway=footway][sac_scale],
line|z13[highway=footway],
{width: 1.3; dashes: 4,2.5;}
line|z14[highway=path],
line|z14[highway=footway][sac_scale],
line|z14[highway=footway],
{width: 1.6; dashes: 4,2.5;}
line|z15[highway=path],
line|z15[highway=footway][sac_scale],
line|z15[highway=footway],
{width: 2; dashes: 6,3.5;}
line|z16[highway=path],
line|z16[highway=footway][sac_scale],
line|z16[highway=footway],
{width: 2.6; dashes: 6,3.5;}
line|z17[highway=path],
line|z17[highway=footway][sac_scale],
line|z17[highway=footway],
{width: 3.3; dashes: 8,4.5;}
line|z18-[highway=path],
line|z18-[highway=footway][sac_scale],
line|z18-[highway=footway],
{width: 4; dashes: 8,4.5;}
line|z12[highway=bridleway],
{width: 1.1; dashes: 6,1;}
line|z13[highway=bridleway],
{width: 1.3; dashes: 7,1.2;}
line|z14[highway=bridleway],
{width: 1.6; dashes: 7,1.2;}
line|z15[highway=bridleway],
{width: 2; dashes: 9,1.7;}
line|z16[highway=bridleway],
{width: 2.6; dashes: 9,1.7;}
line|z17[highway=bridleway],
{width: 3.3; dashes: 12,2.2;}
line|z18-[highway=bridleway],
{width: 4; dashes: 12,2.2;}
line|z11[highway=path][route],
line|z11[highway=footway][route],
line|z11[highway=bridleway][route],
{width: 1.3; dashes: 3.5,2;}
line|z12[highway=path][route],
line|z12[highway=footway][route],
line|z12[highway=bridleway][route],
{width: 1.6;}
line|z13[highway=path][route],
line|z13[highway=footway][route],
line|z13[highway=bridleway][route],
{width: 2;}
line|z14[highway=path][route],
line|z14[highway=footway][route],
line|z14[highway=bridleway][route],
{width: 2.6;}
line|z15[highway=path][route],
line|z15[highway=footway][route],
line|z15[highway=bridleway][route],
{width: 3.3;}
line|z16[highway=path][route],
line|z16[highway=footway][route],
line|z16[highway=bridleway][route],
{width: 4;}
line|z17[highway=path][route],
line|z17[highway=footway][route],
line|z17[highway=bridleway][route],
{width: 5;}
line|z18-[highway=path][route],
line|z18-[highway=footway][route],
line|z18-[highway=bridleway][route],
{width: 6;}
line|z12[highway=cycleway],
{width: 0.8;}
line|z13[highway=cycleway],
{width: 1.1;}
line|z14[highway=cycleway],
{width: 1.4;}
line|z15[highway=cycleway],
{width: 1.6;}
line|z16[highway=cycleway],
{width: 1.9;}
line|z17[highway=cycleway],
{width: 2.3;}
line|z18-[highway=cycleway],
{width: 2.8;}
/* 9.RAIL 11-22 ZOOM */
line|z10-[railway=rail],

16
data/styles/outdoors/include/Roads_label.mapcss
View file

@ -2,12 +2,16 @@
@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-[highway=footway],
line|z13-[highway=bridleway],
line|z13-[highway=cycleway],
{text: name; font-size: 10; 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;}
line|z16-[highway=path],
line|z16-[highway=track],
line|z16-[highway=footway],
line|z16-[highway=bridleway],
line|z16-[highway=cycleway],
{font-size: 12;}

2
data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
View file

@ -56,7 +56,7 @@ landuse-cemetery-christian # area z14- (also has icon z
highway-pedestrian-area # area z14- (also has line z13-, pathtext z14-)
=== 170
highway-footway-area # area z14- (also has line z15-, pathtext z15-)
highway-footway-area # area z14- (also has line z12-, pathtext z13-)
leisure-track-area # area z15- (also has caption z16-)
=== 160

130
data/styles/outdoors/include/priorities_3_FG.prio.txt
View file

@ -45,10 +45,10 @@ power-line # line z15- (also has line::
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-cycleway # line z12- (also has pathtext z13-)
highway-cycleway-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-cycleway-permissive # line z12- (also has pathtext z13-)
highway-cycleway-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
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-)
@ -260,48 +260,54 @@ highway-service-parking_aisle # line z15- (also has pathte
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-bridleway-hiking_route
highway-footway-hiking_route
highway-path-hiking_route
highway-track-hiking_route
=== 185
highway-footway # line z12- (also has pathtext z13-)
highway-footway-alpine_hiking # line z12- (also has pathtext z13-)
highway-footway-area # line z12- and area z14- (also has pathtext z13-)
highway-footway-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-footway-demanding_alpine_hiking # line z12- (also has pathtext z13-)
highway-footway-demanding_mountain_hiking # line z12- (also has pathtext z13-)
highway-footway-difficult_alpine_hiking # line z12- (also has pathtext z13-)
highway-footway-hiking # line z12- (also has pathtext z13-)
highway-footway-mountain_hiking # line z12- (also has pathtext z13-)
highway-footway-permissive # line z12- (also has pathtext z13-)
highway-footway-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
highway-path # line z12- (also has pathtext z13-)
highway-path-alpine_hiking # line z12- (also has pathtext z13-)
highway-path-bicycle # line z12- (also has pathtext z13-)
highway-path-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-path-demanding_alpine_hiking # line z12- (also has pathtext z13-)
highway-path-demanding_mountain_hiking # line z12- (also has pathtext z13-)
highway-path-difficult_alpine_hiking # line z12- (also has pathtext z13-)
highway-path-hiking # line z12- (also has pathtext z13-)
highway-path-horse # line z12- (also has pathtext z13-)
highway-path-mountain_hiking # line z12- (also has pathtext z13-)
highway-path-permissive # line z12- (also has pathtext z13-)
highway-path-tunnel # line z12- (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-)
highway-track # line z12- (also has pathtext z13-)
highway-track-area # line z12- (also has pathtext z13-)
highway-track-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-track-grade1 # line z12- (also has pathtext z13-)
highway-track-grade2 # line z12- (also has pathtext z13-)
highway-track-grade3 # line z12- (also has pathtext z13-)
highway-track-grade4 # line z12- (also has pathtext z13-)
highway-track-grade5 # line z12- (also has pathtext z13-)
highway-track-no-access # line z12- (also has pathtext z13-)
highway-track-permissive # line z12- (also has pathtext z13-)
highway-track-tunnel # line z12- (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-)
highway-bridleway # line z12- (also has pathtext z13-)
highway-bridleway-bridge # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
highway-bridleway-permissive # line z12- (also has pathtext z13-)
highway-bridleway-tunnel # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
=== 170
highway-construction # line z11- (also has pathtext z15-)
@ -315,12 +321,12 @@ railway-preserved-bridge # line z13- (also has line::
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-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
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-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, 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-)
@ -332,7 +338,7 @@ highway-service-bridge::bridgewhite # line::bridgewhite z16- (al
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-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z12-, 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-)
@ -349,12 +355,12 @@ railway-rail-utility-bridge::bridgewhite # line::bridgewhite z13- (al
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-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
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-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, 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-)
@ -366,7 +372,7 @@ highway-service-bridge::bridgeblack # line::bridgeblack z16- (al
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-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z12-, 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-)
@ -432,21 +438,21 @@ isoline-step_500 # line z10- (also has pathte
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-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-)
highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-)
highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-)
highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, 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-)
highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, 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-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, 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-)
highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
=== 40

92
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -651,17 +651,17 @@ highway-residential-bridge::shield # shield::shield z15- (also
highway-residential-tunnel::shield # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
=== 2955
highway-cycleway # pathtext z15- (also has line z13-)
highway-cycleway-bridge # pathtext z15- (also has line z13-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-cycleway-permissive # pathtext z15- (also has line z13-)
highway-cycleway-tunnel # pathtext z15- (also has line z13-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-cycleway # pathtext z13- (also has line z12-)
highway-cycleway-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-cycleway-permissive # pathtext z13- (also has line z12-)
highway-cycleway-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2953
area:highway-footway # caption z15- (also has area z14-)
highway-footway # pathtext z15- (also has line z15-)
highway-footway-area # pathtext z15- (also has line z15-, area z14-)
highway-footway-bridge # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-footway-tunnel # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-footway # pathtext z13- (also has line z12-)
highway-footway-area # pathtext z13- (also has line z12-, area z14-)
highway-footway-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-footway-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-tertiary_link # pathtext z18- (also has line z15-)
highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-)
@ -682,9 +682,9 @@ natural-water-drain # caption z17- (also has are
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 z11-)
waterway-canal # pathtext z13- (also has line z12-)
waterway-fish_pass # pathtext z13- (also has line z13-)
waterway-stream # pathtext z13- (also has line z11-)
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-)
@ -694,25 +694,31 @@ highway-ford # icon z14- and pathtext z16
natural-rock # icon z15-
=== 2850
highway-footway-alpine_hiking # pathtext z15- (also has line z11-)
highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z11-)
highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z11-)
highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z11-)
highway-footway-hiking # pathtext z15- (also has line z11-)
highway-footway-mountain_hiking # pathtext z15- (also has line z11-)
highway-bridleway-hiking_route
highway-footway-hiking_route
highway-path-hiking_route
highway-track-hiking_route
=== 2830
highway-footway-alpine_hiking # pathtext z15- (also has line z12-)
highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z12-)
highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z12-)
highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z12-)
highway-footway-hiking # pathtext z15- (also has line z12-)
highway-footway-mountain_hiking # pathtext z15- (also has line z12-)
highway-footway-permissive # pathtext z15- (also has line z15-)
highway-path # pathtext z13- (also has line z11-)
highway-path-alpine_hiking # pathtext z13- (also has line z11-)
highway-path-bicycle # pathtext z13- (also has line z11-)
highway-path-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-path-demanding_alpine_hiking # pathtext z13- (also has line z11-)
highway-path-demanding_mountain_hiking # pathtext z13- (also has line z11-)
highway-path-difficult_alpine_hiking # pathtext z13- (also has line z11-)
highway-path-hiking # pathtext z13- (also has line z11-)
highway-path-horse # pathtext z13- (also has line z11-)
highway-path-mountain_hiking # pathtext z13- (also has line z11-)
highway-path-permissive # pathtext z13- (also has line z11-)
highway-path-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-path # pathtext z13- (also has line z12-)
highway-path-alpine_hiking # pathtext z13- (also has line z12-)
highway-path-bicycle # pathtext z13- (also has line z12-)
highway-path-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-path-demanding_alpine_hiking # pathtext z13- (also has line z12-)
highway-path-demanding_mountain_hiking # pathtext z13- (also has line z12-)
highway-path-difficult_alpine_hiking # pathtext z13- (also has line z12-)
highway-path-hiking # pathtext z13- (also has line z12-)
highway-path-horse # pathtext z13- (also has line z12-)
highway-path-mountain_hiking # pathtext z13- (also has line z12-)
highway-path-permissive # pathtext z13- (also has line z12-)
highway-path-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2820
highway-steps # pathtext z16- (also has line z15-)
@ -720,23 +726,23 @@ highway-steps-bridge # pathtext z16- (also has li
highway-steps-tunnel # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2810
highway-bridleway # pathtext z15- (also has line z14-)
highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-bridleway-permissive # pathtext z15- (also has line z14-)
highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-bridleway # pathtext z13- (also has line z12-)
highway-bridleway-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-bridleway-permissive # pathtext z13- (also has line z12-)
highway-bridleway-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2790
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-grade1 # pathtext z13- (also has line z11-)
highway-track-grade2 # pathtext z13- (also has line z11-)
highway-track-grade3 # pathtext z13- (also has line z11-)
highway-track-grade4 # pathtext z13- (also has line z11-)
highway-track-grade5 # pathtext z13- (also has line z11-)
highway-track-no-access # pathtext z13- (also has line z11-)
highway-track-permissive # pathtext z13- (also has line z11-)
highway-track-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
highway-track # pathtext z13- (also has line z12-)
highway-track-area # pathtext z13- (also has line z12-)
highway-track-bridge # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
highway-track-grade1 # pathtext z13- (also has line z12-)
highway-track-grade2 # pathtext z13- (also has line z12-)
highway-track-grade3 # pathtext z13- (also has line z12-)
highway-track-grade4 # pathtext z13- (also has line z12-)
highway-track-grade5 # pathtext z13- (also has line z12-)
highway-track-no-access # pathtext z13- (also has line z12-)
highway-track-permissive # pathtext z13- (also has line z12-)
highway-track-tunnel # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
=== 2780
highway-service # pathtext z16- (also has line z13-)

6
data/styles/vehicle/include/priorities_3_FG.prio.txt
View file

@ -235,6 +235,12 @@ highway-service-parking_aisle # line z14- (also has pathte
highway-service-tunnel # line z14- (also has pathtext z16-)
=== 140
highway-bridleway-hiking_route
highway-footway-hiking_route
highway-path-hiking_route
highway-track-hiking_route
=== 135
highway-bridleway # line z18-
highway-bridleway-bridge # line z18-
highway-bridleway-permissive # line z18-

9
generator/relation_tags.cpp
View file

@ -144,7 +144,16 @@ void RelationTagsWay::Process(RelationElement const & e)
if (route == "bicycle")
Base::AddCustomTag({"bicycle", "yes"});
else if (route == "foot" || route == "hiking")
{
Base::AddCustomTag({"foot", "yes"});
if (route == "hiking")
{
auto const hw = m_current->GetTag("highway");
if (hw == "path" || hw == "track" || hw == "bridleway" || hw == "footway")
Base::AddCustomTag({"route", "hiking"});
}
}
}
if (!fetchTags)

2
generator/translator.cpp
View file

@ -46,7 +46,7 @@ void Translator::Emit(OsmElement const & src)
if (!m_filter->IsAccepted(element))
return;
m_tagsEnricher(element);
m_tagsEnricher(element); // Pull necessary tags from relations.
m_collector->Collect(element);
m_featureMaker->Add(element); // A feature is created from OSM tags.
feature::FeatureBuilder feature;