Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post offices and related items need to be in the brands tree, not the operators tree #5613

Merged
merged 1 commit into from
Oct 31, 2021
Merged

Post offices and related items need to be in the brands tree, not the operators tree #5613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions data/operators/amenity/post_box.json → data/brands/amenity/post_box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"properties": {
"path": "operators/amenity/post_box",
"path": "brands/amenity/post_box",
Copy link
Member

@1ec5 1ec5 Oct 31, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, #5561 (comment) described an edit to the amenity=post_office documentation that should’ve had little bearing on amenity=post_box. Conversely, these features were originally moved from the brands tree to the operators tree in response to feedback in #4925, but that feedback was about amenity=post_box, not amenity=post_office.

I think the back and forth is because post offices and postboxes are being treated identically. But it seems like the expectation – most of the time – is that post offices need the distinction between brands and operators more than postboxes do. Contract post offices are a widespread phenomenon in many countries, but contract postboxes would be much more of an edge case.

(I did argue in gravitystorm/openstreetmap-carto#1023 that postboxes should be labeled based on their operators, but that was before I learned about brand and before it had become common on postal facilities in the U.S.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh ok - If I'm reading your comment correctly, it sounds like amenity/post_box should remain in operators tree? That seems ok to me.

"skipCollection": true,
"exclude": {
"generic": [
Expand All @@ -14,23 +14,23 @@
"items": [
{
"templateExclude": ["upsstore"],
"templateSource": "operators/amenity/post_office",
"templateSource": "brands/amenity/post_office",
"templateTags": {
"amenity": "post_box",
"name": ""
}
},
{
"displayName": "UPS",
"id": "ups-b58716",
"id": "ups-5fc3d7",
"locationSet": {"include": ["001"]},
"tags": {
"amenity": "post_box",
"brand": "UPS",
"brand:wikidata": "Q155026",
"brand:wikipedia": "en:United Parcel Service",
"official_name": "United Parcel Service",
"operator": "UPS",
"operator:type": "private",
"operator:wikidata": "Q155026",
"operator:wikipedia": "en:United Parcel Service"
"operator:type": "private"
}
}
]
Expand Down
120 changes: 60 additions & 60 deletions data/operators/amenity/post_depot.json → data/brands/amenity/post_depot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,173 +1,173 @@
{
"properties": {
"path": "operators/amenity/post_depot",
"path": "brands/amenity/post_depot",
"preserveTags": ["^name"],
"exclude": {"generic": ["^post depot$"]}
},
"items": [
{
"displayName": "Amazon",
"id": "amazon-93b2a6",
"id": "amazon-2083a7",
"locationSet": {"include": ["001"]},
"tags": {
"amenity": "post_depot",
"operator": "Amazon",
"operator:type": "private",
"operator:wikidata": "Q3884",
"operator:wikipedia": "en:Amazon (company)"
"brand": "Amazon",
"brand:wikidata": "Q3884",
"brand:wikipedia": "en:Amazon (company)",
"operator:type": "private"
}
},
{
"displayName": "An Post",
"id": "anpost-2f7b40",
"id": "anpost-a3e698",
"locationSet": {"include": ["ie"]},
"tags": {
"amenity": "post_depot",
"brand": "An Post",
"brand:wikidata": "Q482490",
"brand:wikipedia": "en:An Post",
"name": "An Post",
"operator": "An Post",
"operator:type": "public",
"operator:wikidata": "Q482490",
"operator:wikipedia": "en:An Post"
"operator:type": "public"
}
},
{
"displayName": "Canada Post",
"id": "canadapost-c92f48",
"id": "canadapost-3d79d0",
"locationSet": {
"include": ["ca"],
"exclude": ["quebec.geojson"]
},
"tags": {
"amenity": "post_depot",
"operator": "Canada Post",
"operator:type": "public",
"operator:wikidata": "Q1032001",
"operator:wikipedia": "en:Canada Post"
"brand": "Canada Post",
"brand:wikidata": "Q1032001",
"brand:wikipedia": "en:Canada Post",
"operator:type": "public"
}
},
{
"displayName": "Deutsche Post",
"id": "deutschepost-6fd7ff",
"id": "deutschepost-5ac2d1",
"locationSet": {"include": ["de"]},
"matchNames": ["deutsche post ag"],
"tags": {
"amenity": "post_depot",
"brand": "Deutsche Post",
"brand:wikidata": "Q157645",
"brand:wikipedia": "de:Deutsche Post AG",
"name": "Deutsche Post",
"operator": "Deutsche Post",
"operator:type": "private",
"operator:wikidata": "Q157645",
"operator:wikipedia": "de:Deutsche Post AG"
"operator:type": "private"
}
},
{
"displayName": "DHL",
"id": "dhl-93b2a6",
"id": "dhl-2083a7",
"locationSet": {"include": ["001"]},
"tags": {
"amenity": "post_depot",
"brand": "DHL",
"brand:wikidata": "Q489815",
"brand:wikipedia": "de:DHL",
"name": "DHL",
"operator": "DHL",
"operator:type": "private",
"operator:wikidata": "Q489815",
"operator:wikipedia": "de:DHL"
"operator:type": "private"
}
},
{
"displayName": "DPD",
"id": "dpd-93b2a6",
"id": "dpd-2083a7",
"locationSet": {"include": ["001"]},
"matchNames": [
"dpd dynamic parcel distribution"
],
"tags": {
"amenity": "post_depot",
"brand": "DPD",
"brand:wikidata": "Q541030",
"brand:wikipedia": "de:DPDgroup",
"name": "DPD",
"operator": "DPD",
"operator:type": "private",
"operator:wikidata": "Q541030",
"operator:wikipedia": "de:DPDgroup"
"operator:type": "private"
}
},
{
"displayName": "FedEx",
"id": "fedex-93b2a6",
"id": "fedex-2083a7",
"locationSet": {"include": ["001"]},
"matchNames": ["federal express"],
"tags": {
"amenity": "post_depot",
"operator": "FedEx",
"operator:type": "private",
"operator:wikidata": "Q459477",
"operator:wikipedia": "en:FedEx"
"brand": "FedEx",
"brand:wikidata": "Q459477",
"brand:wikipedia": "en:FedEx",
"operator:type": "private"
}
},
{
"displayName": "La Poste",
"id": "laposte-5d47ca",
"id": "laposte-fee54d",
"locationSet": {"include": ["fr"]},
"tags": {
"amenity": "post_depot",
"brand": "La Poste",
"brand:wikidata": "Q373724",
"brand:wikipedia": "fr:La Poste (entreprise française)",
"name": "La Poste",
"operator": "La Poste",
"operator:type": "public",
"operator:wikidata": "Q373724",
"operator:wikipedia": "fr:La Poste (entreprise française)"
"operator:type": "public"
}
},
{
"displayName": "Royal Mail",
"id": "royalmail-a473cc",
"id": "royalmail-d5dfdd",
"locationSet": {"include": ["gb"]},
"tags": {
"amenity": "post_depot",
"brand": "Royal Mail",
"brand:wikidata": "Q638098",
"brand:wikipedia": "en:Royal Mail",
"name": "Royal Mail",
"operator": "Royal Mail",
"operator:type": "private",
"operator:wikidata": "Q638098",
"operator:wikipedia": "en:Royal Mail"
"operator:type": "private"
}
},
{
"displayName": "United States Postal Service",
"id": "unitedstatespostalservice-9cb3b1",
"id": "unitedstatespostalservice-4af266",
"locationSet": {"include": ["us"]},
"tags": {
"amenity": "post_depot",
"operator": "United States Postal Service",
"brand": "United States Postal Service",
"brand:wikidata": "Q668687",
"brand:wikipedia": "en:United States Postal Service",
"operator:type": "public",
"operator:wikidata": "Q668687",
"operator:wikipedia": "en:United States Postal Service",
"short_name": "USPS"
}
},
{
"displayName": "UPS",
"id": "ups-93b2a6",
"id": "ups-2083a7",
"locationSet": {"include": ["001"]},
"matchNames": ["united parcel service"],
"tags": {
"amenity": "post_depot",
"operator": "UPS",
"operator:type": "private",
"operator:wikidata": "Q155026",
"operator:wikipedia": "en:United Parcel Service"
"brand": "UPS",
"brand:wikidata": "Q155026",
"brand:wikipedia": "en:United Parcel Service",
"operator:type": "private"
}
},
{
"displayName": "Yodel",
"id": "yodel-a473cc",
"id": "yodel-d5dfdd",
"locationSet": {"include": ["gb"]},
"matchNames": [
"hdn",
"home delivery network"
],
"tags": {
"amenity": "post_depot",
"brand": "Yodel",
"brand:wikidata": "Q17020712",
"brand:wikipedia": "en:Yodel (company)",
"name": "Yodel",
"operator": "Yodel",
"operator:type": "private",
"operator:wikidata": "Q17020712",
"operator:wikipedia": "en:Yodel (company)"
"operator:type": "private"
}
}
]
Expand Down
Loading