cartodb4/data-services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:CartoDB/data-services

Browse Source
This commit is contained in:
andrewxhill
2014-08-21 15:43:49 -04:00
parent a949e25dd6 e3a4857733
commit ce003f0c22
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geocoder/admin1/sql/build_data_table.sql
+17 -12
View File
@@ -1,17 +1,16 @@
---- ADMIN1 Geometry Table ----- ---- ADMIN1 DATA TABLE BUILD -----
------------------------------- -------------------------------
--- NOTE --- --- NOTE ---
-- for countries that have admin1 regions we use data from qs_adm1_region -- for countries that have admin1 regions we use data from qs_adm1_region
-------------------------------------------------------------- --------------------------------------------------------------
--- only do this step global_id doesn't exist in quattro shapes admin1 datasets:
--- add column global_id to admin1 and admin1 region tables --- add column global_id to admin1 and admin1 region tables
--- only do this if they don't exist:
--ALTER TABLE qs_adm1 ADD COLUMN global_id INT; --ALTER TABLE qs_adm1 ADD COLUMN global_id INT;
--ALTER TABLE qs_adm1_region ADD COLUMN global_id INT; --ALTER TABLE qs_adm1_region ADD COLUMN global_id INT;
--- create a unique id for both the adm1 and adm1_region tables --- we need to create a unique id for both the adm1 and adm1_region tables
--- first create new table in memory --- first create new table in memory. use the cartodb_id with the table name
--- use the cartodb_id with the table name
WITH all_data AS ( WITH all_data AS (
SELECT cartodb_id AS source_id, 'qs_adm1' AS sourcetable FROM qs_adm1 SELECT cartodb_id AS source_id, 'qs_adm1' AS sourcetable FROM qs_adm1
UNION ALL UNION ALL
@@ -21,7 +20,7 @@ WITH all_data AS (
global_id AS ( global_id AS (
SELECT *, ROW_NUMBER() OVER (ORDER BY source_id ASC) id FROM all_data SELECT *, ROW_NUMBER() OVER (ORDER BY source_id ASC) id FROM all_data
), ),
--- update both tables globa_id column --- now update both tables' global_id column
first_update AS ( first_update AS (
UPDATE qs_adm1 SET global_id = ( UPDATE qs_adm1 SET global_id = (
SELECT id FROM global_id WHERE source_id = qs_adm1.cartodb_id AND sourcetable ='qs_adm1' SELECT id FROM global_id WHERE source_id = qs_adm1.cartodb_id AND sourcetable ='qs_adm1'
@@ -32,19 +31,25 @@ first_update AS (
SELECT id FROM global_id WHERE source_id = qs_adm1_region.cartodb_id AND sourcetable ='qs_adm1_region' SELECT id FROM global_id WHERE source_id = qs_adm1_region.cartodb_id AND sourcetable ='qs_adm1_region'
); );
-- clear all existing data from the table --- punch out ne_10m coastline from the following countries in quattro shapes admin1 data. Do this one at a time to not bog down the cpu.
update qs_adm1 set the_geom = ST_Intersection(the_geom, (SELECT the_geom FROM ne_10m_land)) WHERE qs_adm0_a3 = 'USA';
update qs_adm1 set the_geom = ST_Intersection(the_geom, (SELECT the_geom FROM ne_10m_land)) WHERE qs_adm0_a3 = 'CAN';
update qs_adm1 set the_geom = ST_Intersection(the_geom, (SELECT the_geom FROM ne_10m_land)) WHERE qs_adm0_a3 = 'MEX';
update qs_adm1 set the_geom = ST_Intersection(the_geom, (SELECT the_geom FROM ne_10m_land)) WHERE qs_adm0_a3 = 'SWE';
update qs_adm1_region set the_geom = ST_Intersection(the_geom, (SELECT the_geom FROM ne_10m_land)) WHERE qs_adm0_a3 = 'FIN';
update qs_adm1 set the_geom = ST_Intersection(the_geom, (SELECT the_geom FROM ne_10m_land)) WHERE qs_adm0_a3 = 'HRV';
update qs_adm1 set the_geom = ST_Intersection(the_geom, (SELECT the_geom FROM ne_10m_land)) WHERE qs_adm0_a3 = 'NOR';
--- clear all existing data from the adm1 table
DELETE FROM adm1; DELETE FROM adm1;
-- insert data from quattro shapes adm1 where countries don't have Regions --- insert data from quattro shapes adm1 where countries don't have admin1 regions
INSERT INTO adm1 (the_geom, global_id) INSERT INTO adm1 (the_geom, global_id)
SELECT the_geom, global_id SELECT the_geom, global_id
FROM qs_adm1 FROM qs_adm1
WHERE qs_adm0 NOT IN ('Belgium', 'Finland', 'France', 'Hungary', 'Italy', 'Serbia', 'Spain', 'United Kingdom'); WHERE qs_adm0 NOT IN ('Belgium', 'Finland', 'France', 'Hungary', 'Italy', 'Serbia', 'Spain', 'United Kingdom');
-- insert data from quattro shapes adm1 regions --- insert data from quattro shapes adm1 regions
INSERT INTO adm1 (the_geom, global_id) INSERT INTO adm1 (the_geom, global_id)
SELECT the_geom, global_id SELECT the_geom, global_id
FROM qs_adm1_region; FROM qs_adm1_region;
-- synonyms table = rank, isoCode, id, name, name_code