From 5b1b7206d68357c84c188b1e205f1b4209f454ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Mon, 31 Dec 2018 10:04:07 +0100
Subject: [PATCH 1/7] Popup/Details: include description, start_date,
opening_date, (material)
---
detailsBody.html | 32 ++++++++++++++++++++++++++++++++
popupBody.html | 24 ++++++++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/detailsBody.html b/detailsBody.html
index 6b8d1801d..bd5c84bd0 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -1,4 +1,12 @@
<ul>
+{% set hasDescription = tagsPrefix(tags, 'description:') %}
+{% if tags.description or hasDescription %}
+<li class='hasSymbol'>
+ <i class="fa fa-info" aria-hidden="true"></i>
+ <span class='value'>{{ localizedTag(tags, 'description')|default(attribute(tags, 'description:' ~ hasDescription|keys[0])) }}</span>
+</li>
+{% endif %}
+
{% set address = tagsPrefix(tags, 'addr:') %}
{% if address %}
<li class='hasSymbol'>
@@ -133,4 +141,28 @@
</li>
{% endif %}
+{% if tags.start_date %}
+ <li class='hasSymbol'>
+ <i class="fa fa-clock-o" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('start_date') }}:</span>
+ <span class='value'>{{ enumerate(tags.start_date) }}</span>
+ </li>
+{% endif %}
+
+{% if tags.opening_date %}
+ <li class='hasSymbol'>
+ <i class="fa fa-clock-o" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('opening_date') }}:</span>
+ <span class='value'>{{ enumerate(tags.opening_date) }}</span>
+ </li>
+{% endif %}
+
+{% if tags.material %}
+ <li class='hasSymbol'>
+ <img data-src="maki:warehouse">
+ <span class='key'>{{ keyTrans('material') }}:</span>
+ <span class='value'>{{ tagTransList('material', tags.material) }}</span>
+ </li>
+{% endif %}
+
</ul>
diff --git a/popupBody.html b/popupBody.html
index 63b831792..d27884679 100644
--- a/popupBody.html
+++ b/popupBody.html
@@ -1,4 +1,12 @@
<ul>
+{% set hasDescription = tagsPrefix(tags, 'description:') %}
+{% if tags.description or hasDescription %}
+<li class='hasSymbol'>
+ <i class="fa fa-info" aria-hidden="true"></i>
+ <span class='value'>{{ localizedTag(tags, 'description')|default(attribute(tags, 'description:' ~ hasDescription|keys[0])) }}</span>
+</li>
+{% endif %}
+
{% set address = tagsPrefix(tags, 'addr:') %}
{% if address %}
<li class='hasSymbol'>
@@ -139,4 +147,20 @@
<span class='value'><a href="https://{{ wikipedia[1] }}.wikipedia.org/wiki/{{ wikipedia[2]|replace({ ' ': '_' }) }}">{{ wikipedia[2] }}</a></span>
{% endif %}
+{% if tags.start_date %}
+ <li class='hasSymbol'>
+ <i class="fa fa-clock-o" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('start_date') }}:</span>
+ <span class='value'>{{ enumerate(tags.start_date) }}</span>
+ </li>
+{% endif %}
+
+{% if tags.opening_date %}
+ <li class='hasSymbol'>
+ <i class="fa fa-clock-o" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('opening_date') }}:</span>
+ <span class='value'>{{ enumerate(tags.opening_date) }}</span>
+ </li>
+{% endif %}
+
</ul>
From 994b79291b05562261adb132f07473dad1f0a4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Mon, 31 Dec 2018 10:04:48 +0100
Subject: [PATCH 2/7] culture, historic, memorial: include additional info in
popup body
---
culture.json | 24 ++++++++++++++++++++++++
historic.json | 31 +++++++++++++++++++++++++++++++
memorial.json | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)
diff --git a/culture.json b/culture.json
index 9fd02fcf2..c2c91e4ad 100644
--- a/culture.json
+++ b/culture.json
@@ -44,6 +44,30 @@
"{% endif %}"
],
"description": "{{ tagTrans(key, value) }}",
+ "body": [
+ "<ul>",
+ "{% if tags.inscription %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('inscription') }}:</span>",
+ " <span class='value'>{{ localizedTag(tags, 'inscription') }}</span>",
+ " </li>",
+ "{% elseif attribute(tags, 'inscription:url') %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+ " <span class='key'><a href=\"{{ attribute(tags, 'inscription:url') }}\">{{ keyTrans('inscription') }}</a></span>",
+ " </li>",
+ "{% endif %}",
+ "",
+ "{% if tags.artist_name %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-palette\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('artist_name') }}:</span>",
+ " <span class='value'>{{ enumerate(tags.artist_name) }}</span>",
+ " </li>",
+ "{% endif %}",
+ "</ul>"
+ ],
"markerSign": "{{ attribute(const, key ~ '=' ~ value) }}"
},
"const": {
diff --git a/historic.json b/historic.json
index f09cf10fc..b1be97728 100644
--- a/historic.json
+++ b/historic.json
@@ -37,6 +37,37 @@
},
"feature": {
"description": "{{ tagTransList('historic', tags.historic) }}",
+ "body": [
+ "<ul>",
+ "{% if tags.inscription %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('inscription') }}:</span>",
+ " <span class='value'>{{ localizedTag(tags, 'inscription') }}</span>",
+ " </li>",
+ "{% elseif attribute(tags, 'inscription:url') %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+ " <span class='key'><a href=\"{{ attribute(tags, 'inscription:url') }}\">{{ keyTrans('inscription') }}</a></span>",
+ " </li>",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'historic:civilization') %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-users\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('historic:civilization') }}:</span>",
+ " <span class='value'>{{ tagTrans('historic:civilization', attribute(tags, 'historic:civilization')) }}</span>",
+ " </li>",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'memorial:conflict') %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-bolt\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('memorial:conflict') }}:</span>",
+ " <span class='value'>{{ tagTransList('memorial:conflict', attribute(tags, 'memorial:conflict')) }}</span>",
+ " </li>",
+ "{% endif %}"
+ ],
"markerSign": "{{ const[tags.historic].sign|raw }}"
},
"info": [
diff --git a/memorial.json b/memorial.json
index 4095a1378..82e349523 100644
--- a/memorial.json
+++ b/memorial.json
@@ -32,6 +32,46 @@
"{% endif %}"
],
"description": "{{ tagTransList('historic', value) }}",
+ "body": [
+ "<ul>",
+ "{% if tags.inscription %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('inscription') }}:</span>",
+ " <span class='value'>{{ localizedTag(tags, 'inscription') }}</span>",
+ " </li>",
+ "{% elseif attribute(tags, 'inscription:url') %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-pencil-alt\" aria-hidden=\"true\"></i>",
+ " <span class='key'><a href=\"{{ attribute(tags, 'inscription:url') }}\">{{ keyTrans('inscription') }}</a></span>",
+ " </li>",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'historic:civilization') %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-users\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('historic:civilization') }}:</span>",
+ " <span class='value'>{{ tagTrans('historic:civilization', attribute(tags, 'historic:civilization')) }}</span>",
+ " </li>",
+ "{% endif %}",
+ "",
+ "{% if attribute(tags, 'memorial:conflict') %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-bolt\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('memorial:conflict') }}:</span>",
+ " <span class='value'>{{ tagTransList('memorial:conflict', attribute(tags, 'memorial:conflict')) }}</span>",
+ " </li>",
+ "{% endif %}",
+ "",
+ "{% if tags.artist_name %}",
+ " <li class='hasSymbol'>",
+ " <i class=\"fa fa-palette\" aria-hidden=\"true\"></i>",
+ " <span class='key'>{{ keyTrans('artist_name') }}:</span>",
+ " <span class='value'>{{ enumerate(tags.artist_name) }}</span>",
+ " </li>",
+ "{% endif %}",
+ "</ul>"
+ ],
"markerSign": "{{ const[value].sign|raw }}"
},
"info": [
From c7ab9b28203e78d0e182fdc92d3eca431f34768e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 5 Jan 2019 15:38:06 +0100
Subject: [PATCH 3/7] culture: show info about material
---
culture.json | 9 +++++++++
detailsBody.html | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/culture.json b/culture.json
index c2c91e4ad..4fbe618a4 100644
--- a/culture.json
+++ b/culture.json
@@ -66,6 +66,15 @@
" <span class='value'>{{ enumerate(tags.artist_name) }}</span>",
" </li>",
"{% endif %}",
+ "",
+ "{% if tags.material %}",
+ " <li class='hasSymbol'>",
+ " <img data-src=\"maki:warehouse\">",
+ " <span class='key'>{{ keyTrans('material') }}:</span>",
+ " <span class='value'>{{ tagTransList('material', tags.material) }}</span>",
+ " </li>",
+ "{% endif %}",
+ "",
"</ul>"
],
"markerSign": "{{ attribute(const, key ~ '=' ~ value) }}"
diff --git a/detailsBody.html b/detailsBody.html
index bd5c84bd0..3c5a74647 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -157,12 +157,4 @@
</li>
{% endif %}
-{% if tags.material %}
- <li class='hasSymbol'>
- <img data-src="maki:warehouse">
- <span class='key'>{{ keyTrans('material') }}:</span>
- <span class='value'>{{ tagTransList('material', tags.material) }}</span>
- </li>
-{% endif %}
-
</ul>
From 8fea2ae3d3860c043bf866c5adc1130e663283a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 6 Jan 2019 08:17:53 +0100
Subject: [PATCH 4/7] Culture: show museum type (tag museum=*)
---
culture.json | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/culture.json b/culture.json
index 4fbe618a4..a9bd6aba6 100644
--- a/culture.json
+++ b/culture.json
@@ -43,7 +43,13 @@
"{% set value = tags.tourism %}",
"{% endif %}"
],
- "description": "{{ tagTrans(key, value) }}",
+ "description": [
+ "{{ tagTrans(key, value) }}",
+ "",
+ "{% if tags.tourism == 'museum' and tags.museum %}",
+ "({{ tagTrans('museum', tags.museum) }})",
+ "{% endif %}"
+ ],
"body": [
"<ul>",
"{% if tags.inscription %}",
From 4bca710e001536418469b6c42e64116e9fc3f7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 6 Jan 2019 08:42:34 +0100
Subject: [PATCH 5/7] culture: include shop=art
---
culture.json | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/culture.json b/culture.json
index a9bd6aba6..e34c48fb3 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,10 +42,17 @@
"{% 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) }}",
+ "{% if key == 'shop' %}",
+ " {{ keyTrans(key) }} ({{ tagTrans(key, value) }})",
+ "{% else %}",
+ " {{ tagTrans(key, value) }}",
+ "{% endif %}",
"",
"{% if tags.tourism == 'museum' and tags.museum %}",
"({{ tagTrans('museum', tags.museum) }})",
@@ -83,7 +91,7 @@
"",
"</ul>"
],
- "markerSign": "{{ attribute(const, key ~ '=' ~ value) }}"
+ "markerSign": "{{ attribute(const, key ~ '=' ~ value)|raw }}"
},
"const": {
"amenity=arts_centre": "🎨",
@@ -95,13 +103,14 @@
"tourism=artwork": "🎨 ",
"tourism=gallery": "🖼",
"tourism=museum": "🏛 ",
- "tourism=theme_park": ""
+ "tourism=theme_park": "",
+ "shop=art": "<i class=\"fa fa-shopping-cart\"></i>"
},
"info": [
"<table>",
"{% for value, sign in const %}",
" <tr>",
- " <td>{{ markerCircle({})|raw }}<div class='sign'>{{ sign }}</div></td>",
+ " <td>{{ markerCircle({})|raw }}<div class='sign'>{{ sign|raw }}</div></td>",
" <td>{{ tagTrans(value|split('=')[0], value|split('=')[1]) }}</td>",
" </tr>",
"{% endfor %}",
From 92b4decbe27fb944a62a3c32c9066c9a164a4528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 6 Jan 2019 09:07:13 +0100
Subject: [PATCH 6/7] culture: show theatre:genre=* resp. community_centre=*
---
culture.json | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/culture.json b/culture.json
index e34c48fb3..25d0dc156 100644
--- a/culture.json
+++ b/culture.json
@@ -56,6 +56,12 @@
"",
"{% 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": [
From a4196720e0e2e34a159d165ffa1079de79a4141e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Thu, 10 Jan 2019 10:20:52 +0100
Subject: [PATCH 7/7] culture, historic, memorial, tourism_attractions: improve
icons
---
culture.json | 6 +++---
historic.json | 16 ++++++++++++----
memorial.json | 2 +-
tourism_attractions.json | 10 +++++-----
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/culture.json b/culture.json
index 25d0dc156..630f3751b 100644
--- a/culture.json
+++ b/culture.json
@@ -102,14 +102,14 @@
"const": {
"amenity=arts_centre": "🎨",
"amenity=cinema": "🎦",
- "amenity=community_centre": "",
+ "amenity=community_centre": "<i class=\"fas fa-users\" aria-hidden=\"true\"></i>",
"amenity=fountain": "⛲",
- "amenity=studio": "",
+ "amenity=studio": "<i class=\"fas fa-microphone\"></i>",
"amenity=theatre": "🎭",
"tourism=artwork": "🎨 ",
"tourism=gallery": "🖼",
"tourism=museum": "🏛 ",
- "tourism=theme_park": "",
+ "tourism=theme_park": "<img data-src='maki:amusement-park'>",
"shop=art": "<i class=\"fa fa-shopping-cart\"></i>"
},
"info": [
diff --git a/historic.json b/historic.json
index b1be97728..0042fc19c 100644
--- a/historic.json
+++ b/historic.json
@@ -90,19 +90,27 @@
],
"const": {
"archaeological_site": {
- "sign": "",
+ "sign": "<i class=\"fas fa-archway\"></i>",
"zoom": 11
},
"battlefield": {
- "sign": "",
+ "sign": "⚔️",
"zoom": 11
},
"castle": {
- "sign": "<img src='maki:castle'>",
+ "sign": "<img data-src='maki:castle'>",
"zoom": 11
},
+ "building": {
+ "sign": "<img data-src='maki:building'>",
+ "zoom": 14
+ },
"aircraft": {
- "sign": "<img src='maki:airport'>",
+ "sign": "<img data-src='maki:airport'>",
+ "zoom": 14
+ },
+ "ruins": {
+ "sign": "<img data-src='temaki:ruins'>",
"zoom": 14
}
}
diff --git a/memorial.json b/memorial.json
index 82e349523..300f321e5 100644
--- a/memorial.json
+++ b/memorial.json
@@ -102,7 +102,7 @@
"zoom": 14
},
"monument": {
- "sign": "<img src='maki:monument?size=15'>",
+ "sign": "<img data-src='maki:monument?size=15'>",
"zoom": 11
}
}
diff --git a/tourism_attractions.json b/tourism_attractions.json
index 7fdfea76c..d69b2b457 100644
--- a/tourism_attractions.json
+++ b/tourism_attractions.json
@@ -49,12 +49,12 @@
"const": {
"aquarium": "🐟",
"artwork": "🎨 ",
- "attraction": "<img src='maki:attraction'>",
+ "attraction": "<img data-src='maki:attraction'>",
"gallery": "🖼",
- "museum": "<img src='maki:museum'>",
- "picnic_site": "<img src='maki:picnic-site'>",
- "theme_park": "<img src='maki:amusement-park'>",
- "viewpoint": "<i class='fa fa-eye' aria-hidden='true'></i>",
+ "museum": "<img data-src='maki:museum'>",
+ "picnic_site": "<img data-src='maki:picnic-site'>",
+ "theme_park": "<img data-src='maki:amusement-park'>",
+ "viewpoint": "<i class='fas fa-eye' aria-hidden='true'></i>",
"zoo": "🦁"
}
}