Merge pull request #100 from OpenDRR/update_social_fabric_jan2022

Update social fabric jan2022

scripts/Create_MH_risk_sauid_prioritization_Canada.sql

@@ -1058,7 +1058,7 @@ a.geom_poly
 
 FROM results_nhsl_hazard_threat.hazard_threat_values_s a
 LEFT JOIN results_nhsl_hazard_threat.hazard_threat_values_csd b ON a.csduid = b.csduid
-LEFT JOIN results_nhsl_social_fabric.nhsl_social_fabric_indicators_s_tbl c ON a."Sauid" = c."Sauid"
+LEFT JOIN results_nhsl_social_fabric.nhsl_social_fabric_indicators_s c ON a."Sauid" = c."Sauid"
 ORDER BY a."Sauid" ASC; 
 
 -- update total absolute and relative scores

scripts/Create_all_tables_update.sql

@@ -137,31 +137,41 @@ CREATE INDEX IF NOT EXISTS census_2016_canada_sauid_idx ON census.census_2016_ca
 
 /* Create_table_sovi_index_canada_v2.sql */
 -- create index
-CREATE INDEX sovi_index_canada_idx ON sovi.sovi_index_canada (sauidt);
+-- CREATE INDEX sovi_index_canada_idx ON sovi.sovi_index_canada (sauidt);
 
 
 
-/* Create_table_sovi_census_canada.sql */
--- create indexes
-CREATE INDEX IF NOT EXISTS sovi_census_canada_sauid_idx ON sovi.sovi_census_canada(sauidt);
-CREATE INDEX IF NOT EXISTS sovi_census_canada_dauid_idx ON sovi.sovi_census_canada(dauidt);
-CREATE INDEX IF NOT EXISTS sovi_census_canada_cfsauid_idx ON sovi.sovi_census_canada(cfsauid);
-CREATE INDEX IF NOT EXISTS sovi_census_canada_csduid_idx ON sovi.sovi_census_canada(csduid);
-CREATE INDEX IF NOT EXISTS sovi_census_canada_adauid_idx ON sovi.sovi_census_canada(adauid);
-CREATE INDEX IF NOT EXISTS sovi_census_canada_cduid_idx ON sovi.sovi_census_canada(cduid);
-CREATE INDEX IF NOT EXISTS sovi_census_canada_eruid_idx ON sovi.sovi_census_canada(eruid);
-CREATE INDEX IF NOT EXISTS sovi_census_canada_pruid_idx ON sovi.sovi_census_canada(pruid);
+-- /* Create_table_sovi_census_canada.sql */
+-- -- create indexes
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_sauid_idx ON sovi.sovi_census_canada(sauidt);
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_dauid_idx ON sovi.sovi_census_canada(dauidt);
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_cfsauid_idx ON sovi.sovi_census_canada(cfsauid);
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_csduid_idx ON sovi.sovi_census_canada(csduid);
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_adauid_idx ON sovi.sovi_census_canada(adauid);
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_cduid_idx ON sovi.sovi_census_canada(cduid);
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_eruid_idx ON sovi.sovi_census_canada(eruid);
+-- CREATE INDEX IF NOT EXISTS sovi_census_canada_pruid_idx ON sovi.sovi_census_canada(pruid);
 
 /* sovi_index */
 -- create indexes
