pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] attraction=animal as a standalone tag

Browse source 
Signed-off-by: map-per <map-per@gmx.de>
This commit is contained in:
map-per 2024-04-04 16:32:04 +02:00 • committed by Konstantin Pastbin
parent 0f6ce4fc2f
commit 156e9f8192
10 changed files with 130 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
data/categories.txt
View file

@ -12030,6 +12030,48 @@ sw:Zoo
fa:باغ وحش
mr:प्राणीसंग्रहालय
attraction-animal
en:Animal Enclosure
ar:الضميمة الحيوانية
be:Вальера для жывёл
bg:Заграждение за животни
ca:Recinte d'animals
cs:Ohrada pro zvířata
da:Indhegning til dyr
de:Tiergehege
el:Περίφραξη ζώων
es:Recinto de animales
es-MX:Recinto de animales
et:Loomade aedik
eu:Animalien itxitura
fa:محوطه حیوانات
fi:Eläinsuoja
fr:Enclos pour animaux
he:מתחם בעלי חיים
hi:पशु बाड़ा
hu:Állatok tartása
id:Kandang Hewan
it:Recinto per animali
ja:アニマル・エンクロージャー
ko:동물 인클로저
mr:प्राणी संलग्न
nb:Innhegning for dyr
nl:Dierenverblijf
pl:Atrakcje zwierzęce
pt:Recinto para animais
pt-rBR:Recinto para animais
ro:Incintă pentru animale
ru:Вольер для животных
sk:Výbeh pre zvieratá
sv:Inhägnad för djur
sw:Hifadhi ya Wanyama
th:สิ่งที่แนบมากับสัตว์
tr:Hayvan Muhafazası
uk:Вольєр для тварин
vi:Bao vây động vật
zh-Hans:动物围栏
zh-Hant:動物圍欄
tourism-information-office|@category_tourism
en:4Tourist Office
ru:3Туристический офис|туристическая информация

3
data/editor.config
View file

@ -898,6 +898,9 @@
<include group="poi_internet" />
<!-- <include field="wikipedia" />-->
</type>
<type id="attraction-animal">
<include field="name" />
</type>
<type id="tourism-camp_site" group="accomodation">
<include group="poi_internet" />
</type>

4
data/mapcss-mapping.csv
View file

@ -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;

Can't render this file because it contains an unexpected character in line 7 and column 16.

46
data/strings/types_strings.txt
View file

@ -29859,21 +29859,49 @@
zh-Hans = 景点
zh-Hant = 景點
[type.tourism.attraction.animal]
[type.attraction.animal]
ref = type.tourism.attraction
en = Animal Enclosure
af = Skerm vir diere
az = Zoopark
af = Diere Omheining
ar = الضميمة الحيوانية
az = Heyvan mühafizəsi
be = Вальера для жывёл
bg = Заграждение за животни
ca = Recinte d'animals
cs = Ohrada pro zvířata
da = Indhegning til dyr
de = Tiergehege
el = Περίφραξη ζώων
es = Recinto de animales
et = Loomade aedik
it = Recinto
ja = 動物
eu = Animalien itxitura
fa = محوطه حیوانات
fi = Eläinsuoja
fr = Enclos pour animaux
he = מתחם בעלי חיים
hi = पशु बाड़ा
hu = Állatok tartása
id = Kandang Hewan
it = Recinto per animali
ja = アニマル・エンクロージャー
ko = 동물 인클로저
lt = Gyvūnų aptvaras
mr = प्राणी संलग्न
nb = Innhegning for dyr
nl = Dierenverblijf
pl = Atrakcje zwierzęce
tr = Hayvanat bahçesi
[type.tourism.attraction.specified]
ref = type.tourism.attraction
pt = Recinto para animais
ro = Incintă pentru animale
ru = Вольер для животных
sk = Výbeh pre zvieratá
sv = Inhägnad för djur
sw = Hifadhi ya Wanyama
th = สิ่งที่แนบมากับสัตว์
tr = Hayvan Muhafazası
uk = Вольєр для тварин
vi = Bao vây động vật
zh-Hans = 动物围栏
zh-Hant = 動物圍欄
[type.tourism.camp_site]
en = Campground

6
data/styles/clear/include/Icons.mapcss
View file

@ -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],

6
data/styles/clear/include/priorities_4_overlays.prio.txt
View file

@ -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

19
data/styles/clear/style-clear/symbols/animal-m.svg Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1.1"
viewBox="0 0 24 24"
width="18"
height="18"
id="svg1"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1" />
<title
id="title1">animal-m</title>
<path
id="Path"
d="M 16.069622,1.670709 C 13.882633,4.8501398 13.571882,7.5052255 11.149025,9.6194413 8.8344727,11.63888 4.5882073,10.945616 4.5882073,13.858771 v 1.059733 c 0,1.059883 1.0934782,2.068306 1.0934782,3.179442 v 1.059883 c 0,1.589704 -0.5467534,1.589704 -1.0934782,3.179426 h 1.0934782 l 2.1869842,-3.179426 v 3.179426 h 1.640192 v -6.359018 h 1.6402033 v 6.359018 h 1.640205 v -4.769297 l 1.640205,4.769297 h 1.093492 l -1.674454,-6.657053 c 0.644611,-0.381233 0.58092,-1.085969 0.58092,-1.821488 v -3.179419 l 2.460359,-5.8292145 2.460373,0.7948732 c 0,-0.074715 -8.44e-4,-0.734467 0,-0.7948732 0,0 -0.399405,-0.3871019 -0.546738,-0.5298655 L 16.069669,1.670589 Z"
fill="#7f5933"
style="stroke-width:1.47601" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

20
data/styles/clear/style-night/symbols/animal-m.svg Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1.1"
viewBox="0 0 24 24"
width="18"
height="18"
id="svg1"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1" />
<title
id="title1">animal-m</title>
<path
id="Path"
d="M 16.069622,1.670709 C 13.882633,4.8501398 13.571882,7.5052255 11.149025,9.6194413 8.8344727,11.63888 4.5882073,10.945616 4.5882073,13.858771 v 1.059733 c 0,1.059883 1.0934782,2.068306 1.0934782,3.179442 v 1.059883 c 0,1.589704 -0.5467534,1.589704 -1.0934782,3.179426 h 1.0934782 l 2.1869842,-3.179426 v 3.179426 h 1.640192 v -6.359018 h 1.6402033 v 6.359018 h 1.640205 v -4.769297 l 1.640205,4.769297 h 1.093492 l -1.674454,-6.657053 c 0.644611,-0.381233 0.58092,-1.085969 0.58092,-1.821488 v -3.179419 l 2.460359,-5.8292145 2.460373,0.7948732 c 0,-0.074715 -8.44e-4,-0.734467 0,-0.7948732 0,0 -0.399405,-0.3871019 -0.546738,-0.5298655 L 16.069669,1.670589 Z"
fill="#717065"
opacity=".6"
style="stroke-width:1.47601" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

6
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -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

4
data/styles/vehicle/include/priorities_4_overlays.prio.txt
View file

@ -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-)