diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 3bd0c481e0..f1cb3ff01f 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -192,7 +192,7 @@ amenity|recycling|container;[amenity=recycling][recycling_type=container];;name; leisure|garden;110; landuse|commercial;111; railway|station;112; -highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113; +deprecated:highway|path|hiking:04.2024;[highway=path][route=hiking],[highway=path][sac_scale=hiking];x;name;int_name;113;highway|path amenity|hospital;114; # TODO: merge with "intermittent". waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115; @@ -249,7 +249,7 @@ shop|bakery;162; highway|construction;163; highway|cycleway|bridge;[highway=cycleway][bridge?];;name;int_name;164; leisure|sports_centre;165; -highway|path|mountain_hiking;[highway=path][sac_scale=mountain_hiking];;name;int_name;166; +deprecated:highway|path|mountain_hiking:04.2024;[highway=path][sac_scale=mountain_hiking];x;name;int_name;166;highway|path tourism|camp_site;167; highway|bridleway;168; natural|heath;169; @@ -385,7 +385,7 @@ 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; man_made|lighthouse;299; -highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300; +deprecated:highway|path|demanding_mountain_hiking:04.2024;[highway=path][sac_scale=demanding_mountain_hiking];x;name;int_name;300;highway|path man_made|storage_tank;301; man_made|silo;302; power|generator;303; @@ -399,7 +399,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; -deprecated:highway|footway|hiking:04.2024;[highway=footway][sac_scale=hiking];x;name;int_name;314;highway|path|hiking +deprecated:highway|footway|hiking:04.2024;[highway=footway][sac_scale=hiking];x;name;int_name;314;highway|path aeroway|gate;315; # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=* railway|preserved;316; @@ -438,7 +438,7 @@ railway|tram|bridge;[railway=tram][bridge?];;name;int_name;346; piste:type|downhill|advanced;[piste:type=downhill][piste:difficulty=advanced];;name;int_name;347; sport|shooting;348; place|country;349; -highway|path|alpine_hiking;[highway=path][sac_scale=alpine_hiking];;name;int_name;350; +deprecated:highway|path|alpine_hiking:04.2024;[highway=path][sac_scale=alpine_hiking];x;name;int_name;350;highway|path tourism|zoo|petting;[tourism=zoo][zoo=petting_zoo];;name;int_name;351; sport|scuba_diving;352; deprecated:highway|cycleway|permissive:12.2023;[highway=cycleway][access=permissive];x;name;int_name;353;highway|cycleway @@ -450,7 +450,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; -deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path|mountain_hiking +deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path 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; @@ -484,7 +484,7 @@ sport|american_football;391; landuse|education;392; man_made|cairn;393; railway|preserved|bridge;[railway=preserved][bridge?];;name;int_name;394; -highway|path|demanding_alpine_hiking;[highway=path][sac_scale=demanding_alpine_hiking];;name;int_name;395; +deprecated:highway|path|demanding_alpine_hiking:04.2024;[highway=path][sac_scale=demanding_alpine_hiking];x;name;int_name;395;highway|path railway|rail|spur|tunnel;[railway=rail][service=spur][!usage][tunnel?];;name;int_name;396; highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397; railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398; @@ -535,7 +535,7 @@ natural|shingle;440; aerialway|t-bar;441; amenity|parking|lane|fee;[amenity=parking][parking=lane][fee];;name;int_name;442; amenity|parking|street_side|fee;[amenity=parking][parking=street_side][fee];;name;int_name;443; -highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444; +deprecated:highway|path|difficult_alpine_hiking:04.2024;[highway=path][sac_scale=difficult_alpine_hiking];x;name;int_name;444;highway|path earthquake:damage|spontaneous_camp;445; natural|water|drain;[natural=water][water=drain];;name;int_name;446; deprecated:railway|yard:06.2023;447;x @@ -543,7 +543,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 -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 +deprecated:highway|footway|demanding_mountain_hiking:04.2024;[highway=footway][sac_scale=demanding_mountain_hiking];x;name;int_name;452;highway|path 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; @@ -620,7 +620,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; -deprecated:highway|footway|alpine_hiking:04.2024;[highway=footway][sac_scale=alpine_hiking];x;name;int_name;529;highway|path|alpine_hiking +deprecated:highway|footway|alpine_hiking:04.2024;[highway=footway][sac_scale=alpine_hiking];x;name;int_name;529;highway|path deprecated|deprecated;530;x deprecated|deprecated;531;x deprecated|deprecated;532;x @@ -646,7 +646,7 @@ deprecated|deprecated;551;x deprecated|deprecated;552;x deprecated|deprecated;553;x deprecated|deprecated;554;x -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:highway|footway|demanding_alpine_hiking:04.2024;[highway=footway][sac_scale=demanding_alpine_hiking];x;name;int_name;555;highway|path deprecated|deprecated;556;x deprecated|deprecated;557;x deprecated|deprecated;558;x @@ -718,7 +718,7 @@ deprecated|deprecated;623;x deprecated|deprecated;624;x deprecated|deprecated;625;x deprecated:railway|siding|bridge:06.2023;626;x -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:highway|footway|difficult_alpine_hiking:04.2024;[highway=footway][sac_scale=difficult_alpine_hiking];x;name;int_name;627;highway|path 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 d1723c5776..89cf84b4c0 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -12511,17 +12511,6 @@ zh-Hans = 小道 zh-Hant = 人行步道 - [type.highway.path.alpine_hiking] - ref = type.highway.path - de = Alpinwanderweg - es = Camino de senderismo alpino - et = Alpi matkarada - fi = Alppivaellus - nl = Alpine wandelpad - pl = Ścieżka wspinaczkowa - pt-BR = Caminho pedonal - sk = Turistický chodník - [type.highway.path.bicycle] ref = type.highway.path en = Cycle & Foot Path @@ -12547,41 +12536,6 @@ [type.highway.path.bridge] ref = type.highway.road.bridge - [type.highway.path.demanding_alpine_hiking] - ref = type.highway.path - de = Anspruchsvoller Alpinwanderweg - es = Camino de senderismo alpino exigente - et = Nõudlik alpi matkarada - fi = Vaativa alppivaellus - pt-BR = Caminho pedonal difícil - sk = Náročný turistický chodník - - [type.highway.path.demanding_mountain_hiking] - ref = type.highway.path - de = Anspruchsvoller Bergwanderweg - es = Camino de senderismo de montaña exigente - et = Nõudlik mägimatkarada - fi = Vaativa vuoristovaellus - pt-BR = Caminho pedonal difícil - sk = Náročný horský chodník - - [type.highway.path.difficult_alpine_hiking] - ref = type.highway.path - de = Schwieriger Alpinwanderweg - et = Raske alpi matkarada - fi = Vaikea alppivaellus - pt-BR = Caminho pedonal difícil - sk = Obtiažny turistický chodník - - [type.highway.path.hiking] - ref = type.highway.path - de = Wanderweg - es = Sendero - fi = Vaellus - nl = Wandelpad - pt-BR = Caminho pedonal - sk = Turistický chodník - [type.highway.path.horse] ref = type.highway.path en = Bridle Path @@ -12598,19 +12552,6 @@ tr = Atlı Yolu uk = Кінна стежка - [type.highway.path.mountain_hiking] - ref = type.highway.path - de = Bergwanderweg - es = Sendero de montaña - et = Mägitee - fi = Vuoristovaellus - nl = Bergpad - pt-BR = Caminho pedonal - sk = Horský turistický chodník - - [type.highway.path.permissive] - ref = type.highway.path - [type.highway.path.tunnel] ref = type.highway.road.tunnel diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index d74b224088..e654ff8cc0 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -299,14 +299,8 @@ railway-preserved-tunnel # line z15- highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-footway-sidewalk # line z16- highway-footway-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) -highway-path-alpine_hiking # line z14- (also has pathtext z15-) highway-path-bridge # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) -highway-path-demanding_alpine_hiking # line z14- (also has pathtext z15-) -highway-path-demanding_mountain_hiking # line z14- (also has pathtext z15-) -highway-path-difficult_alpine_hiking # line z14- (also has pathtext z15-) -highway-path-hiking # line z14- (also has pathtext z15-) highway-path-horse # line z14- (also has pathtext z15-) -highway-path-mountain_hiking # line z14- (also has pathtext z15-) highway-path-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) === 155 diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 60b543ce9d..c8d148f96f 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -693,15 +693,9 @@ highway-bridleway # pathtext z15- (also has li 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-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-, line::cycleline z14-) highway-path-bridge # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-path-demanding_alpine_hiking # pathtext z15- (also has line z14-) -highway-path-demanding_mountain_hiking # pathtext z15- (also has line z14-) -highway-path-difficult_alpine_hiking # pathtext z15- (also has line z14-) -highway-path-hiking # pathtext z15- (also has line z14-) highway-path-horse # pathtext z15- (also has line z14-) -highway-path-mountain_hiking # pathtext z15- (also has line z14-) highway-path-tunnel # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2820 diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index ff217abcf6..d03395677c 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -299,14 +299,8 @@ railway-preserved-tunnel # line z13- highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) highway-footway-sidewalk # line z16- highway-footway-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) -highway-path-alpine_hiking # line z11- (also has pathtext z13-) highway-path-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) -highway-path-demanding_alpine_hiking # line z11- (also has pathtext z13-) -highway-path-demanding_mountain_hiking # line z11- (also has pathtext z13-) -highway-path-difficult_alpine_hiking # line z11- (also has pathtext z13-) -highway-path-hiking # line z11- (also has pathtext z13-) highway-path-horse # line z11- (also has pathtext z13-) -highway-path-mountain_hiking # line z11- (also has pathtext z13-) highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) === 155 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 767c4be6bf..d3cb5120df 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -693,15 +693,9 @@ highway-bridleway # pathtext z13- (also has li 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-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-, line::cycleline z12-) highway-path-bridge # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-) -highway-path-demanding_alpine_hiking # pathtext z13- (also has line z11-) -highway-path-demanding_mountain_hiking # pathtext z13- (also has line z11-) -highway-path-difficult_alpine_hiking # pathtext z13- (also has line z11-) -highway-path-hiking # pathtext z13- (also has line z11-) highway-path-horse # pathtext z13- (also has line z11-) -highway-path-mountain_hiking # pathtext z13- (also has line z11-) highway-path-tunnel # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-) === 2820 diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 7698578ea9..f6fd5553ee 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -252,15 +252,9 @@ highway-footway-bicycle # line z18- highway-footway-bridge # line z18- highway-footway-sidewalk # line z19- highway-path # line z17- -highway-path-alpine_hiking # line z17- highway-path-bicycle # line z17- highway-path-bridge # line z17- -highway-path-demanding_alpine_hiking # line z17- -highway-path-demanding_mountain_hiking # line z17- -highway-path-difficult_alpine_hiking # line z17- -highway-path-hiking # line z17- highway-path-horse # line z17- -highway-path-mountain_hiking # line z17- highway-pedestrian # line z18- highway-pedestrian-area # line z18- highway-pedestrian-bridge # line z18-