-CREATE INDEX IF NOT EXISTS sovi_index_canada_sauid_idx ON sovi.sovi_index_canada(sauidt);
-CREATE INDEX IF NOT EXISTS sovi_index_canada_dauid_idx ON sovi.sovi_index_canada(dauidt);
-CREATE INDEX IF NOT EXISTS sovi_index_canada_cfsauid_idx ON sovi.sovi_index_canada(cfsauid);
-CREATE INDEX IF NOT EXISTS sovi_index_canada_csduid_idx ON sovi.sovi_index_canada(csduid);
-CREATE INDEX IF NOT EXISTS sovi_index_canada_adauid_idx ON sovi.sovi_index_canada(adauid);
-CREATE INDEX IF NOT EXISTS sovi_index_canada_cduid_idx ON sovi.sovi_index_canada(cduid);
-CREATE INDEX IF NOT EXISTS sovi_index_canada_eruid_idx ON sovi.sovi_index_canada(eruid);
-CREATE INDEX IF NOT EXISTS sovi_index_canada_pruid_idx ON sovi.sovi_index_canada(pruid);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_sauid_idx ON sovi.sovi_index_canada(sauidt);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_dauid_idx ON sovi.sovi_index_canada(dauidt);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_cfsauid_idx ON sovi.sovi_index_canada(cfsauid);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_csduid_idx ON sovi.sovi_index_canada(csduid);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_adauid_idx ON sovi.sovi_index_canada(adauid);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_cduid_idx ON sovi.sovi_index_canada(cduid);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_eruid_idx ON sovi.sovi_index_canada(eruid);
+-- CREATE INDEX IF NOT EXISTS sovi_index_canada_pruid_idx ON sovi.sovi_index_canada(pruid);
+
+/* Create_table_sovi_sauid.sql */
+-- create indexes
+CREATE INDEX IF NOT EXISTS sovi_index_canada_sauid_idx ON sovi.sovi_sauid_nov2021(sauid);
+CREATE INDEX IF NOT EXISTS sovi_index_canada_dauid_idx ON sovi.sovi_sauid_nov2021(dauid);
+CREATE INDEX IF NOT EXISTS sovi_index_canada_fsauid_idx ON sovi.sovi_sauid_nov2021(fsauid);
+CREATE INDEX IF NOT EXISTS sovi_index_canada_csduid_idx ON sovi.sovi_sauid_nov2021(csduid);
+CREATE INDEX IF NOT EXISTS sovi_index_canada_cduid_idx ON sovi.sovi_sauid_nov2021(cduid);
+CREATE INDEX IF NOT EXISTS sovi_index_canada_eruid_idx ON sovi.sovi_sauid_nov2021(eruid);
+CREATE INDEX IF NOT EXISTS sovi_index_canada_pruid_idx ON sovi.sovi_sauid_nov2021(pruid);
 
 
 

scripts/Create_hexbin_social_vulnerability_aggregation_area_proxy.sql

@@ -13,16 +13,13 @@ AVG("VHn_PopHa" * b.area_ratio) AS "VHn_PopHa",
 SUM("VHt_PopHa" * b.area_ratio) AS "VHt_PopHa",
 AVG("VH_Pre1975" * b.area_ratio) AS "VH_Pre1975",
 AVG("VHn_Pre1975" * b.area_ratio) AS "VHn_Pre1975",
-SUM("VHtPre1975" * b.area_ratio) AS "VHtPre1975",
+SUM("VHt_Pre1975" * b.area_ratio) AS "VHt_Pre1975",
 AVG("VH_NSuit" * b.area_ratio) AS "VH_NSuit",
 AVG("VHn_NSuit" * b.area_ratio) AS "VHn_NSuit",
 SUM("VHt_NSuit" * b.area_ratio) AS "VHt_NSuit",
 AVG("VH_MntnAge" * b.area_ratio) AS "VH_MntnAge",
 AVG("VHn_MntnAge" * b.area_ratio) AS "VHn_MntnAge",
 SUM("VHt_MntnAge" * b.area_ratio) AS "VHt_MntnAge",
-AVG("VH_Mntn1" * b.area_ratio) AS "VH_Mntn1",
-AVG("VHn_Mntn1" * b.area_ratio) AS "VHn_Mntn1",
-SUM("VHt_Mntn1" * b.area_ratio) AS "VHt_Mntn1",
 AVG("VH_Renter" * b.area_ratio) AS "VH_Renter",
 AVG("VHn_Renter" * b.area_ratio) AS "VHn_Renter",
 SUM("VHt_Renter" * b.area_ratio) AS "VHt_Renter",
