From f763a43f0cbad22b124b1409e45f44a6c20d6cc6 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 11 Aug 2022 12:52:26 +0200 Subject: [PATCH 1/6] Split out layers, added parcel lockers --- .../layers/parcel_lockers/license_info.json | 13 + .../layers/parcel_lockers/parcel_lockers.json | 62 +++ .../layers/parcel_lockers/parcel_lockers.svg | 177 +++++++ assets/layers/postboxes/license_info.json | 14 + .../{themes => layers}/postboxes/postbox.svg | 0 assets/layers/postboxes/postboxes.json | 101 ++++ .../postoffices}/license_info.json | 12 - .../postoffices}/post_office.svg | 0 assets/layers/postoffices/postoffices.json | 431 ++++++++++++++++++ .../mapcomplete-changes.json | 2 +- assets/themes/postboxes/postboxes.json | 296 ++---------- 11 files changed, 831 insertions(+), 277 deletions(-) create mode 100644 assets/layers/parcel_lockers/license_info.json create mode 100644 assets/layers/parcel_lockers/parcel_lockers.json create mode 100644 assets/layers/parcel_lockers/parcel_lockers.svg create mode 100644 assets/layers/postboxes/license_info.json rename assets/{themes => layers}/postboxes/postbox.svg (100%) create mode 100644 assets/layers/postboxes/postboxes.json rename assets/{themes/postboxes => layers/postoffices}/license_info.json (53%) rename assets/{themes/postboxes => layers/postoffices}/post_office.svg (100%) create mode 100644 assets/layers/postoffices/postoffices.json diff --git a/assets/layers/parcel_lockers/license_info.json b/assets/layers/parcel_lockers/license_info.json new file mode 100644 index 000000000..03368e831 --- /dev/null +++ b/assets/layers/parcel_lockers/license_info.json @@ -0,0 +1,13 @@ +[ + { + "path": "parcel_lockers.svg", + "license": "CC-BY", + "authors": [ + "Emmanuel Darmon", + "Noun Project" + ], + "sources": [ + "https://thenounproject.com/icon/parcel-locker-249755/" + ] + } +] \ No newline at end of file diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json new file mode 100644 index 000000000..526e4a55a --- /dev/null +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -0,0 +1,62 @@ +{ + "id": "parcel_lockers", + "name": { + "en": "Parcel Lockers" + }, + "description": { + "en": "Layer showing parcel lockers for collecting and sending parcels." + }, + "minzoom": 12, + "source": { + "osmTags": "amenity=parcel_locker" + }, + "presets": [ + { + "title": { + "en": "a parcel locker", + "nl": "een pakketautomaat" + }, + "preciseInput": { + "preferredBackground": "photo" + }, + "tags": [ + "amenity=parcel_locker" + ] + } + ], + "title": { + "render": { + "en": "Parcel Locker" + }, + "mappings": [ + { + "if": "brand~*", + "then": { + "en": "{brand} parcel locker" + } + } + ] + }, + "tagRenderings": [], + "filter": [], + "allowMove": { + "enableImproveAccuracy": true + }, + "deletion": {}, + "mapRendering": [ + { + "icon": "./assets/layers/parcel_lockers/parcel_lockers.svg", + "iconBadges": [ + { + "if": "opening_hours~*", + "then": "isOpen" + } + ], + "iconSize": "40,40,center", + "location": [ + "point", + "centroid" + ] + } + ] +} \ No newline at end of file diff --git a/assets/layers/parcel_lockers/parcel_lockers.svg b/assets/layers/parcel_lockers/parcel_lockers.svg new file mode 100644 index 000000000..d3c7781ba --- /dev/null +++ b/assets/layers/parcel_lockers/parcel_lockers.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/postboxes/license_info.json b/assets/layers/postboxes/license_info.json new file mode 100644 index 000000000..8e151d9e0 --- /dev/null +++ b/assets/layers/postboxes/license_info.json @@ -0,0 +1,14 @@ +[ + { + "path": "postbox.svg", + "license": "CC BY 4.0", + "authors": [ + "Vincent Le Moign", + "https://twitter.com/webalys" + ], + "sources": [ + "https://upload.wikimedia.org/wikipedia/commons/6/6d/726-postbox.svg", + "http://emoji.streamlineicons.com" + ] + } +] \ No newline at end of file diff --git a/assets/themes/postboxes/postbox.svg b/assets/layers/postboxes/postbox.svg similarity index 100% rename from assets/themes/postboxes/postbox.svg rename to assets/layers/postboxes/postbox.svg diff --git a/assets/layers/postboxes/postboxes.json b/assets/layers/postboxes/postboxes.json new file mode 100644 index 000000000..ee81709d4 --- /dev/null +++ b/assets/layers/postboxes/postboxes.json @@ -0,0 +1,101 @@ +{ + "id": "postboxes", + "name": { + "en": "Postboxes", + "de": "Briefkästen", + "ru": "Почтовые ящики", + "zh_Hant": "郵筒", + "id": "Kotak pos", + "hu": "Postaládák", + "nl": "Brievenbussen", + "ca": "Bústies", + "es": "Buzones de correo", + "nb_NO": "Postbokser", + "fr": "Boîtes à lettres" + }, + "minzoom": 12, + "source": { + "osmTags": "amenity=post_box" + }, + "title": { + "render": { + "en": "Postbox", + "de": "Briefkasten", + "ru": "Почтовый ящик", + "zh_Hant": "郵筒", + "id": "Kotak pos", + "hu": "Postaláda", + "ca": "Bústia", + "es": "Buzón de correo", + "nb_NO": "Postboks", + "fr": "Boîte à lettres", + "nl": "Brievenbus" + } + }, + "description": { + "en": "The layer showing postboxes.", + "de": "Die Ebene zeigt Briefkästen.", + "zh_Hant": "這圖層顯示郵筒。", + "id": "Layer yang memperlihatkan kotak pos.", + "hu": "A postaládákat megjelenítő réteg.", + "nl": "Deze laag toont brievenbussen.", + "es": "La capa que muestra buzones de correo.", + "fr": "Le calque montrant les boîtes à lettres." + }, + "tagRenderings": [ + "images", + { + "id": "minimap", + "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }" + } + ], + "presets": [ + { + "tags": [ + "amenity=post_box" + ], + "title": { + "en": "a postbox", + "de": "ein Briefkasten", + "ru": "почтовый ящик", + "zh_Hant": "郵筒", + "id": "kotak pos", + "hu": "postaláda", + "nl": "een brievenbus", + "ca": "una bústia", + "es": "un buzón de correo", + "fr": "une boîte à lettres" + } + } + ], + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "razed:amenity=post_box" + ] + } + }, + "mapRendering": [ + { + "icon": { + "render": "./assets/layers/postboxes/postbox.svg" + }, + "iconSize": { + "render": "40,40,bottom" + }, + "location": [ + "point", + "centroid" + ] + }, + { + "color": { + "render": "#DADADA" + }, + "width": { + "render": "1" + } + } + ] +} \ No newline at end of file diff --git a/assets/themes/postboxes/license_info.json b/assets/layers/postoffices/license_info.json similarity index 53% rename from assets/themes/postboxes/license_info.json rename to assets/layers/postoffices/license_info.json index 0c50f7040..252ecfe66 100644 --- a/assets/themes/postboxes/license_info.json +++ b/assets/layers/postoffices/license_info.json @@ -9,17 +9,5 @@ "https://commons.wikimedia.org/wiki/File:Emojione_BW_1F3E4.svg", "https://github.com/emojione/emojione/blob/2.2.7/assets/svg_bw/1f3e4.svg" ] - }, - { - "path": "postbox.svg", - "license": "CC BY 4.0", - "authors": [ - "Vincent Le Moign", - "https://twitter.com/webalys" - ], - "sources": [ - "https://upload.wikimedia.org/wikipedia/commons/6/6d/726-postbox.svg", - "http://emoji.streamlineicons.com" - ] } ] \ No newline at end of file diff --git a/assets/themes/postboxes/post_office.svg b/assets/layers/postoffices/post_office.svg similarity index 100% rename from assets/themes/postboxes/post_office.svg rename to assets/layers/postoffices/post_office.svg diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json new file mode 100644 index 000000000..7cc67a30a --- /dev/null +++ b/assets/layers/postoffices/postoffices.json @@ -0,0 +1,431 @@ +{ + "id": "postoffices", + "name": { + "en": "Post offices", + "de": "Poststellen", + "ru": "Почтовые отделения", + "zh_Hant": "郵局", + "id": "Kantor pos", + "hu": "Posták", + "nl": "Postkantoren", + "ca": "Oficines de correus", + "es": "Oficinas de correo", + "fr": "Bureaux de poste", + "nb_NO": "Postkontor" + }, + "minzoom": 12, + "source": { + "osmTags": { + "or": [ + "amenity=post_office", + "post_office=post_partner" + ] + } + }, + "title": { + "render": { + "en": "Post Office", + "de": "Poststelle", + "ru": "Почтовое отделение", + "zh_Hant": "郵局", + "id": "Kantor Pos", + "hu": "Posta", + "nl": "Postkantoor", + "ca": "Oficina de correus", + "es": "Oficina de Correo", + "fr": "Bureau de poste", + "nb_NO": "Postkontor" + }, + "mappings": [ + { + "if": { + "and": [ + "post_office=post_partner", + "name=" + ] + }, + "then": { + "en": "Post partner at a shop", + "de": "Postfiliale im Einzelhandel", + "nl": "Postpartner in een winkel" + } + }, + { + "if": { + "and": [ + "post_office=post_partner", + "name~*" + ] + }, + "then": { + "en": "Post partner at {name}", + "de": "Postfiliale im {name}" + } + } + ] + }, + "description": { + "en": "A layer showing post offices.", + "de": "Eine Ebene mit Postämtern.", + "zh_Hant": "圖層顯示郵局。", + "id": "Layer yang menunjukkan kantor pos.", + "hu": "Postákat megjelenítő réteg.", + "nl": "Een laag die postkantoren toont.", + "es": "Una capa que muestra oficinas de correo.", + "fr": "Un claque montrant les bureaux de poste.", + "nb_NO": "Et lag som viser postkontor." + }, + "tagRenderings": [ + "images", + { + "id": "minimap", + "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }" + }, + { + "render": { + "en": "Opening Hours: {opening_hours_table()}", + "ru": "Часы работы: {opening_hours_table()}", + "zh_Hant": "開放時間：{opening_hours_table()}", + "id": "Jam Buka: {opening_hours_table()}", + "hu": "Nyitva tartás: {opening_hours_table()}", + "de": "Öffnungszeiten: {opening_hours_table()}", + "es": "Horas de Apertura: {opening_hours_table()}", + "nb_NO": "Åpningstider: {opening_hours_table()}", + "nl": "Openingsuren: {opening_hours_table()}", + "fr": "Heures d’ouverture : {opening_hours_table()}" + }, + "freeform": { + "key": "opening_hours", + "type": "opening_hours" + }, + "question": { + "en": "What are the opening hours for this post office?", + "zh_Hant": "這間郵局的開放時間是？", + "id": "Jam berapa kantor pos ini buka?", + "hu": "Mikor van nyitva ez a posta?", + "de": "Wie sind die Öffnungszeiten dieser Poststelle?", + "es": "¿Cuáles son las horas de apertura para esta oficina de correos?", + "nl": "Wat zijn de openingsuren voor dit postkantoor?", + "fr": "Quelles sont les heures d’ouverture de ce bureau de poste ?" + }, + "mappings": [ + { + "if": "opening_hours=24/7", + "then": { + "en": "24/7 opened (including holidays)", + "de": "durchgehend geöffnet (auch an Feiertagen)", + "zh_Hant": "24/7 開放 (包括假日)", + "id": "Buka 24 jam (termasuk hari libur)", + "hu": "Éjjel-nappal nyitva (munkaszüneti napokon is)", + "es": "Abierta 24/7 (incluyendo festivos)", + "nl": "24/7 open (ook tijdens feestdagen)", + "fr": "Ouvert 24h/24 (jours fériés compris)", + "nb_NO": "Døgnåpent (inkludert helligdager)" + } + } + ], + "id": "OH" + }, + { + "id": "post_partner", + "question": { + "en": "Is this a post partner?" + }, + "condition": "post_office=post_partner", + "mappings": [ + { + "if": "post_office=post_partner", + "then": { + "en": "This shop is a post partner" + } + }, + { + "if": "post_office=", + "then": { + "en": "This shop is not a post partner" + }, + "addExtraTags": [ + "was:post_office=post_partner" + ] + } + ] + }, + { + "id": "partner-brand", + "render": { + "en": "This location offers services for {post_office:brand}" + }, + "question": { + "en": "For which brand does this location offer services?" + }, + "condition": "post_office=post_partner", + "freeform": { + "key": "post_office:brand", + "type": "string" + }, + "multiAnswer": true, + "mappings": [ + { + "if": "post_office:brand=DHL", + "then": { + "en": "This location offers services for DHL" + }, + "hideInAnswer": "_country=de" + }, + { + "if": "post_office:brand=DPD", + "then": { + "en": "This location offers services for DPD" + } + }, + { + "if": "post_office:brand=GLS", + "then": { + "en": "This location offers services for GLS" + } + }, + { + "if": "post_office:brand=UPS", + "then": { + "en": "This location offers services for UPS" + } + }, + { + "if": "post_office:brand=DHL Paketshop", + "then": { + "en": "This location is a DHL Paketshop" + }, + "hideInAnswer": "_country!=de" + }, + { + "if": "post_office:brand=Hermes PaketShop", + "then": { + "en": "This location is a Hermes PaketShop" + }, + "hideInAnswer": "_country!=de" + }, + { + "if": "post_office:brand=PostNL", + "then": { + "en": "This location is a PostNL-point" + }, + "hideInAnswer": { + "and": [ + "_country!=nl", + "_country!=be" + ] + } + }, + { + "if": "post_office:brand=bpost", + "then": { + "en": "This location offers services for bpost" + }, + "hideInAnswer": "_country!=be" + } + ] + }, + { + "id": "letter-from", + "render": { + "en": "You can post letters with these companies: {post_office:letter_from}" + }, + "question": { + "en": "Can you post a letter here?" + }, + "freeform": { + "key": "post_office:letter_from", + "type": "string" + }, + "mappings": [ + { + "if": "post_office:letter_from=yes", + "then": { + "en": "You can post letters here" + } + }, + { + "if": "post_office:letter_from=no", + "then": { + "en": "You can't post letters here" + } + } + ] + }, + { + "id": "parcel-from", + "render": { + "en": "You can post parcels with these companies: {post_office:parcel_from}" + }, + "question": { + "en": "Can you send a parcel here?" + }, + "freeform": { + "key": "post_office:parcel_from", + "type": "string" + }, + "mappings": [ + { + "if": "post_office:parcel_from=yes", + "then": { + "en": "You can send parcels here" + } + }, + { + "if": "post_office:parcel_from=no", + "then": { + "en": "You can't send parcels here" + } + } + ] + }, + { + "id": "parcel-pickup", + "render": { + "en": "You can pick up parcels from these companies: {post_office:parcel_pickup}" + }, + "question": { + "en": "Can you pick up missed parcels here?" + }, + "freeform": { + "key": "post_office:parcel_pickup", + "type": "string" + }, + "mappings": [ + { + "if": "post_office:parcel_pickup=yes", + "then": { + "en": "You can pick up missed parcels here" + } + }, + { + "if": "post_office:parcel_pickup=no", + "then": { + "en": "You can't pick up missed parcels here" + } + } + ] + }, + { + "id": "parcel-to", + "render": { + "en": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}" + }, + "question": { + "en": "Can you send parcels to here for pickup?" + }, + "freeform": { + "key": "post_office:parcel_to", + "type": "string" + }, + "mappings": [ + { + "if": "post_office:parcel_to=yes", + "then": { + "en": "You can send parcels to here for pickup" + } + }, + { + "if": "post_office:parcel_to=no", + "then": { + "en": "You can't send parcels to here for pickup" + } + } + ] + }, + { + "id": "stamps", + "render": { + "en": "You can buy stamps from companies: {post_office:stamps}" + }, + "question": { + "en": "Can you buy stamps here?" + }, + "freeform": { + "key": "post_office:stamps", + "type": "string" + }, + "mappings": [ + { + "if": "post_office:stamps=yes", + "then": { + "en": "You can buy stamps here" + } + }, + { + "if": "post_office:stamps=no", + "then": { + "en": "You can't buy stamps here" + } + } + ] + } + ], + "presets": [ + { + "tags": [ + "amenity=post_office" + ], + "title": { + "en": "a post office", + "de": "eine Poststelle", + "ru": "Почтовое отделение", + "zh_Hant": "郵局", + "id": "Kantor Pos", + "hu": "Posta", + "nl": "een postkantoor", + "ca": "una oficina de correus", + "es": "una oficina de correo", + "nb_NO": "et postkontor", + "fr": "un bureau de poste" + } + } + ], + "filter": [ + { + "id": "is_open", + "options": [ + { + "question": { + "en": "Currently open", + "de": "Aktuell geöffnet", + "zh_Hant": "目前開放", + "id": "Saat ini buka", + "hu": "Most nyitva", + "nl": "Momenteel geopend", + "ca": "Actualment obert", + "es": "Actualmente abierta", + "fr": "Ouvert actuellement" + }, + "osmTags": "_isOpen=yes" + } + ] + } + ], + "mapRendering": [ + { + "icon": { + "render": "square:white;./assets/layers/postoffices/post_office.svg" + }, + "iconBadges": [ + { + "if": "opening_hours~*", + "then": "isOpen" + }, + { + "if": "shop~*", + "then": "./assets/themes/shops/shop.svg" + } + ], + "iconSize": "40,40,center", + "location": [ + "point", + "centroid" + ] + }, + { + "color": "#DADADA", + "width": "1" + } + ] +} \ No newline at end of file diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index eeb934ac2..afc77a95b 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -285,7 +285,7 @@ }, { "if": "theme=postboxes", - "then": "./assets/themes/postboxes/postbox.svg" + "then": "./assets/layers/postboxes/postbox.svg" }, { "if": "theme=rainbow_crossings", diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json index 95045bbed..a144cdb06 100644 --- a/assets/themes/postboxes/postboxes.json +++ b/assets/themes/postboxes/postboxes.json @@ -32,7 +32,7 @@ "fr": "Trouvez et ajoutez des bureaux de poste et boîtes à lettres sur cette carte. Utilisez cette carte où vous pouvez envoyer vos cartes postales ! :)
Vous avez trouvez une erreur ou une boîte à lettres est manquante ? Vous pouvez modifier cette carte avec un compte OpenStreetMap gratuit. " }, "maintainer": "nicolelaine", - "icon": "./assets/themes/postboxes/postbox.svg", + "icon": "./assets/layers/postboxes/postbox.svg", "version": "0", "startLat": 53.5511, "startLon": 9.9937, @@ -44,273 +44,41 @@ "minNeededElements": 100 }, "layers": [ + "postboxes", + "postoffices", + "parcel_lockers", { - "id": "postboxes", - "name": { - "en": "Postboxes", - "de": "Briefkästen", - "ru": "Почтовые ящики", - "zh_Hant": "郵筒", - "id": "Kotak pos", - "hu": "Postaládák", - "nl": "Brievenbussen", - "ca": "Bústies", - "es": "Buzones de correo", - "nb_NO": "Postbokser", - "fr": "Boîtes à lettres" - }, - "minzoom": 12, - "source": { - "osmTags": "amenity=post_box" - }, - "title": { - "render": { - "en": "Postbox", - "de": "Briefkasten", - "ru": "Почтовый ящик", - "zh_Hant": "郵筒", - "id": "Kotak pos", - "hu": "Postaláda", - "nl": "Brievenbus", - "ca": "Bústia", - "es": "Buzón de correo", - "nb_NO": "Postboks", - "fr": "Boîte à lettres" - } - }, - "description": { - "en": "The layer showing postboxes.", - "de": "Die Ebene zeigt Briefkästen.", - "zh_Hant": "這圖層顯示郵筒。", - "id": "Layer yang memperlihatkan kotak pos.", - "hu": "A postaládákat megjelenítő réteg.", - "nl": "Deze laag toont brievenbussen.", - "es": "La capa que muestra buzones de correo.", - "fr": "Le calque montrant les boîtes à lettres." - }, - "tagRenderings": [ - "images", - { - "id": "minimap", - "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }" - } - ], - "presets": [ - { - "tags": [ - "amenity=post_box" - ], - "title": { - "en": "a postbox", - "de": "ein Briefkasten", - "ru": "почтовый ящик", - "zh_Hant": "郵筒", - "id": "kotak pos", - "hu": "postaláda", - "nl": "een brievenbus", - "ca": "una bústia", - "es": "un buzón de correo", - "fr": "une boîte à lettres" - } - } - ], - "deletion": { - "softDeletionTags": { - "and": [ - "amenity=", - "razed:amenity=post_box" - ] - } - }, - "mapRendering": [ - { - "icon": { - "render": "./assets/themes/postboxes/postbox.svg" - }, - "iconSize": { - "render": "40,40,bottom" - }, - "location": [ - "point", - "centroid" - ] + "builtin": "shops", + "override": { + "minzoom": 21, + "minzoomVisible": 21, + "description": { + "en": "Add a new post partner to the map in an existing shop" }, - { - "color": { - "render": "#DADADA" - }, - "width": { - "render": "1" - } - } - ] - }, - { - "id": "postoffices", - "name": { - "en": "Post offices", - "de": "Poststellen", - "ru": "Почтовые отделения", - "zh_Hant": "郵局", - "id": "Kantor pos", - "hu": "Posták", - "nl": "Postkantoren", - "ca": "Oficines de correus", - "es": "Oficinas de correo", - "fr": "Bureaux de poste", - "nb_NO": "Postkontor" - }, - "minzoom": 12, - "source": { - "osmTags": "amenity=post_office" - }, - "title": { - "render": { - "en": "Post Office", - "de": "Poststelle", - "ru": "Почтовое отделение", - "zh_Hant": "郵局", - "id": "Kantor Pos", - "hu": "Posta", - "nl": "Postkantoor", - "ca": "Oficina de correus", - "es": "Oficina de Correo", - "fr": "Bureau de poste", - "nb_NO": "Postkontor" - } - }, - "description": { - "en": "A layer showing post offices.", - "de": "Eine Ebene mit Postämtern.", - "zh_Hant": "圖層顯示郵局。", - "id": "Layer yang menunjukkan kantor pos.", - "hu": "Postákat megjelenítő réteg.", - "nl": "Een laag die postkantoren toont.", - "es": "Una capa que muestra oficinas de correo.", - "fr": "Un claque montrant les bureaux de poste.", - "nb_NO": "Et lag som viser postkontor." - }, - "tagRenderings": [ - "images", - { - "id": "minimap", - "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }" - }, - { - "render": { - "en": "Opening Hours: {opening_hours_table()}", - "ru": "Часы работы: {opening_hours_table()}", - "zh_Hant": "開放時間：{opening_hours_table()}", - "id": "Jam Buka: {opening_hours_table()}", - "hu": "Nyitva tartás: {opening_hours_table()}", - "de": "Öffnungszeiten: {opening_hours_table()}", - "es": "Horas de Apertura: {opening_hours_table()}", - "nb_NO": "Åpningstider: {opening_hours_table()}", - "nl": "Openingsuren: {opening_hours_table()}", - "fr": "Heures d’ouverture : {opening_hours_table()}" - }, - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "question": { - "en": "What are the opening hours for this post office?", - "zh_Hant": "這間郵局的開放時間是？", - "id": "Jam berapa kantor pos ini buka?", - "hu": "Mikor van nyitva ez a posta?", - "de": "Wie sind die Öffnungszeiten dieser Poststelle?", - "es": "¿Cuáles son las horas de apertura para esta oficina de correos?", - "nl": "Wat zijn de openingsuren voor dit postkantoor?", - "fr": "Quelles sont les heures d’ouverture de ce bureau de poste ?" - }, - "mappings": [ - { - "if": "opening_hours=24/7", - "then": { - "en": "24/7 opened (including holidays)", - "de": "durchgehend geöffnet (auch an Feiertagen)", - "zh_Hant": "24/7 開放 (包括假日)", - "id": "Buka 24 jam (termasuk hari libur)", - "hu": "Éjjel-nappal nyitva (munkaszüneti napokon is)", - "es": "Abierta 24/7 (incluyendo festivos)", - "nl": "24/7 open (ook tijdens feestdagen)", - "fr": "Ouvert 24h/24 (jours fériés compris)", - "nb_NO": "Døgnåpent (inkludert helligdager)" - } - } - ], - "id": "OH" - } - ], - "presets": [ - { - "tags": [ - "amenity=post_office" - ], - "title": { - "en": "a post office", - "de": "eine Poststelle", - "ru": "Почтовое отделение", - "zh_Hant": "郵局", - "id": "Kantor Pos", - "hu": "Posta", - "nl": "een postkantoor", - "ca": "una oficina de correus", - "es": "una oficina de correo", - "nb_NO": "et postkontor", - "fr": "un bureau de poste" - } - } - ], - "filter": [ - { - "id": "is_open", - "options": [ - { - "question": { - "en": "Currently open", - "de": "Aktuell geöffnet", - "zh_Hant": "目前開放", - "id": "Saat ini buka", - "hu": "Most nyitva", - "nl": "Momenteel geopend", - "ca": "Actualment obert", - "es": "Actualmente abierta", - "fr": "Ouvert actuellement" + "+tagRenderings": [ + { + "id": "post_partner", + "question": { + "en": "Is this shop a post partner?" + }, + "mappings": [ + { + "if": "post_office=post_partner", + "then": { + "en": "This shop is a post partner" + } }, - "osmTags": "_isOpen=yes" - } - ] - } - ], - "mapRendering": [ - { - "icon": { - "render": "square:white;./assets/themes/postboxes/post_office.svg" - }, - "iconBadges": [ - { - "if": "opening_hours~*", - "then": "isOpen" - } - ], - "iconSize": { - "render": "40,40,bottom" - }, - "location": [ - "point", - "centroid" - ] - }, - { - "color": { - "render": "#DADADA" - }, - "width": { - "render": "1" + { + "if": "post_office=", + "then": { + "en": "This shop is not a post partner" + } + } + ] } - } - ] + ], + "shownByDefault": false + } } ] } \ No newline at end of file From 51c00cf4e1b229e711681fc7dfa72a816ff170d2 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 11 Aug 2022 13:42:41 +0200 Subject: [PATCH 2/6] Added tagrenderings and filter --- .../layers/parcel_lockers/parcel_lockers.json | 179 +++++++++++++++++- 1 file changed, 174 insertions(+), 5 deletions(-) diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json index 526e4a55a..cac6ad666 100644 --- a/assets/layers/parcel_lockers/parcel_lockers.json +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -8,7 +8,17 @@ }, "minzoom": 12, "source": { - "osmTags": "amenity=parcel_locker" + "osmTags": { + "or": [ + "amenity=parcel_locker", + { + "and": [ + "amenity=vending_machine", + "vending=parcel_pickup;parcel_mail_in" + ] + } + ] + } }, "presets": [ { @@ -37,15 +47,174 @@ } ] }, - "tagRenderings": [], - "filter": [], + "tagRenderings": [ + "images", + { + "id": "brand", + "question": { + "en": "What is the brand of the parcel locker?" + }, + "freeform": { + "key": "brand", + "type": "string", + "placeholder": { + "en": "Brand" + } + }, + "mappings": [ + { + "if": "brand=Amazon Locker", + "then": { + "en": "This is an Amazon Locker" + }, + "addExtraTags": [ + "brand:wikidata=Q16974764", + "brand:wikipedia=en:Amazon Locker", + "operator=Amazon" + ] + }, + { + "if": "brand=DHL Packstation", + "then": { + "en": "This is a DHL Packstation" + }, + "addExtraTags": [ + "brand:wikidata=Q1766703", + "brand:wikipedia=de:Packstation", + "operator=DHL" + ], + "hideInAnswer": "_country!=de" + }, + { + "if": "brand=Pickup Station", + "then": { + "en": "This is a DPD Pickup Station" + }, + "addExtraTags": [ + "operator=DPD" + ], + "hideInAnswer": "_country!=pl" + }, + { + "if": "brand=PostNL", + "then": { + "en": "This is a PostNL Parcel Locker", + "nl": "Dit is een PostNL pakketautomaat" + }, + "addExtraTags": [ + "operator=PostNL" + ], + "hideInAnswer": "_country!=nl" + } + ], + "render": { + "en": "This is a {brand} parcel locker" + } + }, + { + "id": "operator", + "question": { + "en": "What is the operator of the parcel locker?" + }, + "freeform": { + "key": "operator", + "type": "string", + "placeholder": { + "en": "Operator" + } + }, + "render": { + "en": "This parcel locker is operated by {operator}" + } + }, + "opening_hours", + { + "id": "ref", + "question": { + "en": "What is the reference number/identifier of this parcel locker?" + }, + "freeform": { + "key": "ref", + "type": "string", + "placeholder": { + "en": "Reference" + } + }, + "render": { + "en": "This parcel locker has the reference {ref}" + } + }, + { + "id": "mail-in", + "question": { + "en": "Can you send packages from this parcel locker?" + }, + "mappings": [ + { + "if": "parcel_mail_in=yes", + "then": { + "en": "You can send packages from this parcel locker" + } + }, + { + "if": "parcel_mail_in=no", + "then": { + "en": "You can't send packages from this parcel locker" + } + } + ], + "condition": "amenity=parcel_locker" + }, + { + "id": "pickup", + "question": { + "en": "Can you pick up packages from this parcel locker?" + }, + "mappings": [ + { + "if": "parcel_pickup=yes", + "then": { + "en": "You can pick up packages from this parcel locker" + } + }, + { + "if": "parcel_pickup=no", + "then": { + "en": "You can't pick up packages from this parcel locker" + } + } + ], + "condition": "amenity=parcel_locker" + } + ], + "filter": [ + { + "id": "is_open", + "options": [ + { + "question": { + "en": "Currently open", + "de": "Aktuell geöffnet", + "zh_Hant": "目前開放", + "id": "Saat ini buka", + "hu": "Most nyitva", + "nl": "Momenteel geopend", + "ca": "Actualment obert", + "es": "Actualmente abierta", + "fr": "Ouvert actuellement" + }, + "osmTags": "_isOpen=yes" + } + ] + } + ], "allowMove": { "enableImproveAccuracy": true }, - "deletion": {}, + "deletion": true, "mapRendering": [ { - "icon": "./assets/layers/parcel_lockers/parcel_lockers.svg", + "icon": "circle:white;./assets/layers/parcel_lockers/parcel_lockers.svg", "iconBadges": [ { "if": "opening_hours~*", From 6b2f61745ed089f730e059c1f346ff63ae58190b Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 11 Aug 2022 13:54:05 +0200 Subject: [PATCH 3/6] Change icon --- assets/layers/parcel_lockers/parcel_lockers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json index cac6ad666..b1e8a8bd7 100644 --- a/assets/layers/parcel_lockers/parcel_lockers.json +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -214,7 +214,7 @@ "deletion": true, "mapRendering": [ { - "icon": "circle:white;./assets/layers/parcel_lockers/parcel_lockers.svg", + "icon": "square:white;./assets/layers/parcel_lockers/parcel_lockers.svg", "iconBadges": [ { "if": "opening_hours~*", From 601f1732c6d26c1d49ae1b7be4ef589eb6c732e5 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 11 Aug 2022 14:03:46 +0200 Subject: [PATCH 4/6] Regenerate translations --- langs/layers/ca.json | 42 +++++++ langs/layers/de.json | 63 ++++++++++ langs/layers/en.json | 238 ++++++++++++++++++++++++++++++++++++++ langs/layers/es.json | 55 +++++++++ langs/layers/fr.json | 55 +++++++++ langs/layers/hu.json | 55 +++++++++ langs/layers/id.json | 55 +++++++++ langs/layers/nb_NO.json | 28 +++++ langs/layers/nl.json | 74 ++++++++++++ langs/layers/ru.json | 27 +++++ langs/layers/zh_Hant.json | 55 +++++++++ langs/themes/ca.json | 35 ------ langs/themes/de.json | 46 -------- langs/themes/en.json | 56 +++------ langs/themes/es.json | 46 -------- langs/themes/fr.json | 46 -------- langs/themes/hu.json | 46 -------- langs/themes/id.json | 48 -------- langs/themes/nb_NO.json | 30 ----- langs/themes/nl.json | 46 -------- langs/themes/ru.json | 31 ----- langs/themes/zh_Hant.json | 46 -------- 22 files changed, 762 insertions(+), 461 deletions(-) diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 8cf1643f7..2164bdb4e 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -801,6 +801,17 @@ } } }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "Actualment obert" + } + } + } + } + }, "parking": { "name": "Aparcament" }, @@ -853,6 +864,37 @@ "render": "Parc infantil" } }, + "postboxes": { + "name": "Bústies", + "presets": { + "0": { + "title": "una bústia" + } + }, + "title": { + "render": "Bústia" + } + }, + "postoffices": { + "filter": { + "0": { + "options": { + "0": { + "question": "Actualment obert" + } + } + } + }, + "name": "Oficines de correus", + "presets": { + "0": { + "title": "una oficina de correus" + } + }, + "title": { + "render": "Oficina de correus" + } + }, "public_bookcase": { "name": "Bústies per llibres", "presets": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 75df80ec6..4d49d6cde 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5018,6 +5018,17 @@ } } }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "Aktuell geöffnet" + } + } + } + } + }, "parking": { "description": "Eine Ebene mit Parkplätzen", "name": "Parkplätze", @@ -5308,6 +5319,58 @@ "render": "Spielplatz" } }, + "postboxes": { + "description": "Die Ebene zeigt Briefkästen.", + "name": "Briefkästen", + "presets": { + "0": { + "title": "ein Briefkasten" + } + }, + "title": { + "render": "Briefkasten" + } + }, + "postoffices": { + "description": "Eine Ebene mit Postämtern.", + "filter": { + "0": { + "options": { + "0": { + "question": "Aktuell geöffnet" + } + } + } + }, + "name": "Poststellen", + "presets": { + "0": { + "title": "eine Poststelle" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "durchgehend geöffnet (auch an Feiertagen)" + } + }, + "question": "Wie sind die Öffnungszeiten dieser Poststelle?", + "render": "Öffnungszeiten: {opening_hours_table()}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Postfiliale im Einzelhandel" + }, + "1": { + "then": "Postfiliale im {name}" + } + }, + "render": "Poststelle" + } + }, "public_bookcase": { "description": "Ein Bücherschrank am Straßenrand mit Büchern, für jedermann zugänglich", "filter": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 3dc11e591..82d18f2c4 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5049,6 +5049,91 @@ } } }, + "parcel_lockers": { + "description": "Layer showing parcel lockers for collecting and sending parcels.", + "filter": { + "0": { + "options": { + "0": { + "question": "Currently open" + } + } + } + }, + "name": "Parcel Lockers", + "presets": { + "0": { + "title": "a parcel locker" + } + }, + "tagRenderings": { + "brand": { + "freeform": { + "placeholder": "Brand" + }, + "mappings": { + "0": { + "then": "This is an Amazon Locker" + }, + "1": { + "then": "This is a DHL Packstation" + }, + "2": { + "then": "This is a DPD Pickup Station" + }, + "3": { + "then": "This is a PostNL Parcel Locker" + } + }, + "question": "What is the brand of the parcel locker?", + "render": "This is a {brand} parcel locker" + }, + "mail-in": { + "mappings": { + "0": { + "then": "You can send packages from this parcel locker" + }, + "1": { + "then": "You can't send packages from this parcel locker" + } + }, + "question": "Can you send packages from this parcel locker?" + }, + "operator": { + "freeform": { + "placeholder": "Operator" + }, + "question": "What is the operator of the parcel locker?", + "render": "This parcel locker is operated by {operator}" + }, + "pickup": { + "mappings": { + "0": { + "then": "You can pick up packages from this parcel locker" + }, + "1": { + "then": "You can't pick up packages from this parcel locker" + } + }, + "question": "Can you pick up packages from this parcel locker?" + }, + "ref": { + "freeform": { + "placeholder": "Reference" + }, + "question": "What is the reference number/identifier of this parcel locker?", + "render": "This parcel locker has the reference {ref}" + } + }, + "title": { + "mappings": { + "0": { + "then": "{brand} parcel locker" + } + }, + "render": "Parcel Locker" + } + }, "parking": { "description": "A layer showing car parkings", "name": "Parking", @@ -5339,6 +5424,159 @@ "render": "Playground" } }, + "postboxes": { + "description": "The layer showing postboxes.", + "name": "Postboxes", + "presets": { + "0": { + "title": "a postbox" + } + }, + "title": { + "render": "Postbox" + } + }, + "postoffices": { + "description": "A layer showing post offices.", + "filter": { + "0": { + "options": { + "0": { + "question": "Currently open" + } + } + } + }, + "name": "Post offices", + "presets": { + "0": { + "title": "a post office" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "24/7 opened (including holidays)" + } + }, + "question": "What are the opening hours for this post office?", + "render": "Opening Hours: {opening_hours_table()}" + }, + "letter-from": { + "mappings": { + "0": { + "then": "You can post letters here" + }, + "1": { + "then": "You can't post letters here" + } + }, + "question": "Can you post a letter here?", + "render": "You can post letters with these companies: {post_office:letter_from}" + }, + "parcel-from": { + "mappings": { + "0": { + "then": "You can send parcels here" + }, + "1": { + "then": "You can't send parcels here" + } + }, + "question": "Can you send a parcel here?", + "render": "You can post parcels with these companies: {post_office:parcel_from}" + }, + "parcel-pickup": { + "mappings": { + "0": { + "then": "You can pick up missed parcels here" + }, + "1": { + "then": "You can't pick up missed parcels here" + } + }, + "question": "Can you pick up missed parcels here?", + "render": "You can pick up parcels from these companies: {post_office:parcel_pickup}" + }, + "parcel-to": { + "mappings": { + "0": { + "then": "You can send parcels to here for pickup" + }, + "1": { + "then": "You can't send parcels to here for pickup" + } + }, + "question": "Can you send parcels to here for pickup?", + "render": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}" + }, + "partner-brand": { + "mappings": { + "0": { + "then": "This location offers services for DHL" + }, + "1": { + "then": "This location offers services for DPD" + }, + "2": { + "then": "This location offers services for GLS" + }, + "3": { + "then": "This location offers services for UPS" + }, + "4": { + "then": "This location is a DHL Paketshop" + }, + "5": { + "then": "This location is a Hermes PaketShop" + }, + "6": { + "then": "This location is a PostNL-point" + }, + "7": { + "then": "This location offers services for bpost" + } + }, + "question": "For which brand does this location offer services?", + "render": "This location offers services for {post_office:brand}" + }, + "post_partner": { + "mappings": { + "0": { + "then": "This shop is a post partner" + }, + "1": { + "then": "This shop is not a post partner" + } + }, + "question": "Is this a post partner?" + }, + "stamps": { + "mappings": { + "0": { + "then": "You can buy stamps here" + }, + "1": { + "then": "You can't buy stamps here" + } + }, + "question": "Can you buy stamps here?", + "render": "You can buy stamps from companies: {post_office:stamps}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Post partner at a shop" + }, + "1": { + "then": "Post partner at {name}" + } + }, + "render": "Post Office" + } + }, "public_bookcase": { "description": "A streetside cabinet with books, accessible to anyone", "filter": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 9f45a974a..2f909769b 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -3000,6 +3000,17 @@ } } }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "Actualmente abierta" + } + } + } + } + }, "parking": { "description": "Una capa que muestra aparcamientos para coches", "name": "Aparcamiento", @@ -3125,6 +3136,50 @@ } } }, + "postboxes": { + "description": "La capa que muestra buzones de correo.", + "name": "Buzones de correo", + "presets": { + "0": { + "title": "un buzón de correo" + } + }, + "title": { + "render": "Buzón de correo" + } + }, + "postoffices": { + "description": "Una capa que muestra oficinas de correo.", + "filter": { + "0": { + "options": { + "0": { + "question": "Actualmente abierta" + } + } + } + }, + "name": "Oficinas de correo", + "presets": { + "0": { + "title": "una oficina de correo" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "Abierta 24/7 (incluyendo festivos)" + } + }, + "question": "¿Cuáles son las horas de apertura para esta oficina de correos?", + "render": "Horas de Apertura: {opening_hours_table()}" + } + }, + "title": { + "render": "Oficina de Correo" + } + }, "public_bookcase": { "filter": { "2": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index e9e10cb50..1fe3833d6 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -3149,6 +3149,17 @@ } } }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "Ouvert actuellement" + } + } + } + } + }, "parking": { "description": "Un calque montrant les parkings", "name": "Lieu de stationnement", @@ -3375,6 +3386,50 @@ "render": "Aire de jeu" } }, + "postboxes": { + "description": "Le calque montrant les boîtes à lettres.", + "name": "Boîtes à lettres", + "presets": { + "0": { + "title": "une boîte à lettres" + } + }, + "title": { + "render": "Boîte à lettres" + } + }, + "postoffices": { + "description": "Un claque montrant les bureaux de poste.", + "filter": { + "0": { + "options": { + "0": { + "question": "Ouvert actuellement" + } + } + } + }, + "name": "Bureaux de poste", + "presets": { + "0": { + "title": "un bureau de poste" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "Ouvert 24h/24 (jours fériés compris)" + } + }, + "question": "Quelles sont les heures d’ouverture de ce bureau de poste ?", + "render": "Heures d’ouverture : {opening_hours_table()}" + } + }, + "title": { + "render": "Bureau de poste" + } + }, "public_bookcase": { "description": "Une armoire ou une boite contenant des livres en libre accès", "name": "Microbibliothèque", diff --git a/langs/layers/hu.json b/langs/layers/hu.json index 1e00fef50..c22c1e384 100644 --- a/langs/layers/hu.json +++ b/langs/layers/hu.json @@ -607,6 +607,61 @@ "render": "Hackerspace" } }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "Most nyitva" + } + } + } + } + }, + "postboxes": { + "description": "A postaládákat megjelenítő réteg.", + "name": "Postaládák", + "presets": { + "0": { + "title": "postaláda" + } + }, + "title": { + "render": "Postaláda" + } + }, + "postoffices": { + "description": "Postákat megjelenítő réteg.", + "filter": { + "0": { + "options": { + "0": { + "question": "Most nyitva" + } + } + } + }, + "name": "Posták", + "presets": { + "0": { + "title": "Posta" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "Éjjel-nappal nyitva (munkaszüneti napokon is)" + } + }, + "question": "Mikor van nyitva ez a posta?", + "render": "Nyitva tartás: {opening_hours_table()}" + } + }, + "title": { + "render": "Posta" + } + }, "public_bookcase": { "description": "Egy utcai szekrény könyvekkel, amelyet bárki használhat", "filter": { diff --git a/langs/layers/id.json b/langs/layers/id.json index 05147e9de..eb67534e1 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -356,6 +356,17 @@ } } }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "Saat ini buka" + } + } + } + } + }, "playground": { "tagRenderings": { "playground-email": { @@ -366,6 +377,50 @@ } } }, + "postboxes": { + "description": "Layer yang memperlihatkan kotak pos.", + "name": "Kotak pos", + "presets": { + "0": { + "title": "kotak pos" + } + }, + "title": { + "render": "Kotak pos" + } + }, + "postoffices": { + "description": "Layer yang menunjukkan kantor pos.", + "filter": { + "0": { + "options": { + "0": { + "question": "Saat ini buka" + } + } + } + }, + "name": "Kantor pos", + "presets": { + "0": { + "title": "Kantor Pos" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "Buka 24 jam (termasuk hari libur)" + } + }, + "question": "Jam berapa kantor pos ini buka?", + "render": "Jam Buka: {opening_hours_table()}" + } + }, + "title": { + "render": "Kantor Pos" + } + }, "tree_node": { "presets": { "2": { diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json index 5b9eb9320..2d07f6cd4 100644 --- a/langs/layers/nb_NO.json +++ b/langs/layers/nb_NO.json @@ -341,6 +341,34 @@ "render": "Brannhydrant" } }, + "postboxes": { + "name": "Postbokser", + "title": { + "render": "Postboks" + } + }, + "postoffices": { + "description": "Et lag som viser postkontor.", + "name": "Postkontor", + "presets": { + "0": { + "title": "et postkontor" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "Døgnåpent (inkludert helligdager)" + } + }, + "render": "Åpningstider: {opening_hours_table()}" + } + }, + "title": { + "render": "Postkontor" + } + }, "windturbine": { "units": { "0": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index a3327973c..f4cee6f2b 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4823,6 +4823,31 @@ } } }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "Momenteel geopend" + } + } + } + }, + "presets": { + "0": { + "title": "een pakketautomaat" + } + }, + "tagRenderings": { + "brand": { + "mappings": { + "3": { + "then": "Dit is een PostNL pakketautomaat" + } + } + } + } + }, "parking": { "description": "Deze laag toont autoparkings", "name": "Parking", @@ -5128,6 +5153,55 @@ "render": "Speeltuin" } }, + "postboxes": { + "description": "Deze laag toont brievenbussen.", + "name": "Brievenbussen", + "presets": { + "0": { + "title": "een brievenbus" + } + }, + "title": { + "render": "Brievenbus" + } + }, + "postoffices": { + "description": "Een laag die postkantoren toont.", + "filter": { + "0": { + "options": { + "0": { + "question": "Momenteel geopend" + } + } + } + }, + "name": "Postkantoren", + "presets": { + "0": { + "title": "een postkantoor" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "24/7 open (ook tijdens feestdagen)" + } + }, + "question": "Wat zijn de openingsuren voor dit postkantoor?", + "render": "Openingsuren: {opening_hours_table()}" + } + }, + "title": { + "mappings": { + "0": { + "then": "Postpartner in een winkel" + } + }, + "render": "Postkantoor" + } + }, "public_bookcase": { "description": "Een straatkastje met boeken voor iedereen", "filter": { diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 163beb679..1fd003510 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1263,6 +1263,33 @@ "render": "Детская площадка" } }, + "postboxes": { + "name": "Почтовые ящики", + "presets": { + "0": { + "title": "почтовый ящик" + } + }, + "title": { + "render": "Почтовый ящик" + } + }, + "postoffices": { + "name": "Почтовые отделения", + "presets": { + "0": { + "title": "Почтовое отделение" + } + }, + "tagRenderings": { + "OH": { + "render": "Часы работы: {opening_hours_table()}" + } + }, + "title": { + "render": "Почтовое отделение" + } + }, "public_bookcase": { "description": "Уличный шкаф с книгами, доступными для всех", "name": "Книжные шкафы", diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json index f9a2f9607..f5c907112 100644 --- a/langs/layers/zh_Hant.json +++ b/langs/layers/zh_Hant.json @@ -562,6 +562,61 @@ "description": "顯示消防栓的地圖圖層。", "name": "消防栓地圖" }, + "parcel_lockers": { + "filter": { + "0": { + "options": { + "0": { + "question": "目前開放" + } + } + } + } + }, + "postboxes": { + "description": "這圖層顯示郵筒。", + "name": "郵筒", + "presets": { + "0": { + "title": "郵筒" + } + }, + "title": { + "render": "郵筒" + } + }, + "postoffices": { + "description": "圖層顯示郵局。", + "filter": { + "0": { + "options": { + "0": { + "question": "目前開放" + } + } + } + }, + "name": "郵局", + "presets": { + "0": { + "title": "郵局" + } + }, + "tagRenderings": { + "OH": { + "mappings": { + "0": { + "then": "24/7 開放 (包括假日)" + } + }, + "question": "這間郵局的開放時間是？", + "render": "開放時間：{opening_hours_table()}" + } + }, + "title": { + "render": "郵局" + } + }, "windturbine": { "name": "風機", "presets": { diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 5d76fd9dc..7a5ea1800 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -419,41 +419,6 @@ "shortDescription": "Codis postals", "title": "Codis postals" }, - "postboxes": { - "layers": { - "0": { - "name": "Bústies", - "presets": { - "0": { - "title": "una bústia" - } - }, - "title": { - "render": "Bústia" - } - }, - "1": { - "filter": { - "0": { - "options": { - "0": { - "question": "Actualment obert" - } - } - } - }, - "name": "Oficines de correus", - "presets": { - "0": { - "title": "una oficina de correus" - } - }, - "title": { - "render": "Oficina de correus" - } - } - } - }, "shops": { "title": "Open Shop Map" }, diff --git a/langs/themes/de.json b/langs/themes/de.json index 954a88dd2..e252d4646 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -888,52 +888,6 @@ }, "postboxes": { "description": "Auf dieser Karte können Sie Daten von Poststellen und Briefkästen finden und ergänzen. Sie können diese Karte nutzen, um herauszufinden, wo Sie Ihre nächste Postkarte versenden können :)
Haben Sie einen Fehler entdeckt oder fehlt ein Briefkasten? Sie können die Kartenddaten mit einem kostenlosen OpenStreetMap-Konto bearbeiten. ", - "layers": { - "0": { - "description": "Die Ebene zeigt Briefkästen.", - "name": "Briefkästen", - "presets": { - "0": { - "title": "ein Briefkasten" - } - }, - "title": { - "render": "Briefkasten" - } - }, - "1": { - "description": "Eine Ebene mit Postämtern.", - "filter": { - "0": { - "options": { - "0": { - "question": "Aktuell geöffnet" - } - } - } - }, - "name": "Poststellen", - "presets": { - "0": { - "title": "eine Poststelle" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "durchgehend geöffnet (auch an Feiertagen)" - } - }, - "question": "Wie sind die Öffnungszeiten dieser Poststelle?", - "render": "Öffnungszeiten: {opening_hours_table()}" - } - }, - "title": { - "render": "Poststelle" - } - } - }, "shortDescription": "Eine Karte die Briefkästen und Poststellen anzeigt", "title": "Post- und Briefkastenkarte" }, diff --git a/langs/themes/en.json b/langs/themes/en.json index b69461ddd..f12db62b5 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -889,48 +889,22 @@ "postboxes": { "description": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. ", "layers": { - "0": { - "description": "The layer showing postboxes.", - "name": "Postboxes", - "presets": { - "0": { - "title": "a postbox" - } - }, - "title": { - "render": "Postbox" - } - }, - "1": { - "description": "A layer showing post offices.", - "filter": { - "0": { - "options": { - "0": { - "question": "Currently open" - } + "3": { + "override": { + "+tagRenderings": { + "0": { + "mappings": { + "0": { + "then": "This shop is a post partner" + }, + "1": { + "then": "This shop is not a post partner" + } + }, + "question": "Is this shop a post partner?" } - } - }, - "name": "Post offices", - "presets": { - "0": { - "title": "a post office" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "24/7 opened (including holidays)" - } - }, - "question": "What are the opening hours for this post office?", - "render": "Opening Hours: {opening_hours_table()}" - } - }, - "title": { - "render": "Post Office" + }, + "description": "Add a new post partner to the map in an existing shop" } } }, diff --git a/langs/themes/es.json b/langs/themes/es.json index 8bdf32655..dbafd095b 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -549,52 +549,6 @@ }, "postboxes": { "description": "En este mapa puedes encontrar y añadir datos de oficinas de correo y buzones de correo. ¡Puedes utilizar este mapa para encontrar donde puedes enviar tu próxima postal! :)
¿Has encontrado un error o algo que falta? Puedes editar este mapa con una cuenta de OpenStreetMap gratuíta. ", - "layers": { - "0": { - "description": "La capa que muestra buzones de correo.", - "name": "Buzones de correo", - "presets": { - "0": { - "title": "un buzón de correo" - } - }, - "title": { - "render": "Buzón de correo" - } - }, - "1": { - "description": "Una capa que muestra oficinas de correo.", - "filter": { - "0": { - "options": { - "0": { - "question": "Actualmente abierta" - } - } - } - }, - "name": "Oficinas de correo", - "presets": { - "0": { - "title": "una oficina de correo" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "Abierta 24/7 (incluyendo festivos)" - } - }, - "question": "¿Cuáles son las horas de apertura para esta oficina de correos?", - "render": "Horas de Apertura: {opening_hours_table()}" - } - }, - "title": { - "render": "Oficina de Correo" - } - } - }, "shortDescription": "Un mapa que muestra buzones y oficinas de correo" }, "shops": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index ebad67004..db3beace1 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -888,52 +888,6 @@ }, "postboxes": { "description": "Trouvez et ajoutez des bureaux de poste et boîtes à lettres sur cette carte. Utilisez cette carte où vous pouvez envoyer vos cartes postales ! :)
Vous avez trouvez une erreur ou une boîte à lettres est manquante ? Vous pouvez modifier cette carte avec un compte OpenStreetMap gratuit. ", - "layers": { - "0": { - "description": "Le calque montrant les boîtes à lettres.", - "name": "Boîtes à lettres", - "presets": { - "0": { - "title": "une boîte à lettres" - } - }, - "title": { - "render": "Boîte à lettres" - } - }, - "1": { - "description": "Un claque montrant les bureaux de poste.", - "filter": { - "0": { - "options": { - "0": { - "question": "Ouvert actuellement" - } - } - } - }, - "name": "Bureaux de poste", - "presets": { - "0": { - "title": "un bureau de poste" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "Ouvert 24h/24 (jours fériés compris)" - } - }, - "question": "Quelles sont les heures d’ouverture de ce bureau de poste ?", - "render": "Heures d’ouverture : {opening_hours_table()}" - } - }, - "title": { - "render": "Bureau de poste" - } - } - }, "shortDescription": "Une carte des bureaux de poste et des boîtes à lettres", "title": "Carte des Bureaux de Poste et Boîtes à Lettres" }, diff --git a/langs/themes/hu.json b/langs/themes/hu.json index 964fde035..a4f0c9653 100644 --- a/langs/themes/hu.json +++ b/langs/themes/hu.json @@ -345,52 +345,6 @@ }, "postboxes": { "description": "Ezen a térképen postahivatalok és postaládák adatait találod és egészítheted ki. Utánanézhetsz, hogy hol adhatod fel a következő képeslapodat! :)
Hibát találtál, vagy hiányzik egy postaláda? Ezt a térképet mindössze egy ingyenes OpenStreetMap-fiókkal szerkesztheted. ", - "layers": { - "0": { - "description": "A postaládákat megjelenítő réteg.", - "name": "Postaládák", - "presets": { - "0": { - "title": "postaláda" - } - }, - "title": { - "render": "Postaláda" - } - }, - "1": { - "description": "Postákat megjelenítő réteg.", - "filter": { - "0": { - "options": { - "0": { - "question": "Most nyitva" - } - } - } - }, - "name": "Posták", - "presets": { - "0": { - "title": "Posta" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "Éjjel-nappal nyitva (munkaszüneti napokon is)" - } - }, - "question": "Mikor van nyitva ez a posta?", - "render": "Nyitva tartás: {opening_hours_table()}" - } - }, - "title": { - "render": "Posta" - } - } - }, "shortDescription": "Posták és postaládák térképe", "title": "Posta- és postaládatérkép" }, diff --git a/langs/themes/id.json b/langs/themes/id.json index addb20850..abc60c194 100644 --- a/langs/themes/id.json +++ b/langs/themes/id.json @@ -148,54 +148,6 @@ "shortDescription": "Kode pos", "title": "Kode pos" }, - "postboxes": { - "layers": { - "0": { - "description": "Layer yang memperlihatkan kotak pos.", - "name": "Kotak pos", - "presets": { - "0": { - "title": "kotak pos" - } - }, - "title": { - "render": "Kotak pos" - } - }, - "1": { - "description": "Layer yang menunjukkan kantor pos.", - "filter": { - "0": { - "options": { - "0": { - "question": "Saat ini buka" - } - } - } - }, - "name": "Kantor pos", - "presets": { - "0": { - "title": "Kantor Pos" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "Buka 24 jam (termasuk hari libur)" - } - }, - "question": "Jam berapa kantor pos ini buka?", - "render": "Jam Buka: {opening_hours_table()}" - } - }, - "title": { - "render": "Kantor Pos" - } - } - } - }, "trees": { "title": "Pohon" }, diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index c1f49dafc..a48b38175 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -443,36 +443,6 @@ "title": "Postkoder" }, "postboxes": { - "layers": { - "0": { - "name": "Postbokser", - "title": { - "render": "Postboks" - } - }, - "1": { - "description": "Et lag som viser postkontor.", - "name": "Postkontor", - "presets": { - "0": { - "title": "et postkontor" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "Døgnåpent (inkludert helligdager)" - } - }, - "render": "Åpningstider: {opening_hours_table()}" - } - }, - "title": { - "render": "Postkontor" - } - } - }, "shortDescription": "Postbokser og postkontor", "title": "Postboks og postkontor-kart" }, diff --git a/langs/themes/nl.json b/langs/themes/nl.json index f35622a8a..3e6c0b505 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -931,52 +931,6 @@ }, "postboxes": { "description": "Op deze kaart kan je informatie over brievenbussen en postkantoren vinden en toevoegen. Je kan deze kaart gebruiken om te achterhalen waar je je volgende postkaart naar kan sturen! :)
Zie je een fout of ontbreekt een brievenbus? Dan kan je deze kaart aanpassen met een gratis OpenStreetMap account. ", - "layers": { - "0": { - "description": "Deze laag toont brievenbussen.", - "name": "Brievenbussen", - "presets": { - "0": { - "title": "een brievenbus" - } - }, - "title": { - "render": "Brievenbus" - } - }, - "1": { - "description": "Een laag die postkantoren toont.", - "filter": { - "0": { - "options": { - "0": { - "question": "Momenteel geopend" - } - } - } - }, - "name": "Postkantoren", - "presets": { - "0": { - "title": "een postkantoor" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "24/7 open (ook tijdens feestdagen)" - } - }, - "question": "Wat zijn de openingsuren voor dit postkantoor?", - "render": "Openingsuren: {opening_hours_table()}" - } - }, - "title": { - "render": "Postkantoor" - } - } - }, "shortDescription": "Een kaart die brievenbussen en postkantoren toont", "title": "Brievenbussen en postkantoren" }, diff --git a/langs/themes/ru.json b/langs/themes/ru.json index edb9275b2..30d3aa496 100644 --- a/langs/themes/ru.json +++ b/langs/themes/ru.json @@ -341,37 +341,6 @@ "shortDescription": "Карта игровых площадок", "title": "Игровые площадки" }, - "postboxes": { - "layers": { - "0": { - "name": "Почтовые ящики", - "presets": { - "0": { - "title": "почтовый ящик" - } - }, - "title": { - "render": "Почтовый ящик" - } - }, - "1": { - "name": "Почтовые отделения", - "presets": { - "0": { - "title": "Почтовое отделение" - } - }, - "tagRenderings": { - "OH": { - "render": "Часы работы: {opening_hours_table()}" - } - }, - "title": { - "render": "Почтовое отделение" - } - } - } - }, "shops": { "title": "Открыть карту магазинов" }, diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index dee090b86..2f1b6683e 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -370,52 +370,6 @@ }, "postboxes": { "description": "在這份地圖你能找到與新增有關郵局與郵筒的資料，你可以用這份地圖找到寄送您下張明信片的地方！:)
發現錯誤或是有郵筒遺漏嗎？你可以用免費的開放街圖帳號來編輯。 ", - "layers": { - "0": { - "description": "這圖層顯示郵筒。", - "name": "郵筒", - "presets": { - "0": { - "title": "郵筒" - } - }, - "title": { - "render": "郵筒" - } - }, - "1": { - "description": "圖層顯示郵局。", - "filter": { - "0": { - "options": { - "0": { - "question": "目前開放" - } - } - } - }, - "name": "郵局", - "presets": { - "0": { - "title": "郵局" - } - }, - "tagRenderings": { - "OH": { - "mappings": { - "0": { - "then": "24/7 開放 (包括假日)" - } - }, - "question": "這間郵局的開放時間是？", - "render": "開放時間：{opening_hours_table()}" - } - }, - "title": { - "render": "郵局" - } - } - }, "shortDescription": "顯示郵筒與郵局的地圖", "title": "郵筒與郵局地圖" }, From 74995fcdadbb29b855e59a565232e3fa6c857af0 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 18 Aug 2022 19:51:58 +0200 Subject: [PATCH 5/6] Remove post_partner questions --- assets/layers/postoffices/postoffices.json | 267 +-------------------- assets/themes/postboxes/postboxes.json | 35 +-- langs/layers/de.json | 8 - langs/layers/en.json | 109 --------- langs/layers/nl.json | 5 - 5 files changed, 2 insertions(+), 422 deletions(-) diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json index 7cc67a30a..30db6f1db 100644 --- a/assets/layers/postoffices/postoffices.json +++ b/assets/layers/postoffices/postoffices.json @@ -35,34 +35,7 @@ "es": "Oficina de Correo", "fr": "Bureau de poste", "nb_NO": "Postkontor" - }, - "mappings": [ - { - "if": { - "and": [ - "post_office=post_partner", - "name=" - ] - }, - "then": { - "en": "Post partner at a shop", - "de": "Postfiliale im Einzelhandel", - "nl": "Postpartner in een winkel" - } - }, - { - "if": { - "and": [ - "post_office=post_partner", - "name~*" - ] - }, - "then": { - "en": "Post partner at {name}", - "de": "Postfiliale im {name}" - } - } - ] + } }, "description": { "en": "A layer showing post offices.", @@ -125,240 +98,6 @@ } ], "id": "OH" - }, - { - "id": "post_partner", - "question": { - "en": "Is this a post partner?" - }, - "condition": "post_office=post_partner", - "mappings": [ - { - "if": "post_office=post_partner", - "then": { - "en": "This shop is a post partner" - } - }, - { - "if": "post_office=", - "then": { - "en": "This shop is not a post partner" - }, - "addExtraTags": [ - "was:post_office=post_partner" - ] - } - ] - }, - { - "id": "partner-brand", - "render": { - "en": "This location offers services for {post_office:brand}" - }, - "question": { - "en": "For which brand does this location offer services?" - }, - "condition": "post_office=post_partner", - "freeform": { - "key": "post_office:brand", - "type": "string" - }, - "multiAnswer": true, - "mappings": [ - { - "if": "post_office:brand=DHL", - "then": { - "en": "This location offers services for DHL" - }, - "hideInAnswer": "_country=de" - }, - { - "if": "post_office:brand=DPD", - "then": { - "en": "This location offers services for DPD" - } - }, - { - "if": "post_office:brand=GLS", - "then": { - "en": "This location offers services for GLS" - } - }, - { - "if": "post_office:brand=UPS", - "then": { - "en": "This location offers services for UPS" - } - }, - { - "if": "post_office:brand=DHL Paketshop", - "then": { - "en": "This location is a DHL Paketshop" - }, - "hideInAnswer": "_country!=de" - }, - { - "if": "post_office:brand=Hermes PaketShop", - "then": { - "en": "This location is a Hermes PaketShop" - }, - "hideInAnswer": "_country!=de" - }, - { - "if": "post_office:brand=PostNL", - "then": { - "en": "This location is a PostNL-point" - }, - "hideInAnswer": { - "and": [ - "_country!=nl", - "_country!=be" - ] - } - }, - { - "if": "post_office:brand=bpost", - "then": { - "en": "This location offers services for bpost" - }, - "hideInAnswer": "_country!=be" - } - ] - }, - { - "id": "letter-from", - "render": { - "en": "You can post letters with these companies: {post_office:letter_from}" - }, - "question": { - "en": "Can you post a letter here?" - }, - "freeform": { - "key": "post_office:letter_from", - "type": "string" - }, - "mappings": [ - { - "if": "post_office:letter_from=yes", - "then": { - "en": "You can post letters here" - } - }, - { - "if": "post_office:letter_from=no", - "then": { - "en": "You can't post letters here" - } - } - ] - }, - { - "id": "parcel-from", - "render": { - "en": "You can post parcels with these companies: {post_office:parcel_from}" - }, - "question": { - "en": "Can you send a parcel here?" - }, - "freeform": { - "key": "post_office:parcel_from", - "type": "string" - }, - "mappings": [ - { - "if": "post_office:parcel_from=yes", - "then": { - "en": "You can send parcels here" - } - }, - { - "if": "post_office:parcel_from=no", - "then": { - "en": "You can't send parcels here" - } - } - ] - }, - { - "id": "parcel-pickup", - "render": { - "en": "You can pick up parcels from these companies: {post_office:parcel_pickup}" - }, - "question": { - "en": "Can you pick up missed parcels here?" - }, - "freeform": { - "key": "post_office:parcel_pickup", - "type": "string" - }, - "mappings": [ - { - "if": "post_office:parcel_pickup=yes", - "then": { - "en": "You can pick up missed parcels here" - } - }, - { - "if": "post_office:parcel_pickup=no", - "then": { - "en": "You can't pick up missed parcels here" - } - } - ] - }, - { - "id": "parcel-to", - "render": { - "en": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}" - }, - "question": { - "en": "Can you send parcels to here for pickup?" - }, - "freeform": { - "key": "post_office:parcel_to", - "type": "string" - }, - "mappings": [ - { - "if": "post_office:parcel_to=yes", - "then": { - "en": "You can send parcels to here for pickup" - } - }, - { - "if": "post_office:parcel_to=no", - "then": { - "en": "You can't send parcels to here for pickup" - } - } - ] - }, - { - "id": "stamps", - "render": { - "en": "You can buy stamps from companies: {post_office:stamps}" - }, - "question": { - "en": "Can you buy stamps here?" - }, - "freeform": { - "key": "post_office:stamps", - "type": "string" - }, - "mappings": [ - { - "if": "post_office:stamps=yes", - "then": { - "en": "You can buy stamps here" - } - }, - { - "if": "post_office:stamps=no", - "then": { - "en": "You can't buy stamps here" - } - } - ] } ], "presets": [ @@ -411,10 +150,6 @@ { "if": "opening_hours~*", "then": "isOpen" - }, - { - "if": "shop~*", - "then": "./assets/themes/shops/shop.svg" } ], "iconSize": "40,40,center", diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json index a144cdb06..bc3e45155 100644 --- a/assets/themes/postboxes/postboxes.json +++ b/assets/themes/postboxes/postboxes.json @@ -46,39 +46,6 @@ "layers": [ "postboxes", "postoffices", - "parcel_lockers", - { - "builtin": "shops", - "override": { - "minzoom": 21, - "minzoomVisible": 21, - "description": { - "en": "Add a new post partner to the map in an existing shop" - }, - "+tagRenderings": [ - { - "id": "post_partner", - "question": { - "en": "Is this shop a post partner?" - }, - "mappings": [ - { - "if": "post_office=post_partner", - "then": { - "en": "This shop is a post partner" - } - }, - { - "if": "post_office=", - "then": { - "en": "This shop is not a post partner" - } - } - ] - } - ], - "shownByDefault": false - } - } + "parcel_lockers" ] } \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index 4d49d6cde..c09925b90 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -5360,14 +5360,6 @@ } }, "title": { - "mappings": { - "0": { - "then": "Postfiliale im Einzelhandel" - }, - "1": { - "then": "Postfiliale im {name}" - } - }, "render": "Poststelle" } }, diff --git a/langs/layers/en.json b/langs/layers/en.json index 82d18f2c4..bba784f16 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -5462,118 +5462,9 @@ }, "question": "What are the opening hours for this post office?", "render": "Opening Hours: {opening_hours_table()}" - }, - "letter-from": { - "mappings": { - "0": { - "then": "You can post letters here" - }, - "1": { - "then": "You can't post letters here" - } - }, - "question": "Can you post a letter here?", - "render": "You can post letters with these companies: {post_office:letter_from}" - }, - "parcel-from": { - "mappings": { - "0": { - "then": "You can send parcels here" - }, - "1": { - "then": "You can't send parcels here" - } - }, - "question": "Can you send a parcel here?", - "render": "You can post parcels with these companies: {post_office:parcel_from}" - }, - "parcel-pickup": { - "mappings": { - "0": { - "then": "You can pick up missed parcels here" - }, - "1": { - "then": "You can't pick up missed parcels here" - } - }, - "question": "Can you pick up missed parcels here?", - "render": "You can pick up parcels from these companies: {post_office:parcel_pickup}" - }, - "parcel-to": { - "mappings": { - "0": { - "then": "You can send parcels to here for pickup" - }, - "1": { - "then": "You can't send parcels to here for pickup" - } - }, - "question": "Can you send parcels to here for pickup?", - "render": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}" - }, - "partner-brand": { - "mappings": { - "0": { - "then": "This location offers services for DHL" - }, - "1": { - "then": "This location offers services for DPD" - }, - "2": { - "then": "This location offers services for GLS" - }, - "3": { - "then": "This location offers services for UPS" - }, - "4": { - "then": "This location is a DHL Paketshop" - }, - "5": { - "then": "This location is a Hermes PaketShop" - }, - "6": { - "then": "This location is a PostNL-point" - }, - "7": { - "then": "This location offers services for bpost" - } - }, - "question": "For which brand does this location offer services?", - "render": "This location offers services for {post_office:brand}" - }, - "post_partner": { - "mappings": { - "0": { - "then": "This shop is a post partner" - }, - "1": { - "then": "This shop is not a post partner" - } - }, - "question": "Is this a post partner?" - }, - "stamps": { - "mappings": { - "0": { - "then": "You can buy stamps here" - }, - "1": { - "then": "You can't buy stamps here" - } - }, - "question": "Can you buy stamps here?", - "render": "You can buy stamps from companies: {post_office:stamps}" } }, "title": { - "mappings": { - "0": { - "then": "Post partner at a shop" - }, - "1": { - "then": "Post partner at {name}" - } - }, "render": "Post Office" } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index f4cee6f2b..00d9cd073 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -5194,11 +5194,6 @@ } }, "title": { - "mappings": { - "0": { - "then": "Postpartner in een winkel" - } - }, "render": "Postkantoor" } }, From 20df00fa0447c7967cf075ecdc651655e840d123 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Thu, 18 Aug 2022 20:12:30 +0200 Subject: [PATCH 6/6] Remove old translation --- langs/themes/en.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/langs/themes/en.json b/langs/themes/en.json index f12db62b5..932a13fc2 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -888,26 +888,6 @@ }, "postboxes": { "description": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :)
Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. ", - "layers": { - "3": { - "override": { - "+tagRenderings": { - "0": { - "mappings": { - "0": { - "then": "This shop is a post partner" - }, - "1": { - "then": "This shop is not a post partner" - } - }, - "question": "Is this shop a post partner?" - } - }, - "description": "Add a new post partner to the map in an existing shop" - } - } - }, "shortDescription": "A map showing postboxes and post offices", "title": "Postbox and Post Office Map" },