From 0d37e906c8fae4bd9e857ec6cac99f0d50c65928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Wed, 24 Oct 2018 20:36:51 +0200
Subject: [PATCH 1/3] Split memorial from historic
---
culture_religion.json | 3 ++
historic.json | 34 ++++++----------------
memorial.json | 65 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 26 deletions(-)
create mode 100644 memorial.json
diff --git a/culture_religion.json b/culture_religion.json
index 2d68d92..52cc1a5 100644
--- a/culture_religion.json
+++ b/culture_religion.json
@@ -28,6 +28,9 @@
{
"id": "historic"
},
+ {
+ "id": "memorial"
+ },
{
"id": "religion"
},
diff --git a/historic.json b/historic.json
index 8ab235d..dab36a1 100644
--- a/historic.json
+++ b/historic.json
@@ -22,28 +22,22 @@
"query": {
"11": [
"(",
- "node[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
- "way[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
- "relation[historic~\"^(castle|archaeological_site|battlefield|monument)$\"];",
+ "node[historic~\"^(castle|archaeological_site|battlefield)$\"];",
+ "way[historic~\"^(castle|archaeological_site|battlefield)$\"];",
+ "relation[historic~\"^(castle|archaeological_site|battlefield)$\"];",
")"
],
"14": [
"(",
- "node[historic];",
- "way[historic];",
- "relation[historic];",
+ "node[historic][historic!~\"^(memorial|monument)$\"];",
+ "way[historic][historic!~\"^(memorial|monument)$\"];",
+ "relation[historic][historic!~\"^(memorial|monument)$\"];",
")"
]
},
"feature": {
- "pre": [
- "{% set value = tags.historic %}",
- "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}",
- " {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}",
- "{% endif %}"
- ],
- "description": "{{ tagTransList('historic', value) }}",
- "markerSign": "{{ const[value].sign|raw }}"
+ "description": "{{ tagTransList('historic', tags.historic) }}",
+ "markerSign": "{{ const[tags.historic].sign|raw }}"
},
"info": [
"<table>",
@@ -79,18 +73,6 @@
"aircraft": {
"sign": "<img src='maki:airport'>",
"zoom": 14
- },
- "memorial": {
- "sign": "<span style='position: relative; top: -2px;'><img src='maki:monument?size=11'></span>",
- "zoom": 14
- },
- "memorial memorial=plaque": {
- "sign": "",
- "zoom": 14
- },
- "monument": {
- "sign": "<img src='maki:monument?size=15'>",
- "zoom": 11
}
}
}
diff --git a/memorial.json b/memorial.json
new file mode 100644
index 0000000..666c93a
--- /dev/null
+++ b/memorial.json
@@ -0,0 +1,65 @@
+{
+ "type": "overpass",
+ "name": {
+ "de": "Denkmäler",
+ "en": "Memorials"
+ },
+ "query": {
+ "11": [
+ "(",
+ "node[historic~\"^(monument)$\"];",
+ "way[historic~\"^(monument)$\"];",
+ "relation[historic~\"^(monument)$\"];",
+ ")"
+ ],
+ "14": [
+ "(",
+ "node[historic~\"^(memorial|monument)$\"];",
+ "way[historic~\"^(memorial|monument)$\"];",
+ "relation[historic~\"^(memorial|monument)$\"];",
+ ")"
+ ]
+ },
+ "feature": {
+ "pre": [
+ "{% set value = tags.historic %}",
+ "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}",
+ " {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}",
+ "{% endif %}"
+ ],
+ "description": "{{ tagTransList('historic', value) }}",
+ "markerSign": "{{ const[value].sign|raw }}"
+ },
+ "info": [
+ "<table>",
+ "{% for value, data in const %}",
+ "{% if data.zoom <= map.zoom %}",
+ " <tr>",
+ " <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
+ " <td>{{ tagTrans('historic', value) }}</td>",
+ " </tr>",
+ "{% endif %}",
+ "{% endfor %}",
+ "{% if 14 <= map.zoom %}",
+ " <tr>",
+ " <td>{{ markerCircle({})|raw }}<div class='sign'></div></td>",
+ " <td>{{ trans('other') }}</td>",
+ " </tr>",
+ "{% endif %}",
+ "</table>"
+ ],
+ "const": {
+ "memorial": {
+ "sign": "<span style='position: relative; top: -2px;'><img src='maki:monument?size=11'></span>",
+ "zoom": 14
+ },
+ "memorial memorial=plaque": {
+ "sign": "",
+ "zoom": 14
+ },
+ "monument": {
+ "sign": "<img src='maki:monument?size=15'>",
+ "zoom": 11
+ }
+ }
+}
From 979714e92cc73760d992a9462e35c38e1afc7356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Wed, 24 Oct 2018 21:29:12 +0200
Subject: [PATCH 2/3] Memorial: use "historic=memorial memorial=*" (or alias
memorial:type=*) as description
---
memorial.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/memorial.json b/memorial.json
index 666c93a..117785c 100644
--- a/memorial.json
+++ b/memorial.json
@@ -23,8 +23,10 @@
"feature": {
"pre": [
"{% set value = tags.historic %}",
- "{% if const[tags.historic ~ ' memorial=' ~ tags.memorial] %}",
+ "{% if tags.historic == 'memorial' and tags.memorial %}",
" {% set value = tags.historic ~ ' memorial=' ~ tags.memorial %}",
+ "{% elseif tags.historic == 'memorial' and attribute(tags, 'memorial:type') %}",
+ " {% set value = tags.historic ~ ' memorial=' ~ attribute(tags, 'memorial:type') %}",
"{% endif %}"
],
"description": "{{ tagTransList('historic', value) }}",
From 2564cbd9efca9436dcb546ad152be5a81811efa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Wed, 24 Oct 2018 22:21:51 +0200
Subject: [PATCH 3/3] historic/religion: move wayside_cross/wayside_shrine to
religion
---
historic.json | 6 +++---
religion.json | 15 +++++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/historic.json b/historic.json
index dab36a1..e69ce8b 100644
--- a/historic.json
+++ b/historic.json
@@ -29,9 +29,9 @@
],
"14": [
"(",
- "node[historic][historic!~\"^(memorial|monument)$\"];",
- "way[historic][historic!~\"^(memorial|monument)$\"];",
- "relation[historic][historic!~\"^(memorial|monument)$\"];",
+ "node[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];",
+ "way[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];",
+ "relation[historic][historic!~\"^(memorial|monument|wayside_cross|wayside_shrine)$\"];",
")"
]
},
diff --git a/religion.json b/religion.json
index 967b59e..c5b12fc 100644
--- a/religion.json
+++ b/religion.json
@@ -27,6 +27,18 @@
"way[landuse~\"^(cemetery)$\"];",
"relation[landuse~\"^(cemetery)$\"];",
")"
+ ],
+ "14": [
+ "(",
+ "node[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+ "way[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+ "relation[amenity~\"^(place_of_worship|grave_yard|crematorium)$\"];",
+ "way[landuse~\"^(cemetery)$\"];",
+ "relation[landuse~\"^(cemetery)$\"];",
+ "node[historic~\"^wayside_(cross|shrine)$\"];",
+ "way[historic~\"^wayside_(cross|shrine)$\"];",
+ "relation[historic~\"^wayside_(cross|shrine)$\"];",
+ ")"
]
},
"feature": {
@@ -34,6 +46,9 @@
"{% if tags.landuse == 'cemetery' %}",
"{% set key = 'landuse' %}",
"{% set value = tags.landuse %}",
+ "{% elseif tags.historic == 'wayside_cross' or tags.historic == 'wayside_shrine' %}",
+ "{% set key = 'historic' %}",
+ "{% set value = tags.historic %}",
"{% else %}",
"{% set key = 'amenity' %}",
"{% set value = tags.amenity %}",