@@ -50,6 +47,9 @@ SUM("VFt_ImmLT5" * b.area_ratio) AS"VFt_ImmLT5" ,
 AVG("VF_NoWrkPlace" * b.area_ratio) AS "VF_NoWrkPlace",
 AVG("VFn_NoWrkPlace" * b.area_ratio) AS "VFn_NoWrkPlace",
 SUM("VFt_NoWrkPlace" * b.area_ratio) AS "VFt_NoWrkPlace",
+AVG("VF_Health" * b.area_ratio) AS "VF_Health",
+AVG("VFn_Health" * b.area_ratio) AS "VFn_Health",
+SUM("VFt_Health" * b.area_ratio) AS "VFt_Health",
 
 --1.3.3 Individual Autonomy
 SUM("VAt_Score" * b.area_ratio) AS "VAt_Score",
@@ -74,9 +74,6 @@ SUM("VAt_VisMinority" * b.area_ratio) AS "VAt_VisMinority",
 PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY "VA_AgeMedian" * b.area_ratio) AS "VA_AgeMedian",
 AVG("VAn_AgeMedian" * b.area_ratio) AS "VAn_AgeMedian",
 SUM("VAt_AgeMedian" * b.area_ratio) AS "VAt_AgeMedian",
-AVG("VA_Health" * b.area_ratio) AS "VA_Health",
-AVG("VAn_Health" * b.area_ratio) AS "VAn_Health",
-SUM("VAt_Health" * b.area_ratio) AS "VAt_Health",
 AVG("VA_PubTrans" * b.area_ratio) AS "VA_PubTrans",
 AVG("VAn_PubTrans" * b.area_ratio) AS "VAn_PubTrans",
 SUM("VAt_PubTrans" * b.area_ratio) AS "VAt_PubTrans",
@@ -110,7 +107,9 @@ SUM("VEt_WorkNone" * b.area_ratio) AS "VEt_WorkNone",
 AVG("VE_WorkPart" * b.area_ratio) AS "VE_WorkPart",
 AVG("VEn_WorkPart" * b.area_ratio) AS "VEn_WorkPart",
 SUM("VEt_WorkPart" * b.area_ratio) AS "VEt_WorkPart",
-
+AVG("VE_Mntn1" * b.area_ratio) AS "VE_Mntn1",
+AVG("VEn_Mntn1" * b.area_ratio) AS "VEn_Mntn1",
+SUM("VEt_Mntn1" * b.area_ratio) AS "VEt_Mntn1",
 c.geom
 
 FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s a
@@ -135,16 +134,13 @@ AVG("VHn_PopHa" * b.area_ratio) AS "VHn_PopHa",
 SUM("VHt_PopHa" * b.area_ratio) AS "VHt_PopHa",
 AVG("VH_Pre1975" * b.area_ratio) AS "VH_Pre1975",
 AVG("VHn_Pre1975" * b.area_ratio) AS "VHn_Pre1975",
-SUM("VHtPre1975" * b.area_ratio) AS "VHtPre1975",
+SUM("VHt_Pre1975" * b.area_ratio) AS "VHt_Pre1975",
 AVG("VH_NSuit" * b.area_ratio) AS "VH_NSuit",
 AVG("VHn_NSuit" * b.area_ratio) AS "VHn_NSuit",
 SUM("VHt_NSuit" * b.area_ratio) AS "VHt_NSuit",
 AVG("VH_MntnAge" * b.area_ratio) AS "VH_MntnAge",
 AVG("VHn_MntnAge" * b.area_ratio) AS "VHn_MntnAge",
 SUM("VHt_MntnAge" * b.area_ratio) AS "VHt_MntnAge",
