From 394247e6d83519073307bc1955fc56086dc0958f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 12 Aug 2017 21:41:56 +0200
Subject: [PATCH 01/15] commonBody: show address and phone number
---
commonBody.html | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 commonBody.html
diff --git a/commonBody.html b/commonBody.html
new file mode 100644
index 0000000..f01130c
--- /dev/null
+++ b/commonBody.html
@@ -0,0 +1,23 @@
+<dl>
+
+{% set address = tagsPrefix(tags, 'addr:') %}
+{% if address %}
+<dt>
+<i class="fa fa-map-marker symbol" aria-hidden="true"></i>
+{{ keyTrans('addr') }}:
+</dt><dd>
+{{ attribute(tags, 'addr:street') }} {{ attribute(tags, 'addr:housenumber') }}, {{ attribute(tags, 'addr:postcode') }} {{ attribute(tags, 'addr:city') }}
+</dd>
+{% endif %}
+
+{% if tags.phone %}
+<dt>
+<i class="fa fa-phone symbol" aria-hidden="true"></i>
+{{ keyTrans('phone') }}:
+</dt>
+<dd>
+<a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+</dd>
+{% endif %}
+
+</dl>
From 23a87ad87719e7fd38645f1d76d370e623fffd9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 12 Aug 2017 21:42:27 +0200
Subject: [PATCH 02/15] commonBody: include payment options
---
commonBody.html | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/commonBody.html b/commonBody.html
index f01130c..52dc8c1 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -20,4 +20,16 @@
</dd>
{% endif %}
+{% set payment = tagsPrefix(tags, 'payment:') %}
+{% if payment %}
+<dt>
+<i class="fa fa-money symbol" aria-hidden="true"></i>
+{{ keyTrans('payment') }}:
+</dt><dd>
+{% for k, tag in payment %}
+{% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+{% endfor %}
+</dd>
+{% endif %}
+
</dl>
From e60ac5a2f6f172db40229319751db830d0a6c5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 13 Aug 2017 15:48:03 +0200
Subject: [PATCH 03/15] gastro: convert to default json structure
---
gastro.json | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gastro.json b/gastro.json
index f016bed..41f87a2 100644
--- a/gastro.json
+++ b/gastro.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Gastronomía",
"cs": "Stravování",
@@ -15,9 +16,9 @@
"ru": "Общепит",
"uk": "Гастрономія"
},
- "type": "overpass",
- "query": "(node[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];);",
- "minZoom": 16,
+ "query": {
+ "16": "(node[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];);"
+ },
"feature": {
"markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}",
"body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{{ keyTrans('cuisine') }}: {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}",
From 7db9d45bdeb412a6d4df2317d49638d1e1f07888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 13 Aug 2017 16:15:55 +0200
Subject: [PATCH 04/15] commonBody: better layout
---
commonBody.html | 52 ++++++++++++++++++++++++++-----------------------
gastro.json | 2 +-
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/commonBody.html b/commonBody.html
index 52dc8c1..7044bc4 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -1,35 +1,39 @@
-<dl>
-
+<ul>
{% set address = tagsPrefix(tags, 'addr:') %}
{% if address %}
-<dt>
-<i class="fa fa-map-marker symbol" aria-hidden="true"></i>
-{{ keyTrans('addr') }}:
-</dt><dd>
-{{ attribute(tags, 'addr:street') }} {{ attribute(tags, 'addr:housenumber') }}, {{ attribute(tags, 'addr:postcode') }} {{ attribute(tags, 'addr:city') }}
-</dd>
+<li>
+ <i class="fa fa-map-marker symbol" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('addr') }}</span>
+ <span class='value'>
+ {{ attribute(tags, 'addr:street') }}
+ {{ attribute(tags, 'addr:housenumber') }},
+ {{ attribute(tags, 'addr:postcode') }}
+ {{ attribute(tags, 'addr:city') }}
+ </span>
+</li>
{% endif %}
{% if tags.phone %}
-<dt>
-<i class="fa fa-phone symbol" aria-hidden="true"></i>
-{{ keyTrans('phone') }}:
-</dt>
-<dd>
-<a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
-</dd>
+<li>
+ <i class="fa fa-phone symbol" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('phone') }}</span>
+ <span class='value'>
+ <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+ </span>
+</li>
{% endif %}
{% set payment = tagsPrefix(tags, 'payment:') %}
{% if payment %}
-<dt>
-<i class="fa fa-money symbol" aria-hidden="true"></i>
-{{ keyTrans('payment') }}:
-</dt><dd>
-{% for k, tag in payment %}
-{% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
-{% endfor %}
-</dd>
+<li>
+ <i class="fa fa-money symbol" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('payment') }}</span>
+ <span class='value'>
+ {% for k, tag in payment %}
+ {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+ {% endfor %}
+ </span>
+</li>
{% endif %}
-</dl>
+</ul>
diff --git a/gastro.json b/gastro.json
index 41f87a2..88ac064 100644
--- a/gastro.json
+++ b/gastro.json
@@ -21,7 +21,7 @@
},
"feature": {
"markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}",
- "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{{ keyTrans('cuisine') }}: {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}",
+ "body": "<span class='description'>\n{{ tagTrans('amenity', tags.amenity) }}\n</span>\n<ul>\n <li>\n <i class=\"fa fa-cutlery symbol\" aria-hidden=\"true\"></i>\n <span class='key'>{{ keyTrans('cuisine') }}</span>\n <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n </li>\n</ul>",
"description": "{{ tagTrans('amenity', tags.amenity) }}"
}
}
From ae1c598d0ceab75d2ad5a7a7904b1be2c2a2471e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 13 Aug 2017 17:45:58 +0200
Subject: [PATCH 05/15] commonBody: wheelchair status
---
commonBody.html | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/commonBody.html b/commonBody.html
index 7044bc4..c75791f 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -36,4 +36,14 @@
</li>
{% endif %}
+{% if attribute(tags, 'wheelchair') %}
+<li>
+ <i class="fa fa-wheelchair-alt symbol" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('wheelchair') }}</span>
+ <span class='value'>
+ {{ tagTrans('wheelchair', tags.wheelchair) }}
+ </span>
+</li>
+{% endif %}
+
</ul>
From 29966730d54ae4b287029ae5d81067ba83eadadf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 13 Aug 2017 17:55:20 +0200
Subject: [PATCH 06/15] commonBody: wheelchair, toilet info, description
---
commonBody.html | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/commonBody.html b/commonBody.html
index c75791f..434ebdb 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -38,10 +38,17 @@
{% if attribute(tags, 'wheelchair') %}
<li>
- <i class="fa fa-wheelchair-alt symbol" aria-hidden="true"></i>
+ <i class="fa fa-wheelchair-alt symbol {{ tags.wheelchair }}" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('wheelchair') }}</span>
<span class='value'>
- {{ tagTrans('wheelchair', tags.wheelchair) }}
+ {{ tagTrans('wheelchair', tags.wheelchair) -}}
+
+ {%- if attribute(tags, 'toilets:wheelchair') -%}
+ , <span class='{{ attribute(tags, 'toilets:wheelchair') }}'>🚽</span> {{ keyTrans('amenity', 'toilets') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}</span>
+ {% endif %}
+
+ <br/>
+ {{ localizedTag(tags, 'wheelchair:description') }}
</span>
</li>
{% endif %}
From 209cf37a806d038bd75677536f7b933e0adb4e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Mon, 14 Aug 2017 18:20:48 +0200
Subject: [PATCH 07/15] li needs .hasSymbol
---
commonBody.html | 36 ++++++++++++++++++------------------
gastro.json | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/commonBody.html b/commonBody.html
index 434ebdb..eb9f27d 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -1,9 +1,9 @@
<ul>
{% set address = tagsPrefix(tags, 'addr:') %}
{% if address %}
-<li>
- <i class="fa fa-map-marker symbol" aria-hidden="true"></i>
- <span class='key'>{{ keyTrans('addr') }}</span>
+<li class='hasSymbol'>
+ <i class="fa fa-map-marker" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('addr') }}:</span>
<span class='value'>
{{ attribute(tags, 'addr:street') }}
{{ attribute(tags, 'addr:housenumber') }},
@@ -14,9 +14,9 @@
{% endif %}
{% if tags.phone %}
-<li>
- <i class="fa fa-phone symbol" aria-hidden="true"></i>
- <span class='key'>{{ keyTrans('phone') }}</span>
+<li class='hasSymbol'>
+ <i class="fa fa-phone" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('phone') }}:</span>
<span class='value'>
<a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
</span>
@@ -25,9 +25,9 @@
{% set payment = tagsPrefix(tags, 'payment:') %}
{% if payment %}
-<li>
- <i class="fa fa-money symbol" aria-hidden="true"></i>
- <span class='key'>{{ keyTrans('payment') }}</span>
+<li class='hasSymbol'>
+ <i class="fa fa-money" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('payment') }}:</span>
<span class='value'>
{% for k, tag in payment %}
{% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
@@ -37,18 +37,18 @@
{% endif %}
{% if attribute(tags, 'wheelchair') %}
-<li>
- <i class="fa fa-wheelchair-alt symbol {{ tags.wheelchair }}" aria-hidden="true"></i>
- <span class='key'>{{ keyTrans('wheelchair') }}</span>
+<li class='hasSymbol'>
+ <i class="fa fa-info-circle" aria-hidden="true"></i>
+ <span class='key'>{{ trans('facilities') }}:</span>
<span class='value'>
- {{ tagTrans('wheelchair', tags.wheelchair) -}}
- {%- if attribute(tags, 'toilets:wheelchair') -%}
- , <span class='{{ attribute(tags, 'toilets:wheelchair') }}'>🚽</span> {{ keyTrans('amenity', 'toilets') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}</span>
- {% endif %}
+ {% if attribute(tags, 'wheelchair') %}
+ <i class="fa fa-wheelchair-alt {{ tags.wheelchair }}" aria-hidden="true" title='{{ keyTrans('wheelchair') }}: {{ tagTrans('wheelchair', tags.wheelchair) }}'></i>
- <br/>
- {{ localizedTag(tags, 'wheelchair:description') }}
+ {% if attribute(tags, 'toilets:wheelchair') %}
+ (<span class='{{ attribute(tags, 'toilets:wheelchair') }}' title='{{ keyTrans('toilets:wheelchair') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}'>🚽</span>)
+ {% endif %}
+ {% endif %}
</span>
</li>
{% endif %}
diff --git a/gastro.json b/gastro.json
index 88ac064..94d2cf2 100644
--- a/gastro.json
+++ b/gastro.json
@@ -21,7 +21,7 @@
},
"feature": {
"markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}",
- "body": "<span class='description'>\n{{ tagTrans('amenity', tags.amenity) }}\n</span>\n<ul>\n <li>\n <i class=\"fa fa-cutlery symbol\" aria-hidden=\"true\"></i>\n <span class='key'>{{ keyTrans('cuisine') }}</span>\n <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n </li>\n</ul>",
+ "body": "<span class='description'>\n{{ tagTrans('amenity', tags.amenity) }}\n</span>\n<ul>\n <li class='hasSymbol'>\n <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>\n <span class='key'>{{ keyTrans('cuisine') }}:</span>\n <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n </li>\n</ul>",
"description": "{{ tagTrans('amenity', tags.amenity) }}"
}
}
From ad4fa1f231d46a0f8b4b85d838a5b19b1126dab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Fri, 18 Aug 2017 09:05:38 +0200
Subject: [PATCH 08/15] Show opening_hours & state
---
commonBody.html | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/commonBody.html b/commonBody.html
index eb9f27d..b014368 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -23,6 +23,20 @@
</li>
{% endif %}
+{% if tags.opening_hours %}
+{% set oh_state = openingHoursState(tags.opening_hours) %}
+{% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}
+{% set oh_css = oh_css[oh_state] %}
+<li class='hasSymbol'>
+ <i class="fa fa-clock-o {{ oh_css }}" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('opening_hours') }}:</span>
+ <span class='value'>
+ {{ trans(oh_state) }}<br />
+ {{ tags.opening_hours }}
+ </span>
+</li>
+{% endif %}
+
{% set payment = tagsPrefix(tags, 'payment:') %}
{% if payment %}
<li class='hasSymbol'>
From f03a23014f0396a29c5a65c27da9f3e2df816500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Fri, 18 Aug 2017 09:15:41 +0200
Subject: [PATCH 09/15] Detail body
---
detailsBody.html | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 detailsBody.html
diff --git a/detailsBody.html b/detailsBody.html
new file mode 100644
index 0000000..27682fc
--- /dev/null
+++ b/detailsBody.html
@@ -0,0 +1,83 @@
+<ul>
+{% set address = tagsPrefix(tags, 'addr:') %}
+{% if address %}
+<li class='hasSymbol'>
+ <i class="fa fa-map-marker" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('addr') }}:</span>
+ <span class='value'>
+ {{ attribute(tags, 'addr:street') }}
+ {{ attribute(tags, 'addr:housenumber') }},
+ {{ attribute(tags, 'addr:postcode') }}
+ {{ attribute(tags, 'addr:city') }}
+ </span>
+</li>
+{% endif %}
+
+{% if tags.phone %}
+<li class='hasSymbol'>
+ <i class="fa fa-phone" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('phone') }}:</span>
+ <span class='value'>
+ <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+ </span>
+</li>
+{% endif %}
+
+{% if tags.opening_hours %}
+{% set oh_state = openingHoursState(tags.opening_hours) %}
+{% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}
+{% set oh_css = oh_css[oh_state] %}
+<li class='hasSymbol'>
+ <i class="fa fa-clock-o {{ oh_css }}" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('opening_hours') }}:</span>
+ <span class='value'>
+ {{ trans(oh_state) }}<br />
+ {{ tags.opening_hours }}
+ </span>
+</li>
+{% endif %}
+
+{% set payment = tagsPrefix(tags, 'payment:') %}
+{% if payment %}
+<li class='hasSymbol'>
+ <i class="fa fa-money" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('payment') }}:</span>
+ <span class='value'>
+ {% for k, tag in payment %}
+ {% if tags[tag] == 'no' %}<s>{{ k }}</s> {% else %}{{ k }} {% endif %}
+ {% endfor %}
+ </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'wheelchair') %}
+<li class='hasSymbol'>
+ <i class="fa fa-info-circle" aria-hidden="true"></i>
+ <span class='key'>{{ trans('facilities') }}:</span>
+ <span class='value'>
+
+ <ul>
+ {% if attribute(tags, 'wheelchair') %}
+ <li class='hasSymbol'>
+ <i class="fa fa-wheelchair-alt {{ tags.wheelchair }}" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('wheelchair') }}:</span>
+ <span class='value'>
+ {{ tagTrans('wheelchair', tags.wheelchair) }}
+ <ul>
+ {% if attribute(tags, 'toilets:wheelchair') %}
+ <li class='hasSymbol'>
+ <span class='{{ attribute(tags, 'toilets:wheelchair') }} symbol'>🚽</span>
+ <span class='key'>{{ keyTrans('toilets:wheelchair') }}:</span>
+ <span class='value'>{{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }}</span>
+ </li>
+ {% endif %}
+ </ul>
+ </span>
+ </li>
+ {% endif %}
+ </ul>
+ </span>
+</li>
+{% endif %}
+
+</ul>
From 85a38870b1696feb60c2ee5adffb71e814afef2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Fri, 18 Aug 2017 10:38:41 +0200
Subject: [PATCH 10/15] More contact information
---
commonBody.html | 62 ++++++++++++++++++++++++++++++++++++++++++++++++
detailsBody.html | 34 ++++++++++++++++++++++++++
2 files changed, 96 insertions(+)
diff --git a/commonBody.html b/commonBody.html
index b014368..49ef42e 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -13,6 +13,26 @@
</li>
{% endif %}
+{% if tags.website %}
+<li class='hasSymbol'>
+ <i class="fa fa-globe" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('website') }}:</span>
+ <span class='value'>
+ <a href='{{ tags.website }}'>{{ tags.website }}</a>
+ </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:website') %}
+<li class='hasSymbol'>
+ <i class="fa fa-globe" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('website') }}:</span>
+ <span class='value'>
+ <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+ </span>
+</li>
+{% endif %}
+
{% if tags.phone %}
<li class='hasSymbol'>
<i class="fa fa-phone" aria-hidden="true"></i>
@@ -23,6 +43,48 @@
</li>
{% endif %}
+{% if attribute(tags, 'contact:phone') %}
+<li class='hasSymbol'>
+ <i class="fa fa-phone" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('phone') }}:</span>
+ <span class='value'>
+ <a href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
+ </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:email') or tags.email %}
+<li class='hasSymbol'>
+ <i class="fa fa-user-circle" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('contact') }}:</span>
+ <span class='value'>
+
+ {% if attribute(tags, 'contact:email') %}
+ <a href='mailto:{{ attribute(tags, 'contact:email') }}'>
+ <i class="fa fa-envelope" aria-hidden="true"></i>
+ </a>
+ {% endif %}
+
+ {% if attribute(tags, 'email') %}
+ <a href='mailto:{{ attribute(tags, 'email') }}'>
+ <i class="fa fa-envelope" aria-hidden="true"></i>
+ </a>
+ {% endif %}
+
+ </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:website') %}
+<li class='hasSymbol'>
+ <i class="fa fa-globe" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('website') }}:</span>
+ <span class='value'>
+ <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+ </span>
+</li>
+{% endif %}
+
{% if tags.opening_hours %}
{% set oh_state = openingHoursState(tags.opening_hours) %}
{% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}
diff --git a/detailsBody.html b/detailsBody.html
index 27682fc..b0e6274 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -23,6 +23,40 @@
</li>
{% endif %}
+{% if attribute(tags, 'contact:phone') %}
+<li class='hasSymbol'>
+ <i class="fa fa-phone" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('phone') }}:</span>
+ <span class='value'>
+ <a href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
+ </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:email') %}
+<li class='hasSymbol'>
+ <i class="fa fa-envelope" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('email') }}:</span>
+ <span class='value'>
+ <a href='mailto:{{ attribute(tags, 'contact:email') }}'>
+ {{ attribute(tags, 'contact:email') }}
+ </a>
+ </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'email') %}
+<li class='hasSymbol'>
+ <i class="fa fa-envelope" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('email') }}:</span>
+ <span class='value'>
+ <a href='mailto:{{ attribute(tags, 'email') }}'>
+ {{ attribute(tags, 'email') }}
+ </a>
+ </span>
+</li>
+{% endif %}
+
{% if tags.opening_hours %}
{% set oh_state = openingHoursState(tags.opening_hours) %}
{% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}
From 333659cc0fc9bd1a2429a1d4fd644b509de9897b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 27 Aug 2017 20:31:09 +0200
Subject: [PATCH 11/15] common/detailsBody: unify contact information
---
commonBody.html | 10 ----------
detailsBody.html | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/commonBody.html b/commonBody.html
index 49ef42e..270ac94 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -75,16 +75,6 @@
</li>
{% endif %}
-{% if attribute(tags, 'contact:website') %}
-<li class='hasSymbol'>
- <i class="fa fa-globe" aria-hidden="true"></i>
- <span class='key'>{{ keyTrans('website') }}:</span>
- <span class='value'>
- <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
- </span>
-</li>
-{% endif %}
-
{% if tags.opening_hours %}
{% set oh_state = openingHoursState(tags.opening_hours) %}
{% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}
diff --git a/detailsBody.html b/detailsBody.html
index b0e6274..a0db52f 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -13,6 +13,26 @@
</li>
{% endif %}
+{% if tags.website %}
+<li class='hasSymbol'>
+ <i class="fa fa-globe" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('website') }}:</span>
+ <span class='value'>
+ <a href='{{ tags.website }}'>{{ tags.website }}</a>
+ </span>
+</li>
+{% endif %}
+
+{% if attribute(tags, 'contact:website') %}
+<li class='hasSymbol'>
+ <i class="fa fa-globe" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('website') }}:</span>
+ <span class='value'>
+ <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+ </span>
+</li>
+{% endif %}
+
{% if tags.phone %}
<li class='hasSymbol'>
<i class="fa fa-phone" aria-hidden="true"></i>
@@ -33,6 +53,16 @@
</li>
{% endif %}
+{% if tags.phone %}
+<li class='hasSymbol'>
+ <i class="fa fa-phone" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('phone') }}:</span>
+ <span class='value'>
+ <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+ </span>
+</li>
+{% endif %}
+
{% if attribute(tags, 'contact:email') %}
<li class='hasSymbol'>
<i class="fa fa-envelope" aria-hidden="true"></i>
From cb6229863a1dfdb349174b20de639083d0a87114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 27 Aug 2017 21:36:23 +0200
Subject: [PATCH 12/15] Integrate description in popups (or popupDescription)
---
administrative.json | 2 +-
agriculture.json | 3 +--
car_amenities.json | 1 -
children.json | 8 ++++----
communication.json | 5 ++---
construction.json | 3 +--
culture.json | 1 -
cycle_amenities.json | 2 +-
education.json | 5 ++---
emergency.json | 1 -
financial.json | 1 -
gastro.json | 2 +-
health.json | 1 -
hiking_routes.json | 1 -
historic.json | 1 -
leisure.json | 8 +++-----
military.json | 3 +--
natural.json | 3 +--
places.json | 5 ++---
power.json | 10 +++++-----
pt_amenities.json | 1 -
pt_stops.json | 3 +--
public.json | 5 ++---
railway.json | 2 +-
religion.json | 5 +++--
residential.json | 3 +--
resources.json | 3 +--
shop.json | 7 ++-----
sport.json | 1 -
tourism_attractions.json | 1 -
tourism_services.json | 1 -
walk_amenities.json | 1 -
waste.json | 2 +-
33 files changed, 37 insertions(+), 64 deletions(-)
diff --git a/administrative.json b/administrative.json
index a376689..c167402 100644
--- a/administrative.json
+++ b/administrative.json
@@ -24,6 +24,6 @@
},
"feature": {
"description": "{{ tagTrans('admin_level', tags.admin_level) }}",
- "body": "{{ tagTrans('admin_level', tags.admin_level) }}\n<br/>\n{{ keyTrans('admin_level') }}: {{ tags.admin_level }}"
+ "body": "{{ keyTrans('admin_level') }}: {{ tags.admin_level }}"
}
}
diff --git a/agriculture.json b/agriculture.json
index 61c8e0c..dbeb6c3 100644
--- a/agriculture.json
+++ b/agriculture.json
@@ -19,7 +19,6 @@
"13": "(\nnode[landuse~\"^(allotments|farm|farmland|farmyard|greenhouse_horticulture|orchard|vineyard)$\"];\nway[landuse~\"^(allotments|farm|farmland|farmyard|greenhouse_horticulture|orchard|vineyard)$\"];\nrelation[landuse~\"^(allotments|farm|farmland|farmyard|greenhouse_horticulture|orchard|vineyard)$\"];\n)"
},
"feature": {
- "description": "{{ tagTrans('landuse', tags.landuse) }}",
- "body": "{{ tagTrans('landuse', tags.landuse) }}"
+ "description": "{{ tagTrans('landuse', tags.landuse) }}"
}
}
diff --git a/car_amenities.json b/car_amenities.json
index 79a22b0..0b75ef2 100644
--- a/car_amenities.json
+++ b/car_amenities.json
@@ -19,7 +19,6 @@
"feature": {
"pre": "{% set key = 'amenity' %}\n{% set value = tags.amenity %}",
"description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}",
"markerSign": "{{ const[value] }}"
},
"const": {
diff --git a/children.json b/children.json
index 3132921..47d4147 100644
--- a/children.json
+++ b/children.json
@@ -1,14 +1,14 @@
{
+ "type": "overpass",
"name": {
"de": "Einrichtungen für Kinder",
"en": "Children amenities"
},
- "type": "overpass",
- "query": "(node[leisure~'^(playground|summer_camp|indoor_play)$'];way[leisure~'^(playground|summer_camp|indoor_play)$'];relation[leisure~'^(playground|summer_camp|indoor_play)$'];node[shop~'^(baby_goods|toys)$'];way[shop~'^(baby_goods|toys)$'];relation[shop~'^(baby_goods|toys)$'];node[amenity=toilets][diaper];way[amenity=toilets][diaper];relation[amenity=toilets][diaper];node[kids_area];way[kids_area];relation[kids_area];);",
- "minZoom": 15,
+ "query": {
+ "15": "(node[leisure~'^(playground|summer_camp|indoor_play)$'];way[leisure~'^(playground|summer_camp|indoor_play)$'];relation[leisure~'^(playground|summer_camp|indoor_play)$'];node[shop~'^(baby_goods|toys)$'];way[shop~'^(baby_goods|toys)$'];relation[shop~'^(baby_goods|toys)$'];node[amenity=toilets][diaper];way[amenity=toilets][diaper];relation[amenity=toilets][diaper];node[kids_area];way[kids_area];relation[kids_area];);"
+ },
"feature": {
"markerSign": "{% if tags.leisure=='playground' %}⛹{% elseif tags.leisure=='summer_camp'%}🏕{% elseif tags.leisure=='indoor_play' or tags.kids_area %}🏠{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}<i class=\"fa fa-shopping-cart\"></i>{% elseif tags.amenity=='toilets' and tags.diaper %}🚽🚼{% endif %}",
- "body": "{% if tags.leisure=='playground' %}{{ tagTrans('leisure', 'playground') }}{% elseif tags.leisure=='summer_camp'%}{{ tagTrans('leisure', 'summer_camp') }}{% elseif tags.leisure=='indoor_play' %}{{ tagTrans('leisure', 'indoor_play') }}{% elseif tags.kids_area %}{{ keyTrans('kids_area') }}{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{{ keyTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}{% elseif tags.amenity=='toilets' and tags.diaper %}{{ tagTrans('amenity', 'toilets') }} with diaper changing table{% endif %}",
"description": "{% if tags.leisure=='playground' %}{{ tagTrans('leisure', 'playground') }}{% elseif tags.leisure=='summer_camp'%}{{ tagTrans('leisure', 'summer_camp') }}{% elseif tags.leisure=='indoor_play' %}{{ tagTrans('leisure', 'indoor_play') }}{% elseif tags.kids_area %}{{ keyTrans('kids_area') }}{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{{ keyTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}{% elseif tags.amenity=='toilets' and tags.diaper %}{{ tagTrans('amenity', 'toilets') }} with diaper changing table{% endif %}"
}
}
diff --git a/communication.json b/communication.json
index 2aab31e..1a7f644 100644
--- a/communication.json
+++ b/communication.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Comunicaciones",
"ca": "Comunicacions",
@@ -16,16 +17,14 @@
"ru": "Услуги связи",
"uk": "Телекомунікації"
},
- "type": "overpass",
"query": {
"13": "(node[amenity~'^(post_office|internet_cafe)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);",
"16": "(node[amenity~'^(post_office|internet_cafe|post_box|telephone)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);"
},
- "minZoom": 13,
"feature": {
"title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTrans('amenity', tags.amenity)) }}",
"markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}",
- "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br/>{% endif %}",
+ "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br/>{% endif %}",
"description": "{{ tagTrans('amenity', tags.amenity) }}"
}
}
diff --git a/construction.json b/construction.json
index 2db89e9..37d1abe 100644
--- a/construction.json
+++ b/construction.json
@@ -16,7 +16,6 @@
},
"feature": {
"pre": "{% if tags.highway == 'construction' %}\n{% set key = 'highway' %}\n{% set value = tags.highway %}\n{% else %}\n{% set key = 'landuse' %}\n{% set value = tags.landuse %}\n{% endif %}",
- "description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}"
+ "description": "{{ tagTrans(key, value) }}"
}
}
diff --git a/culture.json b/culture.json
index 34f42e9..95c723d 100644
--- a/culture.json
+++ b/culture.json
@@ -25,7 +25,6 @@
"feature": {
"pre": "{% if tags.amenity in [ 'arts_centre', 'cinema', 'community_centre', 'fountain', 'studio', 'theatre' ] %}\n{% set key = 'amenity' %}\n{% set value = tags.amenity %}\n{% elseif tags.tourism %}\n{% set key = 'tourism' %}\n{% set value = tags.tourism %}\n{% endif %}",
"description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}",
"markerSign": "{{ const[value] }}"
},
"const": {
diff --git a/cycle_amenities.json b/cycle_amenities.json
index 3dd1b3b..2e5f19e 100644
--- a/cycle_amenities.json
+++ b/cycle_amenities.json
@@ -11,7 +11,7 @@
"feature": {
"pre": "{% if tags.shop in [ 'bicycle' ] %}\n {% set key = 'shop' %}\n {% set value = tags.shop %}\n{% elseif attribute(tags, \"monitoring:bicycle\") %}\n {% set key = 'man_made' %}\n {% set value = 'monitoring_station' %}\n{% elseif tags.vending in [ 'bicycle_tube' ] %}\n {% set key = 'vending' %}\n {% set value = tags.vending %}\n{% else %}\n {% set key = 'amenity' %}\n {% set value = tags.amenity %}\n{% endif %}\n\n{% set constIndex = (key ~ \"=\" ~ value) %}",
"description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}\n\n{% if tags.capacity %}\n <br/>\n {{ keyTrans('capacity') }}: {{ tags.capacity }}\n{% endif %}",
+ "body": "{% if tags.capacity %}\n {{ keyTrans('capacity') }}: {{ tags.capacity }}\n{% endif %}",
"markerSign": "{{ const[constIndex] }}",
"title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}\n\n{% if tags.capacity %}({{ tags.capacity }}){% endif %}"
},
diff --git a/education.json b/education.json
index 2ab0d2a..9cfbee8 100644
--- a/education.json
+++ b/education.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Servicios educativos",
"cs": "Vzdělávací služby",
@@ -15,16 +16,14 @@
"ru": "Образование",
"uk": "Освіта"
},
- "type": "overpass",
"query": {
"11": "(node[amenity~'^(college|university|library)$'];way[amenity~'^(college|university|library)$'];relation[amenity~'^(college|university|library)$'];)",
"14": "(node[amenity~'^(college|university|library|school|kindergarten|language_school)$'];way[amenity~'^(college|university|library|school|kindergarten|language_school)$'];relation[amenity~'^(college|university|library|school|kindergarten|language_school)$'];)",
"16": "(node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];)"
},
- "minZoom": 11,
"feature": {
"markerSign": "{% if tags.amenity == 'university' or tags.amenity == 'college' %}🎓{% elseif tags.amenity == 'library' %}🕮{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}🏫{% elseif tags.amenity == 'kindergarten' %}⛹{% elseif tags.amenity == 'public_bookcase' %}📚{% endif %}",
- "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
+ "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
"description": "{{ tagTrans('amenity', tags.amenity) }}",
"priority": "{% if tags.amenity == 'university' %}0{% elseif tags.amenity == 'college' %}1{% elseif tags.amenity == 'library' %}2{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}3{% elseif tags.amenity == 'kindergarten' %}4{% elseif tags.amenity == 'public_bookcase' %}5{% endif %}"
}
diff --git a/emergency.json b/emergency.json
index d2d07de..6bbb3b6 100644
--- a/emergency.json
+++ b/emergency.json
@@ -23,7 +23,6 @@
},
"feature": {
"description": "{{ tagTrans('amenity', tags.amenity) }}",
- "body": "{{ tagTrans('amenity', tags.amenity) }}",
"markerSign": "{% set data = const[tags.amenity] %}\n{% if data %}\n{{ data.sign }}\n{% endif %}"
},
"const": {
diff --git a/financial.json b/financial.json
index f7f00a1..c2c683f 100644
--- a/financial.json
+++ b/financial.json
@@ -21,7 +21,6 @@
},
"feature": {
"description": "{{ tagTrans('amenity', tags.amenity) }}",
- "body": "{{ tagTrans('amenity', tags.amenity) }}",
"markerSign": "{{ const[tags.amenity] }}"
},
"const": {
diff --git a/gastro.json b/gastro.json
index 94d2cf2..739287d 100644
--- a/gastro.json
+++ b/gastro.json
@@ -21,7 +21,7 @@
},
"feature": {
"markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}",
- "body": "<span class='description'>\n{{ tagTrans('amenity', tags.amenity) }}\n</span>\n<ul>\n <li class='hasSymbol'>\n <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>\n <span class='key'>{{ keyTrans('cuisine') }}:</span>\n <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n </li>\n</ul>",
+ "body": "<ul>\n <li class='hasSymbol'>\n <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>\n <span class='key'>{{ keyTrans('cuisine') }}:</span>\n <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>\n </li>\n</ul>",
"description": "{{ tagTrans('amenity', tags.amenity) }}"
}
}
diff --git a/health.json b/health.json
index 5d61338..ae4d346 100644
--- a/health.json
+++ b/health.json
@@ -21,7 +21,6 @@
},
"feature": {
"description": "{{ tagTrans('amenity', tags.amenity) }}",
- "body": "{{ tagTrans('amenity', tags.amenity) }}",
"markerSign": "{{ const[tags.amenity] }}"
},
"const": {
diff --git a/hiking_routes.json b/hiking_routes.json
index 5241b5b..7e04e78 100644
--- a/hiking_routes.json
+++ b/hiking_routes.json
@@ -12,7 +12,6 @@
},
"feature": {
"description": "{{ tagTrans('network', tags.network) }}",
- "body": "{{ tagTrans('network', tags.network) }}",
"priority": "{% set network_data = const[tags.network] %}\n{% if network_data %}\n{{ network_data.priority }}\n{% endif %}"
},
"const": {
diff --git a/historic.json b/historic.json
index 80616bc..463636c 100644
--- a/historic.json
+++ b/historic.json
@@ -23,7 +23,6 @@
},
"feature": {
"description": "{{ tagTransList('historic', tags.historic) }}",
- "body": "{{ tagTransList('historic', tags.historic) }}",
"markerSign": "{{ const[tags.historic] }}"
},
"const": {
diff --git a/leisure.json b/leisure.json
index 9944fc5..2261260 100644
--- a/leisure.json
+++ b/leisure.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Recréu",
"cs": "Volný čas",
@@ -13,20 +14,17 @@
"ru": "Досуг",
"uk": "Дозвілля"
},
- "type": "overpass",
"query": {
"14": "(way[leisure~'^(park|common)$'];relation[leisure='^(park|common)$'];)",
"16": "(node[amenity~'^(bench|swimming_pool)$'];way[leisure~'^(park|common|nature_reserve|swimming_pool)$'];relation[leisure='^(park|common|nature_reserve|swimming_pool)$'];)"
},
- "minZoom": 14,
"feature": {
"style": {
"color": "green",
"fillColor": "green",
- "fillOpacity": 0.2,
- "weight": 2
+ "fillOpacity": "0.2",
+ "weight": "2"
},
- "body": "{% if tags.leisure %}{{ tagTrans('leisure', tags.leisure ) }}{% elseif tags.amenity %}{{ tagTrans('amenity', tags.amenity ) }}{% endif %}",
"description": "{% if tags.leisure %}{{ tagTrans('leisure', tags.leisure ) }}{% elseif tags.amenity %}{{ tagTrans('amenity', tags.amenity ) }}{% endif %}"
}
}
diff --git a/military.json b/military.json
index c08590a..6758142 100644
--- a/military.json
+++ b/military.json
@@ -20,7 +20,6 @@
},
"feature": {
"pre": "{% if tags.military %}\n {% set key = 'military' %}\n {% set value = tags.military %}\n{% else %}\n {% set key = 'landuse' %}\n {% set value = tags.landuse %}\n{% endif %}",
- "description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}"
+ "description": "{{ tagTrans(key, value) }}"
}
}
diff --git a/natural.json b/natural.json
index 1cead2c..925034b 100644
--- a/natural.json
+++ b/natural.json
@@ -21,7 +21,6 @@
},
"feature": {
"title": "{{ localizedTag(tags, 'name') | default(trans('unnamed')) }}\n{% if tags.natural == 'peak' and tags.ele %}({{ tags.ele }}m){% endif %}",
- "description": "{{ tagTrans('natural', tags.natural) }}",
- "body": "{{ tagTrans('natural', tags.natural) }}"
+ "description": "{{ tagTrans('natural', tags.natural) }}"
}
}
diff --git a/places.json b/places.json
index 2f66d69..27d9fdb 100644
--- a/places.json
+++ b/places.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Llugares",
"cs": "Sídla",
@@ -16,7 +17,6 @@
"ru": "Места",
"uk": "Місцевість"
},
- "type": "overpass",
"query": {
"0": "node[place~'^(continent)$']",
"4": "node[place~'^(continent|country)$']",
@@ -27,10 +27,9 @@
"15": "node[place~'^(city|region|town|village|suburb|hamlet|quarter)$']",
"16": "(node[place~'^(region|town|village|suburb|hamlet|quarter|islet|isolated_dwelling|neighbourhood|farm)$'];way[place~'^(isolated_dwelling|neighbourhood|farm)$'];relation[place~'^(isolated_dwelling|neighbourhood|farm)$'];);"
},
- "minZoom": 0,
"feature": {
"title": "{% set loc_name = localizedTag(tags, 'name') %}{{ loc_name }}{% if loc_name != tags.name %} ({{ tags.name }}){% endif %}",
- "body": "{{ tagTrans('place', tags.place) }}\n{% if tags.population %}<br/>{{ keyTrans('population') }}: {{ tags.population }}{% endif %} \n",
+ "body": "{% if tags.population %}{{ keyTrans('population') }}: {{ tags.population }}{% endif %} \n",
"description": "{{ tagTrans('place', tags.place) }}",
"priority": "{% set priorities = { 'continent': 0, 'country': 1, 'state': 2, 'region': 3, 'city': 4, 'town': 5, 'village': 6, 'suburb': 7, 'hamlet': 8, 'quarter': 9, neighbourhood: 10, 'isolated_dwelling': 11, 'farm': 12 } %}{{ priorities[tags.place] }}"
}
diff --git a/power.json b/power.json
index 7b36f0c..5ce1bc3 100644
--- a/power.json
+++ b/power.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Enerxía",
"cs": "Elektřina",
@@ -13,18 +14,17 @@
"ro": "Energie",
"ru": "Энергетика"
},
- "type": "overpass",
"query": {
"11": "(node[power~'^(plant)$'];way[power~'^(plant|line)$'];relation[power~'^(plant)$'];)",
"13": "(node[power~'^(plant|generator|substation)$'];way[power~'^(plant|line|generator|substation)$'];relation[power~'^(plant|generator|substation)$'];)",
"15": "(node[power~'^(plant|generator|substation|transformer|tower)$'];way[power~'^(plant|line|generator|substation|transformer|minor_line)$'];relation[power~'^(plant|generator|substation|transformer)$'];)",
"16": "(node[power];way[power];relation[power];)"
},
- "minZoom": 11,
"feature": {
- "markerSign": "",
- "body": "{{ tagTrans('power', tags.power) }}\n{% set x='generator:source' %}{% if tags[x] %}<br/>{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}\n{% set x='generator:method' %}{% if tags[x] %}<br/>{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}\n{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}",
+ "markerSign": null,
+ "body": "{% set x='generator:source' %}{% if tags[x] %}<br/>{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}\n{% set x='generator:method' %}{% if tags[x] %}<br/>{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}\n{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}",
"description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
- "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}"
+ "priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}",
+ "popupDescription": "{{ tagTrans('power', tags.power) }}"
}
}
diff --git a/pt_amenities.json b/pt_amenities.json
index 8eba1ba..861b69c 100644
--- a/pt_amenities.json
+++ b/pt_amenities.json
@@ -18,7 +18,6 @@
"feature": {
"pre": "{% if tags.railway == 'subway_entrance' %}\n {% set key = 'railway' %}\n {% set value = tags.railway %}\n{% else %}\n {% set key = 'amenity' %}\n {% set value = tags.amenity %}\n{% endif %}",
"description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}",
"markerSign": "{{ const[value] }}"
},
"const": {
diff --git a/pt_stops.json b/pt_stops.json
index 016604e..e328115 100644
--- a/pt_stops.json
+++ b/pt_stops.json
@@ -21,7 +21,6 @@
},
"feature": {
"pre": "{% if tags.amenity in [ 'ferry_terminal', 'bus_station' ] %}\n {% set key = 'amenity' %}\n {% set value = tags.amenity %}\n{% elseif tags.railway == 'platform' or tags.highway == 'platform' or tags.public_transport == 'platform' %}\n {% set key = 'public_transport' %}\n {% set value = 'platform' %}\n{% else %}\n {% set key = 'public_transport' %}\n {% set value = 'stop_position' %}\n{% endif %}",
- "description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}"
+ "description": "{{ tagTrans(key, value) }}"
}
}
diff --git a/public.json b/public.json
index 412a8ab..66d9bdb 100644
--- a/public.json
+++ b/public.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Serviciu Públicu",
"cs": "Veřejné služby",
@@ -14,16 +15,14 @@
"ru": "Общественные места",
"uk": "Громадські місця"
},
- "type": "overpass",
"query": {
"12": "(node[amenity~'^(court_house|embassy|public_building|townhall)$'];way[amenity~'^(court_house|embassy|public_building|townhall)$'];relation[amenity~'^(court_house|embassy|public_building|townhall)$'];node[amenity=recycling][recyling_type=centre];way[amenity=recycling][recyling_type=centre];relation[amenity=recycling][recyling_type=centre];);",
"16": "(node[amenity~'^(court_house|embassy|public_building|townhall|clock|drinking_water|recycling)$'];way[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];relation[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];node[drinking_water]);"
},
- "minZoom": 12,
"feature": {
"title": "{{ tags.name|default(tags.operator)|default(tagTrans('amenity', tags.amenity)) }}",
"markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}",
- "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
+ "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}<br/>{% endif %}",
"description": "{{ tagTrans('amenity', tags.amenity) }}"
}
}
diff --git a/railway.json b/railway.json
index 928a9d0..158cd7b 100644
--- a/railway.json
+++ b/railway.json
@@ -36,7 +36,7 @@
},
"styles": "{% if tags.railway == 'narrow_gauge' %}default,casing{% else %}default{% endif %}",
"markerSign": "",
- "body": "{{ tagTrans('railway', tags.railway) }}<br/>\n{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br>{% endif %}\n{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}\n{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}<br/>{% endif %}\n{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}<br/>\n{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}<br/>{% endif %}\n",
+ "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br>{% endif %}\n{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}\n{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}<br/>{% endif %}\n{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}<br/>\n{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}<br/>{% endif %}\n",
"description": "{{ tagTrans('railway', tags.railway) }}",
"priority": "{% if tags.railway == 'station' %}0{% elseif tags.railway in [ 'halt', 'tram_stop' ] %}1{% else %}5{% endif %}",
"title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}"
diff --git a/religion.json b/religion.json
index cf33bde..a91b536 100644
--- a/religion.json
+++ b/religion.json
@@ -22,7 +22,8 @@
"feature": {
"pre": "{% if tags.landuse == 'cemetery' %}\n{% set key = 'landuse' %}\n{% set value = tags.landuse %}\n{% else %}\n{% set key = 'amenity' %}\n{% set value = tags.amenity %}\n{% endif %}",
"description": "{{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
- "body": "{{ tagTrans(key, value) }}\n{% if tags.religion %}\n <br/>\n {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}\n{% endif %}\n{% if tags.denomination %}\n <br/>\n {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}\n{% endif %}",
- "markerSign": "{% if tags.religion == 'christian' %}✝\n{% elseif tags.religion == 'muslim' %}☪\n{% elseif tags.religion == 'buddhist' %}☸\n{% elseif tags.religion == 'hindu' %}ॐ\n{% elseif tags.religion == 'jewish' %}✡\n{% elseif tags.religion == 'pagan' %}☆\n{% endif %}"
+ "body": "{% if tags.religion %}\n {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}\n{% endif %}\n{% if tags.denomination %}\n <br/>\n {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}\n{% endif %}",
+ "markerSign": "{% if tags.religion == 'christian' %}✝\n{% elseif tags.religion == 'muslim' %}☪\n{% elseif tags.religion == 'buddhist' %}☸\n{% elseif tags.religion == 'hindu' %}ॐ\n{% elseif tags.religion == 'jewish' %}✡\n{% elseif tags.religion == 'pagan' %}☆\n{% endif %}",
+ "popupDescription": "{{ tagTrans(key, value) }}"
}
}
diff --git a/residential.json b/residential.json
index 96d4165..d322a62 100644
--- a/residential.json
+++ b/residential.json
@@ -21,7 +21,6 @@
"15": "(\nnode[landuse~\"^(residential|allotments)$\"];\nway[landuse~\"^(residential|allotments)$\"];\nrelation[landuse~\"^(residential|allotments)$\"];\n)"
},
"feature": {
- "description": "{{ tagTrans('landuse', tags.landuse) }}",
- "body": "{{ tagTrans('landuse', tags.landuse) }}"
+ "description": "{{ tagTrans('landuse', tags.landuse) }}"
}
}
diff --git a/resources.json b/resources.json
index b5f3e2c..215f07a 100644
--- a/resources.json
+++ b/resources.json
@@ -15,7 +15,6 @@
},
"feature": {
"pre": "{% if tags.landuse in [ 'quarry', 'salt_pond' ] %}\n {% set key = 'landuse' %}\n {% set value = tags.landuse %}\n{% else %}\n {% set key = 'man_made' %}\n {% set value = tags.man_made %}\n{% endif %}",
- "description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}"
+ "description": "{{ tagTrans(key, value) }}"
}
}
diff --git a/shop.json b/shop.json
index 8bcadc8..e4a0048 100644
--- a/shop.json
+++ b/shop.json
@@ -1,4 +1,5 @@
{
+ "type": "overpass",
"name": {
"ast": "Compres",
"cs": "Obchody",
@@ -16,18 +17,14 @@
"ru": "Покупки",
"uk": "Торгівля"
},
- "type": "overpass",
"query": {
"14": "(node[shop~'^(mall|department_store)$'];way[shop~'^(mall|department_store)$'];relation[shop~'^(mall|department_store)$'];);",
"16": "(node[shop];way[shop];relation[shop];);"
},
- "minZoom": 14,
"feature": {
"pre": "{% set shop0 = tags.shop|split(';')[0] %}{% set current = const.default %}{% for v in const.shops %}{% if shop0 in v.types %}{% set current = v %}{% endif %}{% endfor %}",
- "body": "{{ tagTransList('shop', tags.shop) }}",
"description": "{{ tagTransList('shop', tags.shop) }}",
- "markerSign": "{% set c = current.sign %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}",
- "__": "no icons for: brewing_supplies, charity, second_hand, variety_store"
+ "markerSign": "{% set c = current.sign %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}"
},
"const": {
"default": {
diff --git a/sport.json b/sport.json
index b5ea639..0dd15ce 100644
--- a/sport.json
+++ b/sport.json
@@ -19,7 +19,6 @@
},
"feature": {
"description": "{{ tagTransList('sport', tags.sport) }}",
- "body": "{{ tagTransList('sport', tags.sport) }}",
"markerSign": "{% set firstSport = tags.sport|split(';')[0] %}\n{{ const[firstSport] }}",
"title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTransList('sport', tags.sport)) }}"
},
diff --git a/tourism_attractions.json b/tourism_attractions.json
index 538101a..0afd970 100644
--- a/tourism_attractions.json
+++ b/tourism_attractions.json
@@ -22,7 +22,6 @@
},
"feature": {
"description": "{{ tagTrans('tourism', tags.tourism) }}",
- "body": "{{ tagTrans('tourism', tags.tourism) }}",
"markerSign": "{{ const[tags.tourism] }}"
},
"const": {
diff --git a/tourism_services.json b/tourism_services.json
index 7d03c58..39a9ca8 100644
--- a/tourism_services.json
+++ b/tourism_services.json
@@ -22,7 +22,6 @@
},
"feature": {
"description": "{{ tagTrans('tourism', tags.tourism) }}",
- "body": "{{ tagTrans('tourism', tags.tourism) }}",
"markerSign": "{{ const[tags.tourism] }}"
},
"const": {
diff --git a/walk_amenities.json b/walk_amenities.json
index 69eeb1d..194f169 100644
--- a/walk_amenities.json
+++ b/walk_amenities.json
@@ -11,7 +11,6 @@
"feature": {
"pre": "{% if tags.information %}\n {% set key = 'information' %}\n {% set value = tags.information %}\n{% elseif tags.amenity in [ 'bench', 'shelter' ] %}\n {% set key = 'amenity' %}\n {% set value = tags.amenity %}\n{% elseif tags.man_made in [ 'cairn' ] %}\n {% set key = 'man_made' %}\n {% set value = tags.man_made %}\n{% elseif tags.tourism in [ 'viewpoint'] %}\n {% set key = 'tourism' %}\n {% set value = tags.tourism %}\n{% else %}\n {% set key = 'highway' %}\n {% set value = tags.highway %}\n{% endif %}\n\n{% set type_data = const[value] %}",
"description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}",
"title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(tagTrans(key, value)) }}",
"markerSign": "{{ type_data.sign|raw }}",
"priority": "{{ type_data.priority }}"
diff --git a/waste.json b/waste.json
index 1f36afd..a608aec 100644
--- a/waste.json
+++ b/waste.json
@@ -18,6 +18,6 @@
"feature": {
"pre": "{% if tags.landuse == 'landfill' %}\n {% set key = 'landuse' %}\n {% set value = tags.landuse %}\n{% elseif tags.man_made == 'wastewater_plant' %}\n {% set key = 'man_made' %}\n {% set value = tags.man_made %}\n{% elseif tags.amenity == 'recycling' %}\n {% set key = 'amenity' %}\n {% set value = tags.amenity %}\n{% endif %}",
"description": "{{ tagTrans(key, value) }}",
- "body": "{{ tagTrans(key, value) }}\n{% if tags.recycling_type %}\n<br/>\n{{ keyTrans('recycling_type') }}: {{ tagTrans('recycling_type', tags.recycling_type) }}\n{% endif %}"
+ "body": "{% if tags.recycling_type %}\n{{ keyTrans('recycling_type') }}: {{ tagTrans('recycling_type', tags.recycling_type) }}\n{% endif %}"
}
}
From f407103a33466abd3daa6f21d529ec52739da5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 3 Sep 2017 21:31:27 +0200
Subject: [PATCH 13/15] Remove opening_hours state calc - not ready yet
---
commonBody.html | 6 +-----
detailsBody.html | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/commonBody.html b/commonBody.html
index 270ac94..57c5138 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -76,14 +76,10 @@
{% endif %}
{% if tags.opening_hours %}
-{% set oh_state = openingHoursState(tags.opening_hours) %}
-{% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}
-{% set oh_css = oh_css[oh_state] %}
<li class='hasSymbol'>
- <i class="fa fa-clock-o {{ oh_css }}" aria-hidden="true"></i>
+ <i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('opening_hours') }}:</span>
<span class='value'>
- {{ trans(oh_state) }}<br />
{{ tags.opening_hours }}
</span>
</li>
diff --git a/detailsBody.html b/detailsBody.html
index a0db52f..0f4e238 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -88,14 +88,10 @@
{% endif %}
{% if tags.opening_hours %}
-{% set oh_state = openingHoursState(tags.opening_hours) %}
-{% set oh_css = { "open": "yes", "closed": "no", "unknown": "unknown" } %}
-{% set oh_css = oh_css[oh_state] %}
<li class='hasSymbol'>
- <i class="fa fa-clock-o {{ oh_css }}" aria-hidden="true"></i>
+ <i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('opening_hours') }}:</span>
<span class='value'>
- {{ trans(oh_state) }}<br />
{{ tags.opening_hours }}
</span>
</li>
From eecc4319e09de4bf27e6b1b025e7bbf77dabce63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 3 Sep 2017 21:33:33 +0200
Subject: [PATCH 14/15] Remove duplicate phone block
---
detailsBody.html | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/detailsBody.html b/detailsBody.html
index 0f4e238..8e0da2d 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -53,16 +53,6 @@
</li>
{% endif %}
-{% if tags.phone %}
-<li class='hasSymbol'>
- <i class="fa fa-phone" aria-hidden="true"></i>
- <span class='key'>{{ keyTrans('phone') }}:</span>
- <span class='value'>
- <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
- </span>
-</li>
-{% endif %}
-
{% if attribute(tags, 'contact:email') %}
<li class='hasSymbol'>
<i class="fa fa-envelope" aria-hidden="true"></i>
From ce628e2ce3fbe03a44692f40d91308dc62422ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 3 Sep 2017 22:01:28 +0200
Subject: [PATCH 15/15] Links: always open in new tab/window
---
commonBody.html | 12 ++++++------
detailsBody.html | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/commonBody.html b/commonBody.html
index 57c5138..a65b3f2 100644
--- a/commonBody.html
+++ b/commonBody.html
@@ -18,7 +18,7 @@
<i class="fa fa-globe" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('website') }}:</span>
<span class='value'>
- <a href='{{ tags.website }}'>{{ tags.website }}</a>
+ <a target='_blank' href='{{ tags.website }}'>{{ tags.website }}</a>
</span>
</li>
{% endif %}
@@ -28,7 +28,7 @@
<i class="fa fa-globe" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('website') }}:</span>
<span class='value'>
- <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+ <a target='_blank' href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
</span>
</li>
{% endif %}
@@ -38,7 +38,7 @@
<i class="fa fa-phone" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('phone') }}:</span>
<span class='value'>
- <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+ <a target='_blank' href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
</span>
</li>
{% endif %}
@@ -48,7 +48,7 @@
<i class="fa fa-phone" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('phone') }}:</span>
<span class='value'>
- <a href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
+ <a target='_blank' href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
</span>
</li>
{% endif %}
@@ -60,13 +60,13 @@
<span class='value'>
{% if attribute(tags, 'contact:email') %}
- <a href='mailto:{{ attribute(tags, 'contact:email') }}'>
+ <a target='_blank' href='mailto:{{ attribute(tags, 'contact:email') }}'>
<i class="fa fa-envelope" aria-hidden="true"></i>
</a>
{% endif %}
{% if attribute(tags, 'email') %}
- <a href='mailto:{{ attribute(tags, 'email') }}'>
+ <a target='_blank' href='mailto:{{ attribute(tags, 'email') }}'>
<i class="fa fa-envelope" aria-hidden="true"></i>
</a>
{% endif %}
diff --git a/detailsBody.html b/detailsBody.html
index 8e0da2d..f8959f5 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -18,7 +18,7 @@
<i class="fa fa-globe" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('website') }}:</span>
<span class='value'>
- <a href='{{ tags.website }}'>{{ tags.website }}</a>
+ <a target='_blank' href='{{ tags.website }}'>{{ tags.website }}</a>
</span>
</li>
{% endif %}
@@ -28,7 +28,7 @@
<i class="fa fa-globe" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('website') }}:</span>
<span class='value'>
- <a href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+ <a target='_blank' href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
</span>
</li>
{% endif %}
@@ -38,7 +38,7 @@
<i class="fa fa-phone" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('phone') }}:</span>
<span class='value'>
- <a href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
+ <a target='_blank' href='tel:{{ tags.phone }}'>{{ tags.phone }}</a>
</span>
</li>
{% endif %}
@@ -48,7 +48,7 @@
<i class="fa fa-phone" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('phone') }}:</span>
<span class='value'>
- <a href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
+ <a target='_blank' href='tel:{{ attribute(tags, 'contact:phone') }}'>{{ attribute(tags, 'contact:phone') }}</a>
</span>
</li>
{% endif %}
@@ -58,7 +58,7 @@
<i class="fa fa-envelope" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('email') }}:</span>
<span class='value'>
- <a href='mailto:{{ attribute(tags, 'contact:email') }}'>
+ <a target='_blank' href='mailto:{{ attribute(tags, 'contact:email') }}'>
{{ attribute(tags, 'contact:email') }}
</a>
</span>
@@ -70,7 +70,7 @@
<i class="fa fa-envelope" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('email') }}:</span>
<span class='value'>
- <a href='mailto:{{ attribute(tags, 'email') }}'>
+ <a target='_blank' href='mailto:{{ attribute(tags, 'email') }}'>
{{ attribute(tags, 'email') }}
</a>
</span>