diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b69205f71..7395fc5ec 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -403,8 +403,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?],[railway=abandoned][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; @@ -511,8 +510,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?],[railway=abandoned][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 959470626..7716f75fd 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -1217,14 +1217,14 @@ 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, +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=miniature][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 */ @@ -1375,11 +1375,11 @@ line|z18-[railway=light_rail][!tunnel]::dash, line|z15-[railway=preserved], line|z16-[railway=miniature], -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;} line|z17-[railway=turntable], @@ -1434,21 +1434,21 @@ 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, +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=miniature][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=miniature][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, @@ -1456,21 +1456,21 @@ 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=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=miniature][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=miniature][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 7aa501027..afd08f2f0 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -295,10 +295,10 @@ highway-track-tunnel # line z15- (also has line:: 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-miniature # line z16- railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) railway-miniature-tunnel # line z16- @@ -354,7 +354,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-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-) @@ -391,7 +391,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-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-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index ae1f80aad..85309d7c7 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -559,18 +559,18 @@ line|z13-[railway=abandoned], line|z13-[railway=preserved], line|z13-[railway=miniature], -line|z13-[railway=abandoned] +line|z13-[railway=disused] {width: 1.6; dashes: 6.3,6.3;} line|z16-[railway=preserved], line|z16-[railway=miniature], -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|z16-[railway=abandoned] {width: 1.7; dashes: 2.5,7;} line|z12[railway=rail][tunnel?], diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index d062e939f..c3a60c241 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -297,10 +297,10 @@ highway-track-tunnel # line z11- (also has line:: 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-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) +railway-disused-tunnel # line z13- railway-miniature # line z13- railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-) railway-miniature-tunnel # line z13- @@ -356,7 +356,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 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-) @@ -393,7 +393,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 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-) diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index b8ac808ce..2551d1f5b 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -743,7 +743,7 @@ 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=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, @@ -751,7 +751,7 @@ 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=disused][bridge?]::bridgeblack, line|z16-[railway=tram][bridge?]::bridgeblack, {casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;} @@ -915,11 +915,11 @@ line|z19-[railway=light_rail][!tunnel]::dash, line|z16-[railway=preserved], line|z16-[railway=miniature], -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;} line|z17-[railway=turntable], @@ -954,21 +954,21 @@ 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, +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=miniature][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=miniature][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, @@ -976,21 +976,21 @@ 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=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=miniature][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=miniature][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 a469d8bd6..2a2904281 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -272,10 +272,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-miniature # line z16- railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) railway-miniature-tunnel # line z16- @@ -297,7 +297,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-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-) @@ -324,7 +324,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-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-) diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index a61e206cc..55c6ea036 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2896,8 +2896,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"place", "state", "USA"}, {{"place", "state"}, {"is_in", "USA"}}}, {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country", "USA"}}}, {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country_code", "us"}}}, - {{"railway", "abandoned", "bridge"}, {{"railway", "abandoned"}, {"bridge", "any_value"}}}, - {{"railway", "abandoned", "tunnel"}, {{"railway", "abandoned"}, {"tunnel", "any_value"}}}, + {{"railway", "disused", "bridge"}, {{"railway", "disused"}, {"bridge", "any_value"}}}, + {{"railway", "disused", "tunnel"}, {{"railway", "disused"}, {"tunnel", "any_value"}}}, {{"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"}}},