-AVG("VH_Mntn1" * b.area_ratio) AS "VH_Mntn1",
-AVG("VHn_Mntn1" * b.area_ratio) AS "VHn_Mntn1",
-SUM("VHt_Mntn1" * b.area_ratio) AS "VHt_Mntn1",
 AVG("VH_Renter" * b.area_ratio) AS "VH_Renter",
 AVG("VHn_Renter" * b.area_ratio) AS "VHn_Renter",
 SUM("VHt_Renter" * b.area_ratio) AS "VHt_Renter",
@@ -172,6 +168,9 @@ SUM("VFt_ImmLT5" * b.area_ratio) AS"VFt_ImmLT5" ,
 AVG("VF_NoWrkPlace" * b.area_ratio) AS "VF_NoWrkPlace",
 AVG("VFn_NoWrkPlace" * b.area_ratio) AS "VFn_NoWrkPlace",
 SUM("VFt_NoWrkPlace" * b.area_ratio) AS "VFt_NoWrkPlace",
+AVG("VF_Health" * b.area_ratio) AS "VF_Health",
+AVG("VFn_Health" * b.area_ratio) AS "VFn_Health",
+SUM("VFt_Health" * b.area_ratio) AS "VFt_Health",
 
 --1.3.3 Individual Autonomy
 SUM("VAt_Score" * b.area_ratio) AS "VAt_Score",
@@ -196,9 +195,6 @@ SUM("VAt_VisMinority" * b.area_ratio) AS "VAt_VisMinority",
 PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY "VA_AgeMedian" * b.area_ratio) AS "VA_AgeMedian",
 AVG("VAn_AgeMedian" * b.area_ratio) AS "VAn_AgeMedian",
 SUM("VAt_AgeMedian" * b.area_ratio) AS "VAt_AgeMedian",
-AVG("VA_Health" * b.area_ratio) AS "VA_Health",
-AVG("VAn_Health" * b.area_ratio) AS "VAn_Health",
-SUM("VAt_Health" * b.area_ratio) AS "VAt_Health",
 AVG("VA_PubTrans" * b.area_ratio) AS "VA_PubTrans",
 AVG("VAn_PubTrans" * b.area_ratio) AS "VAn_PubTrans",
 SUM("VAt_PubTrans" * b.area_ratio) AS "VAt_PubTrans",
@@ -232,7 +228,9 @@ SUM("VEt_WorkNone" * b.area_ratio) AS "VEt_WorkNone",
 AVG("VE_WorkPart" * b.area_ratio) AS "VE_WorkPart",
 AVG("VEn_WorkPart" * b.area_ratio) AS "VEn_WorkPart",
 SUM("VEt_WorkPart" * b.area_ratio) AS "VEt_WorkPart",
-
+AVG("VE_Mntn1" * b.area_ratio) AS "VE_Mntn1",
+AVG("VEn_Mntn1" * b.area_ratio) AS "VEn_Mntn1",
+SUM("VEt_Mntn1" * b.area_ratio) AS "VEt_Mntn1",
 c.geom
 
 FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s a
@@ -256,16 +254,13 @@ AVG("VHn_PopHa" * b.area_ratio) AS "VHn_PopHa",
 SUM("VHt_PopHa" * b.area_ratio) AS "VHt_PopHa",
 AVG("VH_Pre1975" * b.area_ratio) AS "VH_Pre1975",
 AVG("VHn_Pre1975" * b.area_ratio) AS "VHn_Pre1975",
-SUM("VHtPre1975" * b.area_ratio) AS "VHtPre1975",
+SUM("VHt_Pre1975" * b.area_ratio) AS "VHt_Pre1975",
 AVG("VH_NSuit" * b.area_ratio) AS "VH_NSuit",
 AVG("VHn_NSuit" * b.area_ratio) AS "VHn_NSuit",
 SUM("VHt_NSuit" * b.area_ratio) AS "VHt_NSuit",
 AVG("VH_MntnAge" * b.area_ratio) AS "VH_MntnAge",
 AVG("VHn_MntnAge" * b.area_ratio) AS "VHn_MntnAge",
 SUM("VHt_MntnAge" * b.area_ratio) AS "VHt_MntnAge",
