diff --git a/data/categories.txt b/data/categories.txt index 76743cde72..5124e7b18d 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -12030,6 +12030,48 @@ sw:Zoo fa:باغ وحش mr:प्राणीसंग्रहालय +attraction-animal +en:Animal Enclosure +ar:الضميمة الحيوانية +be:Вальера для жывёл +bg:Заграждение за животни +ca:Recinte d'animals +cs:Ohrada pro zvířata +da:Indhegning til dyr +de:Tiergehege +el:Περίφραξη ζώων +es:Recinto de animales +es-MX:Recinto de animales +et:Loomade aedik +eu:Animalien itxitura +fa:محوطه حیوانات +fi:Eläinsuoja +fr:Enclos pour animaux +he:מתחם בעלי חיים +hi:पशु बाड़ा +hu:Állatok tartása +id:Kandang Hewan +it:Recinto per animali +ja:アニマル・エンクロージャー +ko:동물 인클로저 +mr:प्राणी संलग्न +nb:Innhegning for dyr +nl:Dierenverblijf +pl:Atrakcje zwierzęce +pt:Recinto para animais +pt-rBR:Recinto para animais +ro:Incintă pentru animale +ru:Вольер для животных +sk:Výbeh pre zvieratá +sv:Inhägnad för djur +sw:Hifadhi ya Wanyama +th:สิ่งที่แนบมากับสัตว์ +tr:Hayvan Muhafazası +uk:Вольєр для тварин +vi:Bao vây động vật +zh-Hans:动物围栏 +zh-Hant:動物圍欄 + tourism-information-office|@category_tourism en:4Tourist Office ru:3Туристический офис|туристическая информация diff --git a/data/editor.config b/data/editor.config index 3f5d9f4797..4fd25b5d22 100644 --- a/data/editor.config +++ b/data/editor.config @@ -898,6 +898,9 @@ + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index a0fb5b7201..b2f13e08a0 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1321,8 +1321,8 @@ historic|memorial|statue;[historic=memorial][memorial=statue],[historic=memorial historic|memorial|plaque;[historic=memorial][memorial=plaque],[historic=memorial][memorial:type=plaque];;name;int_name;1233; historic|castle|defensive;[historic=castle][castle_type=defensive];;name;int_name;1234; historic|castle|stately;[historic=castle][castle_type=stately];;name;int_name;1235; -tourism|attraction|animal;[tourism=attraction][attraction=animal];;name;int_name;1236; -tourism|attraction|specified;[tourism=attraction][attraction=specified];;name;int_name;1237; +attraction|animal;[attraction=animal];;name;int_name;1236; +deprecated:tourism|attraction|specified:03.2024;[tourism=attraction][attraction=specified];x;name;int_name;1237;tourism|attraction cuisine|regional;1238; cuisine|pizza;1239; cuisine|burger;1240; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 6b5a9662c5..745fdb496d 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -29859,21 +29859,49 @@ zh-Hans = 景点 zh-Hant = 景點 - [type.tourism.attraction.animal] + [type.attraction.animal] ref = type.tourism.attraction en = Animal Enclosure - af = Skerm vir diere - az = Zoopark + af = Diere Omheining + ar = الضميمة الحيوانية + az = Heyvan mühafizəsi + be = Вальера для жывёл + bg = Заграждение за животни + ca = Recinte d'animals + cs = Ohrada pro zvířata + da = Indhegning til dyr + de = Tiergehege + el = Περίφραξη ζώων es = Recinto de animales et = Loomade aedik - it = Recinto - ja = 動物 + eu = Animalien itxitura + fa = محوطه حیوانات + fi = Eläinsuoja + fr = Enclos pour animaux + he = מתחם בעלי חיים + hi = पशु बाड़ा + hu = Állatok tartása + id = Kandang Hewan + it = Recinto per animali + ja = アニマル・エンクロージャー + ko = 동물 인클로저 + lt = Gyvūnų aptvaras + mr = प्राणी संलग्न + nb = Innhegning for dyr nl = Dierenverblijf pl = Atrakcje zwierzęce - tr = Hayvanat bahçesi - - [type.tourism.attraction.specified] - ref = type.tourism.attraction + pt = Recinto para animais + ro = Incintă pentru animale + ru = Вольер для животных + sk = Výbeh pre zvieratá + sv = Inhägnad för djur + sw = Hifadhi ya Wanyama + th = สิ่งที่แนบมากับสัตว์ + tr = Hayvan Muhafazası + uk = Вольєр для тварин + vi = Bao vây động vật + zh-Hans = 动物围栏 + zh-Hant = 動物圍欄 [type.tourism.camp_site] en = Campground diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 3de023d2b8..45fa8e37a5 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -456,6 +456,7 @@ node|z16-[historic=tomb], area|z16-[historic=tomb], node|z16-[tourism=aquarium], area|z16-[tourism=aquarium], +node|z17-[attraction=animal], node|z17-[historic=ruins], area|z17-[historic=ruins], node|z17-[historic=wayside_shrine], @@ -691,9 +692,8 @@ node|z16-[tourism=theme_park], area|z16-[tourism=theme_park] {icon-image: theme_park-m.svg;icon-min-distance: 24;} -node|z17-[tourism=attraction][attraction=animal], -area|z17-[tourism=attraction][attraction=animal] -{icon-image: zoo-m.svg;icon-min-distance: 24;} +node|z17-[attraction=animal], +{icon-image: animal-m.svg;icon-min-distance: 24;} node|z15-[amenity=community_centre], area|z15-[amenity=community_centre], diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index e89f17b403..dc03609ee1 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -801,6 +801,7 @@ amenity-cinema # icon z17- (also has captio amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) amenity-nightclub # icon z16- (also has caption(optional) z16-) amenity-post_office # icon z17- (also has caption(optional) z17-) +attraction-animal # icon z17- (also has caption(optional) z17-) highway-construction # pathtext z15- (also has line z13-) highway-living_street # pathtext z14- (also has line z12-) highway-living_street-bridge # pathtext z14- (also has line z12-) @@ -808,8 +809,6 @@ highway-living_street-tunnel # pathtext z14- (also has li leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) -tourism-attraction-animal # icon z14- (also has caption(optional) z14-) -tourism-attraction-specified # icon z14- (also has caption(optional) z14-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 2450 @@ -1725,11 +1724,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) # amenity-nightclub # caption(optional) z16- (also has icon z16-) # amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction-animal # caption(optional) z17- (also has icon z17-) # leisure-bowling_alley # caption(optional) z17- (also has icon z17-) # leisure-garden # caption(optional) z16- (also has icon z16-, area z12-) # leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) -# tourism-attraction-animal # caption(optional) z14- (also has icon z14-) -# tourism-attraction-specified # caption(optional) z14- (also has icon z14-) # tourism-zoo-petting # caption(optional) z15- (also has icon z15-) # === -7550 diff --git a/data/styles/clear/style-clear/symbols/animal-m.svg b/data/styles/clear/style-clear/symbols/animal-m.svg new file mode 100644 index 0000000000..bdef5b1b93 --- /dev/null +++ b/data/styles/clear/style-clear/symbols/animal-m.svg @@ -0,0 +1,19 @@ + + + + animal-m + + diff --git a/data/styles/clear/style-night/symbols/animal-m.svg b/data/styles/clear/style-night/symbols/animal-m.svg new file mode 100644 index 0000000000..26c75c0528 --- /dev/null +++ b/data/styles/clear/style-night/symbols/animal-m.svg @@ -0,0 +1,20 @@ + + + + animal-m + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 7e124ee2b3..703dd448a1 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -801,6 +801,7 @@ amenity-cinema # icon z17- (also has captio amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) amenity-nightclub # icon z16- (also has caption(optional) z16-) amenity-post_office # icon z17- (also has caption(optional) z17-) +attraction-animal # icon z17- (also has caption(optional) z17-) highway-construction # pathtext z15- (also has line z11-) highway-living_street # pathtext z14- (also has line z12-) highway-living_street-bridge # pathtext z14- (also has line z12-) @@ -808,8 +809,6 @@ highway-living_street-tunnel # pathtext z14- (also has li leisure-bowling_alley # icon z17- (also has caption(optional) z17-) leisure-garden # icon z16- (also has caption(optional) z16-, area z12-) leisure-swimming_pool # icon z17- (also has caption(optional) z17-, area z13-) -tourism-attraction-animal # icon z14- (also has caption(optional) z14-) -tourism-attraction-specified # icon z14- (also has caption(optional) z14-) tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 2450 @@ -1725,11 +1724,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) # amenity-nightclub # caption(optional) z16- (also has icon z16-) # amenity-post_office # caption(optional) z17- (also has icon z17-) +# attraction-animal # caption(optional) z17- (also has icon z17-) # leisure-bowling_alley # caption(optional) z17- (also has icon z17-) # leisure-garden # caption(optional) z16- (also has icon z16-, area z12-) # leisure-swimming_pool # caption(optional) z17- (also has icon z17-, area z13-) -# tourism-attraction-animal # caption(optional) z14- (also has icon z14-) -# tourism-attraction-specified # caption(optional) z14- (also has icon z14-) # tourism-zoo-petting # caption(optional) z15- (also has icon z15-) # === -7550 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 4ee01e4b4e..ca2e47dc68 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -483,8 +483,6 @@ historic-memorial-sculpture # icon z15- (also has captio historic-memorial-statue # icon z15- (also has caption(optional) z15-) historic-memorial-war_memorial # icon z15- (also has caption(optional) z15-) tourism-attraction # icon z15- (also has caption(optional) z15-) -tourism-attraction-animal # icon z15- (also has caption(optional) z15-) -tourism-attraction-specified # icon z15- (also has caption(optional) z15-) === 1200 amenity-community_centre # icon z16- (also has caption(optional) z16-) @@ -981,8 +979,6 @@ entrance-main # icon z18- (also has captio # historic-memorial-statue # caption(optional) z15- (also has icon z15-) # historic-memorial-war_memorial # caption(optional) z15- (also has icon z15-) # tourism-attraction # caption(optional) z15- (also has icon z15-) -# tourism-attraction-animal # caption(optional) z15- (also has icon z15-) -# tourism-attraction-specified # caption(optional) z15- (also has icon z15-) # === -8800 # amenity-community_centre # caption(optional) z16- (also has icon z16-)