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

Add wetland detail to kind_detail #1461

Merged
merged 2 commits into from
Dec 23, 2017
Merged

Add wetland detail to kind_detail #1461

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccb8665
Add wetland detail to kind_detail
pnorman Dec 18, 2017
688d852
Add a list of common wetland kind_detail values
pnorman Dec 23, 2017
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
3 changes: 3 additions & 0 deletions docs/layers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,9 @@ _TIP: Some `landuse` features only exist as point features in OpenStreetMap. Fin
* `works`
* `zoo`

##### Wetland `kind_detail` values:

The value of the OpenStreetMap `wetland` tag.
Copy link
Member

Choose a reason for hiding this comment

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

We should list common values here in a-z alphabetical sorting.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

✔️


## Places

Expand Down
13 changes: 13 additions & 0 deletions integration-test/1425-osm-features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,19 @@ def test_shops(self):
'http://www.openstreetmap.org/node/2299770718',
'16/19297/24633', {'kind': 'variety_store'})

def test_wetland(self):
self._run_test(
'http://www.openstreetmap.org/way/412807883',
'16/19327/24638', 'landuse', {'kind': 'wetland'})
self._run_test(
'http://www.openstreetmap.org/way/396249564',
'16/19310/24621', 'landuse',
{'kind': 'wetland', 'kind_detail': 'saltmarsh'})
self._run_test(
'http://www.openstreetmap.org/way/257640900',
'16/19318/24656', 'landuse',
{'kind': 'wetland', 'kind_detail': 'tidalflat'})

def _run_test(self, url, zxy, layer, props):
z, x, y = map(int, zxy.split('/'))
self.load_fixtures([url])
Expand Down
1 change: 1 addition & 0 deletions yaml/landuse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,7 @@ filters:
output:
<<: *output_properties
kind: wetland
kind_detail: {col: wetland}
- filter: {natural: park}
min_zoom: { clamp: { max: 16, min: 9, value: { col: zoom } } }
output:
Expand Down