Merge pull request #105 from OpenDRR/update_hexbin1km_feb2022

Update hexbin1km feb2022
OpenDRR · Feb 8, 2022 · e82a4ec · e82a4ec
2 parents 58f46dd + 7784660
commit e82a4ec
Show file tree

Hide file tree

Showing 3 changed files with 270 additions and 14 deletions.
diff --git a/scripts/Create_scenario_risk_building_Indicators_ALL_shkmp.sql b/scripts/Create_scenario_risk_building_Indicators_ALL_shkmp.sql
@@ -133,6 +133,96 @@ JOIN boundaries."HexGrid_100km" b ON ST_INTERSECTS(a.geom,b.geom)
 GROUP BY b.gridid_100;
 
 
+-- create shakemap in hexbin for display - 1km
+-- create full extent of dsra scenario 1km hexbin - using 5km shakemap hexbin
+DROP TABLE IF EXISTS results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_full CASCADE;
+CREATE TABLE results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_full AS
+SELECT 
+a.gridid_1,
+a.geom
+
+FROM boundaries."HexGrid_1km" a
+JOIN results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_5km b ON ST_INTERSECTS(a.geom,b.geom);
+
+
+-- calculate avg, min, max pga of shakemap points within 1km hexbin
+DROP TABLE IF EXISTS results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp CASCADE;
+CREATE TABLE results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp AS
+
+SELECT
+b.gridid_1,
+AVG("sH_PGA") AS "sH_PGA_avg",
+MIN("sH_PGA") as "sH_PGA_min",
+MAX("sH_PGA") as "sH_PGA_max",
+b.geom
+
+FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap a
+JOIN boundaries."HexGrid_1km" b ON ST_INTERSECTS(a.geom,b.geom)
+GROUP BY b.gridid_1,b.geom;
+
+
+-- create dsra scenario shakemap 1km hexbin and assign PGA value based on nearest shakemap ID
+DROP TABLE IF EXISTS results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp1 CASCADE;
+CREATE TABLE results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp1 AS
+SELECT
+a.gridid_1,
+0.00 AS "sH_PGA_avg",
+0.00 AS "sH_PGA_min",
+b."sH_PGA" AS "sH_PGA_max",
+a.geom
+
+FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_full a
+CROSS JOIN LATERAL 
+(
+SELECT
+"sH_PGA",
+geom
+
+FROM results_dsra_{eqScenario}.{eqScenario}_shakemap_tbl
+ORDER BY a.geom <-> geom
+LIMIT 1
+) AS b;
+
+
+-- update dsra shakeap 1km hexbin with calculated max PGA values
+UPDATE results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp1 b
+SET "sH_PGA_max" = a."sH_PGA_max",
+"sH_PGA_min" = a."sH_PGA_min",
+"sH_PGA_avg" = a."sH_PGA_avg"
+FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp a
+WHERE a.gridid_1 = b.gridid_1;
+
+
+-- remove duplicate gridid_1 values from selection
+DROP TABLE IF EXISTS results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_tbl CASCADE;
+CREATE TABLE results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_tbl AS
+SELECT
+DISTINCT(gridid_1),
+"sH_PGA_avg",
+"sH_PGA_min",
+"sH_PGA_max",
+geom
+
+FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp1;
+
+
+-- update assigned 0.00 to null
+UPDATE results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_tbl
+SET "sH_PGA_avg" = NULL WHERE "sH_PGA_avg" = 0.00;
+UPDATE results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_tbl
+SET "sH_PGA_min" = NULL WHERE "sH_PGA_min" = 0.00;
+
+
+-- drop temp
+DROP TABLE IF EXISTS results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp,
+results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_temp1,
+results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_full CASCADE;
+
+
+-- create view
+DROP VIEW IF EXISTS results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km;
+CREATE VIEW results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km AS SELECT * FROM results_dsra_{eqScenario}.dsra_{eqScenario}_shakemap_hexbin_1km_tbl;
+
 
 -- add polygon extents to scenario extents table for each scenario
 INSERT INTO gmf.shakemap_scenario_extents_temp(scenario,geom)
@@ -304,6 +394,8 @@ CREATE VIEW results_dsra_{eqScenario}.dsra_{eqScenario}_indicators_b AS
 SELECT 
 a."AssetID",
 b.eqdeslev AS "E_BldgDesLev",
+b.occclass1 AS "E_BldgOccS1",
+b.gentype AS "E_BldgTypeG",
 
 -- 3.1.1 Shakemap Intensity
 a."Rupture_Abbr" AS "sH_RupName",

