From 03b3afabb5498589c44ebe7195976b479d74b328 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sun, 17 Oct 2021 08:05:41 +0100 Subject: [PATCH] [styles] Do not draw [railway=light_rail][tunnel=yes]. Signed-off-by: Viktor Govako --- data/styles/clear/include/Roads.mapcss | 31 ++++++---------- data/styles/clear/include/Roads_label.mapcss | 6 ++- data/styles/vehicle/include/Roads.mapcss | 37 ++++++++----------- .../styles/vehicle/include/Roads_label.mapcss | 6 ++- generator/generator_tests/osm_type_test.cpp | 19 ++-------- 5 files changed, 38 insertions(+), 61 deletions(-) diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index 9a49436bbd..d94bd1534b 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -179,13 +179,13 @@ line[highway=ford] line[railway=rail], line[railway=subway][!tunnel], -line[railway=light_rail], +line[railway=light_rail][!tunnel], line[railway=yard] {z-index: 680;} line[railway=rail]::dash, line[railway=subway][!tunnel]::dash, -line[railway=light_rail]::dash, +line[railway=light_rail][!tunnel]::dash, line[railway=yard]::dash {z-index: 690;} @@ -1042,7 +1042,7 @@ line|z15-[aeroway=taxiway] line|z11-[railway=rail], line|z11-[railway=yard], line|z12-[railway=funicular], -line|z13-[railway=light_rail], +line|z13-[railway=light_rail][!tunnel], line|z13-[railway=subway][!tunnel], line|z14-[railway=monorail], line|z15-[railway=narrow_gauge], @@ -1055,7 +1055,7 @@ line|z13-[railway=tram] {color: @tram;opacity:1;} line|z16-[railway=rail]::dash, line|z16-[railway=subway][!tunnel]::dash, -line|z16-[railway=light_rail]::dash, +line|z16-[railway=light_rail][!tunnel]::dash, line|z16-[railway=yard]::dash {color: @railway_dash;opacity:1;} line|z14-[railway=rail][bridge?]::bridgewhite, @@ -1076,43 +1076,43 @@ line|z11-12[railway=yard] {color: @railway_light;width: 0.6;} line|z13-[railway=rail], line|z13-[railway=subway][!tunnel], -line|z13-[railway=light_rail], +line|z13-[railway=light_rail][!tunnel], line|z13-[railway=yard] {color: @railway_light;width: 0.8;} line|z14[railway=rail], line|z14[railway=subway][!tunnel], -line|z14[railway=light_rail], +line|z14[railway=light_rail][!tunnel], line|z14[railway=yard] {width: 1;} line|z15[railway=rail], line|z15[railway=subway][!tunnel], -line|z15[railway=light_rail], +line|z15[railway=light_rail][!tunnel], line|z15[railway=yard], {width: 1.2;} line|z16[railway=rail], line|z16[railway=subway][!tunnel], -line|z16[railway=light_rail], +line|z16[railway=light_rail][!tunnel], line|z16[railway=yard] {width: 2.6;} line|z17-[railway=rail], line|z17-[railway=subway][!tunnel], -line|z17-[railway=light_rail], +line|z17-[railway=light_rail][!tunnel], line|z17-[railway=yard] {width: 3;} line|z16[railway=rail]::dash, line|z16[railway=subway][!tunnel]::dash, -line|z16[railway=light_rail]::dash, +line|z16[railway=light_rail][!tunnel]::dash, line|z16[railway=yard]::dash, {width: 1.3;dashes: 4.5,4.5;} line|z17[railway=rail]::dash, line|z17[railway=subway][!tunnel]::dash, -line|z17[railway=light_rail]::dash, +line|z17[railway=light_rail][!tunnel]::dash, line|z17[railway=yard]::dash {width: 2;dashes: 6.3,6.3;} line|z18-[railway=rail]::dash, line|z18-[railway=subway][!tunnel]::dash, -line|z18-[railway=light_rail]::dash, +line|z18-[railway=light_rail][!tunnel]::dash, line|z18-[railway=yard]::dash {width: 2;dashes: 8.1,8.1;} @@ -1127,23 +1127,16 @@ line|z16-[railway=disused] /* 9.2 Rail tunnel 14-22 ZOOM */ line|z14-[railway=rail][tunnel?], -line|z14-[railway=light_rail][tunnel?], line|z14-[railway=yard][tunnel?] {casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;} /* 9.3 Rail bridge 14-22 ZOOM */ line|z14-15[railway][bridge?]::bridgewhite, -line|z14-15[railway=light_rail][bridge?]::bridgewhite, -line|z14-15[railway=yard][bridge?]::bridgewhite, {casing-width: eval(prop("width")+1);} line|z16[railway][bridge?]::bridgewhite, -line|z16[railway=light_rail][bridge?]::bridgewhite, -line|z16[railway=yard][bridge?]::bridgewhite, {casing-width: eval(prop("width")+1.2);} line|z17-[railway][bridge?]::bridgewhite, -line|z17-[railway=light_rail][bridge?]::bridgewhite, -line|z17-[railway=yard][bridge?]::bridgewhite {casing-width: eval(prop("width")+1.4);} line|z18-[railway=rail][bridge?]::bridgewhite, line|z18-[railway=subway][bridge?]::bridgewhite, diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss index 4c2748f3a8..aafff83d39 100644 --- a/data/styles/clear/include/Roads_label.mapcss +++ b/data/styles/clear/include/Roads_label.mapcss @@ -75,12 +75,14 @@ line[highway=ford] {z-index: 660;} line[railway=rail], -line[railway=light_rail], +line[railway=light_rail][!tunnel], +line[railway=subway][!tunnel], line[railway=yard] {z-index: 680;} line[railway=rail]::dash, -line[railway=light_rail]::dash, +line[railway=light_rail][!tunnel]::dash, +line[railway=subway][!tunnel]::dash, line[railway=yard]::dash {z-index: 690;} diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 0ff90b72d3..d3e3b9e812 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -179,13 +179,13 @@ line[highway=ford] line[railway=rail], line[railway=subway][!tunnel], -line[railway=light_rail], +line[railway=light_rail][!tunnel], line[railway=yard] {z-index: 680;} line[railway=rail]::dash, line[railway=subway][!tunnel]::dash, -line[railway=light_rail]::dash, +line[railway=light_rail][!tunnel]::dash, line[railway=yard]::dash {z-index: 690;} @@ -1053,7 +1053,7 @@ line|z15-[aeroway=taxiway] line|z11-[railway=rail], line|z11-[railway=yard], line|z12-[railway=funicular], -line|z13-[railway=light_rail], +line|z13-[railway=light_rail][!tunnel], line|z13-[railway=subway][!tunnel], line|z14-[railway=monorail], line|z15-[railway=narrow_gauge], @@ -1068,7 +1068,7 @@ line|z16-[railway=tram] {color: @tram;opacity:1;} line|z16-[railway=rail]::dash, line|z16-[railway=subway][!tunnel]::dash, -line|z16-[railway=light_rail]::dash, +line|z16-[railway=light_rail][!tunnel]::dash, line|z16-[railway=yard]::dash {color: @railway_dash;opacity:1;} line|z14-[railway=rail][bridge?]::bridgewhite, @@ -1091,58 +1091,58 @@ line|z11-12[railway=yard] {color: @railway_light;width: 0.7;} line|z13-[railway=rail], line|z13-[railway=subway][!tunnel], -line|z13-[railway=light_rail], +line|z13-[railway=light_rail][!tunnel], line|z13-[railway=yard] {color: @railway_light;width: 0.9;} line|z14[railway=rail], line|z14[railway=subway][!tunnel], -line|z14[railway=light_rail], +line|z14[railway=light_rail][!tunnel], line|z14[railway=yard] {width: 1.15;} line|z15[railway=rail], line|z15[railway=subway][!tunnel], -line|z15[railway=light_rail], +line|z15[railway=light_rail][!tunnel], line|z15[railway=yard], {width: 1.8;} line|z16[railway=rail], line|z16[railway=subway][!tunnel], -line|z16[railway=light_rail], +line|z16[railway=light_rail][!tunnel], line|z16[railway=yard] {width: 2.8;} line|z17[railway=rail], line|z17[railway=subway][!tunnel], -line|z17[railway=light_rail], +line|z17[railway=light_rail][!tunnel], line|z17[railway=yard] {width: 3.2;} line|z18[railway=rail], line|z18[railway=subway][!tunnel], -line|z18[railway=light_rail], +line|z18[railway=light_rail][!tunnel], line|z18[railway=yard] {width: 4.2;} line|z19[railway=rail], line|z19[railway=subway][!tunnel], -line|z19[railway=light_rail], +line|z19[railway=light_rail][!tunnel], line|z19[railway=yard] {width: 5.8;} line|z16[railway=rail]::dash, line|z16[railway=subway][!tunnel]::dash, -line|z16[railway=light_rail]::dash, +line|z16[railway=light_rail][!tunnel]::dash, line|z16[railway=yard]::dash, {width: 1.5;dashes: 4.5,4.5;} line|z17[railway=rail]::dash, line|z17[railway=subway][!tunnel]::dash, -line|z17[railway=light_rail]::dash, +line|z17[railway=light_rail][!tunnel]::dash, line|z17[railway=yard]::dash {width: 2.4;dashes: 6.3,6.3;} line|z18[railway=rail]::dash, line|z18[railway=subway][!tunnel]::dash, -line|z18[railway=light_rail]::dash, +line|z18[railway=light_rail][!tunnel]::dash, line|z18[railway=yard]::dash {width: 3.3;dashes: 8.1,8.1;} line|z19[railway=rail]::dash, line|z19[railway=subway][!tunnel]::dash, -line|z19[railway=light_rail]::dash, +line|z19[railway=light_rail][!tunnel]::dash, line|z19[railway=yard]::dash {width: 5;dashes: 10.1,10.1;} @@ -1157,23 +1157,16 @@ line|z16-[railway=disused] /* 9.2 Rail tunnel 14-22 ZOOM */ line|z14-[railway=rail][tunnel?], -line|z14-[railway=light_rail][tunnel?], line|z14-[railway=yard][tunnel?] {casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;} /* 9.3 Rail bridge 14-22 ZOOM */ line|z14-15[railway][bridge?]::bridgewhite, -line|z14-15[railway=light_rail][bridge?]::bridgewhite, -line|z14-15[railway=yard][bridge?]::bridgewhite, {casing-width: eval(prop("width")+1);} line|z16[railway][bridge?]::bridgewhite, -line|z16[railway=light_rail][bridge?]::bridgewhite, -line|z16[railway=yard][bridge?]::bridgewhite, {casing-width: eval(prop("width")+1.2);} line|z17-[railway][bridge?]::bridgewhite, -line|z17-[railway=light_rail][bridge?]::bridgewhite, -line|z17-[railway=yard][bridge?]::bridgewhite {casing-width: eval(prop("width")+1.4);} line|z18-[railway=rail][bridge?]::bridgewhite, line|z18-[railway=subway][bridge?]::bridgewhite, diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss index 0c90dbf48d..4d357f6815 100644 --- a/data/styles/vehicle/include/Roads_label.mapcss +++ b/data/styles/vehicle/include/Roads_label.mapcss @@ -75,12 +75,14 @@ line[highway=ford] {z-index: 660;} line[railway=rail], -line[railway=light_rail], +line[railway=light_rail][!tunnel], +line[railway=subway][!tunnel], line[railway=yard] {z-index: 680;} line[railway=rail]::dash, -line[railway=light_rail]::dash, +line[railway=light_rail][!tunnel]::dash, +line[railway=subway][!tunnel]::dash, line[railway=yard]::dash {z-index: 690;} diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index ffe84bf43f..a396d727bb 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1931,21 +1931,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) // {{"railway", "siding", "tunnel"}, {{"railway", "siding"}, {"tunnel", "any_value"}}}, // {{"railway", "spur", "bridge"}, {{"railway", "spur"}, {"bridge", "any_value"}}}, // {{"railway", "spur", "tunnel"}, {{"railway", "spur"}, {"tunnel", "any_value"}}}, - // {{"railway", "subway", "blue"}, {{"railway", "subway"}, {"colour", "blue"}}}, - // {{"railway", "subway", "bridge"}, {{"railway", "subway"}, {"bridge", "any_value"}}}, - // {{"railway", "subway", "brown"}, {{"railway", "subway"}, {"colour", "brown"}}}, - // {{"railway", "subway", "darkgreen"}, {{"railway", "subway"}, {"colour", "darkgreen"}}}, - // {{"railway", "subway", "gray"}, {{"railway", "subway"}, {"colour", "gray"}}}, - // {{"railway", "subway", "green"}, {{"railway", "subway"}, {"colour", "green"}}}, - // {{"railway", "subway", "grey"}, {{"railway", "subway"}, {"colour", "grey"}}}, - // {{"railway", "subway", "lightblue"}, {{"railway", "subway"}, {"colour", "lightblue"}}}, - // {{"railway", "subway", "lightgreen"}, {{"railway", "subway"}, {"colour", "lightgreen"}}}, - // {{"railway", "subway", "orange"}, {{"railway", "subway"}, {"colour", "orange"}}}, - // {{"railway", "subway", "purple"}, {{"railway", "subway"}, {"colour", "purple"}}}, - // {{"railway", "subway", "red"}, {{"railway", "subway"}, {"colour", "red"}}}, - // {{"railway", "subway", "tunnel"}, {{"railway", "subway"}, {"tunnel", "any_value"}}}, - // {{"railway", "subway", "violet"}, {{"railway", "subway"}, {"colour", "violet"}}}, - // {{"railway", "subway", "yellow"}, {{"railway", "subway"}, {"colour", "yellow"}}}, // {{"waterway", "ditch", "tunnel"}, {{"waterway", "ditch"}, {"tunnel", "any_value"}}}, // {{"waterway", "drain", "tunnel"}, {{"waterway", "drain"}, {"tunnel", "any_value"}}}, // {{"waterway", "stream", "tunnel"}, {{"waterway", "stream"}, {"tunnel", "any_value"}}}, @@ -2145,7 +2130,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"railway", "funicular", "bridge"}, {{"railway", "funicular"}, {"bridge", "any_value"}}}, {{"railway", "funicular", "tunnel"}, {{"railway", "funicular"}, {"tunnel", "any_value"}}}, {{"railway", "light_rail", "bridge"}, {{"railway", "light_rail"}, {"bridge", "any_value"}}}, - {{"railway", "light_rail", "tunnel"}, {{"railway", "light_rail"}, {"tunnel", "any_value"}}}, + //{{"railway", "light_rail", "tunnel"}, {{"railway", "light_rail"}, {"tunnel", "any_value"}}}, {{"railway", "monorail", "bridge"}, {{"railway", "monorail"}, {"bridge", "any_value"}}}, {{"railway", "monorail", "tunnel"}, {{"railway", "monorail"}, {"tunnel", "any_value"}}}, {{"railway", "narrow_gauge", "bridge"}, {{"railway", "narrow_gauge"}, {"bridge", "any_value"}}}, @@ -2183,6 +2168,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"railway", "station", "subway", "spb"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "spb"}}}, {{"railway", "station", "subway"}, {{"railway", "station"}, {"station", "subway"}}}, {{"railway", "station", "subway"}, {{"railway", "station"}, {"transport", "subway"}}}, + {{"railway", "subway", "bridge"}, {{"railway", "subway"}, {"bridge", "any_value"}}}, + //{{"railway", "subway", "tunnel"}, {{"railway", "subway"}, {"tunnel", "any_value"}}}, {{"railway", "subway_entrance", "barcelona"}, {{"railway", "subway_entrance"}, {"city", "barcelona"}}}, {{"railway", "subway_entrance", "berlin"}, {{"railway", "subway_entrance"}, {"city", "berlin"}}}, {{"railway", "subway_entrance", "kiev"}, {{"railway", "subway_entrance"}, {"city", "kiev"}}},