mirror
/
openmaptiles
kopia lustrzana https://github.com/openmaptiles/openmaptiles
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #113 from openmaptiles/fix_city_point 

Fix #108 and  #109 [ osm_city_point and natural earth merge ]
pull/124/head
Lukas Martinelli 2016-12-31 22:16:03 +01:00 zatwierdzone przez GitHub
rodzic 98ce193ebe eb577a040a
commit 4350aa11f9
1 zmienionych plików z 8 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
layers/place/merge_city_rank.sql
Wyświetl plik

@ -1,4 +1,10 @@
CREATE EXTENSION IF NOT EXISTS unaccent;
-- Clear OSM key:rank ( https://github.com/openmaptiles/openmaptiles/issues/108 )
-- etldoc: osm_city_point -> osm_city_point
UPDATE osm_city_point AS osm SET "rank" = NULL WHERE "rank" IS NOT NULL;
-- etldoc: ne_10m_populated_places -> osm_city_point -- etldoc: ne_10m_populated_places -> osm_city_point
-- etldoc: osm_city_point -> osm_city_point -- etldoc: osm_city_point -> osm_city_point
@ -16,7 +22,8 @@ WITH important_city_point AS (
ne.gn_ascii ILIKE osm.name OR ne.gn_ascii ILIKE osm.name OR
ne.gn_ascii ILIKE osm.name_en OR ne.gn_ascii ILIKE osm.name_en OR
ne.nameascii ILIKE osm.name OR ne.nameascii ILIKE osm.name OR
ne.nameascii ILIKE osm.name_en ne.nameascii ILIKE osm.name_en OR
ne.name = unaccent(osm.name)
) )
AND osm.place IN ('city', 'town', 'village') AND osm.place IN ('city', 'town', 'village')
AND ST_DWithin(ne.geometry, osm.geometry, 50000) AND ST_DWithin(ne.geometry, osm.geometry, 50000)