diff --git a/scripts/Create_social_vulnerability_sauid_indicators_SocialFabric.sql b/scripts/Create_social_vulnerability_sauid_indicators_SocialFabric.sql
@@ -166,4 +166,58 @@ b."SACTYPE" AS "sactype",
 b.geom AS "geom_poly"
 
 FROM sovi.sovi_sauid_nov2021 a
-LEFT JOIN boundaries."Geometry_SAUID" b ON b."SAUIDt" = a.sauid;
+LEFT JOIN boundaries."Geometry_SAUID" b ON b."SAUIDt" = a.sauid;
+
+
+-- create views for province
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nl CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nl AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='10';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_pe CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_pe AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='11';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_ns CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_ns AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='12';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nb CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nb AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='13';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_qc CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_qc AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='24';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_on CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_on AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='35';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_mb CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_mb AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='46';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_sk CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_sk AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='47';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_ab CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_ab AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='48';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_bc CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_bc AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='59';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_yt CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_yt AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='60';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nt CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nt AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='61';
+
+DROP VIEW IF EXISTS results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nu CASCADE;
+CREATE VIEW results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_nu AS 
+SELECT * FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s WHERE pruid ='62';
diff --git a/scripts/Update_boundaries_SAUID_table.sql b/scripts/Update_boundaries_SAUID_table.sql
@@ -8,61 +8,139 @@ UPDATE boundaries."Geometry_SAUID"
 SET geom = ST_MakeValid(geom);
 */
 
--- change new PK / add indexes Geommetry_SAUID
+-- change new PK / add indexes Geometry_SAUID
 ALTER TABLE boundaries."Geometry_SAUID" DROP CONSTRAINT IF EXISTS "Geometry_SAUID_pkey";
 ALTER TABLE boundaries."Geometry_SAUID" ADD PRIMARY KEY ("SAUIDt");
 CREATE INDEX IF NOT EXISTS geometry_sauid_sauid_idx ON boundaries."Geometry_SAUID"("SAUIDt");
 CREATE INDEX IF NOT EXISTS geometry_sauid_geom_idx ON boundaries."Geometry_SAUID" using GIST(geom);
 CREATE INDEX IF NOT EXISTS geometry_sauid_geom_point_idx ON boundaries."Geometry_SAUID" using GIST(geompoint);
 
--- change new PK / add indexes Geommetry_ADAUID
+-- change new PK / add indexes Geometry_ADAUID
 ALTER TABLE boundaries."Geometry_ADAUID" DROP CONSTRAINT IF EXISTS "Geometry_ADAUID_pkey";
 ALTER TABLE boundaries."Geometry_ADAUID" ADD PRIMARY KEY ("ADAUID");
 CREATE INDEX IF NOT EXISTS geometry_adauid_adauid_idx ON boundaries."Geometry_ADAUID"("ADAUID");
 CREATE INDEX IF NOT EXISTS geometry_adauid_geom_idx ON boundaries."Geometry_ADAUID" using GIST(geom);
 
--- change new PK / add indexes Geommetry_CANADA
+-- change new PK / add indexes Geometry_CANADA
 ALTER TABLE boundaries."Geometry_CANADA" DROP CONSTRAINT IF EXISTS "Geometry_CANADA_pkey";
 ALTER TABLE boundaries."Geometry_CANADA" ADD PRIMARY KEY ("Country");
 CREATE INDEX IF NOT EXISTS geometry_canada_fid_idx ON boundaries."Geometry_CANADA"("Country");
 CREATE INDEX IF NOT EXISTS geometry_canada_geom_idx ON boundaries."Geometry_CANADA" using GIST(geom);
 
--- change new PK / add indexes Geommetry_CDUID
+-- change new PK / add indexes Geometry_CDUID
 ALTER TABLE boundaries."Geometry_CDUID" DROP CONSTRAINT IF EXISTS "Geometry_CDUID_pkey";
 ALTER TABLE boundaries."Geometry_CDUID" ADD PRIMARY KEY ("CDUID");
 CREATE INDEX IF NOT EXISTS geometry_cduid_cduid_idx ON boundaries."Geometry_CDUID"("CDUID");
 CREATE INDEX IF NOT EXISTS geometry_cduid_geom_idx ON boundaries."Geometry_CDUID" using GIST(geom);
 
--- change new PK / add indexes Geommetry_CSDUID
+-- change new PK / add indexes Geometry_CSDUID
 ALTER TABLE boundaries."Geometry_CSDUID" DROP CONSTRAINT IF EXISTS "Geometry_CSDUID_pkey";
 ALTER TABLE boundaries."Geometry_CSDUID" ADD PRIMARY KEY ("CSDUID");
 CREATE INDEX IF NOT EXISTS geometry_csduid_csduid_idx ON boundaries."Geometry_CSDUID"("CSDUID");
 CREATE INDEX IF NOT EXISTS geometry_csduid_geom_idx ON boundaries."Geometry_CSDUID" using GIST(geom);
 
