diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json
index 994abfba57..9ef7743c6f 100644
--- a/assets/layers/parcel_lockers/parcel_lockers.json
+++ b/assets/layers/parcel_lockers/parcel_lockers.json
@@ -234,4 +234,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index 45a62b6923..d0ab48be92 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -35,7 +35,34 @@
"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.",
@@ -98,6 +125,240 @@
}
],
"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": [
@@ -132,6 +393,10 @@
{
"if": "opening_hours~*",
"then": "isOpen"
+ },
+ {
+ "if": "shop~*",
+ "then": "./assets/themes/shops/shop.svg"
}
],
"iconSize": "40,40,center",
@@ -145,4 +410,4 @@
"width": "1"
}
]
-}
\ No newline at end of file
+}
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index 5a17a4bcc1..ad4371e590 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -50,4 +50,4 @@
"postoffices",
"parcel_lockers"
]
-}
\ No newline at end of file
+}
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 9d643f8e75..a04238f770 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -5493,6 +5493,14 @@
}
},
"title": {
+ "mappings": {
+ "0": {
+ "then": "Postfiliale im Einzelhandel"
+ },
+ "1": {
+ "then": "Postfiliale im {name}"
+ }
+ },
"render": "Poststelle"
}
},
@@ -7367,4 +7375,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 7fbf7ce82b..a30d9c82ec 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -5511,9 +5511,118 @@
},
"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"
}
},
@@ -7388,4 +7497,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index 3ff0a01cae..13f898b776 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -812,4 +812,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 9cca436fd9..590d8cdce1 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -5357,6 +5357,11 @@
}
},
"title": {
+ "mappings": {
+ "0": {
+ "then": "Postpartner in een winkel"
+ }
+ },
"render": "Postkantoor"
}
},
@@ -7117,4 +7122,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index 366b5f6d99..7d88b7e722 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -667,4 +667,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 6a122cb9f6..957b4f7557 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -7,6 +7,56 @@
"description": "An open map of statues, busts, graffitis and other artwork all over the world",
"title": "Open Artwork Map"
},
+ "bag": {
+ "description": "This theme helps with importing data from BAG",
+ "layers": {
+ "0": {
+ "tagRenderings": {
+ "Reference": {
+ "mappings": {
+ "0": {
+ "then": "This building has no reference in the BAG"
+ }
+ },
+ "render": "The reference in BAG is {ref:bag}"
+ }
+ }
+ },
+ "2": {
+ "description": "Buildings from BAG register",
+ "tagRenderings": {
+ "Build year": {
+ "mappings": {
+ "0": {
+ "then": "The building was started in {_bag_obj:start_date}"
+ }
+ },
+ "render": "This building was built in {_bag_obj:start_date}"
+ },
+ "Building type": {
+ "mappings": {
+ "0": {
+ "then": "The building type will be a {_bag_obj:construction}"
+ }
+ },
+ "render": "The building type is a {_bag_obj:building}"
+ },
+ "Import button": {
+ "mappings": {
+ "0": {
+ "then": "Didn't calculate the correct values yet. Refresh this page"
+ }
+ }
+ },
+ "Reference": {
+ "render": "The reference in BAG is {_bag_obj:ref:bag}"
+ }
+ }
+ }
+ },
+ "shortDescription": "BAG import helper tool",
+ "title": "BAG import helper"
+ },
"benches": {
"description": "This map shows all benches that are recorded in OpenStreetMap: Individual benches, and benches belonging to public transport stops or shelters. With an OpenStreetMap account, you can map new benches or edit details of existing benches.",
"shortDescription": "A map of benches",
@@ -885,6 +935,11 @@
"description": "A map for showing and editing wind turbines.",
"title": "OpenWindPowerMap"
},
+ "osm_community_index": {
+ "description": "A list of resources for users of OpenStreetMap. 'Resources' can be links to forums, meetups, Slack groups, IRC channels, mailing lists, and so on. Anything that mappers, especially beginners, might find interesting or helpful.",
+ "shortDescription": "An index of community resources for OpenStreetMap.",
+ "title": "OSM Community Index"
+ },
"parkings": {
"description": "This map shows different parking spots",
"shortDescription": "This map shows different parking spots",