Improved light map style and separated motorways and trunk roads

This commit is contained in:
Yannik Bloscheck
2025-06-08 15:36:12 +02:00
committed by Yannik Bloscheck
parent 59fe3c08ab
commit b96564d454
13 changed files with 220 additions and 170 deletions

View File

@@ -548,11 +548,11 @@ line|z19-[man_made=cutline],
area|z14[building],
area|z14[waterway=dam],
{fill-color: @building0;fill-opacity: 0.5;}
{fill-color: @building0;fill-opacity: 0.6;}
area|z15[building],
area|z15[waterway=dam],
{fill-color: @building0;fill-opacity: 0.6;}
{fill-color: @building0;fill-opacity: 0.7;}
area|z14-15[aeroway=terminal],
area|z16[building],

View File

@@ -53,7 +53,7 @@
line|z6-9[highway=world_towns_level],
line|z4-9[highway=world_level],
{color: @trunk1;opacity: 1;}
{color: @motorway1;opacity: 1;}
line|z4[highway=world_level]
{width: 0.5;}
@@ -73,15 +73,17 @@ line|z9[highway=world_level]
/* 3.TRUNK & MOTORWAY 6-22 ZOOM */
line|z6[highway=trunk],
line|z6[highway=motorway],
{color: @trunk0; opacity: 0.3;}
line|z7-9[highway=trunk],
{color: @motorway0; opacity: 1;}
line|z6[highway=trunk],
{color: @trunk0; opacity: 0.6;}
line|z7-9[highway=motorway],
{color: @trunk0; opacity: 0.7;}
line|z10-[highway=trunk],
{color: @motorway0; opacity: 1;}
line|z7-9[highway=trunk],
{color: @trunk0; opacity: 0.8;}
line|z10-[highway=motorway],
{color: @motorway1; opacity: 0.7;}
line|z10-[highway=trunk],
{color: @trunk1; opacity: 0.7;}
line|z10-[highway=motorway_link],
line|z10-[highway=trunk_link],
@@ -110,85 +112,112 @@ line|z14-[highway=trunk_link][bridge?]::bridgeblack,
/* 3.1 Trunk & Motorway 6-22 ZOOM */
line|z6[highway=trunk],
line|z6[highway=motorway],
{width: 0.9;}
line|z7[highway=motorway]
{width: 1.0;}
line|z8[highway=motorway]
{width: 1.2;}
line|z9[highway=motorway]
{width: 1.3;}
line|z10[highway=motorway]
{width: 1.7;}
line|z11[highway=motorway]
{width: 1.8;}
line|z12[highway=motorway]
{width: 2.0;}
line|z13[highway=motorway],
{width: 2.9;}
line|z14[highway=motorway],
{width: 3.9;}
line|z15[highway=motorway],
{width: 4.5;}
line|z16[highway=motorway],
{width: 6.1;}
line|z17[highway=motorway],
{width: 8.3;}
line|z18[highway=motorway],
{width: 11.1;}
line|z19-[highway=motorway],
{width: 13.6;}
line|z6[highway=trunk],
{width: 0.8;}
line|z7[highway=trunk],
line|z7[highway=motorway]
{width: 0.9;}
line|z8[highway=trunk],
line|z8[highway=motorway]
{width: 1.1;}
line|z9[highway=trunk],
line|z9[highway=motorway]
{width: 1.2;}
line|z10[highway=trunk],
line|z10[highway=motorway]
{width: 1.5;}
line|z11[highway=trunk],
line|z11[highway=motorway]
{width: 1.7;}
line|z12[highway=trunk],
line|z12[highway=motorway]
{width: 1.9;}
line|z13[highway=trunk],
line|z13[highway=motorway],
{width: 2.8;}
line|z14[highway=trunk],
line|z14[highway=motorway],
{width: 3.8;}
line|z15[highway=trunk],
line|z15[highway=motorway],
{width: 4.4;}
line|z16[highway=trunk],
line|z16[highway=motorway],
{width: 6;}
line|z17[highway=trunk],
line|z17[highway=motorway],
{width: 8.2;}
line|z18[highway=trunk],
line|z18[highway=motorway],
{width: 11;}
line|z19-[highway=trunk],
line|z19-[highway=motorway],
{width: 13.5;}
line|z10[highway=motorway_link],
{width: 0.9;}
line|z11[highway=motorway_link],
{width: 1.1;}
line|z12[highway=motorway_link],
{width: 1.4;}
line|z13[highway=motorway_link],
{width: 1.9;}
line|z14[highway=motorway_link],
{width: 2.7;}
line|z15[highway=motorway_link],
{width: 3.7;}
line|z16[highway=motorway_link],
{width: 5.1;}
line|z17[highway=motorway_link],
{width: 6.7;}
line|z18[highway=motorway_link],
{width: 9.5;}
line|z19-[highway=motorway_link],
{width: 11.7;}
line|z10[highway=trunk_link]
{width: 0.8;}
line|z11[highway=motorway_link],
line|z11[highway=trunk_link]
{width: 1.0;}
line|z12[highway=motorway_link],
line|z12[highway=trunk_link]
{width: 1.3;}
line|z13[highway=motorway_link],
line|z13[highway=trunk_link]
{width: 1.8;}
line|z14[highway=motorway_link],
line|z14[highway=trunk_link]
{width: 2.6;}
line|z15[highway=motorway_link],
line|z15[highway=trunk_link]
{width: 3.6;}
line|z16[highway=motorway_link],
line|z16[highway=trunk_link]
{width: 5;}
line|z17[highway=motorway_link],
line|z17[highway=trunk_link]
{width: 6.6;}
line|z18[highway=motorway_link],
line|z18[highway=trunk_link]
{width: 9.4;}
line|z19-[highway=motorway_link],
line|z19-[highway=trunk_link]
{width: 11.6;}
/* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */
line|z12-[highway=motorway][tunnel?],
line|z12-[highway=trunk][tunnel?],
line|z13-[highway=motorway_link][tunnel?],
{color: @motorway_tunnel; casing-linecap: butt; casing-color: @motorway_tunnel_casing; casing-opacity: 0.7;}
line|z12-[highway=trunk][tunnel?],
line|z13-[highway=trunk_link][tunnel?],
{color: @trunk_tunnel; casing-linecap: butt; casing-color: @trunk_tunnel_casing; casing-opacity: 0.7;}
@@ -246,16 +275,12 @@ line|z18-[highway=trunk_link][bridge?]::bridgeblack
/* 4.PRIMARY 8-22 ZOOM */
line|z8-10[highway=primary],
{color: @primary0; opacity: 0.7;}
line|z11-12[highway=primary],
line|z11-12[highway=primary_link]
{color: @primary1; opacity: 0.7;}
line|z13-14[highway=primary],
line|z13-14[highway=primary_link],
{color: @primary1; opacity: 0.85;}
line|z15-[highway=primary],
line|z15-[highway=primary_link],
{color: @primary1; opacity: 1;}
line|z11-13[highway=primary],
line|z11-13[highway=primary_link]
{color: @primary0; opacity: 0.9;}
line|z14-[highway=primary],
line|z14-[highway=primary_link],
{color: @primary2; opacity: 1;}
line|z14-[highway=primary][bridge?]::bridgewhite,
@@ -268,9 +293,9 @@ line|z14-[highway=primary_link][bridge?]::bridgeblack,
/* 4.1 Primary 8-22 ZOOM */
line|z8[highway=primary],
{width: 0.7;}
line|z9[highway=primary],
{width: 0.8;}
line|z9[highway=primary],
{width: 0.9;}
line|z10[highway=primary],
{width: 1.2;}
line|z11[highway=primary],
@@ -349,7 +374,7 @@ line|z18-[highway=primary_link][bridge?]::bridgeblack,
/* 5.SECONDARY 10-22 ZOOM */
line|z10-12[highway=secondary],
{color: @secondary0; opacity: 0.8;}
{color: @secondary0; opacity: 1;}
line|z13-14[highway=secondary],
line|z13-14[highway=secondary_link],
{color: @secondary1; opacity: 0.9;}
@@ -614,7 +639,7 @@ line|z18-[highway=residential][bridge?]::bridgeblack,
line|z15-[highway=service],
line|z15-[highway=service][service=busway],
line|z15-[highway=busway],
{color: @residential; opacity: 0.8;}
{color: @residential; opacity: 0.9;}
line|z15[highway=service],
line|z15[highway=service][service=busway],
@@ -643,11 +668,32 @@ line|z19-[highway=busway],
line|z13-[highway=pedestrian],
line|z13-[highway=ford]
{color: @pedestrian;opacity: 0.85;}
{color: @pedestrian;opacity: 0.9;}
line|z13-[highway=cycleway],
line|z14-[highway=path][bicycle=designated]::cycleline,
line|z15-[highway=footway][bicycle=designated]::cycleline,
{color: @cycleway;}
line|z14-[highway=path][bicycle=designated]::cycleline,
line|z15-[highway=footway][bicycle=designated]::cycleline,
{dashes: 7,9.6;}
line|z16[highway=path][bicycle=designated]::cycleline,
line|z16[highway=footway][bicycle=designated]::cycleline,
{dashes: 7.5,9.5;}
line|z17[highway=path][bicycle=designated]::cycleline,
line|z17[highway=footway][bicycle=designated]::cycleline,
{dashes: 8,9.4;}
line|z18[highway=path][bicycle=designated]::cycleline,
line|z18[highway=footway][bicycle=designated]::cycleline,
{dashes: 8.5,9.3;}
line|z19-[highway=path][bicycle=designated]::cycleline,
line|z19-[highway=footway][bicycle=designated]::cycleline,
{dashes: 9,9.2;}
line|z13-[highway=construction],
{color: @construction;opacity: 0.7;}
line|z13-[highway=pedestrian][bridge?]::bridgewhite,
@@ -679,9 +725,9 @@ line|z15-[leisure=track][!area],
line|z14-[highway=bridleway]
{color: @bridleway;opacity: 0.6;}
line|z15-[highway=footway],
{color: @footway;opacity: 0.75;}
{color: @footway;opacity: 0.8;}
line|z15-[highway=steps],
{color: @footway;opacity: 0.85;}
{color: @footway;opacity: 0.9;}
line|z14-[highway=path],
{color: @path;opacity: 0.6;}
line|z14-[highway=path][_path_grade=expert],
@@ -711,25 +757,25 @@ line|z17-[highway=steps][tunnel?]::tunnelCasing,
line|z13[highway=pedestrian],
line|z13[highway=ford]
{width: 1;dashes: 2,1;}
{width: 1;dashes: 4,1;}
line|z14[highway=pedestrian],
line|z14[highway=ford]
{width: 1.6;dashes: 3.6,1.6;}
{width: 1.6;dashes: 6,1.3;}
line|z15[highway=pedestrian],
line|z15[highway=ford]
{width: 2;dashes: 5,2.2;}
{width: 2;dashes: 8,1.5;}
line|z16[highway=pedestrian],
line|z16[highway=ford]
{width: 2.4;dashes: 5.4,2.7;}
{width: 2.4;dashes: 8,1.5;}
line|z17[highway=pedestrian],
line|z17[highway=ford]
{width: 3;dashes: 5,2;}
{width: 3;dashes: 9,1.8;}
line|z18[highway=pedestrian],
line|z18[highway=ford]
{width: 4;dashes: 7,3;opacity: 1;}
{width: 4;dashes: 11,2.3;opacity: 1;}
line|z19-[highway=pedestrian],
line|z19-[highway=ford]
{width: 5;dashes: 16.2,8.1;opacity: 1;}
{width: 5;dashes: 13,2.7;opacity: 1;}
/* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */
@@ -757,24 +803,24 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
/* 8.4 Cycleway 13-22 ZOOM */
line|z13[highway=cycleway],
{opacity: 0.3;}
{opacity: 0.5;}
line|z14[highway=cycleway],
line|z14[highway=path][bicycle=designated]::cycleline,
{opacity: 0.4;}
{opacity: 0.6;}
line|z15[highway=cycleway],
line|z15[highway=path][bicycle=designated]::cycleline,
{opacity: 0.5;}
{opacity: 0.7;}
line|z16-17[highway=cycleway],
line|z16-17[highway=path][bicycle=designated]::cycleline,
{opacity: 0.6;}
{opacity: 0.8;}
line|z18-[highway=cycleway],
line|z18-[highway=path][bicycle=designated]::cycleline,
{opacity: 0.8;}
{opacity: 1;}
line|z15-16[highway=footway][bicycle=designated]::cycleline,
{opacity: 0.4;}
line|z17-[highway=footway][bicycle=designated]::cycleline,
{opacity: 0.5;}
{opacity: 0.6;}
line|z15-16[highway=footway][bicycle=designated]::cycleline,
{opacity: 0.7;}
line|z13[highway=cycleway]
{width: 0.9;}
@@ -953,26 +999,26 @@ line|z17-[highway=track][bridge?]::bridgeblack
/* 8.7 Footway 15-22 ZOOM */
line|z15[highway=footway]
{width: 1.5; dashes: 5,2;}
{width: 1.5; dashes: 5,1.5;}
line|z16[highway=footway]
{width: 2; dashes: 5,2;}
{width: 2; dashes: 5,1.5;}
line|z17[highway=footway]
{width: 2.4; dashes: 6,2.5;}
{width: 2.4; dashes: 6,1.8;}
line|z18[highway=footway]
{width: 3.2; dashes: 8,3; opacity: 1;}
{width: 3.2; dashes: 8,2.3; opacity: 1;}
line|z19-[highway=footway],
{width: 4.2; dashes: 10,3.5; opacity: 1;}
{width: 4.2; dashes: 10,2.7;opacity: 1;}
line|z15[highway=footway][bicycle=designated],
{width: 1.5; dashes: 5,3;}
{width: 1.5; dashes: none;}
line|z16[highway=footway][bicycle=designated],
{width: 2; dashes: 5,3;}
{width: 2; dashes: none;}
line|z17[highway=footway][bicycle=designated],
{width: 2.4; dashes: 6,4.2; opacity: 0.9;}
{width: 2.4; dashes: none; opacity: 0.9;}
line|z18[highway=footway][bicycle=designated],
{width: 3.2; dashes: 8,5.5; opacity: 1;}
{width: 3.2; dashes: none; opacity: 1;}
line|z19-[highway=footway][bicycle=designated],
{width: 4.2; dashes: 10,6.7; opacity: 1;}
{width: 4.2; dashes: none; opacity: 1;}
/* Don't display sidewalks and pedestrian crossings on z15. */
line|z15[highway=footway][footway=sidewalk],

