From 2f57c1cd9ad1e898847e96b06a0ef0761611d14e Mon Sep 17 00:00:00 2001 From: "Lukas H." Date: Tue, 26 Nov 2024 13:53:12 -0500 Subject: [PATCH 1/4] [styles] swap rendering of railway=abandoned and railway=disused Signed-off-by: Lukas H. --- data/mapcss-mapping.csv | 6 ++---- data/styles/default/include/Roads.mapcss | 20 +++++++++---------- .../default/include/priorities_3_FG.prio.txt | 8 ++++---- data/styles/outdoors/include/Roads.mapcss | 8 ++++---- .../outdoors/include/priorities_3_FG.prio.txt | 10 +++++----- data/styles/vehicle/include/Roads.mapcss | 20 +++++++++---------- .../vehicle/include/priorities_3_FG.prio.txt | 8 ++++---- 7 files changed, 39 insertions(+), 41 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 55e38bf6f0..2101eb29ba 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -395,8 +395,7 @@ place|farm;294; deprecated:boundary|administrative|11:04.2024;[boundary=administrative][admin_level=11];x;name;int_name;295; waterway|weir;296; highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297; -# TODO: its a mismapping likely, if there is a bridge structure still, then it should be railway=disused. -railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298; +railway|disused|bridge;[railway=disused][bridge?];;name;int_name;298; man_made|lighthouse;299; deprecated:highway|path|demanding_mountain_hiking:04.2024;[highway=path][sac_scale=demanding_mountain_hiking];x;name;int_name;300;highway|path|difficult man_made|storage_tank;301; @@ -502,8 +501,7 @@ railway|rail|spur|tunnel;[railway=rail][service=spur][!usage][tunnel?];;name;int highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397; railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398; railway|rail|tourism;[railway=rail][usage=tourism][!service];;name;int_name;399; -# TODO: its a mismapping likely, if there is a tunnel structure still, then it should be railway=disused. -railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400; +railway|disused|tunnel;[railway=disused][tunnel?];;name;int_name;400; area:highway|living_street;401; piste:type|sled;402; leisure|beach_resort;403; diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 6fd441ae82..3284df12a1 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -1126,13 +1126,13 @@ 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=abandoned][bridge?]::bridgewhite, +line|z16-[railway=disused][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=abandoned][bridge?]::bridgeblack, +line|z16-[railway=disused][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;} /* 9.1 RAIL 11-22 ZOOM */ @@ -1282,11 +1282,11 @@ line|z18-[railway=light_rail][!tunnel]::dash, line|z15-[railway=preserved], -line|z16-[railway=abandoned], +line|z16-[railway=disused], {width: 1.6;dashes: 6.3,6.3;} line|z15-[railway=construction], -line|z16-[railway=disused], +line|z16-[railway=abandoned], {width: 1;dashes: 1.8,5.4;} /* 9.2 Rail tunnel 14-22 ZOOM */ @@ -1326,38 +1326,38 @@ 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=abandoned][bridge?]::bridgewhite, +line|z16[railway=disused][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=abandoned][bridge?]::bridgewhite, +line|z17[railway=disused][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=abandoned][bridge?]::bridgewhite, +line|z18-[railway=disused][bridge?]::bridgewhite, {casing-width-add: 3.5;} 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=abandoned][bridge?]::bridgeblack, +line|z16[railway=disused][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=abandoned][bridge?]::bridgeblack, +line|z17[railway=disused][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=abandoned][bridge?]::bridgeblack, +line|z18-[railway=disused][bridge?]::bridgeblack, {casing-width-add: 4.4;} /* 9.4 Monorail 14-22 ZOOM */ diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index c61f4fce1b..0b1b2e1cbe 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -289,10 +289,10 @@ highway-path-bicycle::cycleline # line::cycleline z14- (also highway-construction # line z13- (also has pathtext z15-) leisure-track # line z15- (also has caption z16-) railway-abandoned # line z16- -railway-abandoned-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) -railway-abandoned-tunnel # line z16- railway-construction # line z15- railway-disused # line z16- +railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +railway-disused-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- @@ -327,7 +327,7 @@ highway-track-bridge::bridgewhite # line::bridgewhite z15- (al highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, 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 z16-, line::bridgeblack z16-) +railway-disused-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-) @@ -361,7 +361,7 @@ highway-track-bridge::bridgeblack # line::bridgeblack z17- (al highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, 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 z16-, line::bridgewhite z16-) +railway-disused-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 58c84c91a0..2c5da7b3df 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -518,17 +518,17 @@ line|z13-[railway=abandoned], {color: @railway; opacity:1;} line|z13-[railway=preserved], -line|z13-[railway=abandoned] +line|z16-[railway=disused] {width: 1.6; dashes: 6.3,6.3;} line|z16-[railway=preserved], -line|z16-[railway=abandoned] +line|z16-[railway=disused] {width: 2.2; dashes: 8,8;} line|z13-[railway=construction], -line|z13-[railway=disused] +line|z13-[railway=abandoned] {width: 1; dashes: 1.8,5.5;} line|z16-[railway=construction], -line|z16-[railway=disused] +line|z13-[railway=abandoned] {width: 1.7; dashes: 2.5,7;} diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 24ee35f0ca..7b41a10287 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -289,10 +289,10 @@ highway-path-bicycle::cycleline # line::cycleline z12- (also highway-construction # line z11- (also has pathtext z15-) leisure-track # line z15- (also has caption z16-) 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-disused # line z16- +railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +railway-disused-tunnel # line z16- railway-preserved # line z13- railway-preserved-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-) railway-preserved-tunnel # line z13- @@ -327,7 +327,7 @@ highway-track-bridge::bridgewhite # line::bridgewhite z15- (al highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, 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-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, 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-) @@ -361,7 +361,7 @@ highway-track-bridge::bridgeblack # line::bridgeblack z17- (al highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, 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-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, 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 2abb8253ea..c69db56e2c 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -739,14 +739,14 @@ 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=abandoned][bridge?]::bridgewhite, +line|z16-[railway=disused][bridge?]::bridgewhite, line|z16-[railway=tram][bridge?]::bridgewhite, {casing-linecap: butt;casing-color:@bridge_background; 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=abandoned][bridge?]::bridgeblack, +line|z16-[railway=disused][bridge?]::bridgeblack, line|z16-[railway=tram][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;} @@ -909,11 +909,11 @@ line|z19-[railway=light_rail][!tunnel]::dash, line|z16-[railway=preserved], -line|z16-[railway=abandoned] +line|z16-[railway=disused] {width: 1.6;dashes: 6.3,6.3;} line|z16-[railway=construction], -line|z16-[railway=disused] +line|z16-[railway=abandoned] {width: 1;dashes: 1.8,5.4;} /* 9.2 Rail tunnel 14-22 ZOOM */ @@ -944,38 +944,38 @@ 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=abandoned][bridge?]::bridgewhite, +line|z16[railway=disused][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=abandoned][bridge?]::bridgewhite, +line|z17[railway=disused][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=abandoned][bridge?]::bridgewhite, +line|z18-[railway=disused][bridge?]::bridgewhite, {casing-width-add: 3.5;} 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=abandoned][bridge?]::bridgeblack, +line|z16[railway=disused][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=abandoned][bridge?]::bridgeblack, +line|z17[railway=disused][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=abandoned][bridge?]::bridgeblack, +line|z18-[railway=disused][bridge?]::bridgeblack, {casing-width-add: 4.4;} /* 9.4 Monorail 14-22 ZOOM */ diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 5f8a41ba47..111185f23d 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -268,10 +268,10 @@ highway-track-no-access # line z16- highway-construction # line z13- railway-abandoned # line z16- -railway-abandoned-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) -railway-abandoned-tunnel # line z16- railway-construction # line z16- railway-disused # line z16- +railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) +railway-disused-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- @@ -289,7 +289,7 @@ highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (al highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) 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-disused-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-) @@ -314,7 +314,7 @@ highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (al highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) 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-disused-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-) -- 2.45.3 From debcbed39134b5da971a06ec53579842f72f3ea4 Mon Sep 17 00:00:00 2001 From: Lukas Hamm Date: Tue, 26 Nov 2024 16:40:50 -0500 Subject: [PATCH 2/4] [styles] Regenerated Signed-off-by: Lukas Hamm --- data/classificator.txt | 8 +- data/drules_proto.bin | Bin 425136 -> 424604 bytes data/drules_proto.txt | 496 ++++++++++----------------- data/drules_proto_default_dark.bin | Bin 409577 -> 409573 bytes data/drules_proto_default_dark.txt | 282 +++++++-------- data/drules_proto_default_light.bin | Bin 410935 -> 410931 bytes data/drules_proto_default_light.txt | 282 +++++++-------- data/drules_proto_outdoors_dark.bin | Bin 426490 -> 426081 bytes data/drules_proto_outdoors_dark.txt | 469 ++++++++++--------------- data/drules_proto_outdoors_light.bin | Bin 427959 -> 427550 bytes data/drules_proto_outdoors_light.txt | 469 ++++++++++--------------- data/drules_proto_vehicle_dark.bin | Bin 275501 -> 275497 bytes data/drules_proto_vehicle_dark.txt | 256 +++++++------- data/drules_proto_vehicle_light.bin | Bin 275291 -> 275287 bytes data/drules_proto_vehicle_light.txt | 256 +++++++------- data/patterns.txt | 6 +- data/types.txt | 4 +- data/visibility.txt | 8 +- 18 files changed, 1079 insertions(+), 1457 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 72d3f78eee..3263de0589 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -889,13 +889,13 @@ world + platform - {} railway + - abandoned + + abandoned - + construction - + crossing - + disused + bridge - tunnel - {} - construction - - crossing - - disused - funicular + bridge - tunnel - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 50d6114c662ca1f83f80f85bd34f2f471a2ae844..8aadbe047868cc10ba8daa361fdd52622c1febbf 100644 GIT binary patch delta 135 zcmdn+Q*zE%$%Yoj7N#xC+H;&DSW#kTPI+RbZc1ixX>n?bZc%XS}M>{ic delta 254 zcmbR9RdT~m$%Yoj7N#xC+Qks{Snj@qIvRv diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 0e6cc82f4f..6edce24a28 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -73176,11 +73176,11 @@ cont { element { scale: 13 lines { - width: 1.6 + width: 1.0 color: 1301714310 dashdot { - dd: 6.3 - dd: 6.3 + dd: 1.8 + dd: 5.4 } priority: 160 } @@ -73188,11 +73188,11 @@ cont { element { scale: 14 lines { - width: 1.6 + width: 1.0 color: 1301714310 dashdot { - dd: 6.3 - dd: 6.3 + dd: 1.8 + dd: 5.4 } priority: 160 } @@ -73200,15 +73200,180 @@ cont { element { scale: 15 lines { - width: 1.6 + width: 1.0 color: 1301714310 dashdot { - dd: 6.3 - dd: 6.3 + dd: 1.8 + dd: 5.4 } priority: 160 } } + element { + scale: 16 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } +} +cont { + name: "railway-construction" + element { + scale: 13 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } +} +cont { + name: "railway-disused" element { scale: 16 lines { @@ -73271,79 +73436,7 @@ cont { } } cont { - name: "railway-abandoned-bridge" - element { - scale: 13 - lines { - width: 7.6 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.6 - color: 1301714310 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - } - } - element { - scale: 14 - lines { - width: 7.6 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.6 - color: 1301714310 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - } - } - element { - scale: 15 - lines { - width: 7.6 - color: 1300267136 - priority: 140 - cap: BUTTCAP - } - lines { - width: 6.4 - color: 871230427 - priority: 150 - cap: BUTTCAP - } - lines { - width: 1.6 - color: 1301714310 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - } - } + name: "railway-disused-bridge" element { scale: 16 lines { @@ -73466,43 +73559,7 @@ cont { } } cont { - name: "railway-abandoned-tunnel" - element { - scale: 13 - lines { - width: 1.6 - color: 1301714310 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 1301714310 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 1301714310 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - } - } + name: "railway-disused-tunnel" element { scale: 16 lines { @@ -73564,207 +73621,6 @@ cont { } } } -cont { - name: "railway-construction" - element { - scale: 13 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } -} -cont { - name: "railway-disused" - element { - scale: 13 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 16 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } -} cont { name: "railway-funicular" element { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 3fb2ec4eb4b7a1bda895ade5ddd9f47a8c26a993..a0e316cc2707194c1fec48bb32379c809f7d95f6 100644 GIT binary patch delta 92 zcmaF)U*hS1iG~)&7N#xC!lBbyBAKsk-yXqi%Q#&)l=+(A1!gX>qQuOc^2AErl+5DN j;_ZJznGZ1veqlrtpMEi%`C0p^C}tpL*?uaDRsJaen7<^@ delta 96 zcmaF*U*hF|iG~)&7N#xC!lBdE!kMoLUt;ExC`!!CDNn4_O-xG6OUcjM&Ktpeh*9_( lBZkcM2a(Lrw!aKzwq=}d7RG$7{a6$;5VLGQ7R4(66aW?DCB6Uv diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index 67524425e2..196650f843 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -69179,6 +69179,145 @@ cont { } cont { name: "railway-abandoned" + element { + scale: 16 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } +} +cont { + name: "railway-construction" + element { + scale: 15 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1296316234 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } +} +cont { + name: "railway-disused" element { scale: 16 lines { @@ -69241,7 +69380,7 @@ cont { } } cont { - name: "railway-abandoned-bridge" + name: "railway-disused-bridge" element { scale: 16 lines { @@ -69364,7 +69503,7 @@ cont { } } cont { - name: "railway-abandoned-tunnel" + name: "railway-disused-tunnel" element { scale: 16 lines { @@ -69426,145 +69565,6 @@ cont { } } } -cont { - name: "railway-construction" - element { - scale: 15 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } -} -cont { - name: "railway-disused" - element { - scale: 16 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1296316234 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } -} cont { name: "railway-funicular" element { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index e4bfe3a6699751cef649acc43659e12c5bbd8cb0..884339eedc5d419a348e8af38c7fe398346d62c5 100644 GIT binary patch delta 102 zcmdnqCAqmvvY~~sg=q_OcI5OevCJCNTVk2lZRd|=wq=}tI1r1 zw{Og6-pMHZjS)l1bc;CVXWJd4m~9!SAC6?!n7%EFd0o3)JTnlpY?q5?6@3N(;3Fs( diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 638090a6c7..e323f704d7 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -68964,6 +68964,145 @@ cont { } cont { name: "railway-abandoned" + element { + scale: 16 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } +} +cont { + name: "railway-construction" + element { + scale: 15 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1301714310 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 160 + } + } +} +cont { + name: "railway-disused" element { scale: 16 lines { @@ -69026,7 +69165,7 @@ cont { } } cont { - name: "railway-abandoned-bridge" + name: "railway-disused-bridge" element { scale: 16 lines { @@ -69149,7 +69288,7 @@ cont { } } cont { - name: "railway-abandoned-tunnel" + name: "railway-disused-tunnel" element { scale: 16 lines { @@ -69211,145 +69350,6 @@ cont { } } } -cont { - name: "railway-construction" - element { - scale: 15 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } -} -cont { - name: "railway-disused" - element { - scale: 16 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1301714310 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 160 - } - } -} cont { name: "railway-funicular" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index de9a456cc105232f9da867d4031649ac3648cf46..c5d02f1ed61a260c9ffe8a4983f9e7a3f3d2cc78 100644 GIT binary patch delta 181 zcmey>EcLKKs-cCkg=q`(l=kUO{md#H7K}pL9DG9R(;NGlRUtfnC~x}NKIU87_w_KB zGm5`pTq)sz)iJ_^`O)APvNl)G0 j-^sj%QSLn>rh<~vyu8#LRFm45_cH@A%l75{tihiEyY)c3 delta 117 zcmaFZAoZ(Rs-cCkg=q`(l=kh$bD1L;g|D!1Nfae!=9DK^>Lw;7=B4E4O`kW9Ic0kO zLT26VuJf7qGqOX)w{tIK&S2dBrh~bhQTRO*7e7p2N@j6sacatTmQLn)#&*6wW*}zS K&ez8p{0RUgbSm5c diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 1220f8ce08..9258c40882 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -73495,11 +73495,11 @@ cont { element { scale: 13 lines { - width: 1.6 + width: 1.7 color: 4470602 dashdot { - dd: 6.3 - dd: 6.3 + dd: 2.5 + dd: 7.0 } priority: 160 cap: BUTTCAP @@ -73508,11 +73508,11 @@ cont { element { scale: 14 lines { - width: 1.6 + width: 1.7 color: 4470602 dashdot { - dd: 6.3 - dd: 6.3 + dd: 2.5 + dd: 7.0 } priority: 160 cap: BUTTCAP @@ -73521,16 +73521,181 @@ cont { element { scale: 15 lines { - width: 1.6 + width: 1.7 color: 4470602 dashdot { - dd: 6.3 - dd: 6.3 + dd: 2.5 + dd: 7.0 } priority: 160 cap: BUTTCAP } } + element { + scale: 16 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } +} +cont { + name: "railway-construction" + element { + scale: 13 + lines { + width: 1.0 + color: 4470602 + dashdot { + dd: 1.8 + dd: 5.5 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 4470602 + dashdot { + dd: 1.8 + dd: 5.5 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.0 + color: 4470602 + dashdot { + dd: 1.8 + dd: 5.5 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.7 + color: 4470602 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } +} +cont { + name: "railway-disused" element { scale: 16 lines { @@ -73593,46 +73758,7 @@ cont { } } cont { - name: "railway-abandoned-bridge" - element { - scale: 13 - lines { - width: 1.6 - color: 4470602 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 4470602 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 4470602 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } + name: "railway-disused-bridge" element { scale: 16 lines { @@ -73755,46 +73881,7 @@ cont { } } cont { - name: "railway-abandoned-tunnel" - element { - scale: 13 - lines { - width: 1.6 - color: 4470602 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 4470602 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 4470602 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } + name: "railway-disused-tunnel" element { scale: 16 lines { @@ -73856,210 +73943,6 @@ cont { } } } -cont { - name: "railway-construction" - element { - scale: 13 - lines { - width: 1.0 - color: 4470602 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 4470602 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 4470602 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } -} -cont { - name: "railway-disused" - element { - scale: 13 - lines { - width: 1.0 - color: 4470602 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 4470602 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 4470602 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.7 - color: 4470602 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } -} cont { name: "railway-funicular" element { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 4d2a9e9c4d45f6fd6c9eb40868f24c904276c398..06bf47c49de2b6db6a7790ba960f0a80737cba82 100644 GIT binary patch delta 181 zcmdnqFEy`6s-cCkg=q`(kM8LcCNryWSTG7{bMOhNPw$`1tP0`rLwVB;Co|vLt~8Ok zoKgG*BNu;BVrEWxVx?|MW^rk8YKo91hrslU%bB&NUs%q(O6oK-ml&D~-K3(-l=Rf? k-b}tm08KVN_5c6? delta 122 zcmbQ&BelI>s-cCkg=q`(kM8M@molqw->{U~kWu&w3ztMuVrEWxVx?|kQes|8e%^GR z#mp(w?=EH5-M)D-^L|ElsQC8ErOX+O+XH%;%Nd2=GjZ|5^rd7Lmlmg{Y|rRrj%REy Qn#2smEZd7Fv99?H0Cs~fsQ>@~ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 0b6fe151cf..ba2d463c62 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -73280,11 +73280,11 @@ cont { element { scale: 13 lines { - width: 1.6 + width: 1.7 color: 8487025 dashdot { - dd: 6.3 - dd: 6.3 + dd: 2.5 + dd: 7.0 } priority: 160 cap: BUTTCAP @@ -73293,11 +73293,11 @@ cont { element { scale: 14 lines { - width: 1.6 + width: 1.7 color: 8487025 dashdot { - dd: 6.3 - dd: 6.3 + dd: 2.5 + dd: 7.0 } priority: 160 cap: BUTTCAP @@ -73306,16 +73306,181 @@ cont { element { scale: 15 lines { - width: 1.6 + width: 1.7 color: 8487025 dashdot { - dd: 6.3 - dd: 6.3 + dd: 2.5 + dd: 7.0 } priority: 160 cap: BUTTCAP } } + element { + scale: 16 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } +} +cont { + name: "railway-construction" + element { + scale: 13 + lines { + width: 1.0 + color: 8487025 + dashdot { + dd: 1.8 + dd: 5.5 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 8487025 + dashdot { + dd: 1.8 + dd: 5.5 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.0 + color: 8487025 + dashdot { + dd: 1.8 + dd: 5.5 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 17 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 18 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 19 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } + element { + scale: 20 + lines { + width: 1.7 + color: 8487025 + dashdot { + dd: 2.5 + dd: 7.0 + } + priority: 160 + } + } +} +cont { + name: "railway-disused" element { scale: 16 lines { @@ -73378,46 +73543,7 @@ cont { } } cont { - name: "railway-abandoned-bridge" - element { - scale: 13 - lines { - width: 1.6 - color: 8487025 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 8487025 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 8487025 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } + name: "railway-disused-bridge" element { scale: 16 lines { @@ -73540,46 +73666,7 @@ cont { } } cont { - name: "railway-abandoned-tunnel" - element { - scale: 13 - lines { - width: 1.6 - color: 8487025 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.6 - color: 8487025 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 8487025 - dashdot { - dd: 6.3 - dd: 6.3 - } - priority: 160 - cap: BUTTCAP - } - } + name: "railway-disused-tunnel" element { scale: 16 lines { @@ -73641,210 +73728,6 @@ cont { } } } -cont { - name: "railway-construction" - element { - scale: 13 - lines { - width: 1.0 - color: 8487025 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 8487025 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 8487025 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } -} -cont { - name: "railway-disused" - element { - scale: 13 - lines { - width: 1.0 - color: 8487025 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 8487025 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 15 - lines { - width: 1.0 - color: 8487025 - dashdot { - dd: 1.8 - dd: 5.5 - } - priority: 160 - cap: BUTTCAP - } - } - element { - scale: 16 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 17 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 18 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 19 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } - element { - scale: 20 - lines { - width: 1.7 - color: 8487025 - dashdot { - dd: 2.5 - dd: 7.0 - } - priority: 160 - } - } -} cont { name: "railway-funicular" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 52f57b6cf15cc676d870d3c04d912ebd7a366ae6..4cb093850580fda1ebda8d5940f26606c4db8f9a 100644 GIT binary patch delta 90 zcmZ4cLSW?!frb{wEll>J)2~V}UEID+f{BZ9`crYHi-K#Jxx|VRGjqxlD|J&ci%W~Q huT*22&nWnw5lwu0v-q7=&J)1}0jE()(_=8`B%%*-iItkg|RO3X{i&)fb-oM}Fz@JB`r ondxgJnI3Kz5M$zEoPI!*Nqu^nDATI;UMVIZX5QW_#WF_{0R7Y=Q2+n{ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index f1b465e21f..2a4baa8a0e 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -42875,6 +42875,132 @@ cont { } cont { name: "railway-abandoned" + element { + scale: 16 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } +} +cont { + name: "railway-construction" + element { + scale: 16 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 17 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 18 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 19 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } + element { + scale: 20 + lines { + width: 1.0 + color: 1715089216 + dashdot { + dd: 1.8 + dd: 5.4 + } + priority: 120 + } + } +} +cont { + name: "railway-disused" element { scale: 16 lines { @@ -42937,7 +43063,7 @@ cont { } } cont { - name: "railway-abandoned-bridge" + name: "railway-disused-bridge" element { scale: 16 lines { @@ -43060,7 +43186,7 @@ cont { } } cont { - name: "railway-abandoned-tunnel" + name: "railway-disused-tunnel" element { scale: 16 lines { @@ -43122,132 +43248,6 @@ cont { } } } -cont { - name: "railway-construction" - element { - scale: 16 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } -} -cont { - name: "railway-disused" - element { - scale: 16 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 17 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 18 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 19 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } - element { - scale: 20 - lines { - width: 1.0 - color: 1715089216 - dashdot { - dd: 1.8 - dd: 5.4 - } - priority: 120 - } - } -} cont { name: "railway-halt" element { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index c067235fd09df2acbac47b590dd82987b0465687..fa4c5ea08aed1d1a5fac0f29dbbb9952760ba8b3 100644 GIT binary patch delta 100 zcmccpOyK%6frb{wEldl9rymq&QlFkK&a`T~qBs*5tEp vMYp6hFE2G`x}gfwjqQaZOk9l96-AiTrymz)TGjqTf(eM3xBrk}iI)NZ Date: Fri, 27 Dec 2024 17:50:25 -0500 Subject: [PATCH 3/4] Fixed zoom level Signed-off-by: Lukas Hamm --- data/styles/outdoors/include/Roads.mapcss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index 2c5da7b3df..c8d885b034 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -518,7 +518,7 @@ line|z13-[railway=abandoned], {color: @railway; opacity:1;} line|z13-[railway=preserved], -line|z16-[railway=disused] +line|z13-[railway=disused] {width: 1.6; dashes: 6.3,6.3;} line|z16-[railway=preserved], line|z16-[railway=disused] @@ -528,7 +528,7 @@ line|z13-[railway=construction], line|z13-[railway=abandoned] {width: 1; dashes: 1.8,5.5;} line|z16-[railway=construction], -line|z13-[railway=abandoned] +line|z16-[railway=abandoned] {width: 1.7; dashes: 2.5,7;} -- 2.45.3 From 17d5a809973ba33ed313ee5df4e3173b12149b9f Mon Sep 17 00:00:00 2001 From: Lukas Hamm Date: Fri, 27 Dec 2024 18:08:44 -0500 Subject: [PATCH 4/4] Regenerated after zoom fix Signed-off-by: Lukas Hamm --- data/drules_proto.bin | Bin 424604 -> 425132 bytes data/drules_proto.txt | 144 ++++++++++++++++++ data/drules_proto_outdoors_dark.bin | Bin 426081 -> 426486 bytes data/drules_proto_outdoors_dark.txt | 135 ++++++++++++++-- data/drules_proto_outdoors_light.bin | Bin 427550 -> 427955 bytes data/drules_proto_outdoors_light.txt | 135 ++++++++++++++-- data/patterns.txt | 2 +- .../outdoors/include/priorities_3_FG.prio.txt | 10 +- 8 files changed, 402 insertions(+), 24 deletions(-) diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 8aadbe047868cc10ba8daa361fdd52622c1febbf..0a21221fcd80637aba0f86a1fcc7e31bc7df639a 100644 GIT binary patch delta 207 zcmbR9RdUTw$%Yoj7N#xCPbP?eWa8p4O3chDPps5U$t*4{PE8Tg;^3YBaWbJM#<>`j*M*6FVr&%Okc2!Sp#SaHc@_T kqT4@CWZuTe^n+>o%E`>qjM$vf4s-?(vur;ynf1mq01C!UE&u=k delta 95 zcmZ4UQ*zE%$%Yoj7N#xCPbLVzW#r;7O3chDPps5U$t*4{PEDD9aVqm&rVGr|qb4y+ lZ?B!qyp2)n3nP~pnljyz(!9LXoOYmUAZFQqaVqQWX8=pUC-DFP diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 6edce24a28..b3431cba67 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -73374,6 +73374,42 @@ cont { } cont { name: "railway-disused" + element { + scale: 13 + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } element { scale: 16 lines { @@ -73437,6 +73473,78 @@ cont { } cont { name: "railway-disused-bridge" + element { + scale: 13 + lines { + width: 7.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } + element { + scale: 14 + lines { + width: 7.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } + element { + scale: 15 + lines { + width: 7.6 + color: 1300267136 + priority: 140 + cap: BUTTCAP + } + lines { + width: 6.4 + color: 871230427 + priority: 150 + cap: BUTTCAP + } + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } element { scale: 16 lines { @@ -73560,6 +73668,42 @@ cont { } cont { name: "railway-disused-tunnel" + element { + scale: 13 + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 1301714310 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + } + } element { scale: 16 lines { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index c5d02f1ed61a260c9ffe8a4983f9e7a3f3d2cc78..a173adae987bb558c52e7e5f388db8d59d5df956 100644 GIT binary patch delta 103 zcmaFZAoZ@+>thCDmhF6f HtihiE$vh%P z_=^%VbIKDdbyG5nON&!erW-6~z9Ds*nM({!LN}=>GbKHB`^^Q+TNs(%Gfvm(W0st5 VxS08R`{I6PAZFRVxSuun697Y)Fq;4X diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 9258c40882..c8a6cbb652 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -73495,11 +73495,11 @@ cont { element { scale: 13 lines { - width: 1.7 + width: 1.0 color: 4470602 dashdot { - dd: 2.5 - dd: 7.0 + dd: 1.8 + dd: 5.5 } priority: 160 cap: BUTTCAP @@ -73508,11 +73508,11 @@ cont { element { scale: 14 lines { - width: 1.7 + width: 1.0 color: 4470602 dashdot { - dd: 2.5 - dd: 7.0 + dd: 1.8 + dd: 5.5 } priority: 160 cap: BUTTCAP @@ -73521,11 +73521,11 @@ cont { element { scale: 15 lines { - width: 1.7 + width: 1.0 color: 4470602 dashdot { - dd: 2.5 - dd: 7.0 + dd: 1.8 + dd: 5.5 } priority: 160 cap: BUTTCAP @@ -73696,6 +73696,45 @@ cont { } cont { name: "railway-disused" + element { + scale: 13 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } element { scale: 16 lines { @@ -73759,6 +73798,45 @@ cont { } cont { name: "railway-disused-bridge" + element { + scale: 13 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } element { scale: 16 lines { @@ -73882,6 +73960,45 @@ cont { } cont { name: "railway-disused-tunnel" + element { + scale: 13 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.6 + color: 4470602 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 160 + cap: BUTTCAP + } + } element { scale: 16 lines { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 06bf47c49de2b6db6a7790ba960f0a80737cba82..305a953aae2424697b8647d6aa646d14951a32a6 100644 GIT binary patch delta 134 zcmbQ&Bel6-s-cCkg=q`(kM8aHz047e+XH%;%NfPrGjZ`3C1&Q7CsyjFWEPher=|#L zbMQ`ou#{PA`-Y{=hKz!jSh&PcluYMY%$zd)?owvm?VA@fZ)Ozy#)PI~d*xE*4951N PNz6dZvb|^$>zdC17w|IM delta 125 zcmdnoFEy`6s-cCkg=q`(kM8M<`j}NXEEt8fIrxOsr!VYdR)z5Rp}gsDdzo)-59nns zXB2+H$i-ijn3+?aSgD(mSzKD2nle4HpZNyUY3AwH6PP8p-=4s{nUU!|