RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] tunnels for cycleway, track, bridleway & codecleanup

Browse source 
Signed-off-by: map per <map-per@gmx.de>
This commit is contained in:
map per 2023-08-26 17:22:02 +02:00 • committed by Viktor Govako
parent 30eb085969
commit a394ed2505
2 changed files with 67 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,8 +31,7 @@
8.5 Construction & Proposed 13-22 ZOOM
8.6 Track & Path 14-22 ZOOM
8.7 Footway 15-22 ZOOM
8.7.1 Steps 16-22 ZOOM
8.8 Footway & Path & Steps tunnel 17-22 ZOOM
8.8 Steps 15-22 ZOOM
8.9 Bridleway 14-22 ZOOM
8.11 Runway 12-22 ZOOM
9.RAIL 11-22 ZOOM
@ -632,6 +631,23 @@ line|z15-[highway=steps]
{color: @footway;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,
line|z17-[highway=cycleway][tunnel?]::tunnelBackground,
line|z17-[highway=path][tunnel?]::tunnelBackground,
line|z17-[highway=track][tunnel?]::tunnelBackground,
line|z17-[highway=bridleway][tunnel?]::tunnelBackground,
line|z17-[highway=steps][tunnel?]::tunnelBackground,
{casing-color: @bridge_background;}
line|z17-[highway=footway][tunnel?]::tunnelCasing,
line|z17-[highway=cycleway][tunnel?]::tunnelCasing,
line|z17-[highway=path][tunnel?]::tunnelCasing,
line|z17-[highway=track][tunnel?]::tunnelCasing,
line|z17-[highway=bridleway][tunnel?]::tunnelCasing,
line|z17-[highway=steps][tunnel?]::tunnelCasing,
{
casing-color: @bridge_casing;
casing-dashes: 2,2;
}
/* 8.1 Pedestrian & ford 13-22 ZOOM */
@ -697,6 +713,19 @@ line|z18[highway=cycleway]
line|z19-[highway=cycleway]
{width: 2.2;}
line|z17[highway=cycleway][tunnel?]::tunnelBackground
{casing-width-add: 1;}
line|z18[highway=cycleway][tunnel?]::tunnelBackground
{casing-width-add: 2;}
line|z19-[highway=cycleway][tunnel?]::tunnelBackground
{casing-width-add: 2.5;}
line|z17[highway=cycleway][tunnel?]::tunnelCasing
{casing-width-add: 1.5;}
line|z18[highway=cycleway][tunnel?]::tunnelCasing
{casing-width-add: 2.5;}
line|z19-[highway=cycleway][tunnel?]::tunnelCasing
{casing-width-add: 3;}
line|z15-16[highway=cycleway][bridge?]::bridgewhite
{casing-width-add: 0.5;}
line|z17[highway=cycleway][bridge?]::bridgewhite
@ -796,6 +825,16 @@ line|z19-[route=hiking],
line|z19-[highway=footway][sac_scale],
{width: 4; dashes: 8,4.5;}
line|z17-[highway=path][tunnel?]::tunnelBackground
{casing-width-add: 0.5;}
line|z17-[highway=path][tunnel?]::tunnelCasing
{casing-width-add: 1;}
line|z17-[highway=track][tunnel?]::tunnelBackground
{casing-width-add: 0.5;}
line|z17-[highway=track][tunnel?]::tunnelCasing
{casing-width-add: 1;}
line|z15-[highway=path][bridge?]::bridgewhite
{casing-width-add: 0.5;}
line|z17-[highway=path][bridge?]::bridgeblack
@ -807,7 +846,7 @@ line|z17-[highway=track][bridge?]::bridgeblack
{casing-width-add: 1;}
/* 8.7 Footway 14-22 ZOOM */
/* 8.7 Footway 15-22 ZOOM */
line|z15[highway=footway]
{width: 1.5; dashes: 5,2;}
@ -820,12 +859,17 @@ line|z18[highway=footway]
line|z19-[highway=footway],
{width: 4.5; dashes: 10,3.5;}
line|z17-[highway=footway][tunnel?]::tunnelBackground
{casing-width-add: 0.5;}
line|z17-[highway=footway][tunnel?]::tunnelCasing
{casing-width-add: 1;}
line|z15-[highway=footway][bridge?]::bridgewhite
{casing-width-add: 0.5;}
line|z17-[highway=footway][bridge?]::bridgeblack
{casing-width-add: 1;}
/* 8.7.1 Steps 16-22 ZOOM */
/* 8.8 Steps 15-22 ZOOM */
line|z15[highway=steps]
{width: 2.2;dashes: 1.5,1.5;}
@ -838,6 +882,11 @@ line|z18[highway=steps]
line|z19-[highway=steps]
{width: 10;dashes: 4,4;}
line|z17-[highway=steps][tunnel?]::tunnelBackground
{casing-width: 0.5;}
line|z17-[highway=steps][tunnel?]::tunnelCasing
{casing-width: 1;}
line|z15-16[highway=steps][bridge?]::bridgewhite
{casing-width-add: -2;}
line|z17[highway=steps][bridge?]::bridgewhite
@ -857,35 +906,6 @@ line|z18[highway=steps][bridge?]::bridgeblack
line|z19-[highway=steps][bridge?]::bridgeblack
{casing-width-add: -3;}
/* 8.8 Footway & Path & Steps tunnel 17-22 ZOOM */
line|z17-[highway=footway][tunnel?]::tunnelBackground,
line|z17-[highway=path][tunnel?]::tunnelBackground,
{
casing-width-add: 0.5;
casing-color: @bridge_background;
}
line|z17-[highway=footway][tunnel?]::tunnelCasing,
line|z17-[highway=path][tunnel?]::tunnelCasing,
{
casing-width-add: 1;
casing-color: @bridge_casing;
casing-dashes: 2,2;
}
line|z17-[highway=steps][tunnel?]::tunnelBackground,
{
casing-width: 0.5;
casing-color: @bridge_background;
}
line|z17-[highway=steps][tunnel?]::tunnelCasing,
{
casing-width: 1;
casing-color: @bridge_casing;
casing-dashes: 2,2;
}
/* 8.9 Bridleway 14-22 ZOOM */
line|z14[highway=bridleway]
@ -901,6 +921,11 @@ line|z18[highway=bridleway]
line|z19-[highway=bridleway]
{width: 4;dashes: 9,3.6;}
line|z17-[highway=bridleway][tunnel?]::tunnelBackground
{casing-width-add: 0.5;}
line|z17-[highway=bridleway][tunnel?]::tunnelCasing
{casing-width-add: 1;}
line|z15-[highway=bridleway][bridge?]::bridgewhite
{casing-width-add: 0.5;}
line|z17-[highway=bridleway][bridge?]::bridgeblack

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

@ -48,7 +48,7 @@ power-line::dash # line::dash z19- (also has
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 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-)
@ -292,14 +292,14 @@ highway-track-grade4 # line z14- (also has pathte
highway-track-grade5 # line z14- (also has pathtext z15-)
highway-track-no-access # line z14- (also has pathtext z15-)
highway-track-permissive # line z14- (also has pathtext z15-)
highway-track-tunnel # line z14- (also has pathtext z15-)
highway-track-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
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 pathtext z15-)
highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
=== 170
highway-construction # line z13- (also has pathtext z15-)
@ -430,15 +430,21 @@ isoline-step_500 # line z11- (also has pathte
isoline-zero # line z15- (also has pathtext z17-)
=== 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 z14-, line::tunnelCasing z17-, pathtext z15-)
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 z14-, line::tunnelCasing z17-, pathtext z15-)
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 z14-, line::tunnelBackground z17-, pathtext z15-)
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 z14-, line::tunnelBackground z17-, pathtext z15-)
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
=== 40