diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 4bbbf72cc..13e72f73c 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -757,9 +757,9 @@ highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permiss lateral|port;[seamark:buoy_lateral:category=port],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=port][seamark:beacon_lateral:shape=buoyant];;;;632; lateral|starboard;[seamark:buoy_lateral:category=starboard],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=tower],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=lattice],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=pile],[seamark:beacon_lateral:category=starboard][seamark:beacon_lateral:shape=buoyant];;;;633; highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634; -deprecated|deprecated;635;x -deprecated|deprecated;636;x -deprecated|deprecated;637;x +railway|miniature;635; +railway|miniature|bridge;[railway=miniature][bridge?];;name;int_name;636; +railway|miniature|tunnel;[railway=miniature][tunnel?];;name;int_name;637; deprecated|deprecated;638;x deprecated|deprecated;639;x deprecated|deprecated;640;x diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index c155f5d55..9e291eca5 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -1195,6 +1195,7 @@ line|z14-[railway=monorail], line|z15-[railway=narrow_gauge], line|z15-[railway=construction], line|z15-[railway=preserved], +line|z16-[railway=miniature], line|z16-[railway=disused], line|z16-[railway=abandoned], {color: @railway; opacity: 0.7;} @@ -1214,12 +1215,14 @@ line|z13-[railway=rail][bridge?]::bridgewhite, line|z13-[railway=subway][bridge?]::bridgewhite, line|z13-[railway=light_rail][bridge?]::bridgewhite, line|z15-[railway=preserved][bridge?]::bridgewhite, +line|z16-[railway=miniature][bridge?]::bridgewhite, line|z16-[railway=abandoned][bridge?]::bridgewhite, {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;} line|z16-[railway=rail][bridge?]::bridgeblack, line|z16-[railway=subway][bridge?]::bridgeblack, line|z16-[railway=light_rail][bridge?]::bridgeblack, line|z16-[railway=preserved][bridge?]::bridgeblack, +line|z16-[railway=miniature][bridge?]::bridgeblack, line|z16-[railway=abandoned][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} @@ -1370,6 +1373,7 @@ line|z18-[railway=light_rail][!tunnel]::dash, line|z15-[railway=preserved], +line|z16-[railway=miniature], line|z16-[railway=abandoned], {width: 1.6;dashes: 6.3,6.3;} @@ -1419,23 +1423,27 @@ line|z13-15[railway=rail][bridge?]::bridgewhite, line|z13-15[railway=subway][bridge?]::bridgewhite, line|z13-15[railway=light_rail][bridge?]::bridgewhite, line|z15[railway=preserved][bridge?]::bridgewhite, +line|z16[railway=miniature][bridge?]::bridgewhite, {casing-width-add: 1.2;} line|z16[railway=rail][bridge?]::bridgewhite, line|z16[railway=subway][bridge?]::bridgewhite, line|z16[railway=light_rail][bridge?]::bridgewhite, line|z16[railway=preserved][bridge?]::bridgewhite, +line|z16[railway=miniature][bridge?]::bridgewhite, line|z16[railway=abandoned][bridge?]::bridgewhite, {casing-width-add: 1.6;} line|z17[railway=rail][bridge?]::bridgewhite, line|z17[railway=subway][bridge?]::bridgewhite, line|z17[railway=light_rail][bridge?]::bridgewhite, line|z17[railway=preserved][bridge?]::bridgewhite, +line|z17[railway=miniature][bridge?]::bridgewhite, line|z17[railway=abandoned][bridge?]::bridgewhite, {casing-width-add: 2.3;} line|z18-[railway=rail][bridge?]::bridgewhite, line|z18-[railway=subway][bridge?]::bridgewhite, line|z18-[railway=light_rail][bridge?]::bridgewhite, line|z18-[railway=preserved][bridge?]::bridgewhite, +line|z18-[railway=miniature][bridge?]::bridgewhite, line|z18-[railway=abandoned][bridge?]::bridgewhite, {casing-width-add: 3.5;} @@ -1443,18 +1451,21 @@ line|z16[railway=rail][bridge?]::bridgeblack, line|z16[railway=subway][bridge?]::bridgeblack, line|z16[railway=light_rail][bridge?]::bridgeblack, line|z16[railway=preserved][bridge?]::bridgeblack, +line|z16[railway=miniature][bridge?]::bridgeblack, line|z16[railway=abandoned][bridge?]::bridgeblack, {casing-width-add: 2.2;} line|z17[railway=rail][bridge?]::bridgeblack, line|z17[railway=subway][bridge?]::bridgeblack, line|z17[railway=light_rail][bridge?]::bridgeblack, line|z17[railway=preserved][bridge?]::bridgeblack, +line|z17[railway=miniature][bridge?]::bridgeblack, line|z17[railway=abandoned][bridge?]::bridgeblack, {casing-width-add: 3;} line|z18-[railway=rail][bridge?]::bridgeblack, line|z18-[railway=subway][bridge?]::bridgeblack, line|z18-[railway=light_rail][bridge?]::bridgeblack, line|z18-[railway=preserved][bridge?]::bridgeblack, +line|z18-[railway=miniature][bridge?]::bridgeblack, line|z18-[railway=abandoned][bridge?]::bridgeblack, {casing-width-add: 4.4;} diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index c9b4bab0c..8f33da9df 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -299,6 +299,9 @@ railway-abandoned-bridge # line z16- (also has line:: railway-abandoned-tunnel # line z16- railway-construction # line z15- railway-disused # line z16- +railway-miniature # line z16- +railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +railway-miniature-tunnel # line z16- railway-preserved # line z15- railway-preserved-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-) railway-preserved-tunnel # line z15- @@ -352,6 +355,7 @@ highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (al 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 z16-, line::bridgeblack z16-) railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-) railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) @@ -388,6 +392,7 @@ highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (al 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 z16-, line::bridgewhite z16-) railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-) railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index ba1f2af8f..ae1f80aad 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -552,14 +552,17 @@ line|z18-[railway=rail][service=service]::dash, line|z13-[railway=construction], line|z13-[railway=preserved], +line|z13-[railway=miniature], line|z13-[railway=disused], line|z13-[railway=abandoned], {color: @railway; opacity:1;} line|z13-[railway=preserved], +line|z13-[railway=miniature], line|z13-[railway=abandoned] {width: 1.6; dashes: 6.3,6.3;} line|z16-[railway=preserved], +line|z16-[railway=miniature], line|z16-[railway=abandoned] {width: 2.2; dashes: 8,8;} diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 60cdcb0bb..fb19beb09 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -301,6 +301,9 @@ railway-abandoned-bridge # line z13- (also has line:: railway-abandoned-tunnel # line z13- railway-construction # line z13- railway-disused # line z13- +railway-miniature # line z13- +railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +railway-miniature-tunnel # line z13- railway-preserved # line z13- railway-preserved-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-) railway-preserved-tunnel # line z13- @@ -354,6 +357,7 @@ highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (al 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-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-) railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) @@ -390,6 +394,7 @@ highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (al 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-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-) railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 93aa63548..e7d37c4dd 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -720,6 +720,7 @@ line|z15-[railway=narrow_gauge], line|z16-[railway=construction], line|z16-[railway=disused], line|z16-[railway=preserved], +line|z16-[railway=miniature], line|z16-[railway=abandoned], {color: @railway; opacity: 0.6;} @@ -740,6 +741,7 @@ line|z14-[railway=rail][bridge?]::bridgewhite, line|z14-[railway=subway][bridge?]::bridgewhite, line|z14-[railway=light_rail][bridge?]::bridgewhite, line|z16-[railway=preserved][bridge?]::bridgewhite, +line|z16-[railway=miniature][bridge?]::bridgewhite, line|z16-[railway=abandoned][bridge?]::bridgewhite, line|z16-[railway=tram][bridge?]::bridgewhite, {casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;} @@ -747,6 +749,7 @@ line|z16-[railway=rail][bridge?]::bridgeblack, line|z16-[railway=subway][bridge?]::bridgeblack, line|z16-[railway=light_rail][bridge?]::bridgeblack, line|z16-[railway=preserved][bridge?]::bridgeblack, +line|z16-[railway=miniature][bridge?]::bridgeblack, line|z16-[railway=abandoned][bridge?]::bridgeblack, line|z16-[railway=tram][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;} @@ -910,6 +913,7 @@ line|z19-[railway=light_rail][!tunnel]::dash, line|z16-[railway=preserved], +line|z16-[railway=miniature], line|z16-[railway=abandoned] {width: 1.6;dashes: 6.3,6.3;} @@ -945,18 +949,21 @@ line|z16[railway=rail][bridge?]::bridgewhite, line|z16[railway=subway][bridge?]::bridgewhite, line|z16[railway=light_rail][bridge?]::bridgewhite, line|z16[railway=preserved][bridge?]::bridgewhite, +line|z16[railway=miniature][bridge?]::bridgewhite, line|z16[railway=abandoned][bridge?]::bridgewhite, {casing-width-add: 1.6;} line|z17[railway=rail][bridge?]::bridgewhite, line|z17[railway=subway][bridge?]::bridgewhite, line|z17[railway=light_rail][bridge?]::bridgewhite, line|z17[railway=preserved][bridge?]::bridgewhite, +line|z17[railway=miniature][bridge?]::bridgewhite, line|z17[railway=abandoned][bridge?]::bridgewhite, {casing-width-add: 2.3;} line|z18-[railway=rail][bridge?]::bridgewhite, line|z18-[railway=subway][bridge?]::bridgewhite, line|z18-[railway=light_rail][bridge?]::bridgewhite, line|z18-[railway=preserved][bridge?]::bridgewhite, +line|z18-[railway=miniature][bridge?]::bridgewhite, line|z18-[railway=abandoned][bridge?]::bridgewhite, {casing-width-add: 3.5;} @@ -964,18 +971,21 @@ line|z16[railway=rail][bridge?]::bridgeblack, line|z16[railway=subway][bridge?]::bridgeblack, line|z16[railway=light_rail][bridge?]::bridgeblack, line|z16[railway=preserved][bridge?]::bridgeblack, +line|z16[railway=miniature][bridge?]::bridgeblack, line|z16[railway=abandoned][bridge?]::bridgeblack, {casing-width-add: 2.2;} line|z17[railway=rail][bridge?]::bridgeblack, line|z17[railway=subway][bridge?]::bridgeblack, line|z17[railway=light_rail][bridge?]::bridgeblack, line|z17[railway=preserved][bridge?]::bridgeblack, +line|z17[railway=miniature][bridge?]::bridgeblack, line|z17[railway=abandoned][bridge?]::bridgeblack, {casing-width-add: 3;} line|z18-[railway=rail][bridge?]::bridgeblack, line|z18-[railway=subway][bridge?]::bridgeblack, line|z18-[railway=light_rail][bridge?]::bridgeblack, line|z18-[railway=preserved][bridge?]::bridgeblack, +line|z18-[railway=miniature][bridge?]::bridgeblack, line|z18-[railway=abandoned][bridge?]::bridgeblack, {casing-width-add: 4.4;} diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 76e8de244..1fa840256 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -276,6 +276,9 @@ railway-abandoned-bridge # line z16- (also has line:: railway-abandoned-tunnel # line z16- railway-construction # line z16- railway-disused # line z16- +railway-miniature # line z16- +railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +railway-miniature-tunnel # line z16- railway-preserved # line z16- railway-preserved-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) railway-preserved-tunnel # line z16- @@ -295,6 +298,7 @@ highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (al highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) railway-light_rail-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) railway-preserved-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) railway-rail-branch-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-) railway-rail-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-) @@ -321,6 +325,7 @@ highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (al highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z14-, line::dash z16-) +railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-) railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-)