View File

@@ -45,10 +45,6 @@ power-line # line z19- (also has line::
power-line::dash # line::dash z19- (also has line z19-)
=== 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-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
highway-footway-crossing # line z16-
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-)
@@ -192,16 +188,26 @@ highway-secondary_link-tunnel # line z13- (also has line(c
=== 224
# highway-secondary_link-tunnel # line(casing) z16- (also has line z13-, pathtext z16-)
# === 223
highway-tertiary_link # line z14- (also has pathtext z18-)
highway-tertiary_link-bridge # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
highway-tertiary_link-tunnel # line z14- (also has line(casing) z16-, pathtext z18-)
=== 223
highway-busway # line z15- (also has pathtext z16-)
highway-busway-bridge # line z15- (also has pathtext z16-)
highway-busway-tunnel # line z15- (also has pathtext z16-)
highway-service # line z15- (also has pathtext z16-)
highway-service-area # line z15- (also has pathtext z16-)
highway-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, 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 z15- (also has pathtext z16-)
# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-)
=== 222
# highway-tertiary_link-tunnel # line(casing) z16- (also has line z14-, pathtext z18-)
# === 221
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-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
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 z16- (also has line z11-)
@@ -254,15 +260,8 @@ highway-pedestrian-tunnel # line z13- (also has line(c
# 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 z15- (also has pathtext z16-)
highway-service-area # line z15- (also has pathtext z16-)
highway-service-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z16-, 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 z15- (also has pathtext z16-)
highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, pathtext z15-)
highway-path-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-)
=== 190
highway-bridleway # line z14- (also has pathtext z15-)
@@ -271,6 +270,7 @@ highway-bridleway-tunnel # line z14- (also has line::
highway-footway # line z15- (also has pathtext z15-)
highway-footway-area # line z15- and area z14- (also has pathtext z15-)
highway-footway-bicycle # line z15- (also has line::cycleline z15-, pathtext z15-)
highway-footway-crossing # line z16-
highway-path # line z14- (also has pathtext z15-)
highway-path-bicycle # line z14- (also has line::cycleline z14-, pathtext z15-)
highway-path-difficult # line z14- (also has pathtext z15-)
@@ -283,10 +283,6 @@ highway-track-no-access # line z14- (also has pathte
highway-track-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
=== 180
highway-footway-bicycle::cycleline # line::cycleline z15- (also has line z15-, pathtext z15-)
highway-path-bicycle::cycleline # line::cycleline z14- (also has line z14-, pathtext z15-)
=== 170
highway-construction # line z13- (also has pathtext z15-)
leisure-track # line z15- (also has caption z16-)
railway-abandoned # line z16-