New kinds for OSM and iD presets #1543

zerebubuth · 2018-06-27T19:40:07Z

New kinds:

chemist
elevator
embankment (also an embankment property on roads and railways, and cutting)
miniature_golf
mud
orchard
plant_nursery
plaque (merging both memorial=plaque and historic=memorial_plaque)
reef
cosmetics
fishmonger
bunker
wayside_cross
obelisk

Added kind_detail whitelists on:

beach
forest and wood
wetland

Verified that all the kinds mentioned in #1425 are either implemented here or have been previously implemented. Checked docs and tests, too.

Connects to #1425.

nvkelso · 2018-06-27T19:58:01Z

yaml/pois.yaml

+    min_zoom: 16
+    output:
+      <<: *output_properties
+      kind: plaque


I'm fine with this generic kind value of plaque (versus memorial_plaque).

nvkelso · 2018-06-27T20:00:38Z

yaml/landuse.yaml

+      # call surface=grass a beach, but it's in the data..?
+      kind_detail:
+        case:
+          - when: {surface: [grass, gravel, pebbles, pebblestone, rocky, sand]}


Looks like my favorite British English-ism https://wiki.openstreetmap.org/wiki/Tag:natural=shingle never factors in here (guess it would be rocky), looking at TagInfo.

nvkelso · 2018-06-27T20:30:21Z

yaml/roads.yaml

@@ -78,6 +78,14 @@ global:
      sidewalk: {col: sidewalk}
      sidewalk_left: {col: 'sidewalk:left'}
      sidewalk_right: {col: 'sidewalk:right'}
+      cutting:
+        case:
+          - when: {cutting: ['yes', 'right', 'left', 'both']}


Can this work more like bike lanes – where it's yes, right, left and if both then it'd just be yes? (Please verify, this is from memory.)

