diff --git a/data/categories.txt b/data/categories.txt index 426ac2a366..412819a82a 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -13040,42 +13040,6 @@ sk:Jaskyňa fa:غار mr:गुहा -natural-tree -en:Tree -ru:Дерево -bg:Дърво -ar:شجرة -cs:Strom -da:Træ -nl:Boom -fi:Puu -fr:Arbre -de:Baum -hu:Fa -id:Pohon -it:Albero -ja:木 -ko:나무 -nb:Tre -pl:Drzewo -pt:Árvore -pt-BR:Árvore -ro:Arbore -es:Árbol -et:Puu -eu:Zuhaitza -sv:Träd -th:ต้นไม้ -tr:Ağaç -uk:Дерево -vi:Cây -zh-Hans:树 -zh-Hant:樹 -el:Δέντρο -sk:Strom -fa:درخت -mr:झाड - natural-volcano en:4Volcano ru:4Вулкан diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b210ff295d..0169332614 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -70,7 +70,8 @@ railway|rail|main;[railway=rail][usage=main][!highspeed][!service];;name;int_nam landuse|residential;15; highway|path;16; highway|bus_stop;17; -natural|tree;18; +# ~4M usages. +highway|footway|sidewalk;[highway=footway][footway=sidewalk];;name;int_name;18; place|locality;19; natural|coastline;20; place|village;21; @@ -109,7 +110,8 @@ natural|water|pond;[natural=water][water=pond];;name;int_name;47; landuse|farmland;48; barrier|fence;49; natural|water|lake;[natural=water][water=lake];;name;int_name;50; -power|pole;51; +# ~3M usages. TODO: consolidate all other footway=link/etc. values into highway-footway-minor. +highway|footway|crossing;[highway=footway][footway=crossing];;name;int_name;51; waterway|riverbank;52; highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53; landuse|meadow;54; @@ -186,6 +188,7 @@ landuse|commercial;111; railway|station;112; highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113; amenity|hospital;114; +# TODO: merge with "intermittent". waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115; highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116; amenity|post_office;117; @@ -226,7 +229,7 @@ natural|water|river;[natural=water][water=river];;name;int_name;149; railway|tram;150; amenity|toilets;151; natural|water|basin;[natural=water][water=basin];;name;int_name;152; -highway|footway|permissive;[highway=footway][access=permissive],[highway=footway][foot=permissive];;name;int_name;153; +deprecated:highway|footway|permissive:11.2023;[highway=footway][access=permissive],[highway=footway][foot=permissive];x;name;int_name;153;highway|footway leisure|picnic_table;154; landuse|construction;155; tourism|viewpoint;156; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index fe0cd020a6..59e85d7c6c 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -11495,6 +11495,94 @@ zh-Hans = 步行道路 zh-Hant = 人行步道 + [type.highway.footway.sidewalk] + en = Sidewalk + af = Sypaadjie + ar = رصيف + be = Тратуар + bg = Тротоар + ca = Vorera + cs = Chodník + da = Fortov + de = Bürgersteig + el = Πεζοδρόμιο + es = Acera + es-MX = Banqueta + et = Kõnnitee + eu = Espaloia + fa = پیاده رو + fi = Sidewalk + fr = Trottoir + he = מדרכה + hi = फ़ुटपाथ + hu = Járda + id = Trotoar + it = Marciapiede + ja = 歩道 + ko = 보도 + lt = Šaligatvis + mr = फुटपाथ + nb = Fortau + nl = Stoep + pl = Chodnik + pt = Passeio + pt-BR = Calçada + ro = Trotuar + ru = Тротуар + sk = Chodník + sv = Trottoar + sw = Njia ya kando + th = ทางเท้า + tr = Kaldırım + uk = Тротуар + vi = Đường đi bộ + zh-Hans = 人行道 + zh-Hant = 人行道 + + [type.highway.footway.crossing] + en = Pedestrian Crossing + af = Voetgangersoorgang + ar = عبور المشاة + be = Пешаходны пераход + bg = Пешеходно пресичане + ca = Pas de vianants + cs = Přechod pro chodce + da = Fodgængerovergang + de = Fußgängerübergang + el = Διάβαση πεζών + es = Paso de peatones + es-MX = Cruce peatonal + et = Jalakäijate ülekäigurada + eu = Oinezkoen pasabidea + fa = محل عبور عابر پیاده + fi = Jalankulkijoiden ylitys + fr = Passage pour piétons + he = מעבר הולכי רגל + hi = पैदल पार पथ + hu = Gyalogátkelőhely + id = Penyeberangan Pejalan Kaki + it = Attraversamento pedonale + ja = 横断歩道 + ko = 횡단보도 + lt = Pėsčiųjų perėja + mr = पादचारी ओलांडणे + nb = Fotgjengerovergang + nl = Voetgangersoversteekplaats + pl = Przejście dla pieszych + pt = Passagem de peões + pt-BR = Travessia de pedestres + ro = Trecere de pietoni + ru = Пешеходный переход + sk = Prechod pre chodcov + sv = Övergångsställe för fotgängare + sw = Kivuko cha Watembea kwa miguu + th = ทางม้าลาย + tr = Yaya Geçidi + uk = Пішохідний перехід + vi = Vạch qua đường + zh-Hans = 行人过街天桥 + zh-Hant = 行人穿越道 + [type.highway.footway.alpine_hiking] ref = type.highway.path de = Alpinwanderweg @@ -11585,9 +11673,6 @@ pt-BR = Caminho pedonal zh-Hans = 步行道路 - [type.highway.footway.permissive] - ref = type.highway.footway - [type.highway.footway.tunnel] ref = type.highway.road.tunnel en = Pedestrian Tunnel @@ -18391,45 +18476,6 @@ zh-Hans = 海峡 zh-Hant = 海峽 - [type.natural.tree] - en = Tree - af = Boom - ar = شجرة - be = Дрэва - bg = Дърво - cs = Strom - da = Træ - de = Baum - el = Δέντρο - es = Árbol - et = Puu - eu = Zuhaitza - fa = درخت - fi = Puu - fr = Arbre - he = עץ - hu = Fa - id = Pohon - it = Albero - ja = 木 - ko = 나무 - mr = झाड - nb = Tre - nl = Boom - pl = Drzewo - pt = Árvore - ro = Arbore - ru = Дерево - sk = Strom - sv = Träd - sw = Mti - th = ต้นไม้ - tr = Ağaç - uk = Дерево - vi = Cây - zh-Hans = 树 - zh-Hant = 樹 - [type.natural.tree_row] en = Tree Row af = Boomry @@ -20308,42 +20354,6 @@ zh-Hans = 风力发电厂 zh-Hant = 風力發電廠 - [type.power.pole] - en = Power Pole - af = Elektrisiteitspaal - ar = عمود كهرباء - cs = Sloup elektrického vedení - da = El-pol - de = Nieder-/Mittelspannungsmast - el = Πυλώνες μεταφοράς ρεύματος - es = Poste eléctrico - et = Elektripost - eu = Zutabe elektrikoa - fa = برج قدرت - fi = Sähköpylväs - fr = Poteau électrique - hu = Villanyoszlop - id = Menara listrik - it = Palo elettrico - ja = 電柱 - ko = 전봇대 - mr = विद्युत मनोरा - nb = Strømmast - nl = Elektriciteitspaal - pl = Słup elektryczny - pt = Poste de eletricidade - pt-BR = Poste de eletricidade - ro = Stâlp de electricitate - ru = Опора ЛЭП - sk = Stĺp elektrického vedenia - sv = Elstolpe - th = เสาไฟฟ้า - tr = Elektrik Direği - uk = Стовп ЛЕП - vi = Trụ Điện - zh-Hans = 电线杆 - zh-Hant = 電塔 - [type.power.station] en = Power Station af = Kragstasie diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss index fe90eef8c3..1cc6fdd1da 100644 --- a/data/styles/clear/include/Roads.mapcss +++ b/data/styles/clear/include/Roads.mapcss @@ -842,6 +842,11 @@ line|z18[highway=footway] line|z19-[highway=footway], {width: 4.2; dashes: 10,3.5; opacity: 1;} +/* Don't display sidewalks and pedestrian crossings on z15. */ +line|z15[highway=footway][footway=sidewalk], +line|z15[highway=footway][footway=crossing], +{width: 0;} + line|z17-[highway=footway][tunnel?]::tunnelBackground {casing-width-add: 0.5;} line|z17-[highway=footway][tunnel?]::tunnelCasing diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss index bea7198a07..2e1a60ac85 100644 --- a/data/styles/clear/include/Roads_label.mapcss +++ b/data/styles/clear/include/Roads_label.mapcss @@ -291,6 +291,11 @@ line|z16-[highway=ford], line|z16-[highway=raceway], {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;} +/* Don't display names of sidewalks and pedestrian crossings. */ +line|z15-[highway=footway][footway=sidewalk], +line|z15-[highway=footway][footway=crossing], +{text: none;} + line|z15[highway=construction], line|z15[highway=bridleway], line|z15[highway=path], diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt index 746e1b45ec..ac42e6884c 100644 --- a/data/styles/clear/include/priorities_3_FG.prio.txt +++ b/data/styles/clear/include/priorities_3_FG.prio.txt @@ -49,6 +49,7 @@ highway-cycleway # line z13- (also has pathte highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-cycleway-permissive # line z13- (also has pathtext z15-) highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-footway-crossing # line z16- highway-steps # line z15- (also has pathtext z16-) highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) @@ -269,7 +270,7 @@ highway-footway-demanding_mountain_hiking # line z14- (also has pathte 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-permissive # line z15- (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-) highway-path-alpine_hiking # 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 61a3a574ac..4a4fbaf759 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -700,7 +700,6 @@ highway-footway-demanding_mountain_hiking # pathtext z15- (also has li 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-footway-permissive # pathtext z15- (also has line z15-) 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/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 5e6241a434..170082ba14 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -49,6 +49,7 @@ highway-cycleway # line z13- (also has pathte highway-cycleway-bridge # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) highway-cycleway-permissive # line z13- (also has pathtext z15-) highway-cycleway-tunnel # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) +highway-footway-crossing # line z16- highway-steps # line z15- (also has pathtext z16-) highway-steps-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-) highway-steps-tunnel # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-) @@ -269,7 +270,7 @@ highway-footway-demanding_mountain_hiking # line z11- (also has pathte highway-footway-difficult_alpine_hiking # line z11- (also has pathtext z15-) highway-footway-hiking # line z11- (also has pathtext z15-) highway-footway-mountain_hiking # line z11- (also has pathtext z15-) -highway-footway-permissive # line z15- (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 z11- (also has pathtext z13-) highway-path-alpine_hiking # 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 a8c12159f1..7c6537c343 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -700,7 +700,6 @@ highway-footway-demanding_mountain_hiking # pathtext z15- (also has li highway-footway-difficult_alpine_hiking # pathtext z15- (also has line z11-) highway-footway-hiking # pathtext z15- (also has line z11-) highway-footway-mountain_hiking # pathtext z15- (also has line z11-) -highway-footway-permissive # pathtext z15- (also has line z15-) 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 aa589fce13..d43cd8600b 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -633,6 +633,21 @@ line|z18[highway=construction], line|z19-[highway=construction], {width: 6;dashes: 18,6.2;} +/* 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;} + +/* Don't display sidewalks at z18. */ +line|z18[highway=footway][footway=sidewalk], +{width: 0;} + +line|z18-[highway=footway][tunnel?], +line|z18-[highway=steps][tunnel?], +{width: 0;} + /* 8.6 Track & Path 16-22 ZOOM */ line|z14-[highway=track][tracktype=grade1], @@ -673,15 +688,6 @@ line|z19-[highway=footway][sac_scale], line|z17-[highway=path][tunnel?], {width: 0;} -/* 8.7 Footway & Steps 18-22 ZOOM */ - -line|z18-[highway=footway], -line|z18-[highway=steps], -{color: @footway; opacity: 0.7; width: 1.5; dashes: 5,2;} -line|z18-[highway=footway][tunnel?], -line|z18-[highway=steps][tunnel?], -{width: 0;} - /* 8.9 Bridleway 18-22 ZOOM */ line|z18-[highway=bridleway], diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss index ff57bb87e7..b2dcb768d1 100644 --- a/data/styles/vehicle/include/Roads_label.mapcss +++ b/data/styles/vehicle/include/Roads_label.mapcss @@ -290,78 +290,6 @@ line|z18-[highway=service], line|z18-[highway=road], {font-size: 15.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;} -/* 8.OTHERS ROADS 15-22 ZOOM */ - -/*line|z15-[highway=cycleway], -line|z15-[highway=construction], -line|z15-[highway=proposed], -line|z15-[highway=track], -line|z15-[highway=path], -line|z15-[highway=bridleway], -line|z15-[highway=footway], -line|z16-[leisure=track], -line|z16-[route=hiking], -line|z16-[highway=steps], -line|z16-[highway=ford], -line|z16-[highway=raceway], -{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;} - -line|z15[highway=construction], -line|z15[highway=proposed], -line|z15[highway=bridleway], -line|z15[highway=path], -line|z15[highway=footway], -line|z15[highway=cycleway], -line|z15[highway=track] -{font-size: 8;} -line|z16-17[highway=ford], -line|z16-17[highway=cycleway], -line|z16-17[highway=construction], -line|z16-17[highway=proposed], -line|z16-17[highway=track], -line|z16-17[highway=raceway], -line|z16-17[leisure=track], -line|z16-17[highway=path], -line|z16-17[route=hiking], -line|z16-17[highway=bridleway], -line|z16-17[highway=footway], -{font-size: 9;} -line|z18-[highway=ford], -line|z18-[highway=cycleway], -line|z18-[highway=construction], -line|z18-[highway=proposed], -line|z18-[highway=track], -line|z18-[highway=raceway], -line|z18-[leisure=track], -line|z18-[highway=path], -line|z18-[route=hiking], -line|z18-[highway=bridleway], -line|z18-[highway=footway], -{font-size: 10;}*/ - -/* 10.PISTE 15-22 ZOOM */ -/* -line[power=line], -line[aerialway=cable_car], -line[aerialway=chair_lift], -line[aerialway=gondola], -line[aerialway=mixed_lift], -line[aerialway=drag_lift], -line[aerialway=j-bar], -line[aerialway=t-bar], -line[aerialway=magic_carpet], -line[aerialway=platter], -line[aerialway=rope_tow], -*/ -/* 10.3 Piste & Route 14-22 ZOOM */ -/* -line[piste:type=downhill], -line[piste:type=nordic], -line[piste:type=sled] -{color: @piste;opacity: 1;} -line|z14[route=ski], -line|z14[leisure=skiing] -*/ /* 11. FERRY */ diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index d111667526..35bf7a1fc8 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -57,6 +57,9 @@ highway-world_towns_level # line z6-9 # highway-trunk-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-) # === 249 +highway-footway-crossing # line z18- +=== 245 + highway-motorway_link # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-motorway_link-tunnel # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) @@ -250,7 +253,7 @@ 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-permissive # line z18- +highway-footway-sidewalk # line z19- highway-path # line z17- highway-path-alpine_hiking # line z17- highway-path-bicycle # line z17- diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 448a05df36..287c53101b 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -2844,7 +2844,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke) {{"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", "permissive"}, {{"highway", "footway"}, {"access", "permissive"}}}, + {{"highway", "footway"}, {{"highway", "footway"}, {"footway", "unsupported_value"}}}, + {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"footway", "sidewalk"}}}, + {{"highway", "footway", "crossing"}, {{"highway", "footway"}, {"footway", "crossing"}}}, {{"highway", "footway", "tunnel"}, {{"highway", "footway"}, {"tunnel", "any_value"}}}, {{"highway", "footway", "tunnel"}, {{"highway", "footway"}, {"location", "underground"}}}, {{"highway", "living_street", "bridge"}, {{"highway", "living_street"}, {"bridge", "any_value"}}}, diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp index f2d7ef0c4a..3ff6fc2950 100644 --- a/search/search_integration_tests/smoke_test.cpp +++ b/search/search_integration_tests/smoke_test.cpp @@ -234,7 +234,6 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest) base::StringIL const arrInvisible[] = { {"man_made", "tower"}, {"man_made", "water_tower"}, - {"natural", "tree"}, {"place", "continent"}, {"place", "county"},