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

Update state boundaries from NE to include statistical boundaries. #798

Merged
merged 1 commit into from
May 6, 2016

Conversation

zerebubuth
Copy link
Member

Include Admin-1 statistical boundary and Admin-1 statistical meta bounds as types of state boundary.

Connects to #797.

This was (somewhat surprisingly) the only migration I needed to run to get the tests to pass. Since this is on top of the v0.10.0 tag, will we tag the pre-merge state as v0.10.1? If so, then it should already be covered by the existing migrations in the repo, but the shorter version is:

update ne_10m_admin_1_states_provinces_lines
set mz_boundary_min_zoom = mz_calculate_min_zoom_boundaries(ne_10m_admin_1_states_provinces_lines.*)
where featurecla in ('Admin-1 statistical boundary', 'Admin-1 statistical meta bounds');

@rmarianski could you review, please?

@rmarianski
Copy link
Member

👍

Since other code has landed on master since, should we make a v0.10 release branch off the v0.10.0 tag, and merge this change into there? And then we can merge the release branch into master?

@zerebubuth
Copy link
Member Author

ea43400 is a commit on top of v0.10.0, so we could just tag it v0.10.1 if we want to?

@zerebubuth zerebubuth merged commit 91c3010 into master May 6, 2016
@rmarianski
Copy link
Member

ea43400 is a commit on top of v0.10.0, so we could just tag it v0.10.1 if we want to?

👍 This is what I'll do.

Do we want to make a separate pr on top of this commit (ea43400) to include a v0.10.1 changelog entry and tag that? Or do we not bother and just add in a changelog entry on master?

@rmarianski
Copy link
Member

rmarianski commented May 6, 2016

pr for the changelog entry.

@zerebubuth zerebubuth deleted the 797-add-missing-boundaries branch May 13, 2016 13:28
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