-AVG("VH_Mntn1" * b.area_ratio) AS "VH_Mntn1",
-AVG("VHn_Mntn1" * b.area_ratio) AS "VHn_Mntn1",
-SUM("VHt_Mntn1" * b.area_ratio) AS "VHt_Mntn1",
 AVG("VH_Renter" * b.area_ratio) AS "VH_Renter",
 AVG("VHn_Renter" * b.area_ratio) AS "VHn_Renter",
 SUM("VHt_Renter" * b.area_ratio) AS "VHt_Renter",
@@ -293,6 +288,9 @@ SUM("VFt_ImmLT5" * b.area_ratio) AS"VFt_ImmLT5" ,
 AVG("VF_NoWrkPlace" * b.area_ratio) AS "VF_NoWrkPlace",
 AVG("VFn_NoWrkPlace" * b.area_ratio) AS "VFn_NoWrkPlace",
 SUM("VFt_NoWrkPlace" * b.area_ratio) AS "VFt_NoWrkPlace",
+AVG("VF_Health" * b.area_ratio) AS "VF_Health",
+AVG("VFn_Health" * b.area_ratio) AS "VFn_Health",
+SUM("VFt_Health" * b.area_ratio) AS "VFt_Health",
 
 --1.3.3 Individual Autonomy
 SUM("VAt_Score" * b.area_ratio) AS "VAt_Score",
@@ -317,9 +315,6 @@ SUM("VAt_VisMinority" * b.area_ratio) AS "VAt_VisMinority",
 PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY "VA_AgeMedian" * b.area_ratio) AS "VA_AgeMedian",
 AVG("VAn_AgeMedian" * b.area_ratio) AS "VAn_AgeMedian",
 SUM("VAt_AgeMedian" * b.area_ratio) AS "VAt_AgeMedian",
-AVG("VA_Health" * b.area_ratio) AS "VA_Health",
-AVG("VAn_Health" * b.area_ratio) AS "VAn_Health",
-SUM("VAt_Health" * b.area_ratio) AS "VAt_Health",
 AVG("VA_PubTrans" * b.area_ratio) AS "VA_PubTrans",
 AVG("VAn_PubTrans" * b.area_ratio) AS "VAn_PubTrans",
 SUM("VAt_PubTrans" * b.area_ratio) AS "VAt_PubTrans",
@@ -353,7 +348,9 @@ SUM("VEt_WorkNone" * b.area_ratio) AS "VEt_WorkNone",
 AVG("VE_WorkPart" * b.area_ratio) AS "VE_WorkPart",
 AVG("VEn_WorkPart" * b.area_ratio) AS "VEn_WorkPart",
 SUM("VEt_WorkPart" * b.area_ratio) AS "VEt_WorkPart",
-
+AVG("VE_Mntn1" * b.area_ratio) AS "VE_Mntn1",
+AVG("VEn_Mntn1" * b.area_ratio) AS "VEn_Mntn1",
+SUM("VEt_Mntn1" * b.area_ratio) AS "VEt_Mntn1",
 c.geom
 
 FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s a
@@ -377,16 +374,13 @@ AVG("VHn_PopHa" * b.area_ratio) AS "VHn_PopHa",
 SUM("VHt_PopHa" * b.area_ratio) AS "VHt_PopHa",
 AVG("VH_Pre1975" * b.area_ratio) AS "VH_Pre1975",
 AVG("VHn_Pre1975" * b.area_ratio) AS "VHn_Pre1975",
-SUM("VHtPre1975" * b.area_ratio) AS "VHtPre1975",
+SUM("VHt_Pre1975" * b.area_ratio) AS "VHt_Pre1975",
 AVG("VH_NSuit" * b.area_ratio) AS "VH_NSuit",
 AVG("VHn_NSuit" * b.area_ratio) AS "VHn_NSuit",
 SUM("VHt_NSuit" * b.area_ratio) AS "VHt_NSuit",
 AVG("VH_MntnAge" * b.area_ratio) AS "VH_MntnAge",
 AVG("VHn_MntnAge" * b.area_ratio) AS "VHn_MntnAge",
 SUM("VHt_MntnAge" * b.area_ratio) AS "VHt_MntnAge",
