From d1fa17d35b9c6d713a0d4ff1770c8f47707f5de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 14 Jan 2022 21:06:22 +0100 Subject: [PATCH] communication: include amenity=parcel_locker (and older variants) --- communication.json | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/communication.json b/communication.json index 5fc3d48..3382980 100644 --- a/communication.json +++ b/communication.json @@ -22,23 +22,25 @@ "query": { "13": [ "(", - "node[amenity~'^(post_office|internet_cafe)$'];", - "way[amenity~'^(post_office|internet_cafe)$'];", - "relation[amenity~'^(post_office|internet_cafe)$'];", + "nwr[amenity~'^(post_office|internet_cafe)$'];", "nwr[office~\"^(telecommunication|it|newspaper|publisher|advertising_agency)$\"];", ");" ], - "16": [ - "(node[amenity~'^(post_office|internet_cafe|post_box|telephone)$'];", - "way[amenity~'^(post_office|internet_cafe)$'];", - "relation[amenity~'^(post_office|internet_cafe)$'];", + "15": [ + "(", + "nwr[amenity~'^(post_office|internet_cafe|post_box|parcel_locker|telephone)$'];", "nwr[office~\"^(telecommunication|it|newspaper|publisher|advertising_agency)$\"];", + "nwr[vending~\"^(|.*;)parcel_pickup(;.*|)$\"];", + "nwr[vending~\"^(|.*;)parcel_mail_in(;.*|)$\"];", ");" ] }, "feature": { "pre": [ - "{% if tags.amenity %}", + "{% if tags.vending %}", + " {% set key = 'amenity' %}", + " {% set value = 'parcel_locker' %}", + "{% elseif tags.amenity %}", " {% set key = 'amenity' %}", " {% set value = tags.amenity %}", "{% else %}", @@ -50,7 +52,7 @@ "{% if key == 'office' %}", " {{ keyTrans('office') }} ({{ tagTrans('office', tags.office) }})", "{% else %}", - " {{ tagTrans(key, value) }}", + " {{ tagTransList(key, value) }}", "{% endif %}" ], "body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
{% endif %}", @@ -64,7 +66,7 @@ "info": [ "", "{% for kv, data in const %}", - "{% if data.zoom <= map.zoom %}", + "{% if data.zoom <= map.zoom and not data.info_hide %}", " ", " ", "
{{ markerCircle({})|raw }}
{{ data.sign|raw }}
", @@ -93,6 +95,20 @@ "sign": "", "zoom": 13 }, + "amenity=parcel_locker": { + "sign": "", + "zoom": 16 + }, + "vending=parcel_pickup": { + "sign": "", + "info_hide": true, + "zoom": 16 + }, + "vending=parcel_mail_in": { + "sign": "", + "info_hide": true, + "zoom": 16 + }, "office=telecommunication": { "sign": "", "zoom": 13