From 394247e6d83519073307bc1955fc56086dc0958f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 000000000..f01130c71 --- /dev/null +++ b/commonBody.html @@ -0,0 +1,23 @@ +
+ +{% set address = tagsPrefix(tags, 'addr:') %} +{% if address %} +
+ +{{ keyTrans('addr') }}: +
+{{ attribute(tags, 'addr:street') }} {{ attribute(tags, 'addr:housenumber') }}, {{ attribute(tags, 'addr:postcode') }} {{ attribute(tags, 'addr:city') }} +
+{% endif %} + +{% if tags.phone %} +
+ +{{ keyTrans('phone') }}: +
+
+{{ tags.phone }} +
+{% endif %} + +
From 23a87ad87719e7fd38645f1d76d370e623fffd9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 f01130c71..52dc8c18e 100644 --- a/commonBody.html +++ b/commonBody.html @@ -20,4 +20,16 @@ {% endif %} +{% set payment = tagsPrefix(tags, 'payment:') %} +{% if payment %} +
+ +{{ keyTrans('payment') }}: +
+{% for k, tag in payment %} +{% if tags[tag] == 'no' %}{{ k }} {% else %}{{ k }} {% endif %} +{% endfor %} +
+{% endif %} + From e60ac5a2f6f172db40229319751db830d0a6c5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 f016bedd8..41f87a2b9 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) }}
{{ 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?= 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 52dc8c18e..7044bc4f9 100644 --- a/commonBody.html +++ b/commonBody.html @@ -1,35 +1,39 @@ -
- +
    {% set address = tagsPrefix(tags, 'addr:') %} {% if address %} -
    - -{{ keyTrans('addr') }}: -
    -{{ attribute(tags, 'addr:street') }} {{ attribute(tags, 'addr:housenumber') }}, {{ attribute(tags, 'addr:postcode') }} {{ attribute(tags, 'addr:city') }} -
    +
  • + + {{ keyTrans('addr') }} + + {{ attribute(tags, 'addr:street') }} + {{ attribute(tags, 'addr:housenumber') }}, + {{ attribute(tags, 'addr:postcode') }} + {{ attribute(tags, 'addr:city') }} + +
    • {% endif %} {% if tags.phone %} -
    - -{{ keyTrans('phone') }}: -
    -
    -{{ tags.phone }} -
    +
  • + + {{ keyTrans('phone') }} + + {{ tags.phone }} + +
    • {% endif %} {% set payment = tagsPrefix(tags, 'payment:') %} {% if payment %} -
    - -{{ keyTrans('payment') }}: -
    -{% for k, tag in payment %} -{% if tags[tag] == 'no' %}{{ k }} {% else %}{{ k }} {% endif %} -{% endfor %} -
    +
  • + + {{ keyTrans('payment') }} + + {% for k, tag in payment %} + {% if tags[tag] == 'no' %}{{ k }} {% else %}{{ k }} {% endif %} + {% endfor %} + +
    • {% endif %} -
+ diff --git a/gastro.json b/gastro.json index 41f87a2b9..88ac064f3 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) }}
{{ keyTrans('cuisine') }}: {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}", + "body": "\n{{ tagTrans('amenity', tags.amenity) }}\n\n
    \n
  • \n \n {{ keyTrans('cuisine') }}\n {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}\n
    • \n