-AVG("VH_Mntn1" * b.area_ratio) AS "VH_Mntn1",
-AVG("VHn_Mntn1" * b.area_ratio) AS "VHn_Mntn1",
-SUM("VHt_Mntn1" * b.area_ratio) AS "VHt_Mntn1",
 AVG("VH_Renter" * b.area_ratio) AS "VH_Renter",
 AVG("VHn_Renter" * b.area_ratio) AS "VHn_Renter",
 SUM("VHt_Renter" * b.area_ratio) AS "VHt_Renter",
@@ -414,6 +408,9 @@ SUM("VFt_ImmLT5" * b.area_ratio) AS"VFt_ImmLT5" ,
 AVG("VF_NoWrkPlace" * b.area_ratio) AS "VF_NoWrkPlace",
 AVG("VFn_NoWrkPlace" * b.area_ratio) AS "VFn_NoWrkPlace",
 SUM("VFt_NoWrkPlace" * b.area_ratio) AS "VFt_NoWrkPlace",
+AVG("VF_Health" * b.area_ratio) AS "VF_Health",
+AVG("VFn_Health" * b.area_ratio) AS "VFn_Health",
+SUM("VFt_Health" * b.area_ratio) AS "VFt_Health",
 
 --1.3.3 Individual Autonomy
 SUM("VAt_Score" * b.area_ratio) AS "VAt_Score",
@@ -438,9 +435,6 @@ SUM("VAt_VisMinority" * b.area_ratio) AS "VAt_VisMinority",
 PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY "VA_AgeMedian" * b.area_ratio) AS "VA_AgeMedian",
 AVG("VAn_AgeMedian" * b.area_ratio) AS "VAn_AgeMedian",
 SUM("VAt_AgeMedian" * b.area_ratio) AS "VAt_AgeMedian",
-AVG("VA_Health" * b.area_ratio) AS "VA_Health",
-AVG("VAn_Health" * b.area_ratio) AS "VAn_Health",
-SUM("VAt_Health" * b.area_ratio) AS "VAt_Health",
 AVG("VA_PubTrans" * b.area_ratio) AS "VA_PubTrans",
 AVG("VAn_PubTrans" * b.area_ratio) AS "VAn_PubTrans",
 SUM("VAt_PubTrans" * b.area_ratio) AS "VAt_PubTrans",
@@ -474,7 +468,9 @@ SUM("VEt_WorkNone" * b.area_ratio) AS "VEt_WorkNone",
 AVG("VE_WorkPart" * b.area_ratio) AS "VE_WorkPart",
 AVG("VEn_WorkPart" * b.area_ratio) AS "VEn_WorkPart",
 SUM("VEt_WorkPart" * b.area_ratio) AS "VEt_WorkPart",
-
+AVG("VE_Mntn1" * b.area_ratio) AS "VE_Mntn1",
+AVG("VEn_Mntn1" * b.area_ratio) AS "VEn_Mntn1",
+SUM("VEt_Mntn1" * b.area_ratio) AS "VEt_Mntn1",
 c.geom
 
 FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s a
@@ -498,16 +494,13 @@ AVG("VHn_PopHa" * b.area_ratio) AS "VHn_PopHa",
 SUM("VHt_PopHa" * b.area_ratio) AS "VHt_PopHa",
 AVG("VH_Pre1975" * b.area_ratio) AS "VH_Pre1975",
 AVG("VHn_Pre1975" * b.area_ratio) AS "VHn_Pre1975",
