more rigorous countries labels per ISO and point-of-view

data/apply-ne_country_label_recasting.sql

@@ -0,0 +1,41 @@
+-- Recasts a few rows in the ne_10m_admin_0_countries_iso and ne_10m_admin_0_countries_tlc
+-- tables to either show or hide certain labels.
+-- The TLC table yields around 10 country and dependency features over ISO (including Kosovo and Taiwan),
+-- which Tilezen sometimes has opinions about.
+
+
+-- sets featurcla to equal fclass_tlc values. We can then further modify the values while keeping the fclass intact.
+-- featurecla column has a shorter varchar length and needs altering first.
+alter table ne_10m_admin_0_countries_tlc alter column featurecla type varchar;
+update ne_10m_admin_0_countries_tlc set featurecla = fclass_tlc;
+
+-- Akrotiri Sovereign Base Area
+update ne_10m_admin_0_countries_tlc set featurecla = 'unrecognized' where ne_id = 1159320741;
+
+-- Ashmore and Cartier Islands
+update ne_10m_admin_0_countries_tlc set featurecla = 'unrecognized' where ne_id = 1159320353;
+
+-- Clipperton Island
+update ne_10m_admin_0_countries_tlc set featurecla = 'unrecognized' where ne_id = 1159320635;
+
+-- Coral Sea Islands
+update ne_10m_admin_0_countries_tlc set featurecla = 'unrecognized' where ne_id = 1159320359;
+
+-- Dhekelia Cantonment
+update ne_10m_admin_0_countries_tlc set featurecla = 'unrecognized' where ne_id = 1159320709;
+
+-- Gaza Strip
+update ne_10m_admin_0_countries_tlc set featurecla = 'Admin-0 country' where ne_id = 1159320901;
+
+-- Somaliland
+update ne_10m_admin_0_countries_tlc set featurecla = 'unrecognized' where ne_id = 1159321259;
+
+-- Turkish Republic of Northern Cyprus
+update ne_10m_admin_0_countries_tlc set featurecla = 'unrecognized' where ne_id = 1159320531;
+
+-- West Bank
+update ne_10m_admin_0_countries_tlc set featurecla = 'Admin-0 dependency' where ne_id = 1159320903;
+
+
+-- Fix Saint Helena wikidata id for this build. Remove once NE is updated
+update ne_10m_admin_0_countries_iso set wikidataid = 'Q192184' where ne_id = 1159320733;

data/functions.sql

@@ -1017,7 +1017,8 @@ BEGIN
         SELECT
             min_label, max_label INTO min_zoom, max_zoom
         FROM ne_10m_admin_0_countries_tlc t
-        WHERE t.wikidataid = wikidata_id;
+        WHERE t.wikidataid = wikidata_id
+        AND featurecla IN ('Admin-0 country', 'Admin-0 dependency');
       END IF;
   ELSE
     -- try states and provinces if it's not a country
@@ -1071,7 +1072,8 @@ END IF;
         SELECT
             t.fclass_iso, t.fclass_tlc, t.label_x, t.label_y INTO fclass_iso_var, fclass_tlc_var, label_x_var, label_y_var
         FROM ne_10m_admin_0_countries_tlc t
-        WHERE t.wikidataid = wikidata_id;
+        WHERE t.wikidataid = wikidata_id
+        AND featurecla IN ('Admin-0 country', 'Admin-0 dependency');
     END IF;
 
     IF NOT FOUND THEN

data/perform-sql-updates.sh

@@ -47,6 +47,11 @@ psql $PSQLOPTS  $@ -f apply-planet_disputed_area_features_name_suppression.sql
 echo -e "\nRecasting unwanted NE disputed lines to unrecognized"
 psql $PSQLOPTS  $@ -f apply-ne_disputed_border_suppression.sql
 
+# Recasts a few rows in the ne_10m_admin_0_countries_iso and ne_10m_admin_0_countries_tlc
+# tables to either show or hide certain labels.
+echo -e "\nRecasting NE country labels"
+psql $PSQLOPTS  $@ -f apply-ne_country_label_recasting.sql
+
 # Australia suburbs are treated more like cities than typical US style suburbs so we recast them to place=town
 echo -e "\nRecasting Australia suburbs"
 psql $PSQLOPTS  $@ -f apply-planet_australia_suburb_recast.sql

integration-test/1826-unrecognised-country-labels.py

@@ -37,8 +37,8 @@ def test_country_no_ne(self):
 
         self.assert_has_feature(
             z, x, y, 'places', {
-                'kind': 'country',
-                'min_zoom': 6,
+                'kind': 'unrecognized',
+                'min_zoom': 8,
             })
 
     def test_region_no_ne(self):

osm2pgsql.lua

@@ -508,7 +508,7 @@ function osm2pgsql.process_node(object)
     end
 -- Show Abkhazia label as region for most countries
     if object.tags.place and object.tags.wikidata == 'Q23334' then
-        output_hstore['place'] = 'region'
+        output_hstore['place'] = 'state'
         output_hstore['place:RU'] = 'country'
     end
 -- Turn off South Ossetia label for most countries
@@ -557,7 +557,7 @@ function osm2pgsql.process_node(object)
         output_hstore['place'] = 'country'
     end
 -- New Caledonia
-    if object.tags.place == 'archipelago' and object.tags['ISO3166-1'] == 'NF' then
+    if object.tags.place == 'archipelago' and object.tags['ISO3166-1'] == 'NC' then
         output_hstore['place'] = 'country'
     end
 -- Norfolk Island

vectordatasource/transform.py

@@ -8906,13 +8906,14 @@ def tags_set_ne_min_max_zoom(ctx):
                 min_zoom = ceil(min_zoom)
             props['min_zoom'] = min_zoom
 
-        elif props.get('kind') == 'country':
+        elif props.get('kind') in ('country', 'unrecognized'):
             # countries and regions which don't have a min zoom joined from NE
             # are probably either vandalism or unrecognised countries. either
             # way, we probably don't want to see them at zoom, which is lower
             # than most of the curated NE min zooms. see issue #1826 for more
             # information.
-            props['min_zoom'] = max(6, props['min_zoom'])
+            props['kind'] = 'unrecognized'
+            props['min_zoom'] = max(8, props['min_zoom'])
 
         elif props.get('kind') == 'region':
             props['min_zoom'] = max(8, props['min_zoom'])

yaml/places.yaml

@@ -147,7 +147,11 @@ filters:
     #
     # note: also, we knock this down to 6 during post-processing for any country
     # which doesn't match an NE curated one.
-    min_zoom: 1
+    min_zoom:
+      case:
+        - when: { place: country }
+          then: 1
+        - else: 8
     output:
       <<: [*output_properties, *ne_zooms]
       kind: {col: place}