diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 55c2ec39c1..1cf04b096c 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -2007,8 +2007,7 @@
منحوتة
تمثال
مكان جذاب
- مكان جذاب
- مكان جذاب
+ الضميمة الحيوانية
مخيّم
موقع لمراكب ترفيه
شاليه
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 2052600130..b41abaf089 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -2019,8 +2019,7 @@
Heykəl
Heykəl
Attraksionlar
- Zoopark
- Attraksionlar
+ Heyvan mühafizəsi
Düşərgə sahəsi
Treyler parkı
Dağ evi
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 76d1a84d09..ae5320861b 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -1326,6 +1326,7 @@
Бадмінтон
Баскская пелота
Акварыум
+ Вальера для жывёл
Кемпінг для аўтадамоў
Турыстычная інфармацыя
Інфармацыйны шчыт
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 1b02a1181c..d5e1429e5d 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -1168,6 +1168,7 @@
Бадминтон
Баска пелота
Аквариум
+ Заграждение за животни
Туринформация
Информационен щит
Пътеводител
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index fcd44d6781..5fe526713b 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -929,6 +929,7 @@
Botiga d\'electrodomèstics
Botiga de llits
Aquari
+ Recinte d\'animals
Zoo d\'animals de companyia
Pas de peix
Sèquia de drenatge
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 1a98c619d3..6eaaa16e33 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -1852,8 +1852,7 @@
Umělecké dílo
Umělecké dílo
Atrakce
- Atrakce
- Atrakce
+ Ohrada pro zvířata
Kempování
Kemp pro obytné přívěsy
Pamětihodnost
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 0592589130..e7d9400d6d 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -1832,8 +1832,7 @@
Kunstværk
Kunstværk
Attraktioner
- Attraktioner
- Attraktioner
+ Indhegning til dyr
Autocamperplads
Hytte
Turisme
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 143c484d38..e67207d39c 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -2028,8 +2028,7 @@
Skulptur
Statue
Sehenswürdigkeit
- Sehenswürdigkeit
- Sehenswürdigkeit
+ Tiergehege
Campingplatz
Wohnmobilstellplatz
Ferienhaus
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index c641847374..2018fc8ddc 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -1842,8 +1842,7 @@
Έργα τέχνης
Έργα τέχνης
Αξιοθέατα
- Αξιοθέατα
- Αξιοθέατα
+ Περίφραξη ζώων
Κάμπινγκ
Χώρος για τροχόσπιτα
Σαλέ
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index fe257212d4..33a38de39d 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -2050,8 +2050,7 @@
Obras de arte
Obras de arte
Atracción turística
- Recinto de animales
- Atracción turística
+ Recinto de animales
Camping
Zona de caravanas
Chalé
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 255b92e233..c14b1104d9 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -2050,8 +2050,7 @@
Kunstiteos - skulptuur
Kunstiteos - kuju
Turismiatraktsioon
- Loomade aedik
- Turismiatraktsioon
+ Loomade aedik
Telkimine
Haagiselamute park
Suvila
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index f09f9c7388..9aef8807f4 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -1958,8 +1958,7 @@
Artelanak
Artelanak
Erakarpen turistikoa
- Erakarpen turistikoa
- Erakarpen turistikoa
+ Animalien itxitura
Kanpalekua
Karabana gunea
Txaleta
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 484c7f8808..df64e8b5b9 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -1760,8 +1760,7 @@
گردشگری
گردشگری
گردشگری
- گردشگری
- گردشگری
+ محوطه حیوانات
محل چادر زنی
هتل
گالری
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 2507b8d64f..3e9aeea392 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -1986,8 +1986,7 @@
Taideteos
Taideteos
Nähtävyys
- Nähtävyys
- Nähtävyys
+ Eläinsuoja
Retkeily
Asuntovaunupaikka
Mökki
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index fec43ba6c1..dc4486f663 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -2015,6 +2015,7 @@
Œuvre
Œuvre
Œuvre
+ Enclos pour animaux
Camping
Aire de camping-car
Meublé de tourisme
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 695f93d426..806d29d5af 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -1150,8 +1150,7 @@
कलाकृति
प्रतिमा
पर्यटन स्थल
- पर्यटन स्थल
- पर्यटन स्थल
+ पशु बाड़ा
कारवां स्थल
षाले
आर्ट गैलरी
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 70dae04dd6..583013e887 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -1864,8 +1864,7 @@
Szobor
Szobor
Látnivaló
- Látnivaló
- Látnivaló
+ Állatok tartása
Kemping
Karaván pihenő
Turistaház
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index f48ca71fff..19deb3e8e8 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -1838,8 +1838,7 @@
Pariwisata
Pariwisata
Atraksi
- Atraksi
- Atraksi
+ Kandang Hewan
Perkemahan
Lokasi perkemahan
Pemandangan
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 1240cdf3cb..ec688955de 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -2001,8 +2001,7 @@
Scultura
Statua
Attrattiva
- Recinto
- Attrattiva
+ Recinto per animali
Campeggio
Area per campeggiatori
Chalet
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 049860901b..2bfcdd2d16 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -1324,6 +1324,7 @@
תיצונ
תיקסאב הטלפ
אַקוַרִיוּם
+ מתחם בעלי חיים
מידע לתייר
לוח מידע
מנחה
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 5ad7e67638..1d77a0d68f 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -2014,8 +2014,7 @@
彫刻
像
アトラクション
- 動物
- アトラクション
+ アニマル・エンクロージャー
キャンプ場
オートキャンプ場
シャレー
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index ddfd48ac14..f7c231c426 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -1847,8 +1847,7 @@
작품
작품
관광 명소
- 관광 명소
- 관광 명소
+ 동물 인클로저
캠핑
카라반 사용가능 캠핑장
별장
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 0bbd5dbebe..bdd77637e2 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -1867,8 +1867,7 @@
कलाकृती
कलाकृती
आकर्षण
- आकर्षण
- आकर्षण
+ प्राणी संलग्न
शिबिरवास(कॅम्पिंग)
वीथि
अतिथीगृह
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index b9d9176e67..fa260d37cb 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -1902,8 +1902,7 @@
Kunstverk
Kunstverk
Attraksjon
- Attraksjon
- Attraksjon
+ Innhegning for dyr
Campingplass
Camping
Galleri
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 6bfb2ee9e3..32dbdd2f3d 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -2053,8 +2053,7 @@
Kunstwerk
Standbeeld
Attractie
- Dierenverblijf
- Attractie
+ Dierenverblijf
Kampeerterrein
Caravan site
Vakantiehuis
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 02e2e4bdf7..361746d078 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -2026,8 +2026,7 @@
Rzeźba
Posąg
Atrakcja turystyczna
- Atrakcje zwierzęce
- Atrakcja turystyczna
+ Atrakcje zwierzęce
Kamping
Pole namiotowe
Domek letniskowy
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 19845f1ade..41e844aa4c 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -1814,8 +1814,6 @@
Escultura
Estátua
Atração turística
- Atração turística
- Atração turística
Parque de campismo
Área de trailers
Chalé
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index ac584da668..fbe91e7238 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -1998,8 +1998,7 @@
Escultura
Estátua
Atração turística
- Atração turística
- Atração turística
+ Recinto para animais
Parque de campismo
Parque de caravanas
Chalé
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index bd22decf90..c1fc7c4ab4 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -1862,8 +1862,7 @@
Turism
Turism
Punct de atracție
- Punct de atracție
- Punct de atracție
+ Incintă pentru animale
Teren pentru campare
Cabană
Galerie
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index d3bbec408c..3352742434 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -2077,8 +2077,7 @@
Произведение искусства
Произведение искусства
Достопримечательность
- Достопримечательность
- Достопримечательность
+ Вольер для животных
Кемпинг
Кемпинг для автодомов
Шале
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index a68a5d8b42..aa84a8a446 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -1899,8 +1899,7 @@
Umelecké diela
Umelecké diela
Atrakcia
- Atrakcia
- Atrakcia
+ Výbeh pre zvieratá
Kemp pre karavany
Chata
Pamätihodnosť
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index fbf020a8c9..d8c17d6cf1 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -1836,8 +1836,7 @@
Konstverk
Konstverk
Attraktion
- Attraktion
- Attraktion
+ Inhägnad för djur
Husvagnsplats
Stuga
Attraktion
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 2b3148d5f8..c8dfd0106b 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -902,6 +902,7 @@
Badminton
Basque pelota
Aquarium
+ Hifadhi ya Wanyama
Taarifa za Watalii
Bodi ya habari
Chapisho la mwongozo
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index cd5c950708..e9658aa1fd 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -1845,8 +1845,7 @@
งานศิลปะ
งานศิลปะ
การท่องเที่ยว
- การท่องเที่ยว
- การท่องเที่ยว
+ สิ่งที่แนบมากับสัตว์
การตั้งแคมป์
ขบวนนักเดินทาง
ชาเลต์
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 618d2c9212..83e48396f7 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -2051,8 +2051,7 @@
Heykel
Heykel
Görülecek Yerler
- Hayvanat bahçesi
- Görülecek Yerler
+ Hayvan Muhafazası
Kamp Alanı
Karavan Parkı
Dağ Evi
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 34aae8192c..054349db4c 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -2054,8 +2054,7 @@
Витвір мистецтва
Витвір мистецтва
Пам’ятне місце
- Пам’ятне місце
- Пам’ятне місце
+ Вольєр для тварин
Кемпінг
Кемпінг для автобудинків
Шале
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index d8d8fed24e..d89ad6069d 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -1842,8 +1842,7 @@
Du lịch
Du lịch
Hấp dẫn
- Hấp dẫn
- Hấp dẫn
+ Bao vây động vật
Cắm trại
Khu lễ hội hóa trang
Khách sạn
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 5f6fdb531f..126d65bacd 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -1896,8 +1896,7 @@
藝術品
藝術品
景點
- 景點
- 景點
+ 動物圍欄
露營
營區
木屋
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 5466e00975..2025699444 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -1986,8 +1986,7 @@
雕塑
雕像
景点
- 景点
- 景点
+ 动物围栏
宿营场地
房车宿营地
度假屋
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 03e1bee732..68e6f36794 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -2118,8 +2118,7 @@
Sculpture
Statue
Attraction
- Animal Enclosure
- Attraction
+ Animal Enclosure
Campground
RV Park
Chalet
diff --git a/data/categories.txt b/data/categories.txt
index 76743cde72..05932f4104 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -12030,6 +12030,46 @@ 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
+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
+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/classificator.txt b/data/classificator.txt
index f38402066e..3556430c57 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -195,6 +195,9 @@ world +
trunk -
unclassified -
{}
+ attraction +
+ animal -
+ {}
barrier +
block -
bollard -
@@ -1389,10 +1392,7 @@ world +
sculpture -
statue -
{}
- attraction +
- animal -
- specified -
- {}
+ attraction -
camp_site -
caravan_site -
chalet -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f4666ea5e6..7d5cfe7abf 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 1f42c2cde8..2caad8393a 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -14327,6 +14327,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -59832,20 +59903,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 13620648
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 13620648
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -126794,250 +126851,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 99f7538ca0..2d12d1165e 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index b97009e19e..79fd896c68 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -13933,6 +13933,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -56840,20 +56911,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 13620648
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 13620648
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -122490,250 +122547,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index c15726398b..4f2e316343 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 92bba4511c..1ca97e0793 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -13933,6 +13933,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -57066,20 +57137,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 988160
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 988160
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -122705,250 +122762,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index b287f3a2bb..f8a3516ef6 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 8b2eb200e7..345ba6b390 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -14181,6 +14181,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -60603,20 +60674,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 13620648
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 13620648
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -127858,250 +127915,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index e2bbb49a41..669056a479 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 8232045949..30596cc50e 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -14181,6 +14181,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -60829,20 +60900,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 988160
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 988160
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -128073,250 +128130,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 6bfffe9bdf..050c1008ea 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 1fe7a13c95..0bfb4edcb7 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -81037,216 +81037,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
cont {
name: "tourism-gallery"
element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 82c3e07702..3f416316db 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 35d40817a9..b69c658f31 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -81577,216 +81577,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
cont {
name: "tourism-gallery"
element {
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/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 8ec3dbfd95..7935cac19c 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index dd2d19296d..c0ccf56b59 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -72,157 +72,157 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -456,133 +456,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 5c67fc51f2..c85cdf79f1 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index 89d6ef41f2..81b6c3639f 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -72,157 +72,157 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -456,133 +456,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index d2647a6326..2cefefc383 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 39fb8e44cc..c113259a32 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 2762e386b6..b61b859e6a 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 39fb8e44cc..c113259a32 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 68d0eb37c8..1ff74cee3b 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index a7d731b4b9..8fcf99b356 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 58a7d19a92..9276813a25 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index a7d731b4b9..8fcf99b356 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 3fc6732b54..4131c044f5 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index fea1846c15..c2c903cea7 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 80ef832d6f..ea5fe88ce5 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index fea1846c15..c2c903cea7 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index a5e4109e53..751a8f6899 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index ff15c020eb..4aa4d794a2 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index f875e79c7f..53d2b3fb4b 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index ff15c020eb..4aa4d794a2 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png
index 5acbf8ca90..954e7fee32 100644
Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf
index 13ded08252..8d56c2ad39 100644
--- a/data/resources-xxxhdpi_clear/symbols.sdf
+++ b/data/resources-xxxhdpi_clear/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index 53e085fd4a..fbb39b55e9 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf
index 13ded08252..8d56c2ad39 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 6b5a9662c5..9da4be5d8c 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -29859,21 +29859,48 @@
zh-Hans = 景点
zh-Hant = 景點
- [type.tourism.attraction.animal]
- ref = type.tourism.attraction
+ [type.attraction.animal]
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_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index fac25c830e..44531fe622 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z
=== 140
landuse-flowerbed # area z16-
-natural-scrub # area z10-
+natural-scrub # area z12-
=== 130
landuse-grass # area z12-
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 @@
+
+
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 @@
+
+
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 029f9c6b0d..6dc8dac68a 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z
=== 140
landuse-flowerbed # area z16-
-natural-scrub # area z10-
+natural-scrub # area z12-
=== 130
landuse-grass # area z12-
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-)
diff --git a/data/types.txt b/data/types.txt
index cdf8686797..e7e0280746 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1233,8 +1233,8 @@ leisure|sports_centre
*historic|memorial|plaque
*historic|castle|defensive
*historic|castle|stately
-*tourism|attraction|animal
-*tourism|attraction|specified
+*attraction|animal
+tourism|attraction
*cuisine|regional
*cuisine|pizza
*cuisine|burger
diff --git a/data/visibility.txt b/data/visibility.txt
index 07a9794fa1..63f59d8b27 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -195,6 +195,9 @@ world 000000000000000000000 +
trunk 000000000000000000000 -
unclassified 000000000000000000000 -
{}
+ attraction 000000000000000000000 +
+ animal 000000000000000000000 -
+ {}
barrier 000000000000000000000 +
block 000000000000000000000 -
bollard 000000000000000000000 -
@@ -1389,10 +1392,7 @@ world 000000000000000000000 +
sculpture 000000000000000000111 -
statue 000000000000000000111 -
{}
- attraction 000000000000000111111 +
- animal 000000000000000111111 -
- specified 000000000000000111111 -
- {}
+ attraction 000000000000000111111 -
camp_site 000000000000000000000 -
caravan_site 000000000000000000000 -
chalet 000000000000000000000 -
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index b92a1b0d18..6b802565d5 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -3057,8 +3057,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
{{"tourism", "artwork", "sculpture"}, {{"tourism", "artwork"}, {"type", "sculpture"}}},
{{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"artwork_type", "statue"}}},
{{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"type", "statue"}}},
- {{"tourism", "attraction", "animal"}, {{"tourism", "attraction"}, {"attraction", "animal"}}},
- {{"tourism", "attraction", "specified"}, {{"tourism", "attraction"}, {"attraction", "specified"}}},
+ {{"attraction", "animal"}, {{"attraction", "animal"}}},
{{"tourism", "information", "board"}, {{"tourism", "information"}, {"information", "board"}}},
{{"tourism", "information", "guidepost"}, {{"tourism", "information"}, {"information", "guidepost"}}},
{{"tourism", "information", "map"}, {{"tourism", "information"}, {"information", "map"}}},
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 2455bd33ec..4e9d42fb42 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "مكان جذاب";
-"type.tourism.attraction.animal" = "مكان جذاب";
-
-"type.tourism.attraction.specified" = "مكان جذاب";
+"type.attraction.animal" = "الضميمة الحيوانية";
"type.tourism.camp_site" = "مخيّم";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 4a62550f9d..884efa73e3 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraksionlar";
-"type.tourism.attraction.animal" = "Zoopark";
-
-"type.tourism.attraction.specified" = "Attraksionlar";
+"type.attraction.animal" = "Heyvan mühafizəsi";
"type.tourism.camp_site" = "Düşərgə sahəsi";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 602184b4fb..9330614901 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Attraction";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "Вальера для жывёл";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index ba0b0650dd..4d3eb82954 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Attraction";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "Заграждение за животни";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index c09e6bde11..f64e278f85 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Attraction";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "Recinte d'animals";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 9a0399de63..364eea39dd 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atrakce";
-"type.tourism.attraction.animal" = "Atrakce";
-
-"type.tourism.attraction.specified" = "Atrakce";
+"type.attraction.animal" = "Ohrada pro zvířata";
"type.tourism.camp_site" = "Kempování";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 487c331709..da99491fc5 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraktioner";
-"type.tourism.attraction.animal" = "Attraktioner";
-
-"type.tourism.attraction.specified" = "Attraktioner";
+"type.attraction.animal" = "Indhegning til dyr";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 9b4afefcf0..9935010164 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Sehenswürdigkeit";
-"type.tourism.attraction.animal" = "Sehenswürdigkeit";
-
-"type.tourism.attraction.specified" = "Sehenswürdigkeit";
+"type.attraction.animal" = "Tiergehege";
"type.tourism.camp_site" = "Campingplatz";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 36dc363551..73ea8b6f4a 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Αξιοθέατα";
-"type.tourism.attraction.animal" = "Αξιοθέατα";
-
-"type.tourism.attraction.specified" = "Αξιοθέατα";
+"type.attraction.animal" = "Περίφραξη ζώων";
"type.tourism.camp_site" = "Κάμπινγκ";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 5d745b7a0a..7201f182ec 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Attraction";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "Animal Enclosure";
"type.tourism.camp_site" = "Campsite";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index a86bb3356b..fff9090221 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Animal Enclosure";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "Animal Enclosure";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 53e926a10c..9a0c252bfc 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atracción turística";
-"type.tourism.attraction.animal" = "Atracción turística";
-
-"type.tourism.attraction.specified" = "Atracción turística";
+"type.attraction.animal" = "Recinto de animales";
"type.tourism.camp_site" = "Camping";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 7a80a23986..75893e5ba4 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atracción turística";
-"type.tourism.attraction.animal" = "Recinto de animales";
-
-"type.tourism.attraction.specified" = "Atracción turística";
+"type.attraction.animal" = "Recinto de animales";
"type.tourism.camp_site" = "Camping";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index ae18b0ece8..87a61e8d4e 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Turismiatraktsioon";
-"type.tourism.attraction.animal" = "Loomade aedik";
-
-"type.tourism.attraction.specified" = "Turismiatraktsioon";
+"type.attraction.animal" = "Loomade aedik";
"type.tourism.camp_site" = "Telkimine";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index fc9d95a588..0e0427d273 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Erakarpen turistikoa";
-"type.tourism.attraction.animal" = "Erakarpen turistikoa";
-
-"type.tourism.attraction.specified" = "Erakarpen turistikoa";
+"type.attraction.animal" = "Animalien itxitura";
"type.tourism.camp_site" = "Kanpalekua";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index ee6f3fe06c..eb40a93617 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "گردشگری";
-"type.tourism.attraction.animal" = "گردشگری";
-
-"type.tourism.attraction.specified" = "گردشگری";
+"type.attraction.animal" = "محوطه حیوانات";
"type.tourism.camp_site" = "محل چادر زنی";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 45b96a450d..3e9d0418e2 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Nähtävyys";
-"type.tourism.attraction.animal" = "Nähtävyys";
-
-"type.tourism.attraction.specified" = "Nähtävyys";
+"type.attraction.animal" = "Eläinsuoja";
"type.tourism.camp_site" = "Retkeily";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 209e401a86..adcf9308ad 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Attraction";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "Enclos pour animaux";
"type.tourism.camp_site" = "Camping";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index f4ee8c987b..b9ecaeb8c4 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Attraction";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "מתחם בעלי חיים";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index 38bb55044c..d0597a7844 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "पर्यटन स्थल";
-"type.tourism.attraction.animal" = "पर्यटन स्थल";
-
-"type.tourism.attraction.specified" = "पर्यटन स्थल";
+"type.attraction.animal" = "पशु बाड़ा";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 330a4cdd94..0bb1c62771 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Látnivaló";
-"type.tourism.attraction.animal" = "Látnivaló";
-
-"type.tourism.attraction.specified" = "Látnivaló";
+"type.attraction.animal" = "Állatok tartása";
"type.tourism.camp_site" = "Kemping";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index d4bf6ce274..de8d6bad54 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atraksi";
-"type.tourism.attraction.animal" = "Atraksi";
-
-"type.tourism.attraction.specified" = "Atraksi";
+"type.attraction.animal" = "Kandang Hewan";
"type.tourism.camp_site" = "Perkemahan";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index b972b10dd8..13e8c58e90 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attrattiva";
-"type.tourism.attraction.animal" = "Recinto";
-
-"type.tourism.attraction.specified" = "Attrattiva";
+"type.attraction.animal" = "Recinto per animali";
"type.tourism.camp_site" = "Campeggio";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 78a8a78903..7b8bc7fbc0 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "アトラクション";
-"type.tourism.attraction.animal" = "動物";
-
-"type.tourism.attraction.specified" = "アトラクション";
+"type.attraction.animal" = "アニマル・エンクロージャー";
"type.tourism.camp_site" = "キャンプ場";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 816062d792..6682a18145 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "관광 명소";
-"type.tourism.attraction.animal" = "관광 명소";
-
-"type.tourism.attraction.specified" = "관광 명소";
+"type.attraction.animal" = "동물 인클로저";
"type.tourism.camp_site" = "캠핑";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 8ce7fdf623..6b20380cef 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "आकर्षण";
-"type.tourism.attraction.animal" = "आकर्षण";
-
-"type.tourism.attraction.specified" = "आकर्षण";
+"type.attraction.animal" = "प्राणी संलग्न";
"type.tourism.camp_site" = "शिबिरवास(कॅम्पिंग)";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index fa24c3bfa2..69df4451c8 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraksjon";
-"type.tourism.attraction.animal" = "Attraksjon";
-
-"type.tourism.attraction.specified" = "Attraksjon";
+"type.attraction.animal" = "Innhegning for dyr";
"type.tourism.camp_site" = "Campingplass";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 213105a30f..f3c35dccd5 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attractie";
-"type.tourism.attraction.animal" = "Dierenverblijf";
-
-"type.tourism.attraction.specified" = "Attractie";
+"type.attraction.animal" = "Dierenverblijf";
"type.tourism.camp_site" = "Kampeerterrein";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 2e1105353c..a8a97852fa 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atrakcja turystyczna";
-"type.tourism.attraction.animal" = "Atrakcje zwierzęce";
-
-"type.tourism.attraction.specified" = "Atrakcja turystyczna";
+"type.attraction.animal" = "Atrakcje zwierzęce";
"type.tourism.camp_site" = "Kamping";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index e7f9960690..2b55d35707 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atração turística";
-"type.tourism.attraction.animal" = "Atração turística";
-
-"type.tourism.attraction.specified" = "Atração turística";
+"type.attraction.animal" = "Recinto para animais";
"type.tourism.camp_site" = "Parque de campismo";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 9f22d84161..cf73701600 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atração turística";
-"type.tourism.attraction.animal" = "Atração turística";
-
-"type.tourism.attraction.specified" = "Atração turística";
+"type.attraction.animal" = "Recinto para animais";
"type.tourism.camp_site" = "Parque de campismo";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 31c6dd4910..614e46435f 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Punct de atracție";
-"type.tourism.attraction.animal" = "Punct de atracție";
-
-"type.tourism.attraction.specified" = "Punct de atracție";
+"type.attraction.animal" = "Incintă pentru animale";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index aa37ab7ea5..4d067af30a 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Достопримечательность";
-"type.tourism.attraction.animal" = "Достопримечательность";
-
-"type.tourism.attraction.specified" = "Достопримечательность";
+"type.attraction.animal" = "Вольер для животных";
"type.tourism.camp_site" = "Кемпинг";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 6f52dcf6a3..f193eb1318 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Atrakcia";
-"type.tourism.attraction.animal" = "Atrakcia";
-
-"type.tourism.attraction.specified" = "Atrakcia";
+"type.attraction.animal" = "Výbeh pre zvieratá";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 73ccf45f87..d9a3aa92e4 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraktion";
-"type.tourism.attraction.animal" = "Attraktion";
-
-"type.tourism.attraction.specified" = "Attraktion";
+"type.attraction.animal" = "Inhägnad för djur";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 9dbf51f378..81042aa92b 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Attraction";
-"type.tourism.attraction.animal" = "Attraction";
-
-"type.tourism.attraction.specified" = "Attraction";
+"type.attraction.animal" = "Hifadhi ya Wanyama";
"type.tourism.camp_site" = "Campground";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 5f5cc62d63..7bc346f3de 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "การท่องเที่ยว";
-"type.tourism.attraction.animal" = "การท่องเที่ยว";
-
-"type.tourism.attraction.specified" = "การท่องเที่ยว";
+"type.attraction.animal" = "สิ่งที่แนบมากับสัตว์";
"type.tourism.camp_site" = "การตั้งแคมป์";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index a4d0d143ae..4a5c222712 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Görülecek Yerler";
-"type.tourism.attraction.animal" = "Hayvanat bahçesi";
-
-"type.tourism.attraction.specified" = "Görülecek Yerler";
+"type.attraction.animal" = "Hayvan Muhafazası";
"type.tourism.camp_site" = "Kamp Alanı";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index f96d086a72..f7e9264419 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Пам’ятне місце";
-"type.tourism.attraction.animal" = "Пам’ятне місце";
-
-"type.tourism.attraction.specified" = "Пам’ятне місце";
+"type.attraction.animal" = "Вольєр для тварин";
"type.tourism.camp_site" = "Кемпінг";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 53b8937de6..c683e61870 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "Hấp dẫn";
-"type.tourism.attraction.animal" = "Hấp dẫn";
-
-"type.tourism.attraction.specified" = "Hấp dẫn";
+"type.attraction.animal" = "Bao vây động vật";
"type.tourism.camp_site" = "Cắm trại";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 7d83230bda..328ffa6bab 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "景点";
-"type.tourism.attraction.animal" = "景点";
-
-"type.tourism.attraction.specified" = "景点";
+"type.attraction.animal" = "动物围栏";
"type.tourism.camp_site" = "宿营场地";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 431afa1be4..4bcd4ec0d7 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -3765,9 +3765,7 @@
"type.tourism.attraction" = "景點";
-"type.tourism.attraction.animal" = "景點";
-
-"type.tourism.attraction.specified" = "景點";
+"type.attraction.animal" = "動物圍欄";
"type.tourism.camp_site" = "露營";