-SUM("VHtPre1975" * b.area_ratio) AS "VHtPre1975",
+SUM("VHt_Pre1975" * b.area_ratio) AS "VHt_Pre1975",
 AVG("VH_NSuit" * b.area_ratio) AS "VH_NSuit",
 AVG("VHn_NSuit" * b.area_ratio) AS "VHn_NSuit",
 SUM("VHt_NSuit" * b.area_ratio) AS "VHt_NSuit",
 AVG("VH_MntnAge" * b.area_ratio) AS "VH_MntnAge",
 AVG("VHn_MntnAge" * b.area_ratio) AS "VHn_MntnAge",
 SUM("VHt_MntnAge" * b.area_ratio) AS "VHt_MntnAge",
-AVG("VH_Mntn1" * b.area_ratio) AS "VH_Mntn1",
-AVG("VHn_Mntn1" * b.area_ratio) AS "VHn_Mntn1",
-SUM("VHt_Mntn1" * b.area_ratio) AS "VHt_Mntn1",
 AVG("VH_Renter" * b.area_ratio) AS "VH_Renter",
 AVG("VHn_Renter" * b.area_ratio) AS "VHn_Renter",
 SUM("VHt_Renter" * b.area_ratio) AS "VHt_Renter",
@@ -535,6 +528,9 @@ SUM("VFt_ImmLT5" * b.area_ratio) AS"VFt_ImmLT5" ,
 AVG("VF_NoWrkPlace" * b.area_ratio) AS "VF_NoWrkPlace",
 AVG("VFn_NoWrkPlace" * b.area_ratio) AS "VFn_NoWrkPlace",
 SUM("VFt_NoWrkPlace" * b.area_ratio) AS "VFt_NoWrkPlace",
+AVG("VF_Health" * b.area_ratio) AS "VF_Health",
+AVG("VFn_Health" * b.area_ratio) AS "VFn_Health",
+SUM("VFt_Health" * b.area_ratio) AS "VFt_Health",
 
 --1.3.3 Individual Autonomy
 SUM("VAt_Score" * b.area_ratio) AS "VAt_Score",
@@ -559,9 +555,6 @@ SUM("VAt_VisMinority" * b.area_ratio) AS "VAt_VisMinority",
 PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY "VA_AgeMedian" * b.area_ratio) AS "VA_AgeMedian",
 AVG("VAn_AgeMedian" * b.area_ratio) AS "VAn_AgeMedian",
 SUM("VAt_AgeMedian" * b.area_ratio) AS "VAt_AgeMedian",
-AVG("VA_Health" * b.area_ratio) AS "VA_Health",
-AVG("VAn_Health" * b.area_ratio) AS "VAn_Health",
-SUM("VAt_Health" * b.area_ratio) AS "VAt_Health",
 AVG("VA_PubTrans" * b.area_ratio) AS "VA_PubTrans",
 AVG("VAn_PubTrans" * b.area_ratio) AS "VAn_PubTrans",
 SUM("VAt_PubTrans" * b.area_ratio) AS "VAt_PubTrans",
@@ -595,7 +588,9 @@ SUM("VEt_WorkNone" * b.area_ratio) AS "VEt_WorkNone",
 AVG("VE_WorkPart" * b.area_ratio) AS "VE_WorkPart",
 AVG("VEn_WorkPart" * b.area_ratio) AS "VEn_WorkPart",
 SUM("VEt_WorkPart" * b.area_ratio) AS "VEt_WorkPart",
-
+AVG("VE_Mntn1" * b.area_ratio) AS "VE_Mntn1",
+AVG("VEn_Mntn1" * b.area_ratio) AS "VEn_Mntn1",
+SUM("VEt_Mntn1" * b.area_ratio) AS "VEt_Mntn1",
 c.geom
 
 FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s a
@@ -619,16 +614,13 @@ AVG("VHn_PopHa" * b.area_ratio) AS "VHn_PopHa",
 SUM("VHt_PopHa" * b.area_ratio) AS "VHt_PopHa",
 AVG("VH_Pre1975" * b.area_ratio) AS "VH_Pre1975",
 AVG("VHn_Pre1975" * b.area_ratio) AS "VHn_Pre1975",
