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] 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 7cc67a30aa..30db6f1db8 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 a144cdb066..bc3e45155b 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 4d49d6cde5..c09925b903 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 82d18f2c41..bba784f169 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 f4cee6f2bb..00d9cd073b 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" } },