", "description": "{{ tagTrans('amenity', tags.amenity) }}" } } From ae1c598d0ceab75d2ad5a7a7904b1be2c2a2471e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 7044bc4f9..c75791ff6 100644 --- a/commonBody.html +++ b/commonBody.html @@ -36,4 +36,14 @@ {% endif %} +{% if attribute(tags, 'wheelchair') %} +
  • + + {{ keyTrans('wheelchair') }} + + {{ tagTrans('wheelchair', tags.wheelchair) }} + +
    • +{% endif %} + From 29966730d54ae4b287029ae5d81067ba83eadadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 c75791ff6..434ebdb6e 100644 --- a/commonBody.html +++ b/commonBody.html @@ -38,10 +38,17 @@ {% if attribute(tags, 'wheelchair') %}
  • - + {{ keyTrans('wheelchair') }} - {{ tagTrans('wheelchair', tags.wheelchair) }} + {{ tagTrans('wheelchair', tags.wheelchair) -}} + + {%- if attribute(tags, 'toilets:wheelchair') -%} + , 🚽 {{ keyTrans('amenity', 'toilets') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }} + {% endif %} + +
    + {{ localizedTag(tags, 'wheelchair:description') }}
    • {% endif %} From 209cf37a806d038bd75677536f7b933e0adb4e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 434ebdb6e..eb9f27dc4 100644 --- a/commonBody.html +++ b/commonBody.html @@ -1,9 +1,9 @@
      {% set address = tagsPrefix(tags, 'addr:') %} {% if address %} -
    • - - {{ keyTrans('addr') }} +
    • + + {{ keyTrans('addr') }}: {{ attribute(tags, 'addr:street') }} {{ attribute(tags, 'addr:housenumber') }}, @@ -14,9 +14,9 @@ {% endif %} {% if tags.phone %} -
    • - - {{ keyTrans('phone') }} +
    • + + {{ keyTrans('phone') }}: {{ tags.phone }} @@ -25,9 +25,9 @@ {% set payment = tagsPrefix(tags, 'payment:') %} {% if payment %} -
    • - - {{ keyTrans('payment') }} +
    • + + {{ keyTrans('payment') }}: {% for k, tag in payment %} {% if tags[tag] == 'no' %}{{ k }} {% else %}{{ k }} {% endif %} @@ -37,18 +37,18 @@ {% endif %} {% if attribute(tags, 'wheelchair') %} -
    • - - {{ keyTrans('wheelchair') }} +
    • + + {{ trans('facilities') }}: - {{ tagTrans('wheelchair', tags.wheelchair) -}} - {%- if attribute(tags, 'toilets:wheelchair') -%} - , 🚽 {{ keyTrans('amenity', 'toilets') }}: {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }} - {% endif %} + {% if attribute(tags, 'wheelchair') %} + -
      - {{ localizedTag(tags, 'wheelchair:description') }} + {% if attribute(tags, 'toilets:wheelchair') %} + (🚽) + {% endif %} + {% endif %}
      • {% endif %} diff --git a/gastro.json b/gastro.json index 88ac064f3..94d2cf275 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": "\n{{ tagTrans('amenity', tags.amenity) }}\n\n
        \n
      • \n \n {{ keyTrans('cuisine') }}\n {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}\n
        • \n
      ", + "body": "\n{{ tagTrans('amenity', tags.amenity) }}\n\n
        \n
      • \n \n {{ keyTrans('cuisine') }}:\n {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}\n
        • \n
      ", "description": "{{ tagTrans('amenity', tags.amenity) }}" } } From ad4fa1f231d46a0f8b4b85d838a5b19b1126dab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 eb9f27dc4..b01436893 100644 --- a/commonBody.html +++ b/commonBody.html @@ -23,6 +23,20 @@ {% 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] %} +
    • + + {{ keyTrans('opening_hours') }}: + + {{ trans(oh_state) }}
      + {{ tags.opening_hours }} +       +
      • +{% endif %} + {% set payment = tagsPrefix(tags, 'payment:') %} {% if payment %}
    • From f03a23014f0396a29c5a65c27da9f3e2df816500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 000000000..27682fc39 --- /dev/null +++ b/detailsBody.html @@ -0,0 +1,83 @@ +
        +{% set address = tagsPrefix(tags, 'addr:') %} +{% if address %} +
      • + + {{ keyTrans('addr') }}: + + {{ attribute(tags, 'addr:street') }} + {{ attribute(tags, 'addr:housenumber') }}, + {{ attribute(tags, 'addr:postcode') }} + {{ attribute(tags, 'addr:city') }} + +
        • +{% endif %} + +{% if tags.phone %} +
      • + + {{ keyTrans('phone') }}: + + {{ tags.phone }} + +
        • +{% 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] %} +
      • + + {{ keyTrans('opening_hours') }}: + + {{ trans(oh_state) }}
        + {{ tags.opening_hours }} +         +
        • +{% endif %} + +{% set payment = tagsPrefix(tags, 'payment:') %} +{% if payment %} +
      • + + {{ keyTrans('payment') }}: + + {% for k, tag in payment %} + {% if tags[tag] == 'no' %}{{ k }} {% else %}{{ k }} {% endif %} + {% endfor %} + +
        • +{% endif %} + +{% if attribute(tags, 'wheelchair') %} +
      • + + {{ trans('facilities') }}: + + +
          + {% if attribute(tags, 'wheelchair') %} +
        • + + {{ keyTrans('wheelchair') }}: + + {{ tagTrans('wheelchair', tags.wheelchair) }} +
            + {% if attribute(tags, 'toilets:wheelchair') %} +
          • + 🚽 + {{ keyTrans('toilets:wheelchair') }}: + {{ tagTrans('toilets:wheelchair', attribute(tags, 'toilets:wheelchair')) }} +
            • + {% endif %} +
          +           +
          • + {% endif %} +
        +         +
        • +{% endif %} + +
      From 85a38870b1696feb60c2ee5adffb71e814afef2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 b01436893..49ef42e40 100644 --- a/commonBody.html +++ b/commonBody.html @@ -13,6 +13,26 @@
      • {% endif %} +{% if tags.website %} +
    • + + {{ keyTrans('website') }}: + + {{ tags.website }} + +
      • +{% endif %} + +{% if attribute(tags, 'contact:website') %} +
    • + + {{ keyTrans('website') }}: + + {{ attribute(tags, 'contact:website') }} + +
      • +{% endif %} + {% if tags.phone %}
    • @@ -23,6 +43,48 @@
      • {% endif %} +{% if attribute(tags, 'contact:phone') %} +
    • + + {{ keyTrans('phone') }}: + + {{ attribute(tags, 'contact:phone') }} + +
      • +{% endif %} + +{% if attribute(tags, 'contact:email') or tags.email %} +
    • + + {{ keyTrans('contact') }}: + + + {% if attribute(tags, 'contact:email') %} + + + + {% endif %} + + {% if attribute(tags, 'email') %} + + + + {% endif %} + + +
      • +{% endif %} + +{% if attribute(tags, 'contact:website') %} +
    • + + {{ keyTrans('website') }}: + + {{ attribute(tags, 'contact:website') }} + +
      • +{% 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 27682fc39..b0e627421 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -23,6 +23,40 @@ {% endif %} +{% if attribute(tags, 'contact:phone') %} +
    • + + {{ keyTrans('phone') }}: + + {{ attribute(tags, 'contact:phone') }} + +
      • +{% endif %} + +{% if attribute(tags, 'contact:email') %} +
    • + + {{ keyTrans('email') }}: + + + {{ attribute(tags, 'contact:email') }} + + +
      • +{% endif %} + +{% if attribute(tags, 'email') %} +
    • + + {{ keyTrans('email') }}: + + + {{ attribute(tags, 'email') }} + + +
      • +{% 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?= 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 49ef42e40..270ac9442 100644 --- a/commonBody.html +++ b/commonBody.html @@ -75,16 +75,6 @@ {% endif %} -{% if attribute(tags, 'contact:website') %} -
    • - - {{ keyTrans('website') }}: - - {{ attribute(tags, 'contact:website') }} - -
      • -{% 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 b0e627421..a0db52f77 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -13,6 +13,26 @@ {% endif %} +{% if tags.website %} +
    • + + {{ keyTrans('website') }}: + + {{ tags.website }} + +
      • +{% endif %} + +{% if attribute(tags, 'contact:website') %} +
    • + + {{ keyTrans('website') }}: + + {{ attribute(tags, 'contact:website') }} + +
      • +{% endif %} + {% if tags.phone %}
    • @@ -33,6 +53,16 @@
      • {% endif %} +{% if tags.phone %} +
    • + + {{ keyTrans('phone') }}: + + {{ tags.phone }} + +
      • +{% endif %} + {% if attribute(tags, 'contact:email') %}
    • From cb6229863a1dfdb349174b20de639083d0a87114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 a3766897e..c16740297 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
      \n{{ keyTrans('admin_level') }}: {{ tags.admin_level }}" + "body": "{{ keyTrans('admin_level') }}: {{ tags.admin_level }}" } } diff --git a/agriculture.json b/agriculture.json index 61c8e0c8b..dbeb6c3e1 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 79a22b045..0b75ef202 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 3132921a4..47d414786 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' %}{% 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 2aab31e67..1a7f64419 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) }}
      {% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
      {% endif %}", + "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
      {% endif %}", "description": "{{ tagTrans('amenity', tags.amenity) }}" } } diff --git a/construction.json b/construction.json index 2db89e916..37d1abe6e 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 34f42e982..95c723d04 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 3dd1b3bdb..2e5f19eec 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
      \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 2ab0d2a2b..9cfbee8bf 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) }}
      {% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
      {% endif %}", + "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
      {% 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 d2d07de88..6bbb3b60e 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 f7f00a197..c2c683fc7 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 94d2cf275..739287d9c 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": "\n{{ tagTrans('amenity', tags.amenity) }}\n\n
        \n
      • \n \n {{ keyTrans('cuisine') }}:\n {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}\n
        • \n
      ", + "body": "
        \n
      • \n \n {{ keyTrans('cuisine') }}:\n {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}\n
        • \n
      ", "description": "{{ tagTrans('amenity', tags.amenity) }}" } } diff --git a/health.json b/health.json index 5d613382a..ae4d34696 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 5241b5bf5..7e04e784b 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 80616bc8b..463636c52 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 9944fc523..22612604a 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 c08590a58..675814204 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 1cead2c44..925034b45 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 2f66d69ec..27d9fdb9e 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 %}
      {{ 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 7b36f0c61..5ce1bc398 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] %}
      {{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}\n{% set x='generator:method' %}{% if tags[x] %}
      {{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}\n{% set x='generator:type' %}{% if tags[x] %}
      {{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}", + "markerSign": null, + "body": "{% set x='generator:source' %}{% if tags[x] %}
      {{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}\n{% set x='generator:method' %}{% if tags[x] %}
      {{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}\n{% set x='generator:type' %}{% if tags[x] %}
      {{ 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 8eba1baec..861b69c08 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 016604ea2..e32811568 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 412a8abef..66d9bdbba 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) }}
      {% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
      {% endif %}", + "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
      {% endif %}", "description": "{{ tagTrans('amenity', tags.amenity) }}" } } diff --git a/railway.json b/railway.json index 928a9d0d6..158cd7b00 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) }}
      \n{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
      {% endif %}\n{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}
      {% endif %}\n{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}
      {% endif %}\n{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}
      \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')) }}
      {% endif %}\n", + "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
      {% endif %}\n{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}
      {% endif %}\n{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}
      {% endif %}\n{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}
      \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')) }}
      {% 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 cf33bdeb1..a91b5369f 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
      \n {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}\n{% endif %}\n{% if tags.denomination %}\n
      \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
      \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 96d416516..d322a622f 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 b5f3e2cf4..215f07a52 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 8bcadc858..e4a004880 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-' %}{% 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-' %}{% else %}{{ c|raw }}{% endif %}" }, "const": { "default": { diff --git a/sport.json b/sport.json index b5ea63943..0dd15ce54 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 538101ae6..0afd970fa 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 7d03c58ab..39a9ca8f8 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 69eeb1db5..194f1698b 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 1f36afda2..a608aec60 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
      \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?= 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 270ac9442..57c5138cc 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] %}
    • - + {{ keyTrans('opening_hours') }}: - {{ trans(oh_state) }}
      {{ tags.opening_hours }}
      • diff --git a/detailsBody.html b/detailsBody.html index a0db52f77..0f4e2386d 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] %}
    • - + {{ keyTrans('opening_hours') }}: - {{ trans(oh_state) }}
      {{ tags.opening_hours }}
      • From eecc4319e09de4bf27e6b1b025e7bbf77dabce63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 0f4e2386d..8e0da2deb 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -53,16 +53,6 @@ {% endif %} -{% if tags.phone %} -
    • - - {{ keyTrans('phone') }}: - - {{ tags.phone }} - -
      • -{% endif %} - {% if attribute(tags, 'contact:email') %}
    • From ce628e2ce3fbe03a44692f40d91308dc62422ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= 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 57c5138cc..a65b3f2fd 100644 --- a/commonBody.html +++ b/commonBody.html @@ -18,7 +18,7 @@ {{ keyTrans('website') }}: - {{ tags.website }} + {{ tags.website }}
      • {% endif %} @@ -28,7 +28,7 @@ {{ keyTrans('website') }}: - {{ attribute(tags, 'contact:website') }} + {{ attribute(tags, 'contact:website') }} {% endif %} @@ -38,7 +38,7 @@ {{ keyTrans('phone') }}: - {{ tags.phone }} + {{ tags.phone }} {% endif %} @@ -48,7 +48,7 @@ {{ keyTrans('phone') }}: - {{ attribute(tags, 'contact:phone') }} + {{ attribute(tags, 'contact:phone') }} {% endif %} @@ -60,13 +60,13 @@ {% if attribute(tags, 'contact:email') %} - + {% endif %} {% if attribute(tags, 'email') %} - + {% endif %} diff --git a/detailsBody.html b/detailsBody.html index 8e0da2deb..f8959f50e 100644 --- a/detailsBody.html +++ b/detailsBody.html @@ -18,7 +18,7 @@ {{ keyTrans('website') }}: - {{ tags.website }} + {{ tags.website }} {% endif %} @@ -28,7 +28,7 @@ {{ keyTrans('website') }}: - {{ attribute(tags, 'contact:website') }} + {{ attribute(tags, 'contact:website') }} {% endif %} @@ -38,7 +38,7 @@ {{ keyTrans('phone') }}: - {{ tags.phone }} + {{ tags.phone }} {% endif %} @@ -48,7 +48,7 @@ {{ keyTrans('phone') }}: - {{ attribute(tags, 'contact:phone') }} + {{ attribute(tags, 'contact:phone') }} {% endif %} @@ -58,7 +58,7 @@ {{ keyTrans('email') }}: - + {{ attribute(tags, 'contact:email') }} @@ -70,7 +70,7 @@ {{ keyTrans('email') }}: - + {{ attribute(tags, 'email') }}