diff --git a/data/copyright.html b/data/copyright.html index 21e8e3cd38..6690487db8 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -335,6 +335,9 @@
  • Maki
    © 2022 Mapbox CC0 1.0 Universal
    • + +
  • OnlineWebFonts
    + © 2023 OnlineWebFonts.com CC BY 4.0 License
    • diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index d339e3adbe..9207d4e930 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -426,7 +426,7 @@ piste:type|downhill|advanced;[piste:type=downhill][piste:difficulty=advanced];;n sport|shooting;348; place|country;349; highway|path|alpine_hiking;[highway=path][sac_scale=alpine_hiking];;name;int_name;350; -deprecated|deprecated;351;x +tourism|zoo|petting;[tourism=zoo][zoo=petting_zoo];;name;int_name;351; sport|scuba_diving;352; highway|cycleway|permissive;[highway=cycleway][access=permissive];;name;int_name;353; highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index b9c3d459d8..1b89e77a6a 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -29109,6 +29109,48 @@ zh-Hans = 动物园 zh-Hant = 動物園 + [type.tourism.zoo.petting] + en = Petting Zoo + ar = حديقة الحيوان الملاعبة + be = Хатні заапарк + bg = Зоопарк за домашни любимци + ca = Zoo d'animals de companyia + cs = ZOO pro domácí mazlíčky + da = Petting Zoo + de = Streichelzoo + el = Ζωολογικό κήπο + es = Zoológico de animales acariciables + et = Lemmikloomaaed + eu = Petting Zoo + fa = باغ وحش پتینگ + fi = Lemmikkieläintarha + fr = Zoo pour enfants + he = פינת חי + hu = Állatsimogató + id = Kebun Binatang + it = Zoo di coccole + ja = ふれあい動物園 + ko = 페팅 동물원 + lt = Petting Zoo + mr = पेटिंग प्राणीसंग्रहालय + nb = Dyrehage + nl = Kinderboerderij + pl = Małe Zoo + pt = Jardim Zoológico + pt-BR = Jardim Zoológico + ro = Grădina Zoologică + ru = Контактный зоопарк + sk = Zoologická záhrada s domácimi zvieratami + sv = Petting Zoo + sw = Kufuga Zoo + th = สวนสัตว์ลูบคลำ + tr = Sevişme Hayvanat Bahçesi + uk = Контактний зоопарк + vi = Vườn thú cưng + zh-Hans = 宠物动物园 + zh-Hant = 寵物動物園 + + [type.traffic_calming] en = Traffic Calming af = Verkeerskalmering diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index bd9fce058f..4f2b84ad42 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -451,6 +451,8 @@ area|z14-[tourism=attraction], node|z14-[tourism=theme_park], area|z14-[tourism=theme_park], node|z14-[tourism=viewpoint], +node|z15-[tourism=zoo][zoo=petting_zoo], +area|z15-[tourism=zoo][zoo=petting_zoo], node|z15-[amenity=community_centre], area|z15-[amenity=community_centre], node|z15-[historic=memorial], @@ -633,6 +635,15 @@ node|z16-[tourism=aquarium], area|z16-[tourism=aquarium] {icon-image: aquarium-m.svg;text-offset: 1;icon-min-distance: 8;} + +node|z13-[tourism=zoo][zoo=petting_zoo], +area|z13-[tourism=zoo][zoo=petting_zoo], +{icon-image: none;text: none;} /*needed to override base type styles*/ + +node|z15-[tourism=zoo][zoo=petting_zoo], +area|z15-[tourism=zoo][zoo=petting_zoo], +{icon-image: petting_zoo-m.svg;text: name;text-offset: 1;icon-min-distance: 8;} + node|z14[tourism=viewpoint] {icon-image: viewpoint-s.svg;text-offset: 1;icon-min-distance: 8;} node|z15-[tourism=viewpoint] diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 76a59e5e64..0439fe0c41 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -663,6 +663,7 @@ highway-unclassified # pathtext z13- (also has li highway-unclassified-area # pathtext z13- (also has line z11-) highway-unclassified-bridge # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-) highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-) +tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 3100 amenity-fountain # icon z16- (also has caption(optional) z16-, area z16-) @@ -1745,6 +1746,9 @@ amenity-parking_entrance-private # icon z19- (also has captio # amenity-pharmacy # caption(optional) z17- (also has icon z16-) # === -6850 +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) +# === -6900 + # amenity-fountain # caption(optional) z16- (also has icon z16-, area z16-) # === -6950 diff --git a/data/styles/clear/style-clear/symbols/petting_zoo-m.svg b/data/styles/clear/style-clear/symbols/petting_zoo-m.svg new file mode 100644 index 0000000000..dbe70cfeea --- /dev/null +++ b/data/styles/clear/style-clear/symbols/petting_zoo-m.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/clear/style-night/symbols/petting_zoo-m.svg b/data/styles/clear/style-night/symbols/petting_zoo-m.svg new file mode 100644 index 0000000000..18115f159d --- /dev/null +++ b/data/styles/clear/style-night/symbols/petting_zoo-m.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index db756b859b..fabe7ba3e5 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -465,6 +465,7 @@ place-square # caption z16- === 1400 tourism-zoo # icon z15- (also has caption(optional) z15-) +tourism-zoo-petting # icon z15- (also has caption(optional) z15-) === 1350 tourism-museum # icon z15- (also has caption(optional) z15-) @@ -955,6 +956,7 @@ entrance-main # icon z18- (also has captio # === -8500 # tourism-zoo # caption(optional) z15- (also has icon z15-) +# tourism-zoo-petting # caption(optional) z15- (also has icon z15-) # === -8650 # tourism-museum # caption(optional) z15- (also has icon z15-)