-SUM("VHtPre1975" * b.area_ratio) AS "VHtPre1975",
+SUM("VHt_Pre1975" * b.area_ratio) AS "VHt_Pre1975",
 AVG("VH_NSuit" * b.area_ratio) AS "VH_NSuit",
 AVG("VHn_NSuit" * b.area_ratio) AS "VHn_NSuit",
 SUM("VHt_NSuit" * b.area_ratio) AS "VHt_NSuit",
 AVG("VH_MntnAge" * b.area_ratio) AS "VH_MntnAge",
 AVG("VHn_MntnAge" * b.area_ratio) AS "VHn_MntnAge",
 SUM("VHt_MntnAge" * b.area_ratio) AS "VHt_MntnAge",
-AVG("VH_Mntn1" * b.area_ratio) AS "VH_Mntn1",
-AVG("VHn_Mntn1" * b.area_ratio) AS "VHn_Mntn1",
-SUM("VHt_Mntn1" * b.area_ratio) AS "VHt_Mntn1",
 AVG("VH_Renter" * b.area_ratio) AS "VH_Renter",
 AVG("VHn_Renter" * b.area_ratio) AS "VHn_Renter",
 SUM("VHt_Renter" * b.area_ratio) AS "VHt_Renter",
@@ -656,6 +648,9 @@ SUM("VFt_ImmLT5" * b.area_ratio) AS"VFt_ImmLT5" ,
 AVG("VF_NoWrkPlace" * b.area_ratio) AS "VF_NoWrkPlace",
 AVG("VFn_NoWrkPlace" * b.area_ratio) AS "VFn_NoWrkPlace",
 SUM("VFt_NoWrkPlace" * b.area_ratio) AS "VFt_NoWrkPlace",
+AVG("VF_Health" * b.area_ratio) AS "VF_Health",
+AVG("VFn_Health" * b.area_ratio) AS "VFn_Health",
+SUM("VFt_Health" * b.area_ratio) AS "VFt_Health",
 
 --1.3.3 Individual Autonomy
 SUM("VAt_Score" * b.area_ratio) AS "VAt_Score",
@@ -680,9 +675,6 @@ SUM("VAt_VisMinority" * b.area_ratio) AS "VAt_VisMinority",
 PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY "VA_AgeMedian" * b.area_ratio) AS "VA_AgeMedian",
 AVG("VAn_AgeMedian" * b.area_ratio) AS "VAn_AgeMedian",
 SUM("VAt_AgeMedian" * b.area_ratio) AS "VAt_AgeMedian",
-AVG("VA_Health" * b.area_ratio) AS "VA_Health",
-AVG("VAn_Health" * b.area_ratio) AS "VAn_Health",
-SUM("VAt_Health" * b.area_ratio) AS "VAt_Health",
 AVG("VA_PubTrans" * b.area_ratio) AS "VA_PubTrans",
 AVG("VAn_PubTrans" * b.area_ratio) AS "VAn_PubTrans",
 SUM("VAt_PubTrans" * b.area_ratio) AS "VAt_PubTrans",
@@ -716,7 +708,9 @@ SUM("VEt_WorkNone" * b.area_ratio) AS "VEt_WorkNone",
 AVG("VE_WorkPart" * b.area_ratio) AS "VE_WorkPart",
 AVG("VEn_WorkPart" * b.area_ratio) AS "VEn_WorkPart",
 SUM("VEt_WorkPart" * b.area_ratio) AS "VEt_WorkPart",
-
+AVG("VE_Mntn1" * b.area_ratio) AS "VE_Mntn1",
+AVG("VEn_Mntn1" * b.area_ratio) AS "VEn_Mntn1",
+SUM("VEt_Mntn1" * b.area_ratio) AS "VEt_Mntn1",
 c.geom
 
 FROM results_nhsl_social_fabric.nhsl_social_fabric_indicators_s a