Skip to content

Commit 2d9c77e

Browse files
drotheramwkhchowDamonU2
authored
Update hexbin and dsra source (#79)
* update indexes on all boundaries table including hexbins * 2 new indicators for building level dsra * test hexbin aggregation scripts for nhsl layers, area and centroid included * updated r2 to r1 * update physical exposure indicators * minor change to ini file * remove hexbin centroid aggregations * revised indicators * removed _area suffix, added global fabric aggregation but commented out until ready * exposure v1.2 updates * update mapping mean_recovery_time,sC_Recovery mean_interruption_time,sC_Downtime * Update Create_hexbin_physical_exposure_aggregation_area_proxy.sql * Update Create_scenario_risk_building_Indicators_ALL_shkmp.sql * Update Create_scenario_risk_master_tables.sql * Update Create_scenario_risk_sauid_Indicators_ALL_shkmp.sql * Update Create_scenario_risk_sauid_Indicators_ALL_shkmp.sql * eq_Scenario to eqScenario * Update Create_scenario_risk_sauid_Indicators_ALL_shkmp.sql * Update Create_all_tables_update.sql * Update Create_scenario_risk_building_Indicators_ALL_shkmp.sql * Update Create_scenario_risk_sauid_Indicators_ALL_shkmp.sql * update MFshld to include RES4,RES5,RES6 * add national hmaps table and view * update sC_Downtime to sC_Interruption * displaced res to affected res * Revert "displaced res to affected res" This reverts commit b2f660a. * Revert "Revert "displaced res to affected res"" This reverts commit 90807d4. * Revert "displaced res to affected res" This reverts commit b2f660a. * Revert "update sC_Downtime to sC_Interruption" This reverts commit e71d413. * updated typo for RES6 in MFHshld * Update Create_physical_exposure_sauid_indicators_view_PhysicalExposure_ste.sql * downtime to interruption * dsra updates * remove { } in comments * global fabric hexbin update * update for global fabric * Update DSRA_outputs2postgres_lfs.py (#76) Co-authored-by: William Chow <59062243+wkhchow@users.noreply.github.com> Co-authored-by: Damon Ulmi <63123585+DamonU2@users.noreply.github.com>
1 parent 494f8b6 commit 2d9c77e

16 files changed

Lines changed: 2604 additions & 667 deletions

‎scripts/Create_all_tables_update.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ername varchar,
1616
pruid varchar,
1717
prname varchar,
1818
sh_rupname varchar,
19-
sh_rupabbr varchar,
19+
--sh_rupabbr varchar,
2020
sh_mag varchar,
2121
sh_hypolon float,
2222
sh_hypolat float,

‎scripts/Create_hexbin_MH_risk_sauid_prioritization_aggregation_area.sql‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
2+
-- test aggregation to hexbin grids area proxy
3+
4+
--5km
5+
DROP VIEW IF EXISTS results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_5km;
6+
CREATE VIEW results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_5km AS
7+
SELECT
8+
b.gridid_5,
9+
--SUM("E_AreaKm2" * b.area_ratio) AS "Et_AreaKm2",
10+
--SUM("E_AreaHa" * b.area_ratio) AS "Et_AreaHa",
11+
SUM("Et_BldgNum" * b.area_ratio) AS "Et_BldgNum",
12+
SUM("Et_AssetValue" * b.area_ratio) AS "Et_AssetValue",
13+
SUM("Et_PopNight" * b.area_ratio) AS "Et_PopNight",
14+
SUM(eq_shaking_score_abs * b.area_ratio) AS "eq_shaking_score_abs",
15+
SUM(eq_shaking_score_rel * b.area_ratio) AS "eq_shaking_score_rel",
16+
SUM(fld_priority_score_abs * b.area_ratio) AS "fld_priority_score_abs",
17+
SUM(fld_priority_score_rel * b.area_ratio) AS "fld_priority_score_rel",
18+
SUM(wildfire_priority_score_abs * b.area_ratio) AS "wildfire_priority_score_abs",
19+
SUM(wildfire_priority_score_rel * b.area_ratio) AS "wildfire_priority_score_rel",
20+
SUM(cy_priority_score_abs * b.area_ratio) AS "cy_priority_score_abs",
21+
SUM(cy_priority_score_rel * b.area_ratio) AS "cy_priority_score_rel",
22+
SUM(total_abs_score * b.area_ratio) AS "total_abs_score",
23+
SUM(total_rel_score * b.area_ratio) AS "total_rel_score",
24+
c.geom
25+
26+
FROM results_nhsl_hazard_threat.nhsl_hazard_threat_all_indicators_s_tbl a
27+
LEFT JOIN boundaries."SAUID_HexGrid_5km_intersect" b ON a."Sauid" = b.sauid
28+
LEFT JOIN boundaries."HexGrid_5km" c ON b.gridid_5 = c.gridid_5
29+
GROUP BY b.gridid_5,c.geom;
30+
31+
32+
-- 10km
33+
DROP VIEW IF EXISTS results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_10km;
34+
CREATE VIEW results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_10km AS
35+
SELECT
36+
b.gridid_10,
37+
--SUM("E_AreaKm2" * b.area_ratio) AS "Et_AreaKm2",
38+
--SUM("E_AreaHa" * b.area_ratio) AS "Et_AreaHa",
39+
SUM("Et_BldgNum" * b.area_ratio) AS "Et_BldgNum",
40+
SUM("Et_AssetValue" * b.area_ratio) AS "Et_AssetValue",
41+
SUM("Et_PopNight" * b.area_ratio) AS "Et_PopNight",
42+
SUM(eq_shaking_score_abs * b.area_ratio) AS "eq_shaking_score_abs",
43+
SUM(eq_shaking_score_rel * b.area_ratio) AS "eq_shaking_score_rel",
44+
SUM(fld_priority_score_abs * b.area_ratio) AS "fld_priority_score_abs",
45+
SUM(fld_priority_score_rel * b.area_ratio) AS "fld_priority_score_rel",
46+
SUM(wildfire_priority_score_abs * b.area_ratio) AS "wildfire_priority_score_abs",
47+
SUM(wildfire_priority_score_rel * b.area_ratio) AS "wildfire_priority_score_rel",
48+
SUM(cy_priority_score_abs * b.area_ratio) AS "cy_priority_score_abs",
49+
SUM(cy_priority_score_rel * b.area_ratio) AS "cy_priority_score_rel",
50+
SUM(total_abs_score * b.area_ratio) AS "total_abs_score",
51+
SUM(total_rel_score * b.area_ratio) AS "total_rel_score",
52+
c.geom
53+
54+
FROM results_nhsl_hazard_threat.nhsl_hazard_threat_all_indicators_s_tbl a
55+
LEFT JOIN boundaries."SAUID_HexGrid_10km_intersect" b ON a."Sauid" = b.sauid
56+
LEFT JOIN boundaries."HexGrid_10km" c ON b.gridid_10 = c.gridid_10
57+
GROUP BY b.gridid_10,c.geom;
58+
59+
-- 25km
60+
DROP VIEW IF EXISTS results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_25km;
61+
CREATE VIEW results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_25km AS
62+
SELECT
63+
b.gridid_25,
64+
--SUM("E_AreaKm2" * b.area_ratio) AS "Et_AreaKm2",
65+
--SUM("E_AreaHa" * b.area_ratio) AS "Et_AreaHa",
66+
SUM("Et_BldgNum" * b.area_ratio) AS "Et_BldgNum",
67+
SUM("Et_AssetValue" * b.area_ratio) AS "Et_AssetValue",
68+
SUM("Et_PopNight" * b.area_ratio) AS "Et_PopNight",
69+
SUM(eq_shaking_score_abs * b.area_ratio) AS "eq_shaking_score_abs",
70+
SUM(eq_shaking_score_rel * b.area_ratio) AS "eq_shaking_score_rel",
71+
SUM(fld_priority_score_abs * b.area_ratio) AS "fld_priority_score_abs",
72+
SUM(fld_priority_score_rel * b.area_ratio) AS "fld_priority_score_rel",
73+
SUM(wildfire_priority_score_abs * b.area_ratio) AS "wildfire_priority_score_abs",
74+
SUM(wildfire_priority_score_rel * b.area_ratio) AS "wildfire_priority_score_rel",
75+
SUM(cy_priority_score_abs * b.area_ratio) AS "cy_priority_score_abs",
76+
SUM(cy_priority_score_rel * b.area_ratio) AS "cy_priority_score_rel",
77+
SUM(total_abs_score * b.area_ratio) AS "total_abs_score",
78+
SUM(total_rel_score * b.area_ratio) AS "total_rel_score",
79+
c.geom
80+
81+
FROM results_nhsl_hazard_threat.nhsl_hazard_threat_all_indicators_s_tbl a
82+
LEFT JOIN boundaries."SAUID_HexGrid_25km_intersect" b ON a."Sauid" = b.sauid
83+
LEFT JOIN boundaries."HexGrid_25km" c ON b.gridid_25 = c.gridid_25
84+
GROUP BY b.gridid_25,c.geom;
85+
86+
87+
-- 50km
88+
DROP VIEW IF EXISTS results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_50km;
89+
CREATE VIEW results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_50km AS
90+
SELECT
91+
b.gridid_50,
92+
--SUM("E_AreaKm2" * b.area_ratio) AS "Et_AreaKm2",
93+
--SUM("E_AreaHa" * b.area_ratio) AS "Et_AreaHa",
94+
SUM("Et_BldgNum" * b.area_ratio) AS "Et_BldgNum",
95+
SUM("Et_AssetValue" * b.area_ratio) AS "Et_AssetValue",
96+
SUM("Et_PopNight" * b.area_ratio) AS "Et_PopNight",
97+
SUM(eq_shaking_score_abs * b.area_ratio) AS "eq_shaking_score_abs",
98+
SUM(eq_shaking_score_rel * b.area_ratio) AS "eq_shaking_score_rel",
99+
SUM(fld_priority_score_abs * b.area_ratio) AS "fld_priority_score_abs",
100+
SUM(fld_priority_score_rel * b.area_ratio) AS "fld_priority_score_rel",
101+
SUM(wildfire_priority_score_abs * b.area_ratio) AS "wildfire_priority_score_abs",
102+
SUM(wildfire_priority_score_rel * b.area_ratio) AS "wildfire_priority_score_rel",
103+
SUM(cy_priority_score_abs * b.area_ratio) AS "cy_priority_score_abs",
104+
SUM(cy_priority_score_rel * b.area_ratio) AS "cy_priority_score_rel",
105+
SUM(total_abs_score * b.area_ratio) AS "total_abs_score",
106+
SUM(total_rel_score * b.area_ratio) AS "total_rel_score",
107+
c.geom
108+
109+
FROM results_nhsl_hazard_threat.nhsl_hazard_threat_all_indicators_s_tbl a
110+
LEFT JOIN boundaries."SAUID_HexGrid_50km_intersect" b ON a."Sauid" = b.sauid
111+
LEFT JOIN boundaries."HexGrid_50km" c ON b.gridid_50 = c.gridid_50
112+
GROUP BY b.gridid_50,c.geom;
113+
114+
-- 100km
115+
DROP VIEW IF EXISTS results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_100km;
116+
CREATE VIEW results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_100km AS
117+
SELECT
118+
b.gridid_100,
119+
--SUM("E_AreaKm2" * b.area_ratio) AS "Et_AreaKm2",
120+
--SUM("E_AreaHa" * b.area_ratio) AS "Et_AreaHa",
121+
SUM("Et_BldgNum" * b.area_ratio) AS "Et_BldgNum",
122+
SUM("Et_AssetValue" * b.area_ratio) AS "Et_AssetValue",
123+
SUM("Et_PopNight" * b.area_ratio) AS "Et_PopNight",
124+
SUM(eq_shaking_score_abs * b.area_ratio) AS "eq_shaking_score_abs",
125+
SUM(eq_shaking_score_rel * b.area_ratio) AS "eq_shaking_score_rel",
126+
SUM(fld_priority_score_abs * b.area_ratio) AS "fld_priority_score_abs",
127+
SUM(fld_priority_score_rel * b.area_ratio) AS "fld_priority_score_rel",
128+
SUM(wildfire_priority_score_abs * b.area_ratio) AS "wildfire_priority_score_abs",
129+
SUM(wildfire_priority_score_rel * b.area_ratio) AS "wildfire_priority_score_rel",
130+
SUM(cy_priority_score_abs * b.area_ratio) AS "cy_priority_score_abs",
131+
SUM(cy_priority_score_rel * b.area_ratio) AS "cy_priority_score_rel",
132+
SUM(total_abs_score * b.area_ratio) AS "total_abs_score",
133+
SUM(total_rel_score * b.area_ratio) AS "total_rel_score",
134+
c.geom
135+
136+
FROM results_nhsl_hazard_threat.nhsl_hazard_threat_all_indicators_s_tbl a
137+
LEFT JOIN boundaries."SAUID_HexGrid_100km_intersect" b ON a."Sauid" = b.sauid
138+
LEFT JOIN boundaries."HexGrid_100km" c ON b.gridid_100 = c.gridid_100
139+
GROUP BY b.gridid_100,c.geom;
140+
141+
142+
-- global fabric
143+
DROP VIEW IF EXISTS results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_global_fabric;
144+
CREATE VIEW results_nhsl_hazard_threat.nhsl_hazard_threat_prioritization_hexgrid_global_fabric AS
145+
SELECT
146+
b.gridid,
147+
--SUM("E_AreaKm2" * b.area_ratio) AS "Et_AreaKm2",
148+
--SUM("E_AreaHa" * b.area_ratio) AS "Et_AreaHa",
149+
SUM("Et_BldgNum" * b.area_ratio) AS "Et_BldgNum",
150+
SUM("Et_AssetValue" * b.area_ratio) AS "Et_AssetValue",
151+
SUM("Et_PopNight" * b.area_ratio) AS "Et_PopNight",
152+
SUM(eq_shaking_score_abs * b.area_ratio) AS "eq_shaking_score_abs",
153+
SUM(eq_shaking_score_rel * b.area_ratio) AS "eq_shaking_score_rel",
154+
SUM(fld_priority_score_abs * b.area_ratio) AS "fld_priority_score_abs",
155+
SUM(fld_priority_score_rel * b.area_ratio) AS "fld_priority_score_rel",
156+
SUM(wildfire_priority_score_abs * b.area_ratio) AS "wildfire_priority_score_abs",
157+
SUM(wildfire_priority_score_rel * b.area_ratio) AS "wildfire_priority_score_rel",
158+
SUM(cy_priority_score_abs * b.area_ratio) AS "cy_priority_score_abs",
159+
SUM(cy_priority_score_rel * b.area_ratio) AS "cy_priority_score_rel",
160+
SUM(total_abs_score * b.area_ratio) AS "total_abs_score",
161+
SUM(total_rel_score * b.area_ratio) AS "total_rel_score",
162+
c.geom
163+
164+
FROM results_nhsl_hazard_threat.nhsl_hazard_threat_all_indicators_s_tbl a
165+
LEFT JOIN boundaries."SAUID_HexGrid_GlobalFabric_intersect" b ON a."Sauid" = b.sauid
166+
LEFT JOIN boundaries."HexGrid_GlobalFabric" c ON b.gridid = c.gridid
167+
GROUP BY b.gridid,c.geom;

0 commit comments

Comments
 (0)