From 00d88a103ccc179538f1d5037e40615707fc4e39 Mon Sep 17 00:00:00 2001 From: jirik Date: Thu, 29 Nov 2018 14:03:39 +0100 Subject: [PATCH] Revert back to NE 4.0.0 See https://github.com/openmaptiles/openmaptiles/issues/365#issuecomment-442823991 --- docker-compose.yml | 2 +- layers/place/update_country_point.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fb8be72c..675b890a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - "5432" env_file: .env import-natural-earth: - image: "openmaptiles/import-natural-earth:1.5" + image: "openmaptiles/import-natural-earth:1.4" env_file: .env networks: - postgres_conn diff --git a/layers/place/update_country_point.sql b/layers/place/update_country_point.sql index 5b4d48e1..175a7226 100644 --- a/layers/place/update_country_point.sql +++ b/layers/place/update_country_point.sql @@ -25,8 +25,8 @@ BEGIN WHERE -- We match only countries with ISO codes to eliminate disputed countries iso3166_1_alpha_2 IS NOT NULL - -- that has same Wikidata ID or lies inside polygon of sovereign country - AND (osm.tags->'wikidata' = ne.wikidataid OR ST_Within(osm.geometry, ne.geometry)) + -- that lies inside polygon of sovereign country + AND ST_Within(osm.geometry, ne.geometry) ) UPDATE osm_country_point AS osm -- Normalize both scalerank and labelrank into a ranking system from 1 to 6