From 3698c598f5bed1cc321339ef9751987b6037a5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 29 Sep 2020 22:22:03 +0200 Subject: [PATCH 01/27] Layouts: split details from description; remove 'unnamed' --- buildings-height.json | 15 +++++++++++++++ car_maxspeed.json | 3 ++- car_routes.json | 2 +- communication.json | 1 - cycle_amenities.json | 2 +- cycle_routes.json | 2 +- hiking_routes.json | 4 ++-- mtb-routes.json | 2 +- natural.json | 5 +---- power_routes.json | 2 +- pt.json | 2 +- public.json | 1 - railway-electrification.json | 11 +++++------ railway-gauge.json | 5 +++-- railway-infrastructure.json | 2 +- railway-routes.json | 2 +- 16 files changed, 36 insertions(+), 25 deletions(-) diff --git a/buildings-height.json b/buildings-height.json index dc08cf32..a29e75e6 100644 --- a/buildings-height.json +++ b/buildings-height.json @@ -34,6 +34,21 @@ "{% endif %}" ], "description": [ + "{% if tags.building == 'yes' and tags.military %}", + "{{ tagTrans('building', 'military') }}", + "{% elseif tags.building == 'yes' %}", + "{{ keyTrans('building') }}", + "{% else %}", + "{{ tagTransList('building', tags.building) }}", + "{% endif %}", + "{% if tags.building == 'construction' and tags.construction %}", + "({{ tagTransList('building', tags.construction) }})", + "{% endif %}", + "{% if tags.building in [ 'yes', 'military' ] and tags.military %}", + "({{ tagTransList('military', tags.military) }})", + "{% endif %}" + ], + "details": [ "{% if tags.height is defined %}", " {% if tags.height|matches('(m|ft)$') %}{{ tags.height -}}", " {% else %}{{ tags.height }} m", diff --git a/car_maxspeed.json b/car_maxspeed.json index b5047331..9805d07a 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -93,7 +93,8 @@ "{% set colorB = colorInterpolate(const.colorMap, (maxspeedBKmh - const.offsetColorSpeed) / const.highestColorSpeed) %}", "{% endif %}" ], - "description": [ + "description": "{{ tagTransList('highway', tags.highway) }}", + "details": [ "{% if maxspeedF or maxspeedB %}", "{{ maxspeedB == 'other' ? attribute(tags, 'maxspeed:backward') : const.colorOther[maxspeedB] ? tagTrans('maxspeed', maxspeedB) : maxspeedB|default(trans('unknown')) }} / {{ maxspeedF == 'other' ? attribute(tags, 'maxspeed:forward') : const.colorOther[maxspeedF] ? tagTrans('maxspeed', maxspeedF) : maxspeedF|default(trans('unknown')) }} {{ unit }}", "{% elseif maxspeed %}", diff --git a/car_routes.json b/car_routes.json index d1c7734c..a60530a4 100644 --- a/car_routes.json +++ b/car_routes.json @@ -13,7 +13,7 @@ "feature": { "pre": "{% set color = '#' ~ tags.network|default('')|md5|slice(0, 6) %}", "description": "{% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %}", - "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", + "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %}", "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': color })|raw }}", "markerSymbol": "", "styles": "" diff --git a/communication.json b/communication.json index 3053b3e8..5fc3d487 100644 --- a/communication.json +++ b/communication.json @@ -46,7 +46,6 @@ " {% set value = tags.office %}", "{% endif %}" ], - "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTrans('amenity', tags.amenity)) }}", "description": [ "{% if key == 'office' %}", " {{ keyTrans('office') }} ({{ tagTrans('office', tags.office) }})", diff --git a/cycle_amenities.json b/cycle_amenities.json index 925ade8a..e38afff6 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -56,7 +56,7 @@ "{% set constIndex = (key ~ \"=\" ~ value) %}" ], "title": [ - "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}", + "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) }}", "", "{% if tags.capacity %}({{ tags.capacity }}){% endif %}" ], diff --git a/cycle_routes.json b/cycle_routes.json index a3c5ceb5..69ccde1e 100644 --- a/cycle_routes.json +++ b/cycle_routes.json @@ -16,7 +16,7 @@ }, "members": true, "feature": { - "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", + "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %}", "description": "{{ tagTrans('network', tags.network) }}", "markerSymbol": "", "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network].color|default(const[''].color) })|raw }}", diff --git a/hiking_routes.json b/hiking_routes.json index 53ce1e5a..2e1e25e9 100644 --- a/hiking_routes.json +++ b/hiking_routes.json @@ -19,7 +19,7 @@ "priority": "{{ const[tags.network].priority|default(4) }}", "description": "{% if tags.network %}{{ tagTrans('network', tags.network) }}{% endif %}", "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': const[tags.network|default('')].color|default(const[''].color) })|raw }}", - "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", + "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %}", "styles": "", "markerSymbol": "" }, @@ -46,7 +46,7 @@ "{% for master in masters %}", "
  • ", "
    {{ markerLine({ width: 4, color: const[master.tags.network].color|default(const[''].color) })|raw }}
    ", - " {% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", + " {% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% endif %}", " {{ tagTrans('network', master.tags.network) }}", "
    • ", "{% endfor %}", diff --git a/mtb-routes.json b/mtb-routes.json index b7930618..2d0d5242 100644 --- a/mtb-routes.json +++ b/mtb-routes.json @@ -13,7 +13,7 @@ "feature": { "description": "{{ tagTrans('route', 'mtb') }}", "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': '#007fff' })|raw }}", - "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", + "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %}", "styles": "", "markerSymbol": "" }, diff --git a/natural.json b/natural.json index 53749c3d..b2f09c61 100644 --- a/natural.json +++ b/natural.json @@ -39,10 +39,7 @@ ] }, "feature": { - "title": [ - "{{ localizedTag(tags, 'name') | default(trans('unnamed')) }}", - "{% if tags.natural == 'peak' and tags.ele %}({{ tags.ele }}m){% endif %}" - ], + "details": "{% if tags.natural == 'peak' and tags.ele %}{{ tags.ele }}m{% endif %}", "description": "{{ tagTrans('natural', tags.natural) }}", "style": { "color": "{{ const[tags.natural].color|default('#f2756a') }}" diff --git a/power_routes.json b/power_routes.json index e90591c5..7794763b 100644 --- a/power_routes.json +++ b/power_routes.json @@ -13,7 +13,7 @@ "feature": { "pre": "{% set color = '#' ~ tags.operator|default('')|md5|slice(0, 6) %}", "description": "{% if tags.operator %}{{ tags.operator }}{% endif %}", - "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", + "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %}", "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': color })|raw }}", "markerSymbol": "", "styles": "" diff --git a/pt.json b/pt.json index 6bbd5aca..6b066fe0 100644 --- a/pt.json +++ b/pt.json @@ -54,7 +54,7 @@ "title": [ "{% if tags.ref %}{{ tags.ref }} - {% endif %}", "", - "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) | default(trans('unnamed')) }}" + "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) }}" ], "description": "{{ tagTrans('route', tags.route) }}", "body": [ diff --git a/public.json b/public.json index 3c95f11e..2421b81b 100644 --- a/public.json +++ b/public.json @@ -53,7 +53,6 @@ "{% set value = tags.office %}", "{% endif %}" ], - "title": "{{ tags.name|default(tags.operator)|default(tagTrans('amenity', value)) }}", "description": [ "{% if key == 'office' %}", " {{ keyTrans('office') }} ({{ tagTrans('office', tags.office) }})", diff --git a/railway-electrification.json b/railway-electrification.json index 66bb031b..01fd6182 100644 --- a/railway-electrification.json +++ b/railway-electrification.json @@ -44,14 +44,13 @@ " {% endif %}", "{% endif %}" ], - "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}", - "description": [ - "{{ tagTrans('railway', tags.railway) }}", - "", + "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator')) }}", + "description": "{{ tagTrans('railway', tags.railway) }}", + "details": [ "{% if tags.electrified == 'no' %}", - " - {{ tagTrans('electrified', 'no') }}", + "{{ tagTrans('electrified', 'no') }}", "{% elseif tags.electrified %}", - " - {{ tags.voltage|default(trans('unknown')) }}V, {{ tags.frequency|default(trans('unknown')) }}Hz", + "{{ tags.voltage|default(trans('unknown')) }}V, {{ tags.frequency|default(trans('unknown')) }}Hz", "{% endif %}" ], "body": [ diff --git a/railway-gauge.json b/railway-gauge.json index 4771b27c..f9a80464 100644 --- a/railway-gauge.json +++ b/railway-gauge.json @@ -12,8 +12,9 @@ "{% set gauges = tags.gauge|split(';')|sort|reverse %}", "{% set width = max(3, 3 / map.metersPerPixel) %}" ], - "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}", - "description": "{{ tags.gauge|default(trans('unknown'))|enumerate }}", + "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator')) }}", + "description": "{{ tagTrans('railway', tags.railway) }}", + "details": "{{ tags.gauge|default(trans('unknown'))|enumerate }}", "body": [ "{{ tagTrans('railway', tags.railway) }}
    ", "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}
    {% endif %}", diff --git a/railway-infrastructure.json b/railway-infrastructure.json index 93810487..43edcc65 100644 --- a/railway-infrastructure.json +++ b/railway-infrastructure.json @@ -14,7 +14,7 @@ "17": "(node[railway];way[railway];)" }, "feature": { - "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}", + "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator')) }}", "description": [ "{{ tagTrans('railway', tags.railway) -}}", "{%- if tags.usage %}", diff --git a/railway-routes.json b/railway-routes.json index f06a1d37..f163c5c3 100644 --- a/railway-routes.json +++ b/railway-routes.json @@ -14,7 +14,7 @@ "pre": "{% set color = '#' ~ tags.operator|default('')|md5|slice(0, 6) %}", "listMarkerSymbol": "{{ markerLine({ 'width': 4, 'color': color })|raw }}", "description": "{{ tags.operator }}", - "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}", + "title": "{% if tags.ref and tags.name %}{{ tags.ref }} - {{ tags.name }}{% elseif tags.ref %}{{ tags.ref }}{% elseif tags.name %}{{ tags.name }}{% endif %}", "styles": "", "markerSymbol": "" }, From 92255ed3d6dfae4c183c970bcd961c7c5bbd1101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Thu, 1 Oct 2020 20:54:10 +0200 Subject: [PATCH 02/27] gastro, religion: show details --- gastro.json | 1 + religion.json | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gastro.json b/gastro.json index eaf7a123..667b8580 100644 --- a/gastro.json +++ b/gastro.json @@ -23,6 +23,7 @@ }, "feature": { "description": "{{ tagTrans('amenity', tags.amenity) }}", + "details": "{{ tagTransList('cuisine', tags.cuisine) }}", "body": [ "" diff --git a/hiking_routes.json b/hiking_routes.json index a31378bb..3ba0c5f0 100644 --- a/hiking_routes.json +++ b/hiking_routes.json @@ -58,11 +58,15 @@ " {% for n in master.tags.network|split(';') %}", " {% if n|matches('wn$') %}{% set masterNetwork = n %}{% endif %}", " {% endfor %}", - "
  • ", - "
    {{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}
    ", - " {% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% endif %}", - " {{ tagTrans('network', masterNetwork) }}", - "
    • ", + "
  • ", + "
    ", + "
    {{ markerLine({ width: 4, color: const[masterNetwork].color|default(const[''].color) })|raw }}
    ", + "
    ", + "
    ", + "
    {{ tagTrans('network', masterNetwork) }}
    ", + "
    {% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% endif %}
    ", + "
    ", + "
    • ", "{% endfor %}", "" ], From 4dd51b46e26b6f622515347c12e7e8ab6631ab43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 22 Aug 2021 20:56:41 +0200 Subject: [PATCH 16/27] cycle_routes: fix layout of member popups --- cycle_routes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cycle_routes.json b/cycle_routes.json index 836fa7a8..16d8f6e7 100644 --- a/cycle_routes.json +++ b/cycle_routes.json @@ -83,7 +83,7 @@ "
    {{ tagTrans('network', masterNetwork) }}
    ", "
    {% if master.tags.ref and master.tags.name %}{{ master.tags.ref }} - {{ master.tags.name|default(master.tags.ref) }}{% elseif master.tags.ref %}{{ master.tags.ref }}{% elseif master.tags.name %}{{ master.tags.name }}{% else %}{{ trans('unnamed') }}{% endif %}
    ", " ", - " ", + " ", "{% endfor %}", "" ], From 898679a6dffd21d54c9a7a6d6ca532b8154e622c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 5 Sep 2020 08:55:49 +0200 Subject: [PATCH 17/27] heritage: create basic category --- culture_religion.json | 3 +++ heritage.json | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 heritage.json diff --git a/culture_religion.json b/culture_religion.json index 17c8e164..fa89b4a7 100644 --- a/culture_religion.json +++ b/culture_religion.json @@ -31,6 +31,9 @@ { "id": "memorial" }, + { + "id": "heritage" + }, { "id": "religion" }, diff --git a/heritage.json b/heritage.json new file mode 100644 index 00000000..b8ee500c --- /dev/null +++ b/heritage.json @@ -0,0 +1,9 @@ +{ + "type": "overpass", + "query": { + "8": "nwr[heritage=1];", + "11": "nwr[heritage~'^(1|2)$'];" + }, + "feature": { + } +} From a6609f03bfb3cd2118c0c6c6a5edc271a9fa9783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 6 Sep 2020 19:17:34 +0200 Subject: [PATCH 18/27] Heritage: start developing category --- heritage.json | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/heritage.json b/heritage.json index b8ee500c..00a17ada 100644 --- a/heritage.json +++ b/heritage.json @@ -1,9 +1,29 @@ { "type": "overpass", "query": { - "8": "nwr[heritage=1];", - "11": "nwr[heritage~'^(1|2)$'];" + "8": "nwr[heritage~\"^(|.*;)1(|;.*)$\"];", + "11": "nwr[heritage~\"^(|.*;)(1|2)(|;.*)$\"];", + "13": "nwr[heritage];" }, "feature": { + "description": [ + "{% for op in attribute(tags, 'heritage:operator')|split(';') %}", + "{% if const[op].url and attribute(tags, const[op].key) %}{% endif -%}", + "{{- tagTrans('heritage:operator', op) -}}", + "{%- if attribute(tags, const[op].key) %}: {{ attribute(tags, const[op].key) }}{% endif %}", + "{% if const[op].url and attribute(tags, const[op].key) %}{% endif -%}", + "
    ", + "{% endfor %}" + ], + "priority": "{{ min(tags.heritage|split(\";\")) }}" + }, + "const": { + "whc": { + "key": "ref:whc" + }, + "bda": { + "key": "ref:at:bda", + "url": "https://tools.wmflabs.org/denkmalliste/index.php?action=EinzelID&ID=$1" + } } } From 9fa8e6a601d785d5d9168a0e0799270cf1ab110c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 12 Nov 2021 16:46:07 +0100 Subject: [PATCH 19/27] Name for 'heritage' category: de, en --- lang/de.json | 1 + lang/en.json | 1 + 2 files changed, 2 insertions(+) diff --git a/lang/de.json b/lang/de.json index bf640db9..9820e522 100644 --- a/lang/de.json +++ b/lang/de.json @@ -32,6 +32,7 @@ "category:gastro": "Gastronomie", "category:gastro-smoking": "Rauchfreie Gastronomie", "category:health": "Gesundheitsdienste", + "category:heritage": "Denkmalschutz", "category:hiking_routes": "Wanderrouten", "category:historic": "Geschichte", "category:index": "", diff --git a/lang/en.json b/lang/en.json index 03ed02d4..c97dad07 100644 --- a/lang/en.json +++ b/lang/en.json @@ -34,6 +34,7 @@ "category:gastro": "Gastronomy", "category:gastro-smoking": "Smokefree Gastronomy", "category:health": "Health", + "category:heritage": "Heritage Protection", "category:hiking_routes": "Hiking routes", "category:historic": "Historic", "category:index": "Index of Categories", From 028238cfb234eaa91106401613dafe19487c1ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 13 Nov 2021 13:29:24 +0100 Subject: [PATCH 20/27] heritage: detect 'description' of object from several tags --- heritage.json | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/heritage.json b/heritage.json index 00a17ada..59fae5d5 100644 --- a/heritage.json +++ b/heritage.json @@ -7,23 +7,22 @@ }, "feature": { "description": [ - "{% for op in attribute(tags, 'heritage:operator')|split(';') %}", - "{% if const[op].url and attribute(tags, const[op].key) %}{% endif -%}", - "{{- tagTrans('heritage:operator', op) -}}", - "{%- if attribute(tags, const[op].key) %}: {{ attribute(tags, const[op].key) }}{% endif %}", - "{% if const[op].url and attribute(tags, const[op].key) %}{% endif -%}", - "
    ", - "{% endfor %}" + "{% set found = false %}", + "{% for k in ['amenity', 'shop', 'telecom', 'waterway', 'craft', 'highway', 'railway', 'aerialway', 'emergency', 'geological', 'man_made', 'natural', 'office', 'power', 'aeroway', 'tourism', 'leisure', 'military', 'landuse', 'barrier', 'route'] if not found %}", + " {% if attribute(tags, k) and attribute(tags, k) != 'yes' %}", + " {{ tagTransList(k, attribute(tags, k)) }}", + " {% set found = true %}", + " {% endif %}", + "{% endfor %}", + "{% if found %}{# nothing #}", + "{% elseif tags.building and tags.building != 'yes' %}", + "{{ tagTransList('building', tags.building) }}", + "{% elseif tags.historic and tags.historic not in ['heritage', 'yes', 'building'] %}", + "{{ tagTransList('historic', tags.historic) }}", + "{% elseif tags.building == 'yes' or tags.historic == 'building' %}", + "{{ keyTrans('building') }}", + "{% endif %}" ], "priority": "{{ min(tags.heritage|split(\";\")) }}" - }, - "const": { - "whc": { - "key": "ref:whc" - }, - "bda": { - "key": "ref:at:bda", - "url": "https://tools.wmflabs.org/denkmalliste/index.php?action=EinzelID&ID=$1" - } } } 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 21/27] 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 5fc3d487..3382980b 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 From 94e5394610c202f0890ada0245d28bc011a84f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Fri, 14 Jan 2022 21:07:10 +0100 Subject: [PATCH 22/27] swimming_bathing: fix queries --- swimming_bathing.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/swimming_bathing.json b/swimming_bathing.json index 98e8aee6..e4994530 100644 --- a/swimming_bathing.json +++ b/swimming_bathing.json @@ -11,10 +11,10 @@ "13": [ "(", "nwr[leisure=swimming_area];", - "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(.*|)$\"];", + "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(;.*|)$\"];", "nwr[natural~\"^(beach)\"];", "nwr[leisure~\"^(water_park|beach_resort)$\"];", - "nwr[leisure=sports_centre][sport~\"^(|.*;)swimming(.*|)$\"];", + "nwr[leisure=sports_centre][sport~\"^(|.*;)swimming(;.*|)$\"];", "nwr[amenity=public_bath];", "nwr[tourism=spa_resort];", ")" @@ -22,7 +22,7 @@ "16": [ "(", "nwr[leisure=swimming_area];", - "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(.*|)$\"];", + "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(;.*|)$\"];", "nwr[natural~\"^(beach)\"];", "nwr[leisure~\"^(water_park|beach_resort)$\"];", "nwr[leisure=sports_centre][sport~\"^(|.*;)swimming(;.*|)$\"];", From 2be9b9c57ca1edd49e0fd2daebcc4f88042a1776 Mon Sep 17 00:00:00 2001 From: CapitaineMoustache Date: Wed, 11 Aug 2021 18:19:31 +0000 Subject: [PATCH 23/27] Translated using Weblate (French) Currently translated at 95.9% (93 of 97 strings) Translation: OpenStreetBrowser/Main Categories Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/fr/ --- lang/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/fr.json b/lang/fr.json index 2d723e2d..03738e55 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -20,7 +20,7 @@ "category:construction": "Chantiers de construction", "category:craft": "Artisanat", "category:culture": "Culture", - "category:culture_religion": "Culture et religion", + "category:culture_religion": "Culture et Religion", "category:cycle_amenities": "Équipements vélo", "category:cycle_routes": "Itinéraires vélo", "category:education": "Éducation", From 40ac725c9506b15881872e6d83d893764dfe9ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Str=C4=99bski?= Date: Fri, 29 Oct 2021 20:07:44 +0000 Subject: [PATCH 24/27] Translated using Weblate (Polish) Currently translated at 100.0% (97 of 97 strings) Translation: OpenStreetBrowser/Main Categories Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/pl/ --- lang/pl.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lang/pl.json b/lang/pl.json index b467b168..4fdbc8de 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -92,5 +92,8 @@ "outdated feature": "Przestarzałe obiekty", "xmas:outdated-warning": "Funkcja nie została zaktualizowana w bieżącym sezonie! Sprawdź i ustaw znacznik „xmas:lastcheck” na bieżącą datę.", "category:climbing": "Wspinaczka", - "category:roads": "Drogi" + "category:roads": "Drogi", + "category:developable_areas": "Obszary do rozwoju", + "category:developments": "Planowanie i budowanie", + "category:proposals": "Propozycje" } From 07894f970a7852439a527a2d8e00dfb4c6d2235a Mon Sep 17 00:00:00 2001 From: Igor Eliezer Date: Thu, 4 Nov 2021 14:06:33 +0000 Subject: [PATCH 25/27] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (97 of 97 strings) Translation: OpenStreetBrowser/Main Categories Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/pt_BR/ --- lang/pt-br.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lang/pt-br.json b/lang/pt-br.json index 4c662aff..881f1a3a 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -12,7 +12,7 @@ "category:buildings-type": "Tipologias", "category:car_amenities": "Equipamentos", "category:car_furniture": "Mobiliário urbano", - "category:car_maxspeed": "Velocidade máxima", + "category:car_maxspeed": "Veloc. máxima", "category:car_routes": "Rotas rodoviárias", "category:children": "Equipamentos infantis", "category:coal": "Carvão", @@ -20,7 +20,7 @@ "category:construction": "Terrenos vazios e obras", "category:craft": "Ofícios", "category:culture": "Cultura", - "category:culture_religion": "Cultura", + "category:culture_religion": "Cultura e religião", "category:cycle_amenities": "Equipamentos", "category:cycle_routes": "Ciclorrotas", "category:education": "Educação", @@ -39,10 +39,10 @@ "category:law": "Direito", "category:leisure": "Lazer", "category:leisure_sport_shopping": "Lazer, esportes e compras", - "category:memorial": "Memoriais e Monumentos", + "category:memorial": "Memoriais e monumentos", "category:military": "Militar", "category:mtb-routes": "Rotas de mountain bike", - "category:natural": "Formações naturais", + "category:natural": "Elementos naturais", "category:office": "Escritórios e agências", "category:oil_gas": "Petróleo e gás", "category:organisations": "Organizações", @@ -50,12 +50,12 @@ "category:outdoor": "Atividades ao ar livre", "category:phone": "Telefone", "category:places": "Lugares", - "category:places_geo": "Lugares", + "category:places_geo": "Localidades", "category:playgrounds": "Parquinhos", "category:post": "Correios", - "category:power_routes": "Rotas energéticas", + "category:power_routes": "Rotas de energia", "category:pt": "Mapa de transporte público", - "category:pt:routes": "Rotas", + "category:pt:routes": "Linhas", "category:pt:stops": "Paradas e estações", "category:pt_amenities": "Equipamentos", "category:public": "Utilidade pública", @@ -95,5 +95,5 @@ "category:climbing": "Escalada", "category:developable_areas": "Áreas urbanizáveis", "category:developments": "Planejamento e construção", - "category:proposals": "Propostas" + "category:proposals": "Planejados" } From 3f67e2d08e84170c0cd244e8e5fbb0ed2118ee86 Mon Sep 17 00:00:00 2001 From: Igor Eliezer Date: Wed, 17 Nov 2021 04:22:02 +0000 Subject: [PATCH 26/27] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (97 of 97 strings) Translation: OpenStreetBrowser/Main Categories Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/pt_BR/ --- lang/pt-br.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/pt-br.json b/lang/pt-br.json index 881f1a3a..09ee9ae2 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -27,7 +27,7 @@ "category:electric_power": "Energia elétrica", "category:emergency": "Emergência", "category:energy": "Energia", - "category:financial": "Finanças", + "category:financial": "Finanças e seguros", "category:gastro": "Gastronomia", "category:gastro-smoking": "Gastronomia sem fumo", "category:health": "Saúde e assistência", From 7359fef673c98dd5400a82849c71b1ea86d1af8e Mon Sep 17 00:00:00 2001 From: Peire BRECHET Date: Wed, 29 Dec 2021 14:37:18 +0000 Subject: [PATCH 27/27] Translated using Weblate (Occitan) Currently translated at 100.0% (97 of 97 strings) Translation: OpenStreetBrowser/Main Categories Translate-URL: http://weblate.openstreetbrowser.org/projects/openstreetbrowser/main-categories/oc/ --- lang/oc.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lang/oc.json b/lang/oc.json index 6952eef0..42e1d2c2 100644 --- a/lang/oc.json +++ b/lang/oc.json @@ -91,5 +91,9 @@ "date format not understood": "Format de data non reconoissut", "outdated feature": "Caracteristicas obsoletas", "xmas:outdated-warning": "Aquest element es pas estat actualizat per la session ! Siatz pregats de verificar e mai reglar la valor de \"xmas:lastcheck\" a la data actuala.", - "category:roads": "Rotas" + "category:roads": "Rotas", + "category:climbing": "Escalada", + "category:developable_areas": "Airaus ameinatjats", + "category:developments": "Planificacion e construccion", + "category:proposals": "Propositions" }