From e1850dafc8fb52fae723c5d02c20e7f4e0b927ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Tue, 5 Mar 2019 14:06:41 +0100
Subject: [PATCH] memorial: Always show memorial/monument

---
 memorial.json | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/memorial.json b/memorial.json
index c61991c..5c75c4b 100644
--- a/memorial.json
+++ b/memorial.json
@@ -44,14 +44,10 @@
             "{% endfor %}"
         ],
         "description": [
-            "{% if memtype != 'yes' and tags.historic == 'monument' %}",
-            "  {{ tagTrans('historic', 'monument') }}",
-            "{% endif %}",
+            "{{ tagTrans('historic', tags.historic) }}",
             "",
-            "{% if memtype == 'yes' %}",
-            "  {{ tagTrans('historic', tags.historic) }}",
-            "{% else %}",
-            "  {{ tagTrans('memorial', memtype) }}",
+            "{% if memtype != 'yes' %}",
+            "  ({{ tagTrans('memorial', memtype) }})",
             "{% endif %}"
         ],
         "priority": [
@@ -111,7 +107,7 @@
         "{% endfor %}",
         "{% if 14 <= map.zoom %}",
         "  <tr>",
-        "    <td>{{ markerCircle({})|raw }}<div class='sign'><img src='maki:monument'></div></td>",
+        "    <td>{{ markerCircle({})|raw }}<div class='sign'></div></td>",
         "    <td>{{ trans('other') }}</td>",
         "  </tr>",
         "{% endif %}",