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.

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 sort keys for "natural" landuse kinds #1720

Merged
merged 8 commits into from
Dec 11, 2018

Conversation

zerebubuth
Copy link
Member

@zerebubuth zerebubuth commented Dec 6, 2018

Insert natural_wood, natural_forest and natural_park into the middle of the sort ranking, bumping up all the values above them.

Connects to #1096.

16 total new:

  • natural_wood
  • natural_forest
  • natural_park
  • airfield
  • danger_area
  • naval_base
  • port_terminal
  • ferry_terminal
  • container_terminal
  • shipyard
  • wharf
  • quay
  • boatyard
  • range
  • wetland
  • embankment (lines)

Insert `natural_wood`, `natural_forest` and `natural_park` into the middle of the sort ranking, bumping up all the values above them.
@zerebubuth zerebubuth requested a review from nvkelso December 6, 2018 12:02
@nvkelso
Copy link
Member

nvkelso commented Dec 6, 2018

Please update for the following issues, too:

@zerebubuth
Copy link
Member Author

Added all those others - except for boatyard and range. Those are POIs only, and we don't generate landuse polygons for them at the moment. Would you like me to add landuse polygons for those, or are they fine as POIs?

@nvkelso
Copy link
Member

nvkelso commented Dec 7, 2018

Ooops, yes those should also be landuse polygons. Good catch!

@@ -1,16 +1,16 @@
kind,boundary,sort_rank
river,,201
Copy link
Member

Choose a reason for hiding this comment

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

What does the - mean here?

Copy link
Member Author

Choose a reason for hiding this comment

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

It means boundary is not set. The empty match in river,,201 translates to kind == 'river' and boundary == '', which never matched (boundary is either None or True), so all water features were getting a sort_rank of 200.

quay,*,65
wharf,*,65
port_terminal,*,64
ferry_terminal,*,64
Copy link
Member

Choose a reason for hiding this comment

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

Can't share sort values otherwise it creates flickr no Tangram ES... so this and quay and possibly others need to offset away from each other.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've re-arranged them in ffe23bd to make them unique. Also added a test, so that we'll get a test failure if a duplicate is added in future.

@@ -1,4 +1,5 @@
kind,geometrytype,sort_rank
embankment,*,274
Copy link
Member

Choose a reason for hiding this comment

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

Seems like this should go below power_line, more just under fence?

Copy link
Member Author

Choose a reason for hiding this comment

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

OK. Fixed in ffe23bd.

Copy link
Member

@nvkelso nvkelso left a comment

Choose a reason for hiding this comment

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

Add 2 key-value pairs, spread the values for a few other keys (no dups values!)

…ly included only as POIs.

Ensure landuse sort ranks are unique, and add test for that to maintain that requirement.

Adjust tests where sort ranks have changed.
@nvkelso
Copy link
Member

nvkelso commented Dec 10, 2018

The following two kind values are new to the landuse layer and need to be documented:

  • boatyard
  • range

Copy link
Member

@nvkelso nvkelso left a comment

Choose a reason for hiding this comment

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

Changes look good and I added docs in 7ec8850.

@zerebubuth zerebubuth merged commit 5a64d33 into master Dec 11, 2018
@zerebubuth zerebubuth deleted the zerebubuth/1096-natural-landuse-sort-key branch December 11, 2018 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants