Move to NE 5.1.2 - Add Config for new POVs #2078
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -996,7 +996,7 @@ $$ LANGUAGE plpgsql IMMUTABLE; | |
| -- returns a JSONB object containing __ne_min_zoom and __ne_max_zoom set to the | ||
| -- label min and max zoom of any matching row from the Natural Earth countries, | ||
| -- map units and states/provinces themes. | ||
| CREATE OR REPLACE FUNCTION tz_get_ne_min_max_zoom(wikidata_id TEXT, place_tag TEXT) | ||
| RETURNS JSONB AS $$ | ||
| DECLARE | ||
| min_zoom REAL; | ||
|
|
@@ -1006,28 +1006,30 @@ BEGIN | |
| RETURN '{}'::jsonb; | ||
| END IF; | ||
|
|
||
| -- if it's a country, only look it up in the iso and tlc tables | ||
| IF place_tag='country' OR place_tag='unrecognized' THEN | ||
| SELECT | ||
| min_label, max_label INTO min_zoom, max_zoom | ||
| FROM ne_10m_admin_0_countries_iso i | ||
| WHERE i.wikidataid = wikidata_id; | ||
|
|
||
| IF NOT FOUND THEN | ||
| SELECT | ||
| min_label, max_label INTO min_zoom, max_zoom | ||
| FROM ne_10m_admin_0_countries_tlc t | ||
| WHERE t.wikidataid = wikidata_id; | ||
| END IF; | ||
|
|
||
| IF NOT FOUND THEN | ||
| RETURN '{}'::jsonb; | ||
| END IF; | ||
| END IF; | ||
|
|
||
nvkelso marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| -- try states and provinces if it's not a country | ||
| SELECT | ||
| min_label, max_label INTO min_zoom, max_zoom | ||
| FROM ne_10m_admin_1_states_provinces sp | ||
| WHERE sp.wikidataid = wikidata_id; | ||
|
|
||
| -- finally, try localities | ||
| -- There is no concept of max_zoom for ne_10m_populated_places | ||
|
|
@@ -1051,6 +1053,65 @@ BEGIN | |
| END; | ||
| $$ LANGUAGE plpgsql STABLE; | ||
|
|
||
| CREATE OR REPLACE FUNCTION tz_get_fclass_and_label_position(wikidata_id TEXT, place_tag TEXT) | ||
| RETURNS JSONB AS $$ | ||
| DECLARE | ||
| fclass_iso TEXT; | ||
| fclass_tlc TEXT; | ||
| label_x REAL; | ||
| label_y REAL; | ||
| BEGIN | ||
| IF wikidata_id IS NULL THEN | ||
| RETURN '{}'::jsonb; | ||
| END IF; | ||
|
|
||
| -- if it's a country, only look it up in the iso and tlc tables | ||
| IF place_tag='country' OR place_tag='unrecognized' THEN | ||
| SELECT | ||
| fclass_iso, fclass_tlc, label_x, label_y INTO fclass_iso, fclass_tlc, label_x, label_y | ||
| FROM ne_10m_admin_0_countries_iso i | ||
| WHERE i.wikidataid = wikidata_id; | ||
|
|
||
| IF NOT FOUND THEN | ||
| SELECT | ||
| fclass_iso, fclass_tlc, label_x, label_y INTO fclass_iso, fclass_tlc, label_x, label_y | ||
| FROM ne_10m_admin_0_countries_tlc t | ||
| WHERE t.wikidataid = wikidata_id; | ||
| END IF; | ||
|
|
||
| IF NOT FOUND THEN | ||
| RETURN '{}'::jsonb; | ||
| END IF; | ||
| END IF; | ||
|
|
||
| -- There is no label_x and label_y for the non-countries | ||
| SELECT | ||
| fclass_iso, fclass_tlc, NULL, NULL INTO fclass_iso, fclass_tlc, label_x, label_y | ||
|
There was a problem hiding this comment. This is confusingly called: "latitude" (label_y) and "longitude" (label_x) in the NE admin-1 table. Please update to pull them out. There was a problem hiding this comment. (so keep the output as label_{x,y} but the input would be There was a problem hiding this comment. fixed in 31a5b4a |
||
| FROM ne_10m_admin_1_states_provinces sp | ||
| WHERE sp.wikidataid = wikidata_id; | ||
|
|
||
| -- finally, try localities | ||
| IF NOT FOUND THEN | ||
| SELECT | ||
| fclass_iso, fclass_tlc, NULL, NULL INTO fclass_iso, fclass_tlc, label_x, label_y | ||
|
There was a problem hiding this comment. Same deal: This is confusingly called: "latitude" (label_y) and "longitude" (label_x) in the NE populated places table. Please update to pull them out. There was a problem hiding this comment. fixed in 31a5b4a |
||
| FROM ne_10m_populated_places pp | ||
| WHERE pp.wikidataid = wikidata_id;END IF; | ||
|
|
||
| -- return an empty JSONB rather than null, so that it can be safely | ||
| -- concatenated with whatever other JSONB rather than needing a check for | ||
| -- null. | ||
| IF NOT FOUND THEN | ||
| RETURN '{}'::jsonb; | ||
| END IF; | ||
| RETURN jsonb_build_object( | ||
| '__ne_fclass_iso', fclass_iso, | ||
| '__ne_fclass_tlc', fclass_tlc, | ||
| '__ne_label_x', label_x, | ||
| '__ne_label_y', label_y | ||
| ); | ||
| END; | ||
| $$ LANGUAGE plpgsql STABLE; | ||
|
|
||
|
|
||
| -- returns a JSONB object containing __ne_pop_min and __ne_pop_max | ||
| CREATE OR REPLACE FUNCTION tz_get_ne_pop_min_max(wikidata_id TEXT) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIt: but 5.1.0 was only officially released on May 4th, so bring this forward?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated to most recent (which I think @jeffdefacto found an issue in for the iso countries.zip)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That zero length char definition is really odd. Opens fine in QGIS but PostGIS barfs on it (saying it doesn't support 0 length varchar fields).
Filed mbloch/mapshaper#541 upstream.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With mbloch/mapshaper#541 fixed upstream, I'll update Natural Earth to v5.1.1 with the fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Natural Earth 5.1.1 is now out, please update here and see if the problem persists.