I was just setting cutting to true if it matched any of those (or omitting if it didn't match). I've updated in 8c79ac2 to make the values yes, left or right.

Looking at the properties for cycleway, it looks like we export a cycleway_both property, so we don't collapse that down onto cycleway. Perhaps that's something we should come back to on a ☔ (although now I suppose it'd be a breaking change, we'd need to wait for v2.0).

nvkelso · 2018-06-27T20:30:26Z

yaml/roads.yaml

+            then: true
+      embankment:
+        case:
+          - when: {embankment: ['yes', 'right', 'left', 'two_sided', 'both']}


Can this work more like bike lanes – where it's yes, right, left and if both then it'd just be yes? (Please verify, this is from memory.)

embankment and cutting are now one of yes, left, right in 8c79ac2. See comment above regarding bike lanes.

nvkelso · 2018-06-27T20:31:38Z

docs/layers.md

@@ -621,11 +628,11 @@ The value of the OpenStreetMap `wall` tag. Common values include `brick`, `castl

 ##### Wetland `kind_detail` values:

-The value of the OpenStreetMap `wetland` tag. Common values include `bog`, `fen`, `mangrove`, `marsh`, `reedbed`, `saltmarsh`, `string_bog`, `swamp`, `tidalflat`, and `wet_meadow`.
+The value of the OpenStreetMap `wetland` tag. If available, value will be one of: `bog`, `fen`, `mangrove`, `marsh`, `mud`, `reedbed`, `saltern`, `saltmarsh`, `string_bog`, `swamp`, `tidalflat`, `wet_meadow`.


New to me! https://en.wikipedia.org/wiki/Saltern

nvkelso · 2018-06-27T20:35:29Z

docs/layers.md

@@ -853,6 +861,7 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o
 * `consulting`
 * `convenience`
 * `copyshop` - A shop offering photocopying and printing services.
+* `cosmetics` - A shop selling cosmetics.


Since we also say chemist sells "cosmetics" let's say for this one:
A specialty shop selling cosmetics.

Good point, thanks. Fixed in fe1cbf0.

nvkelso · 2018-06-27T20:37:30Z

yaml/pois.yaml

@@ -2100,6 +2138,18 @@ filters:
      <<: *output_properties
      kind: sanitary_dump_station

+  - filter: {highway: elevator}
+    min_zoom: 16


To min_zoom 17, please. This is an "indoor" feature.

OK. Updated in 1e6b874.

nvkelso · 2018-06-27T20:40:00Z

yaml/pois.yaml

  - filter: {historic: memorial}
    min_zoom: 17
    output:
      <<: *output_properties
      kind: memorial
+  # obelisk - but not a monument or a memorial


I think obelisk should be sorted (matched first) above plaque and memorial – it's the thing visible from far while the others are generally attached to an obelisk?

OK. Done in bfb655a. Moved the monument/memorial info to kind_detail and updated documentation and added tests.

nvkelso · 2018-06-27T20:41:44Z

integration-test/1425-more-osm-features.py

+                'natural': u'beach',
+                'source': u'openstreetmap.org',
+                'surface': u'gravel',
+                # fake name to get the POI to appear


This is true for pois, but for landuse the polygon would still show up regardless of name being present?

Yup, the fake name is only needed for POIs. I've split the test in 4f20bd3 between pois and landuse, with the fake name only on the pois test.

nvkelso · 2018-06-27T20:43:06Z

integration-test/1425-more-osm-features.py

+            # https://www.openstreetmap.org/way/510502210
+            dsl.way(510502210, dsl.tile_box(z, x, y), {
+                'highway': u'elevator',
+                'level': u'(-1,-2)',


Someday we'll do indoor, but not today!

nvkelso · 2018-06-27T20:46:43Z

yaml/pois.yaml

@@ -497,6 +498,16 @@ filters:
      <<: *output_properties
      kind: danger_area
      tier: 3
+  # bunker
+  - filter: {military: bunker}
+    min_zoom: 16


Can this be 16 if with a name and 18 if no-name? For client-side collisions.

Yup, sounds good. Fixed in 09a6734.

nvkelso · 2018-06-27T20:49:06Z

yaml/landuse.yaml

@@ -489,6 +493,17 @@ filters:
      <<: *output_properties
      kind: glacier
      tier: 3
+  # reef
+  - filter: {natural: reef}


Odd question – but since this is underwater should this go into the water layer instead of landuse?

Sure, that makes sense. Moved to water layer in 973963c.

nvkelso

LGTM with a few comments and questions.

Only big one is if reef should go into water layer.

(I think this totally closes out the #1425 issue.)

… rail.

… shop, not just any shop that might sell some cosmetics.

…t info into the kind_detail.

… isn't needed for the feature to appear in the landuse layer.

zerebubuth · 2018-06-28T14:30:36Z

@nvkelso I think I addressed all the issues. Would you like to give it a quick look over again, just to be sure?

nvkelso · 2018-06-28T16:50:30Z

yaml/pois.yaml

@@ -1139,6 +1156,17 @@ filters:
    output:
      <<: *output_properties
      kind: motorway_junction
+  # obelisk - note that this takes precedence over monument and memorial!
+  - filter: {man_made: obelisk}
+    min_zoom: { clamp: { min: 15, max: 17, value: { sum: [ { col: zoom }, 2.24 ] } } }


For the Washington Monument in DC, if something is "tall", let's make it zoom 14. (greater than 20 meters?)

If it's medium tall then zoom 15? (greater than 10 meters?)

Done in b90875b. Also pushed the priority of obelisks above artworks, as some appear to also have tourism=artwork on them, but obelisk seems more specific - especially for the >10m ones.

nvkelso

LGTM with one comment about obelisk zooms.

…height of the obelisk.

zerebubuth added 20 commits June 27, 2018 12:14

Add kind_detail to beaches from surface tag.

d63af94

Add shop=chemist.

e812a80

Add elevators as POIs.

928fee2

Add man_made=embankment.

ac6353b

Whitelist leaf_type on woods and forests.

a111afd

Add miniature golf.

d4ec8ac

Add landuse mud.

aa9a7ff

Add orchards.

2e0ec79

Added plant nurseries.

71c7cee

Added memorial plaques.

5dcd313

Add reefs.

53ab572

Add whitelist for wetland kind_detail.

2e8b6e2

Added cosmetics shops.

4741416

Add fishmongers

3b080b4

Add military bunkers.

8c5323c

Added wayside crosses.

2b6612d

Added historic=memorial_plaque.

846992e

Added obelisks.

2ab7c9b

Added cuttings.

e2f90a3

Added embankment/cutting properties on roads layer features.

e6069ad

zerebubuth requested a review from nvkelso June 27, 2018 19:40

nvkelso reviewed Jun 27, 2018

View reviewed changes

nvkelso approved these changes Jun 27, 2018

View reviewed changes

zerebubuth added 7 commits June 28, 2018 12:05

Add side information to cutting and embankment properties on road and…

8c79ac2

… rail.

Update description of cosmetics shops to indicate they're a specialty…

fe1cbf0

… shop, not just any shop that might sell some cosmetics.

Bumped min zoom for elevators to 17.

1e6b874

Made obelisks take priority over monuments and memorials, putting tha…

bfb655a

…t info into the kind_detail.

Split test between pois and landuse so that we can test the fake name…

4f20bd3

… isn't needed for the feature to appear in the landuse layer.

Make bunker min zoom depend on whether it is named or not.

09a6734

Moved reefs to water layer.

973963c

nvkelso reviewed Jun 28, 2018

View reviewed changes

nvkelso approved these changes Jun 28, 2018

View reviewed changes

Bumped up obelisk priority over artwork. Made min zoom depend on the …

b90875b

…height of the obelisk.

zerebubuth merged commit 7f224ff into master Jun 28, 2018

zerebubuth deleted the zerebubuth/1425-osm-id-new-kinds branch June 28, 2018 17:18

nvkelso mentioned this pull request Dec 29, 2018

Missing mud in landuse layer #1572

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New kinds for OSM and iD presets #1543

New kinds for OSM and iD presets #1543

zerebubuth commented Jun 27, 2018 •

edited by nvkelso

Loading

nvkelso Jun 27, 2018

nvkelso Jun 27, 2018

nvkelso Jun 27, 2018

zerebubuth Jun 28, 2018

nvkelso Jun 27, 2018

zerebubuth Jun 28, 2018

nvkelso Jun 27, 2018

nvkelso Jun 27, 2018

zerebubuth Jun 28, 2018

nvkelso Jun 27, 2018

zerebubuth Jun 28, 2018

nvkelso Jun 27, 2018 •

edited

Loading

zerebubuth Jun 28, 2018

nvkelso Jun 27, 2018

nvkelso Jun 27, 2018

zerebubuth Jun 28, 2018

nvkelso Jun 27, 2018

nvkelso Jun 27, 2018 •

edited

Loading

zerebubuth Jun 28, 2018

nvkelso Jun 27, 2018

zerebubuth Jun 28, 2018

nvkelso left a comment •

edited

Loading

zerebubuth commented Jun 28, 2018

nvkelso Jun 28, 2018

zerebubuth Jun 28, 2018

nvkelso left a comment

New kinds for OSM and iD presets #1543

New kinds for OSM and iD presets #1543

Conversation

zerebubuth commented Jun 27, 2018 • edited by nvkelso Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nvkelso Jun 27, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nvkelso Jun 27, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nvkelso left a comment • edited Loading

Choose a reason for hiding this comment

zerebubuth commented Jun 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nvkelso left a comment

Choose a reason for hiding this comment

zerebubuth commented Jun 27, 2018 •

edited by nvkelso

Loading

nvkelso Jun 27, 2018 •

edited

Loading

nvkelso Jun 27, 2018 •

edited

Loading

nvkelso left a comment •

edited

Loading