-
Notifications
You must be signed in to change notification settings - Fork 120
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.
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
More kinds for maki icon library support #1541
More kinds for maki icon library support #1541
Conversation
…es of greengrocer, which was already included.
… to cherry pick specific instances for exploring corner cases.
In SF they are different things, I think we should set as different
Seems like For For
Both as distinct kinds, please. BTW, |
yaml/landuse.yaml
Outdated
min_zoom: 16 | ||
output: | ||
<<: *output_properties | ||
kind: harbor |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Our practice on the kinds is generally to follow British English, especially if that's what the original OSM tag was.
Please set this to harbour
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See PR comments – this should move to landuse: harbour
only, and can be merged with the next filter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
harbor
-> harbour
in 96110df.
@@ -1614,6 +1614,13 @@ filters: | |||
output: | |||
<<: *output_properties | |||
kind: petroleum_well | |||
# a boat lift is a more specific type of object than a crane, although it may |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 Useful note explaining the order of filters.
yaml/pois.yaml
Outdated
min_zoom: 17 | ||
output: | ||
<<: *output_properties | ||
kind: gaming |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the kind should be adult_gaming_centre
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed in 96110df.
yaml/landuse.yaml
Outdated
output: | ||
<<: *output_properties | ||
kind: naval_base | ||
kind_detail: military |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is the kind_detail
set here? Are there naval bases that aren't military related?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, sorry, I think that was copy-pasta from the above airfield
, where it makes sense to say it's a military thing. Civilian airfields exist, but civilian naval bases, as you rightly point out, not so much. Fixed in 96110df.
self.assert_has_feature( | ||
z, x, y, 'landuse', { | ||
'id': 183049783, | ||
# should be 'kind': u'harbor',? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolve this before merging.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolved in 96110df.
…r=yes, *_terminal > pier.
docs/layers.md
Outdated
@@ -524,6 +526,7 @@ _TIP: Some `landuse` features only exist as point features in OpenStreetMap. Fin | |||
* `groyne` | |||
* `guard_rail` | |||
* `hanami` | |||
* `harbor` (a.k.a harbour) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also fix the documentation spelling (to harbour
without the parenthetical note)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ooops, well spotted. Thanks. Fixed in 745f2e5.
docs/layers.md
Outdated
@@ -879,16 +890,20 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o | |||
* `fuel` - Fuel stations provide liquid gas (or diesel) for automotive use. | |||
* `furniture` | |||
* `gallery` - An art gallery. | |||
* `gaming` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This name also changes to adult_gaming_centre
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for pointing that out. Fixed in 745f2e5.
docs/layers.md
Outdated
* `golf_course` | ||
* `government` | ||
* `greengrocer` | ||
* `greengrocer` - Shop selling fruits and vegetables. | ||
* `grocery` - Shop selling non-perishable foods. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shop selling non-perishable foods, also known as a "supermarket".
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed it to:
Shop selling non-perishable food often similar to, but smaller than, a
supermarket
. See also grocery store on Wikipedia.
I get the impression from that Wikipedia article that a grocery store doesn't generally sell fresh fruits and vegetables, nor non-food items. I can't remember ever having been in a store which had such a laser focus - all the ones which come to mind either additionally sold stationery, cards, household products and similar non-food items (and might be called a newsagents or convenience store), or had a fridge/freezer section for selling perishable food.
Should we merge this into supermarket
or convenience
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the USA grocery
is probably more akin to "corner store" or "bodega" versus a supermarket which is a usually "big box" style store. Fine as-is from OSM.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM asside from couple minor documentation change requests.
yaml/landuse.yaml
Outdated
@@ -1116,3 +1132,14 @@ filters: | |||
<<: *output_properties | |||
kind: crane | |||
kind_detail: {col: "crane:type"} | |||
- filter: | |||
landuse: | |||
- harbour |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think harbour
should go into the general port group above, with the min zoom clamp of 11 to 16 ... Possibly also port
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. Moved harbour
and port
in 745f2e5.
yaml/landuse.yaml
Outdated
- shipyard | ||
- wharf | ||
- quay | ||
min_zoom: 16 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
15 for port and shipyard, 16 for wharf and quay?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated, and added tests in 745f2e5.
…nd gaming->adult_gaming_centre. Altered min_zooms for port or harbour-related landuse.
Added some more kinds related to #1423.
gaming
garden_centre
golf
grocery
harbor
naval_base
port_terminal
ferry_terminal
landusecontainer_terminal
shipyard
wharf
quay
boatyard
boat_lift
ship_chandler
customs
(NOTE: we already had
man_made=crane
mapped tokind: crane
, so there wasn't a need to add that.)Some follow-ups:
grocery
. We already hadgreengrocer
and, looking at the Wikipedia pages for grocery compared with greengrocer, I'm not sure that they're the same thing. For the moment, I've left them as separate kinds.harbour=yes
are also tagged as other things. For example, this port terminal is taggedharbour=yes, landuse=port_terminal, man_made=pier
; should that be output as a harbour, port terminal or pier - or should we split the geometry to allow multiple features for the harbour landuse and pier, with a POI for the port terminal? Also, this pier is taggedharbour=yes, man_made=pier
- should that be harbour, pier or split into two features?customs
kind mentions theamenity=customs
tag, which has only 742 uses. Should we also include thebarrier=border_control
tag, which has over 5,000 uses? Should they both be mapped to kindcustoms
, or are customs (i.e: taxation) and border control sufficiently distinct things to deserve distinct kinds?