From c7dc2eabeb98908cd2e5d56aaea44753bb7ae904 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 9 Apr 2024 19:00:02 +0300 Subject: [PATCH] [classif] Delete [highway=footway][sac_scale] types Signed-off-by: Konstantin Pastbin --- data/mapcss-mapping.csv | 12 ++-- data/strings/types_strings.txt | 66 ------------------- data/styles/clear/include/Roads.mapcss | 8 --- .../clear/include/priorities_3_FG.prio.txt | 6 -- .../include/priorities_4_overlays.prio.txt | 6 -- data/styles/outdoors/include/Roads.mapcss | 3 - .../outdoors/include/priorities_3_FG.prio.txt | 6 -- .../include/priorities_4_overlays.prio.txt | 6 -- data/styles/vehicle/include/Roads.mapcss | 4 -- .../vehicle/include/priorities_3_FG.prio.txt | 6 -- generator/generator_tests/osm_type_test.cpp | 6 -- 11 files changed, 6 insertions(+), 123 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 6568ee8026..a3d0c7df23 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -393,7 +393,7 @@ highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310; man_made|tower|communication;[man_made=tower][tower:type=communication];;name;int_name;311; sport|equestrian;312; tourism|information|office;[tourism=information][information=office];;name;int_name;313; -highway|footway|hiking;[highway=footway][sac_scale=hiking];;name;int_name;314; +deprecated:highway|footway|hiking:04.2024;[highway=footway][sac_scale=hiking];x;name;int_name;314;highway|path|hiking aeroway|gate;315; # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=* railway|preserved;316; @@ -444,7 +444,7 @@ amenity|parking|street_side;[amenity=parking][parking=street_side];;name;int_nam amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359; # TODO: its being replaced by landuse-recreation_ground, merge in there. leisure|recreation_ground;360; -highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361; +deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path|mountain_hiking deprecated:highway|service|driveway|bridge:01.2020;[highway=service][service=driveway][bridge?];x;name;int_name;362;highway|service|driveway amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee];;name;int_name;363; sport|9pin;364; @@ -536,7 +536,7 @@ natural|water|ditch;[natural=water][water=ditch];;name;int_name;448; natural|water|moat;[natural=water][water=moat];;name;int_name;449; natural|water|wastewater;[natural=water][water=wastewater];;name;int_name;450; deprecated:railway|razed:06.2023;451;x -highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452; +deprecated:highway|footway|demanding_mountain_hiking:04.2024;[highway=footway][sac_scale=demanding_mountain_hiking];x;name;int_name;452;highway|path|demanding_mountain_hiking amenity|shelter|basic_hut;[amenity=shelter][shelter_type=basic_hut];;name;int_name;453; amenity|shelter|lean_to;[amenity=shelter][shelter_type=lean_to];;name;int_name;454; landuse|orchard;455; @@ -613,7 +613,7 @@ railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525; deprecated|deprecated;526;x deprecated|deprecated;527;x highway|primary_link|tunnel;[highway=primary_link][tunnel?];;name;int_name;528; -highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;int_name;529; +deprecated:highway|footway|alpine_hiking:04.2024;[highway=footway][sac_scale=alpine_hiking];x;name;int_name;529;highway|path|alpine_hiking deprecated|deprecated;530;x deprecated|deprecated;531;x deprecated|deprecated;532;x @@ -639,7 +639,7 @@ deprecated|deprecated;551;x deprecated|deprecated;552;x deprecated|deprecated;553;x deprecated|deprecated;554;x -highway|footway|demanding_alpine_hiking;[highway=footway][sac_scale=demanding_alpine_hiking];;name;int_name;555; +deprecated:highway|footway|demanding_alpine_hiking:04.2024;[highway=footway][sac_scale=demanding_alpine_hiking];x;name;int_name;555;highway|path|demanding_alpine_hiking deprecated|deprecated;556;x deprecated|deprecated;557;x deprecated|deprecated;558;x @@ -711,7 +711,7 @@ deprecated|deprecated;623;x deprecated|deprecated;624;x deprecated|deprecated;625;x deprecated:railway|siding|bridge:06.2023;626;x -highway|footway|difficult_alpine_hiking;[highway=footway][sac_scale=difficult_alpine_hiking];;name;int_name;627; +deprecated:highway|footway|difficult_alpine_hiking:04.2024;[highway=footway][sac_scale=difficult_alpine_hiking];x;name;int_name;627;highway|path|difficult_alpine_hiking deprecated|deprecated;628;x deprecated|deprecated;629;x deprecated|deprecated;630;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index fa791cbf08..930cdced2c 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -12208,18 +12208,6 @@ zh-Hans = 行人过街天桥 zh-Hant = 行人穿越道 - [type.highway.footway.alpine_hiking] - ref = type.highway.path - de = Alpinwanderweg - es = Camino de senderismo alpino - et = Alpi matkarada - nl = Alpine wandelpad - pl = Ścieżka wspinaczkowa - pt = Caminho pedonal - pt-BR = Caminho pedonal - sk = Turistický chodník - zh-Hans = 步行道路 - [type.highway.footway.area] ref = type.highway.footway en = Pedestrian Area @@ -12253,60 +12241,6 @@ ru = Пешеходный мост sk = Most pre chodcov - [type.highway.footway.demanding_alpine_hiking] - ref = type.highway.path - de = Anspruchsvoller Alpinwanderweg - et = Nõudlik alpi matkarada - fi = Vaativa alppivaellus - nl = Uitdagend alpine bergklimpad - pt = Caminho pedonal - pt-BR = Caminho pedonal difícil - zh-Hans = 步行道路 - - [type.highway.footway.demanding_mountain_hiking] - ref = type.highway.path - de = Anspruchsvoller Bergwanderweg - fi = Vaativa vuoristovaellus - nl = Uitdagend bergwandelpad - pt = Caminho pedonal - pt-BR = Caminho pedonal difícil - sk = Náročný horský chodník - zh-Hans = 步行道路 - - [type.highway.footway.difficult_alpine_hiking] - ref = type.highway.path - de = Schwieriger Alpinwanderweg - et = Nõudlik mägimatkarada - fi = Vaikea alppivaellus - nl = Moeilijk alpine bergklimpad - pt = Caminho pedonal - pt-BR = Caminho pedonal difícil - sk = Náročný turistický chodník - zh-Hans = 步行道路 - - [type.highway.footway.hiking] - ref = type.highway.path - de = Wanderweg - es = Sendero - fi = Vaellus - nl = Wandelpad - pt = Caminho pedonal - pt-BR = Caminho pedonal - sk = Turistický chodník - zh-Hans = 步行道路 - - [type.highway.footway.mountain_hiking] - ref = type.highway.path - de = Bergwanderweg - es = Sendero de montaña - et = Mägirada - fi = Vuoristovaellus - nl = Bergpad - pt = Caminho pedonal - pt-BR = Caminho pedonal - sk = Horský turistický chodník - zh-Hans = 步行道路 - [type.highway.footway.tunnel] ref = type.highway.road.tunnel en = Pedestrian Tunnel diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index 86cda9dba5..da8a0461a2 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -675,8 +675,6 @@ line|z15-[highway=footway], line|z15-[highway=steps], {color: @footway;opacity: 0.85;} line|z14-[highway=path], -/* Important to be declared after ordinary [highway=footway] to avoid overriding. */ -line|z14-[highway=footway][sac_scale], {color: @path;opacity: 0.6;} line|z14-[piste:type=hike], {color: @piste; opacity: 0.4;} @@ -844,26 +842,20 @@ line|z19-[highway=track], {width: 4.2; dashes: 12,3.5; opacity: 0.8;} line|z14[highway=path], -line|z14[highway=footway][sac_scale], line|z14[piste:type=hike], {width: 0.9; dashes: 3.5,2;} line|z15[highway=path], -line|z15[highway=footway][sac_scale], line|z15[piste:type=hike], {width: 1.1; dashes: 3.5,2;} line|z16[highway=path], -line|z16[highway=footway][sac_scale], line|z16[piste:type=hike], {width: 1.5; dashes: 4,2.5;} line|z17[highway=path], -line|z17[highway=footway][sac_scale], line|z17-[piste:type=hike], {width: 2; dashes: 4,2.5;} line|z18[highway=path], -line|z18[highway=footway][sac_scale], {width: 2.8; dashes: 6,3.5; opacity: 0.8;} line|z19-[highway=path], -line|z19-[highway=footway][sac_scale], {width: 3.7; dashes: 8,4.5; opacity: 0.8;} line|z17-[highway=path][tunnel?]::tunnelBackground diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index d497875d28..19e1410638 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -268,14 +268,8 @@ highway-bridleway # line z14- (also has pathte highway-bridleway-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-bridleway-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) highway-footway # line z15- (also has pathtext z15-) -highway-footway-alpine_hiking # line z14- (also has pathtext z15-) highway-footway-area # line z15- and area z14- (also has pathtext z15-) highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-footway-demanding_alpine_hiking # line z14- (also has pathtext z15-) -highway-footway-demanding_mountain_hiking # line z14- (also has pathtext z15-) -highway-footway-difficult_alpine_hiking # line z14- (also has pathtext z15-) -highway-footway-hiking # line z14- (also has pathtext z15-) -highway-footway-mountain_hiking # line z14- (also has pathtext z15-) highway-footway-sidewalk # line z16- highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) highway-path # line z14- (also has pathtext z15-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 514fc552ef..dbf998e358 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -691,12 +691,6 @@ natural-rock # icon z17- (also has captio highway-bridleway # pathtext z15- (also has line z14-) highway-bridleway-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) highway-bridleway-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-footway-alpine_hiking # pathtext z15- (also has line z14-) -highway-footway-demanding_alpine_hiking # pathtext z15- (also has line z14-) -highway-footway-demanding_mountain_hiking # pathtext z15- (also has line z14-) -highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z14-) -highway-footway-hiking # pathtext z15- (also has line z14-) -highway-footway-mountain_hiking # pathtext z15- (also has line z14-) highway-path # pathtext z15- (also has line z14-) highway-path-alpine_hiking # pathtext z15- (also has line z14-) highway-path-bicycle # pathtext z15- (also has line z14-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index e33b2ffba2..ce642be998 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -88,7 +88,6 @@ line|z12-[highway=steps], {color: @footway; opacity: 1;} line|z11-[highway=path], -line|z11-[highway=footway][sac_scale], {color: @path; opacity: 1;} line|z12-[piste:type=hike], @@ -120,14 +119,12 @@ line|z18-[highway=track], line|z11[highway=footway], {width: 1; dashes: 3.5,2;} line|z11[highway=path], -line|z11[highway=footway][sac_scale], {width: 1; dashes: 3.5,2; opacity: 0.6;} line|z12[highway=footway], /* Make steps on z12-14 look same as footways, z15- follows main style */ line|z12[highway=steps], {width: 1.1; dashes: 3.5,2;} line|z12[highway=path], -line|z12[highway=footway][sac_scale], line|z12[piste:type=hike], {width: 1.1; dashes: 3.5,2; opacity: 0.7;} line|z13[highway=path], diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 22c445263c..5d64a3324e 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -268,14 +268,8 @@ highway-bridleway # line z11- (also has pathte highway-bridleway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-bridleway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-footway # line z11- (also has pathtext z13-) -highway-footway-alpine_hiking # line z11- (also has pathtext z13-) highway-footway-area # line z11- and area z14- (also has pathtext z13-) highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-footway-demanding_alpine_hiking # line z11- (also has pathtext z13-) -highway-footway-demanding_mountain_hiking # line z11- (also has pathtext z13-) -highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z13-) -highway-footway-hiking # line z11- (also has pathtext z13-) -highway-footway-mountain_hiking # line z11- (also has pathtext z13-) highway-footway-sidewalk # line z16- highway-footway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) highway-path # line z11- (also has pathtext z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 5c576bcf6f..49f77a198e 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -691,12 +691,6 @@ natural-rock # icon z14- (also has captio highway-bridleway # pathtext z13- (also has line z11-) highway-bridleway-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) highway-bridleway-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) -highway-footway-alpine_hiking # pathtext z13- (also has line z11-) -highway-footway-demanding_alpine_hiking # pathtext z13- (also has line z11-) -highway-footway-demanding_mountain_hiking # pathtext z13- (also has line z11-) -highway-footway-difficult_alpine_hiking # pathtext z13- (also has line z11-) -highway-footway-hiking # pathtext z13- (also has line z11-) -highway-footway-mountain_hiking # pathtext z13- (also has line z11-) highway-path # pathtext z13- (also has line z11-) highway-path-alpine_hiking # pathtext z13- (also has line z11-) highway-path-bicycle # pathtext z13- (also has line z11-) diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 4678c3a77e..c21df9c93a 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -633,7 +633,6 @@ line|z19-[highway=construction], /* 8.7 Footway & Steps 18-22 ZOOM */ -/* [highway=footway] should be defined before [highway=footway][sac_scale] in 8.6. */ line|z18-[highway=footway], line|z18-[highway=steps], {color: @footway; opacity: 0.7; width: 1.5; dashes: 5,2;} @@ -675,13 +674,10 @@ line|z16-[highway=track][tunnel?], {width: 0;} line|z17-[highway=path], -line|z17-[highway=footway][sac_scale], {color: @path; opacity: 0.6; width: 0.9; dashes: 3.5,2;} line|z18[highway=path], -line|z18[highway=footway][sac_scale], {width: 1.1; dashes: 3.5,2;} line|z19-[highway=path], -line|z19-[highway=footway][sac_scale], {width: 1.5; dashes: 4,2.5;} line|z17-[highway=path][tunnel?], {width: 0;} diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index d680d5e56f..92f780fb58 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -247,14 +247,8 @@ highway-bridleway-bridge # line z18- highway-cycleway # line z18- highway-cycleway-bridge # line z18- highway-footway # line z18- -highway-footway-alpine_hiking # line z17- highway-footway-area # line z18- highway-footway-bridge # line z18- -highway-footway-demanding_alpine_hiking # line z17- -highway-footway-demanding_mountain_hiking # line z17- -highway-footway-difficult_alpine_hiking # line z17- -highway-footway-hiking # line z17- -highway-footway-mountain_hiking # line z17- highway-footway-sidewalk # line z19- highway-path # line z17- highway-path-alpine_hiking # line z17- diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 1cb9d1168e..d75291283f 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2817,14 +2817,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"highway", "busway", "tunnel"}, {{"highway", "busway"}, {"tunnel", "any_value"}}}, {{"highway", "cycleway", "bridge"}, {{"highway", "cycleway"}, {"bridge", "any_value"}}}, {{"highway", "cycleway", "tunnel"}, {{"highway", "cycleway"}, {"tunnel", "any_value"}}}, - {{"highway", "footway", "alpine_hiking"}, {{"highway", "footway"}, {"sac_scale", "alpine_hiking"}}}, {{"highway", "footway", "area"}, {{"highway", "footway"}, {"area", "any_value"}}}, {{"highway", "footway", "bridge"}, {{"highway", "footway"}, {"bridge", "any_value"}}}, - {{"highway", "footway", "demanding_alpine_hiking"}, {{"highway", "footway"}, {"sac_scale", "demanding_alpine_hiking"}}}, - {{"highway", "footway", "demanding_mountain_hiking"}, {{"highway", "footway"}, {"sac_scale", "demanding_mountain_hiking"}}}, - {{"highway", "footway", "difficult_alpine_hiking"}, {{"highway", "footway"}, {"sac_scale", "difficult_alpine_hiking"}}}, - {{"highway", "footway", "hiking"}, {{"highway", "footway"}, {"sac_scale", "hiking"}}}, - {{"highway", "footway", "mountain_hiking"}, {{"highway", "footway"}, {"sac_scale", "mountain_hiking"}}}, {{"highway", "footway"}, {{"highway", "footway"}, {"footway", "unsupported_value"}}}, {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"footway", "sidewalk"}}}, {{"highway", "footway", "crossing"}, {{"highway", "footway"}, {"footway", "crossing"}}},