Skip to content

fix scalerank 0 region boundaries, drop low-zoom names, add map_unit - #1037

Merged
nvkelso merged 19 commits into
masterfrom
nvkelso/992-fix-boundaries-scalerank-0-to-7
Sep 14, 2016
Merged

nvkelso merged 19 commits into
masterfrom
nvkelso/992-fix-boundaries-scalerank-0-to-7

Conversation

@nvkelso

@nvkelso nvkelso commented Sep 12, 2016

Copy link
Copy Markdown
Member

connects to #992 to fix scalerank 0 region boundaries
also adds map_unit boundaries and
drops name at low zooms 0,1,2,3,4,5,6

  • Update tests
  • Update data download and config
  • Update docs

also adds map_unit boundaries and
drops name at low zooms 0,1,2,3,4,5,6
@nvkelso nvkelso added this to the v1.0.0 milestone Sep 12, 2016
@nvkelso

nvkelso commented Sep 12, 2016

Copy link
Copy Markdown
Member Author

@zerebubuth Looks like my adding map_unit as a new Natural Earth data source is making all the tests fail. Can you take a look, please?

@zerebubuth

zerebubuth commented Sep 12, 2016

Copy link
Copy Markdown
Member

The first error seems to be:

ERROR:  column "mapcolor9" of relation "ne_10m_admin_0_boundary_lines_map_units" does not exist
invalid command \N
invalid command \.
ERROR:  syntax error at or near "5.00000000000"
LINE 1: 5.00000000000 Map unit boundary 
        ^
ERROR:  current transaction is aborted, commands ignored until end of transaction block

Which is preventing the shapefiles for the map units being loaded. It looks like the schema doesn't contain a column called "mapcolor9", but the data does. We don't currently support loading a subset of the columns - they must all be specified in the schema.

The second error seems to be:

psql:apply-updates-non-planet-tables.sql:107: ERROR:  column "scalerank" does not exist
LINE 15: ...recla" = 'Admin-1 region boundary' THEN CASE WHEN scalerank ...

Which probably means that extra_columns: scalerank needs to be specified when using the global ne_region_boundaries_min_zoom.

@zerebubuth zerebubuth assigned nvkelso and unassigned zerebubuth Sep 12, 2016
@nvkelso

nvkelso commented Sep 12, 2016

Copy link
Copy Markdown
Member Author

Thanks! Fixed in b39f38b and 26e1c15, waiting for CirlceCI to confirm.

Comment thread yaml/boundaries.yaml Outdated
min_zoom: *ne_region_boundaries_min_zoom
extra_columns: [scalerank]
output: {kind: region, kind_detail: '4'}
table: ne No newline at end of file

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

no trailing newline

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fixed in ad617c9.

@rmarianski

Copy link
Copy Markdown
Member

LGTM

@rmarianski

Copy link
Copy Markdown
Member

I checked in some fixes. We'll see if the tests pass on circle now :fingers-crossed:

@zerebubuth

Copy link
Copy Markdown
Member

We'll see if the tests pass on circle now

Do they pass locally? 😜

@rmarianski

Copy link
Copy Markdown
Member

Do they pass locally? 😜

I'm going to wait until the circle build finishes before answering that 😝

@nvkelso

nvkelso commented Sep 13, 2016

Copy link
Copy Markdown
Member Author

Our current thinking is the data files here need to be in web Mercator (but are probably in geographic now).

@nvkelso nvkelso assigned rmarianski and unassigned rmarianski Sep 13, 2016
@nvkelso

nvkelso commented Sep 14, 2016

Copy link
Copy Markdown
Member Author

Last test failures are related to OSM zoom 8 content, what gives?

@zerebubuth

Copy link
Copy Markdown
Member

Boundaries looked like they just needed the names swapped, possibly because the direction was reversed due to the introduction of stable ordering in #1022.

The second failure looks like it was also a copy-paste issue with the tile coordinates.

Works for me now, let's see if CircleCI agrees 😉

@nvkelso

nvkelso commented Sep 14, 2016

Copy link
Copy Markdown
Member Author

Woot! Merging.

@nvkelso
nvkelso merged commit e55d7c8 into master Sep 14, 2016
@nvkelso
nvkelso deleted the nvkelso/992-fix-boundaries-scalerank-0-to-7 branch September 14, 2016 15:29
@nvkelso nvkelso removed the in review label Sep 14, 2016
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.

3 participants