From 4340a38dd2a50fc47fe7149f0153266bd0611394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?=
<plepe@noreply.openstreetbrowser.org>
Date: Mon, 3 Dec 2018 21:49:00 +0100
Subject: [PATCH 1/4] xmas: show features from z13
---
xmas.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xmas.json b/xmas.json
index ab72802..89049a8 100644
--- a/xmas.json
+++ b/xmas.json
@@ -5,7 +5,7 @@
"fr": "Noël"
},
"query": {
- "14": [
+ "13": [
"(",
"node[\"xmas:feature\"];",
"way[\"xmas:feature\"];",
From 059abb67d7bcc89cc3fdfd48295c46812d4aef0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?=
<plepe@noreply.openstreetbrowser.org>
Date: Mon, 3 Dec 2018 22:11:57 +0100
Subject: [PATCH 2/4] xmas: show outdated features in red
---
xmas.json | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/xmas.json b/xmas.json
index 89049a8..5f698b9 100644
--- a/xmas.json
+++ b/xmas.json
@@ -14,9 +14,17 @@
]
},
"feature": {
+ "pre": [
+ "{% set isCurrent = meta.timestamp > now|date_modify('-1 month')|date('Y') %}",
+ "{% set bgColor = isCurrent ? '#f2756a' : 'red' %}"
+ ],
"title": "{{ attribute(tags, \"xmas:name\")|default(trans(\"unnamed\")) }}",
"description": "{{ tagTransList(\"xmas:feature\", attribute(tags, \"xmas:feature\")) }}",
"body": [
+ "{% if not isCurrent %}",
+ "<div style='border: 1px solid red; padding: 2px; margin-bottom: 2px;'>Feature has not been updated for the current season! Please check and set the tag 'xmas:lastcheck' to the current date.</div>",
+ "{% endif %}",
+ "",
"{% if attribute(tags, 'xmas:location') %}",
"<li class='hasSymbol'>",
" <i class=\"fa fa-globe\" aria-hidden=\"true\"></i>",
@@ -60,7 +68,9 @@
"markerSign": [
"{{ attribute(const, attribute(tags, 'xmas:feature'))|raw }}",
""
- ]
+ ],
+ "markerSymbol": "{{ markerPointer({\"fillColor\":bgColor})|raw }}",
+ "listMarkerSymbol": "{{ markerCircle({\"fillColor\":bgColor})|raw }}"
},
"const": {
"market": "<img src='maki:commercial'>",
From 643a607701ead913a13bdab4a7b7664270f46646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?=
<plepe@noreply.openstreetbrowser.org>
Date: Mon, 3 Dec 2018 22:26:11 +0100
Subject: [PATCH 3/4] xmas: add outdated feature to map key;
---
xmas.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xmas.json b/xmas.json
index 5f698b9..f285e1c 100644
--- a/xmas.json
+++ b/xmas.json
@@ -86,6 +86,10 @@
" <td>{{ tagTrans('xmas:feature', value) }}</td>",
" </tr>",
"{% endfor %}",
+ " <tr>",
+ " <td>{{ markerCircle({\"fillColor\":\"red\"})|raw }}</td>",
+ " <td>outdated feature</td>",
+ " </tr>",
"</table>"
]
}
From 0cb5b80235679a4f1ea8e6d8a99c296d592f5a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?=
<plepe@noreply.openstreetbrowser.org>
Date: Mon, 3 Dec 2018 22:36:48 +0100
Subject: [PATCH 4/4] xmas: lint, german title
---
xmas.json | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/xmas.json b/xmas.json
index f285e1c..3bc95f9 100644
--- a/xmas.json
+++ b/xmas.json
@@ -2,7 +2,8 @@
"type": "overpass",
"name": {
"en": "Christmas",
- "fr": "Noël"
+ "fr": "Noël",
+ "de": "Weihnachten"
},
"query": {
"13": [
@@ -65,18 +66,15 @@
"</li>",
"{% endif %}"
],
- "markerSign": [
- "{{ attribute(const, attribute(tags, 'xmas:feature'))|raw }}",
- ""
- ],
+ "markerSign": "{{ attribute(const, attribute(tags, 'xmas:feature'))|raw }}",
"markerSymbol": "{{ markerPointer({\"fillColor\":bgColor})|raw }}",
"listMarkerSymbol": "{{ markerCircle({\"fillColor\":bgColor})|raw }}"
},
"const": {
- "market": "<img src='maki:commercial'>",
+ "market": "<img data-src='maki:commercial'>",
"tree": "<i class=\"fa fa-tree\" aria-hidden=\"true\"></i>",
"shop": "<i class=\"fa fa-shopping-basket\" aria-hidden=\"true\"></i>",
- "event": "<img src='maki:amusement-park'>"
+ "event": "<img data-src='maki:amusement-park'>"
},
"info": [
"<table>",