diff --git a/culture.json b/culture.json
index 9fd02fc..630f375 100644
--- a/culture.json
+++ b/culture.json
@@ -30,6 +30,7 @@
"node[tourism~\"^(artwork|gallery|museum|theme_park)$\"];",
"way[tourism~\"^(artwork|gallery|museum|theme_park)$\"];",
"relation[tourism~\"^(artwork|gallery|museum|theme_park)$\"];",
+ "nwr[shop~\"^(art)$\"];",
")"
]
},
@@ -41,28 +42,81 @@
"{% elseif tags.tourism %}",
"{% set key = 'tourism' %}",
"{% set value = tags.tourism %}",
+ "{% elseif tags.shop %}",
+ "{% set key = 'shop' %}",
+ "{% set value = tags.shop %}",
"{% endif %}"
],
- "description": "{{ tagTrans(key, value) }}",
- "markerSign": "{{ attribute(const, key ~ '=' ~ value) }}"
+ "description": [
+ "{% if key == 'shop' %}",
+ " {{ keyTrans(key) }} ({{ tagTrans(key, value) }})",
+ "{% else %}",
+ " {{ tagTrans(key, value) }}",
+ "{% endif %}",
+ "",
+ "{% if tags.tourism == 'museum' and tags.museum %}",
+ "({{ tagTrans('museum', tags.museum) }})",
+ "{% endif %}",
+ "{% if tags.amenity == 'theatre' and attribute(tags, 'theatre:genre') %}",
+ "({{ tagTrans('theatre:genre', attribute(tags, 'theatre:genre')) }})",
+ "{% endif %}",
+ "{% if tags.amenity == 'community_centre' and tags.community_centre %}",
+ "({{ tagTrans('community_centre', tags.community_centre) }})",
+ "{% endif %}"
+ ],
+ "body": [
+ "
",
+ "{% if tags.inscription %}",
+ " - ",
+ " ",
+ " {{ keyTrans('inscription') }}:",
+ " {{ localizedTag(tags, 'inscription') }}",
+ "
",
+ "{% elseif attribute(tags, 'inscription:url') %}",
+ " - ",
+ " ",
+ " {{ keyTrans('inscription') }}",
+ "
",
+ "{% endif %}",
+ "",
+ "{% if tags.artist_name %}",
+ " - ",
+ " ",
+ " {{ keyTrans('artist_name') }}:",
+ " {{ enumerate(tags.artist_name) }}",
+ "
",
+ "{% endif %}",
+ "",
+ "{% if tags.material %}",
+ " - ",
+ "
",
+ " {{ keyTrans('material') }}:",
+ " {{ tagTransList('material', tags.material) }}",
+ " ",
+ "{% endif %}",
+ "",
+ "
"
+ ],
+ "markerSign": "{{ attribute(const, key ~ '=' ~ value)|raw }}"
},
"const": {
"amenity=arts_centre": "🎨",
"amenity=cinema": "🎦",
- "amenity=community_centre": "",
+ "amenity=community_centre": "",
"amenity=fountain": "⛲",
- "amenity=studio": "",
+ "amenity=studio": "",
"amenity=theatre": "🎭",
"tourism=artwork": "🎨 ",
"tourism=gallery": "🖼",
"tourism=museum": "🏛 ",
- "tourism=theme_park": ""
+ "tourism=theme_park": "
",
+ "shop=art": ""
},
"info": [
"",
"{% for value, sign in const %}",
" ",
- " {{ markerCircle({})|raw }} {{ sign }} | ",
+ " {{ markerCircle({})|raw }} {{ sign|raw }} | ",
" {{ tagTrans(value|split('=')[0], value|split('=')[1]) }} | ",
"
",
"{% endfor %}",
diff --git a/detailsBody.html b/detailsBody.html
index 6b8d180..3c5a746 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -1,4 +1,12 @@
+{% set hasDescription = tagsPrefix(tags, 'description:') %}
+{% if tags.description or hasDescription %}
+-
+
+ {{ localizedTag(tags, 'description')|default(attribute(tags, 'description:' ~ hasDescription|keys[0])) }}
+
+{% endif %}
+
{% set address = tagsPrefix(tags, 'addr:') %}
{% if address %}
-
@@ -133,4 +141,20 @@
{% endif %}
+{% if tags.start_date %}
+ -
+
+ {{ keyTrans('start_date') }}:
+ {{ enumerate(tags.start_date) }}
+
+{% endif %}
+
+{% if tags.opening_date %}
+ -
+
+ {{ keyTrans('opening_date') }}:
+ {{ enumerate(tags.opening_date) }}
+
+{% endif %}
+
diff --git a/historic.json b/historic.json
index f09cf10..0042fc1 100644
--- a/historic.json
+++ b/historic.json
@@ -37,6 +37,37 @@
},
"feature": {
"description": "{{ tagTransList('historic', tags.historic) }}",
+ "body": [
+ "",
+ "{% if tags.inscription %}",
+ " - ",
+ " ",
+ " {{ keyTrans('inscription') }}:",
+ " {{ localizedTag(tags, 'inscription') }}",
+ "
",
+ "{% elseif attribute(tags, 'inscription:url') %}",
+ " - ",
+ " ",
+ " {{ keyTrans('inscription') }}",
+ "
",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'historic:civilization') %}",
+ " - ",
+ " ",
+ " {{ keyTrans('historic:civilization') }}:",
+ " {{ tagTrans('historic:civilization', attribute(tags, 'historic:civilization')) }}",
+ "
",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'memorial:conflict') %}",
+ " - ",
+ " ",
+ " {{ keyTrans('memorial:conflict') }}:",
+ " {{ tagTransList('memorial:conflict', attribute(tags, 'memorial:conflict')) }}",
+ "
",
+ "{% endif %}"
+ ],
"markerSign": "{{ const[tags.historic].sign|raw }}"
},
"info": [
@@ -59,19 +90,27 @@
],
"const": {
"archaeological_site": {
- "sign": "",
+ "sign": "",
"zoom": 11
},
"battlefield": {
- "sign": "",
+ "sign": "⚔️",
"zoom": 11
},
"castle": {
- "sign": "
",
+ "sign": "
",
"zoom": 11
},
+ "building": {
+ "sign": "
",
+ "zoom": 14
+ },
"aircraft": {
- "sign": "
",
+ "sign": "
",
+ "zoom": 14
+ },
+ "ruins": {
+ "sign": "
",
"zoom": 14
}
}
diff --git a/memorial.json b/memorial.json
index 143b72e..2022e21 100644
--- a/memorial.json
+++ b/memorial.json
@@ -33,6 +33,46 @@
"{% endif %}"
],
"description": "{{ tagTransList('historic', value) }}",
+ "body": [
+ "",
+ "{% if tags.inscription %}",
+ " - ",
+ " ",
+ " {{ keyTrans('inscription') }}:",
+ " {{ localizedTag(tags, 'inscription') }}",
+ "
",
+ "{% elseif attribute(tags, 'inscription:url') %}",
+ " - ",
+ " ",
+ " {{ keyTrans('inscription') }}",
+ "
",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'historic:civilization') %}",
+ " - ",
+ " ",
+ " {{ keyTrans('historic:civilization') }}:",
+ " {{ tagTrans('historic:civilization', attribute(tags, 'historic:civilization')) }}",
+ "
",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'memorial:conflict') %}",
+ " - ",
+ " ",
+ " {{ keyTrans('memorial:conflict') }}:",
+ " {{ tagTransList('memorial:conflict', attribute(tags, 'memorial:conflict')) }}",
+ "
",
+ "{% endif %}",
+ "",
+ "{% if tags.artist_name %}",
+ " - ",
+ " ",
+ " {{ keyTrans('artist_name') }}:",
+ " {{ enumerate(tags.artist_name) }}",
+ "
",
+ "{% endif %}",
+ "
"
+ ],
"markerSign": "{{ const[value].sign|raw }}"
},
"info": [
@@ -63,7 +103,7 @@
"zoom": 14
},
"monument": {
- "sign": "
",
+ "sign": "
",
"zoom": 11
}
}
diff --git a/popupBody.html b/popupBody.html
index 63b8317..d278846 100644
--- a/popupBody.html
+++ b/popupBody.html
@@ -1,4 +1,12 @@
+{% set hasDescription = tagsPrefix(tags, 'description:') %}
+{% if tags.description or hasDescription %}
+-
+
+ {{ localizedTag(tags, 'description')|default(attribute(tags, 'description:' ~ hasDescription|keys[0])) }}
+
+{% endif %}
+
{% set address = tagsPrefix(tags, 'addr:') %}
{% if address %}
-
@@ -139,4 +147,20 @@
{{ wikipedia[2] }}
{% endif %}
+{% if tags.start_date %}
+
-
+
+ {{ keyTrans('start_date') }}:
+ {{ enumerate(tags.start_date) }}
+
+{% endif %}
+
+{% if tags.opening_date %}
+ -
+
+ {{ keyTrans('opening_date') }}:
+ {{ enumerate(tags.opening_date) }}
+
+{% endif %}
+
diff --git a/tourism_attractions.json b/tourism_attractions.json
index 7fdfea7..d69b2b4 100644
--- a/tourism_attractions.json
+++ b/tourism_attractions.json
@@ -49,12 +49,12 @@
"const": {
"aquarium": "🐟",
"artwork": "🎨 ",
- "attraction": "
",
+ "attraction": "
",
"gallery": "🖼",
- "museum": "
",
- "picnic_site": "
",
- "theme_park": "
",
- "viewpoint": "",
+ "museum": "
",
+ "picnic_site": "
",
+ "theme_park": "
",
+ "viewpoint": "",
"zoo": "🦁"
}
}