--- change new PK / add indexes Geommetry_DAUID
+-- change new PK / add indexes Geometry_DAUID
 ALTER TABLE boundaries."Geometry_DAUID" DROP CONSTRAINT IF EXISTS "Geometry_DAUID_pkey";
 ALTER TABLE boundaries."Geometry_DAUID" ADD PRIMARY KEY ("DAUID");
 CREATE INDEX IF NOT EXISTS geometry_dauid_dauid_idx ON boundaries."Geometry_DAUID"("DAUID");
 CREATE INDEX IF NOT EXISTS geometry_dauid_geom_idx ON boundaries."Geometry_DAUID" using GIST(geom);
 
--- change new PK / add indexes Geommetry_ERUID
+-- change new PK / add indexes Geometry_ERUID
 ALTER TABLE boundaries."Geometry_ERUID" DROP CONSTRAINT IF EXISTS "Geometry_ERUID_pkey";
 ALTER TABLE boundaries."Geometry_ERUID" ADD PRIMARY KEY ("ERUID");
 CREATE INDEX IF NOT EXISTS geometry_eruid_eruid_idx ON boundaries."Geometry_ERUID"("ERUID");
 CREATE INDEX IF NOT EXISTS geometry_eruid_geom_idx ON boundaries."Geometry_ERUID" using GIST(geom);
 
--- change new PK / add indexes Geommetry_FSAUID
+-- change new PK / add indexes Geometry_FSAUID
 ALTER TABLE boundaries."Geometry_FSAUID" DROP CONSTRAINT IF EXISTS "Geometry_FSAUID_pkey";
 ALTER TABLE boundaries."Geometry_FSAUID" ADD PRIMARY KEY ("CFSAUID");
 CREATE INDEX IF NOT EXISTS geometry_fsauid_fsauid_idx ON boundaries."Geometry_FSAUID"("CFSAUID");
 CREATE INDEX IF NOT EXISTS geometry_fsauid_geom_idx ON boundaries."Geometry_FSAUID" using GIST(geom);
 
--- change new PK / add indexes Geommetry_PRUID
+-- change new PK / add indexes Geometry_PRUID
 ALTER TABLE boundaries."Geometry_PRUID" DROP CONSTRAINT IF EXISTS "Geometry_PRUID_pkey";
 ALTER TABLE boundaries."Geometry_PRUID" ADD PRIMARY KEY ("PRUID");
 CREATE INDEX IF NOT EXISTS geometry_pruid_pruid_idx ON boundaries."Geometry_PRUID"("PRUID");
 CREATE INDEX IF NOT EXISTS geometry_prauid_geom_idx ON boundaries."Geometry_PRUID" using GIST(geom);
 
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_AB" DROP CONSTRAINT IF EXISTS "HexGrid_1km_AB_pkey";
+ALTER TABLE boundaries."HexGrid_1km_AB" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_ab_idx ON boundaries."HexGrid_1km_AB"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_ab_idx ON boundaries."HexGrid_1km_AB" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_BC" DROP CONSTRAINT IF EXISTS "HexGrid_1km_BC_pkey";
+ALTER TABLE boundaries."HexGrid_1km_BC" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_bc_idx ON boundaries."HexGrid_1km_BC"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_bc_idx ON boundaries."HexGrid_1km_BC" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_MB" DROP CONSTRAINT IF EXISTS "HexGrid_1km_MB_pkey";
+ALTER TABLE boundaries."HexGrid_1km_MB" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_mb_idx ON boundaries."HexGrid_1km_MB"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_mb_idx ON boundaries."HexGrid_1km_MB" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_NB" DROP CONSTRAINT IF EXISTS "HexGrid_1km_NB_pkey";
+ALTER TABLE boundaries."HexGrid_1km_NB" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_nb_idx ON boundaries."HexGrid_1km_NB"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_nb_idx ON boundaries."HexGrid_1km_NB" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_NL" DROP CONSTRAINT IF EXISTS "HexGrid_1km_NL_pkey";
+ALTER TABLE boundaries."HexGrid_1km_NL" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_nl_idx ON boundaries."HexGrid_1km_NL"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_nl_idx ON boundaries."HexGrid_1km_NL" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_NS" DROP CONSTRAINT IF EXISTS "HexGrid_1km_NS_pkey";
+ALTER TABLE boundaries."HexGrid_1km_NS" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_ns_idx ON boundaries."HexGrid_1km_NS"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_ns_idx ON boundaries."HexGrid_1km_NS" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_NT" DROP CONSTRAINT IF EXISTS "HexGrid_1km_NT_pkey";
+ALTER TABLE boundaries."HexGrid_1km_NT" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_nt_idx ON boundaries."HexGrid_1km_NT"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_nt_idx ON boundaries."HexGrid_1km_NT" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_NU" DROP CONSTRAINT IF EXISTS "HexGrid_1km_NU_pkey";
+ALTER TABLE boundaries."HexGrid_1km_NU" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_nu_idx ON boundaries."HexGrid_1km_NU"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_nu_idx ON boundaries."HexGrid_1km_NU" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_ON" DROP CONSTRAINT IF EXISTS "HexGrid_1km_ON_pkey";
+ALTER TABLE boundaries."HexGrid_1km_ON" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_on_idx ON boundaries."HexGrid_1km_ON"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_on_idx ON boundaries."HexGrid_1km_ON" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_PE" DROP CONSTRAINT IF EXISTS "HexGrid_1km_PE_pkey";
+ALTER TABLE boundaries."HexGrid_1km_PE" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_pe_idx ON boundaries."HexGrid_1km_PE"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_pe_idx ON boundaries."HexGrid_1km_PE" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_QC" DROP CONSTRAINT IF EXISTS "HexGrid_1km_QC_pkey";
+ALTER TABLE boundaries."HexGrid_1km_QC" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_qc_idx ON boundaries."HexGrid_1km_QC"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_qc_idx ON boundaries."HexGrid_1km_QC" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_SK" DROP CONSTRAINT IF EXISTS "HexGrid_1km_SK_pkey";
+ALTER TABLE boundaries."HexGrid_1km_SK" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_sk_idx ON boundaries."HexGrid_1km_SK"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_sk_idx ON boundaries."HexGrid_1km_SK" using GIST(geom);
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km_YT" DROP CONSTRAINT IF EXISTS "HexGrid_1km_YT_pkey";
+ALTER TABLE boundaries."HexGrid_1km_YT" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_yt_idx ON boundaries."HexGrid_1km_YT"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_yt_idx ON boundaries."HexGrid_1km_YT" using GIST(geom);
+
 -- change new PK / add indexes HexGrid_5km
 ALTER TABLE boundaries."HexGrid_5km" DROP CONSTRAINT IF EXISTS "HexGrid_5km_pkey";
 ALTER TABLE boundaries."HexGrid_5km" ADD PRIMARY KEY ("gridid_5");
@@ -124,7 +202,39 @@ ALTER TABLE boundaries."SAUID_HexGrid_100km_intersect" DROP CONSTRAINT IF EXISTS
 ALTER TABLE boundaries."SAUID_HexGrid_100km_intersect" ADD PRIMARY KEY ("gridid_100","sauid");
 CREATE INDEX IF NOT EXISTS sauid_hexgrid_100km_sauid_idx ON boundaries."SAUID_HexGrid_100km_intersect"("gridid_100","sauid");
 
--- change new PK / add indexes SAUID_100km_intersect
-ALTER TABLE boundaries."SAUID_HexGrid_GlobalFabric_intersect" DROP CONSTRAINT IF EXISTS "SAUID_HexGrid_GlobalFabric_intersect_pkey";
-ALTER TABLE boundaries."SAUID_HexGrid_GlobalFabric_intersect" ADD PRIMARY KEY ("gridid","sauid");
-CREATE INDEX IF NOT EXISTS sauid_hexgrid_100km_sauid_idx ON boundaries."SAUID_HexGrid_GlobalFabric_intersect" ("gridid","sauid");
+
+-- union 1km hexgrid from P/T
+DROP TABLE IF EXISTS boundaries."HexGrid_1km" CASCADE;
+
+CREATE TABLE boundaries."HexGrid_1km" AS
+SELECT * FROM boundaries."HexGrid_1km_AB"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_BC"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_MB"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_NB"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_NL"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_NS"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_NT"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_NU"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_ON"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_PE"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_QC"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_SK"
+UNION
+SELECT * FROM boundaries."HexGrid_1km_YT";
+
+-- change new PK / add indexes HexGrid_1km
+ALTER TABLE boundaries."HexGrid_1km" DROP CONSTRAINT IF EXISTS "HexGrid_1km_pkey";
+ALTER TABLE boundaries."HexGrid_1km" ADD PRIMARY KEY ("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_gridid_1_idx ON boundaries."HexGrid_1km"("gridid_1");
+CREATE INDEX IF NOT EXISTS hexgrid_1km_geom_idx ON boundaries."HexGrid_1km" using GIST(geom);