From 73300b653784c34f20df2f796f4d1236b0ca5447 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Wed, 13 Apr 2016 11:00:26 -0400 Subject: [PATCH 1/5] add missing high-income column --- src/pg/sql/41_observatory_augmentation.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index d6c5f11..35d616b 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -109,7 +109,8 @@ RETURNS TABLE( income_75000_99999 NUMERIC, income_100000_124999 NUMERIC, income_125000_149999 NUMERIC, - income_150000_199999 NUMERIC) + income_150000_199999 NUMERIC, + income_200000_or_more NUMERIC) AS $$ DECLARE target_cols text[]; @@ -202,7 +203,8 @@ BEGIN 'income_75000_99999', 'income_100000_124999', 'income_125000_149999', - 'income_150000_199999']; + 'income_150000_199999', + 'income_200000_or_more']; q := 'WITH a As ( SELECT From a929f2902e2a7552a6ddb5eec265d535dec14b24 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Wed, 13 Apr 2016 11:08:41 -0400 Subject: [PATCH 2/5] go back to using block_group for demographicsnapshot etc --- src/pg/sql/41_observatory_augmentation.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index 6ee5583..dd1f02e 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -235,7 +235,7 @@ CREATE OR REPLACE FUNCTION OBS_GetCensus( geom geometry, dimension_names text[], time_span text DEFAULT '2009 - 2013', - geometry_level text DEFAULT '"us.census.tiger".census_tract' + geometry_level text DEFAULT '"us.census.tiger".block_group' ) RETURNS TABLE(dimension text[], dimension_value NUMERIC[]) AS $$ @@ -445,7 +445,7 @@ $$ LANGUAGE plpgsql; CREATE OR REPLACE FUNCTION OBS_GetSegmentSnapshot( geom geometry, - geometry_level text DEFAULT '"us.census.tiger".census_tract' + geometry_level text DEFAULT '"us.census.tiger".block_group' ) RETURNS TABLE( segment_name TEXT, @@ -589,7 +589,7 @@ $$ LANGUAGE plpgsql; CREATE OR REPLACE FUNCTION OBS_GetCategories( geom geometry, dimension_names text[], - geometry_level text DEFAULT '"us.census.tiger".census_tract', + geometry_level text DEFAULT '"us.census.tiger".block_group', time_span text DEFAULT '2009 - 2013' ) RETURNS TABLE(names text[], categories text[]) as $$ From 346f381a9cb764d971a1ff1fb10455750d8e0161 Mon Sep 17 00:00:00 2001 From: Stuart Lynn Date: Wed, 13 Apr 2016 11:12:29 -0400 Subject: [PATCH 3/5] Adding defaults to the OBS_GETDEMOGRAPHICSNAPSHOT --- src/pg/sql/41_observatory_augmentation.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index 4152954..e1fa139 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -23,7 +23,7 @@ -- Creates a table of demographic snapshot -- TODO: Remove since it does address geocoding? -CREATE OR REPLACE FUNCTION OBS_GetDemographicSnapshot(geom geometry) +CREATE OR REPLACE FUNCTION OBS_GetDemographicSnapshot(geom geometry, time_span text default '2009 - 2013', geometry_level text default '"us.census.tiger".block_group' ) RETURNS TABLE( total_pop NUMERIC, male_pop NUMERIC, @@ -210,7 +210,7 @@ DECLARE SELECT dimension As names, dimension_value As vals - FROM OBS_GetCensus($1,$2) + FROM OBS_GetCensus($1,$2,$3,$4) )' || OBS_BuildSnapshotQuery(target_cols) || ' FROM a'; @@ -218,7 +218,7 @@ DECLARE RETURN QUERY EXECUTE q - USING geom, target_cols; + USING geom, target_cols, time_span, geometry_level; RETURN; END; From ceac78ecd8cbc1634a2d151db0359c140e9c07b7 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Wed, 13 Apr 2016 11:19:39 -0400 Subject: [PATCH 4/5] remove block-group incompatible quantile cols --- src/pg/sql/41_observatory_augmentation.sql | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index a8f4183..8a571d1 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -457,31 +457,31 @@ RETURNS TABLE( black_pop_quantile NUMERIC, asian_pop_quantile NUMERIC, hispanic_pop_quantile NUMERIC, - not_us_citizen_pop_quantile NUMERIC, - workers_16_and_over_quantile NUMERIC, - commuters_by_car_truck_van_quantile NUMERIC, - commuters_by_public_transportation_quantile NUMERIC, - commuters_by_bus_quantile NUMERIC, - commuters_by_subway_or_elevated_quantile NUMERIC, - walked_to_work_quantile NUMERIC, - worked_at_home_quantile NUMERIC, - children_quantile NUMERIC, + --not_us_citizen_pop_quantile NUMERIC, + --workers_16_and_over_quantile NUMERIC, + --commuters_by_car_truck_van_quantile NUMERIC, + --commuters_by_public_transportation_quantile NUMERIC, + --commuters_by_bus_quantile NUMERIC, + --commuters_by_subway_or_elevated_quantile NUMERIC, + --walked_to_work_quantile NUMERIC, + --worked_at_home_quantile NUMERIC, + --children_quantile NUMERIC, households_quantile NUMERIC, - population_3_years_over_quantile NUMERIC, - in_school_quantile NUMERIC, - in_grades_1_to_4_quantile NUMERIC, - in_grades_5_to_8_quantile NUMERIC, - in_grades_9_to_12_quantile NUMERIC, - in_undergrad_college_quantile NUMERIC, + --population_3_years_over_quantile NUMERIC, + --in_school_quantile NUMERIC, + --in_grades_1_to_4_quantile NUMERIC, + --in_grades_5_to_8_quantile NUMERIC, + --in_grades_9_to_12_quantile NUMERIC, + --in_undergrad_college_quantile NUMERIC, pop_25_years_over_quantile NUMERIC, high_school_diploma_quantile NUMERIC, bachelors_degree_quantile NUMERIC, masters_degree_quantile NUMERIC, - pop_5_years_over_quantile NUMERIC, - speak_only_english_at_home_quantile NUMERIC, - speak_spanish_at_home_quantile NUMERIC, - pop_determined_poverty_status_quantile NUMERIC, - poverty_quantile NUMERIC, + --pop_5_years_over_quantile NUMERIC, + --speak_only_english_at_home_quantile NUMERIC, + --speak_spanish_at_home_quantile NUMERIC, + --pop_determined_poverty_status_quantile NUMERIC, + --poverty_quantile NUMERIC, median_income_quantile NUMERIC, gini_index_quantile NUMERIC, income_per_capita_quantile NUMERIC, @@ -510,31 +510,31 @@ target_cols := Array[ '"us.census.acs".B03002004_quantile', '"us.census.acs".B03002006_quantile', '"us.census.acs".B03002012_quantile', - '"us.census.acs".B05001006_quantile', - '"us.census.acs".B08006001_quantile', - '"us.census.acs".B08006002_quantile', - '"us.census.acs".B08006008_quantile', - '"us.census.acs".B08006009_quantile', - '"us.census.acs".B08006011_quantile', - '"us.census.acs".B08006015_quantile', - '"us.census.acs".B08006017_quantile', - '"us.census.acs".B09001001_quantile', + --'"us.census.acs".B05001006_quantile', + --'"us.census.acs".B08006001_quantile', + --'"us.census.acs".B08006002_quantile', + --'"us.census.acs".B08006008_quantile', + --'"us.census.acs".B08006009_quantile', + --'"us.census.acs".B08006011_quantile', + --'"us.census.acs".B08006015_quantile', + --'"us.census.acs".B08006017_quantile', + --'"us.census.acs".B09001001_quantile', '"us.census.acs".B11001001_quantile', - '"us.census.acs".B14001001_quantile', - '"us.census.acs".B14001002_quantile', - '"us.census.acs".B14001005_quantile', - '"us.census.acs".B14001006_quantile', - '"us.census.acs".B14001007_quantile', - '"us.census.acs".B14001008_quantile', + --'"us.census.acs".B14001001_quantile', + --'"us.census.acs".B14001002_quantile', + --'"us.census.acs".B14001005_quantile', + --'"us.census.acs".B14001006_quantile', + --'"us.census.acs".B14001007_quantile', + --'"us.census.acs".B14001008_quantile', '"us.census.acs".B15003001_quantile', '"us.census.acs".B15003017_quantile', '"us.census.acs".B15003022_quantile', '"us.census.acs".B15003023_quantile', - '"us.census.acs".B16001001_quantile', - '"us.census.acs".B16001002_quantile', - '"us.census.acs".B16001003_quantile', - '"us.census.acs".B17001001_quantile', - '"us.census.acs".B17001002_quantile', + --'"us.census.acs".B16001001_quantile', + --'"us.census.acs".B16001002_quantile', + --'"us.census.acs".B16001003_quantile', + --'"us.census.acs".B17001001_quantile', + --'"us.census.acs".B17001002_quantile', '"us.census.acs".B19013001_quantile', '"us.census.acs".B19083001_quantile', '"us.census.acs".B19301001_quantile', From c119a66fea8d158b71d549cb3f5083821acba18c Mon Sep 17 00:00:00 2001 From: John Krauss Date: Wed, 13 Apr 2016 11:28:56 -0400 Subject: [PATCH 5/5] segment should default to census tract --- src/pg/sql/41_observatory_augmentation.sql | 82 +++++++++++----------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index 8a571d1..37fd27f 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -445,7 +445,7 @@ $$ LANGUAGE plpgsql; CREATE OR REPLACE FUNCTION OBS_GetSegmentSnapshot( geom geometry, - geometry_level text DEFAULT '"us.census.tiger".block_group' + geometry_level text DEFAULT '"us.census.tiger".census_tract' ) RETURNS TABLE( segment_name TEXT, @@ -457,31 +457,31 @@ RETURNS TABLE( black_pop_quantile NUMERIC, asian_pop_quantile NUMERIC, hispanic_pop_quantile NUMERIC, - --not_us_citizen_pop_quantile NUMERIC, - --workers_16_and_over_quantile NUMERIC, - --commuters_by_car_truck_van_quantile NUMERIC, - --commuters_by_public_transportation_quantile NUMERIC, - --commuters_by_bus_quantile NUMERIC, - --commuters_by_subway_or_elevated_quantile NUMERIC, - --walked_to_work_quantile NUMERIC, - --worked_at_home_quantile NUMERIC, - --children_quantile NUMERIC, + not_us_citizen_pop_quantile NUMERIC, + workers_16_and_over_quantile NUMERIC, + commuters_by_car_truck_van_quantile NUMERIC, + commuters_by_public_transportation_quantile NUMERIC, + commuters_by_bus_quantile NUMERIC, + commuters_by_subway_or_elevated_quantile NUMERIC, + walked_to_work_quantile NUMERIC, + worked_at_home_quantile NUMERIC, + children_quantile NUMERIC, households_quantile NUMERIC, - --population_3_years_over_quantile NUMERIC, - --in_school_quantile NUMERIC, - --in_grades_1_to_4_quantile NUMERIC, - --in_grades_5_to_8_quantile NUMERIC, - --in_grades_9_to_12_quantile NUMERIC, - --in_undergrad_college_quantile NUMERIC, + population_3_years_over_quantile NUMERIC, + in_school_quantile NUMERIC, + in_grades_1_to_4_quantile NUMERIC, + in_grades_5_to_8_quantile NUMERIC, + in_grades_9_to_12_quantile NUMERIC, + in_undergrad_college_quantile NUMERIC, pop_25_years_over_quantile NUMERIC, high_school_diploma_quantile NUMERIC, bachelors_degree_quantile NUMERIC, masters_degree_quantile NUMERIC, - --pop_5_years_over_quantile NUMERIC, - --speak_only_english_at_home_quantile NUMERIC, - --speak_spanish_at_home_quantile NUMERIC, - --pop_determined_poverty_status_quantile NUMERIC, - --poverty_quantile NUMERIC, + pop_5_years_over_quantile NUMERIC, + speak_only_english_at_home_quantile NUMERIC, + speak_spanish_at_home_quantile NUMERIC, + pop_determined_poverty_status_quantile NUMERIC, + poverty_quantile NUMERIC, median_income_quantile NUMERIC, gini_index_quantile NUMERIC, income_per_capita_quantile NUMERIC, @@ -510,31 +510,31 @@ target_cols := Array[ '"us.census.acs".B03002004_quantile', '"us.census.acs".B03002006_quantile', '"us.census.acs".B03002012_quantile', - --'"us.census.acs".B05001006_quantile', - --'"us.census.acs".B08006001_quantile', - --'"us.census.acs".B08006002_quantile', - --'"us.census.acs".B08006008_quantile', - --'"us.census.acs".B08006009_quantile', - --'"us.census.acs".B08006011_quantile', - --'"us.census.acs".B08006015_quantile', - --'"us.census.acs".B08006017_quantile', - --'"us.census.acs".B09001001_quantile', + '"us.census.acs".B05001006_quantile',-- + '"us.census.acs".B08006001_quantile',-- + '"us.census.acs".B08006002_quantile',-- + '"us.census.acs".B08006008_quantile',-- + '"us.census.acs".B08006009_quantile',-- + '"us.census.acs".B08006011_quantile',-- + '"us.census.acs".B08006015_quantile',-- + '"us.census.acs".B08006017_quantile',-- + '"us.census.acs".B09001001_quantile',-- '"us.census.acs".B11001001_quantile', - --'"us.census.acs".B14001001_quantile', - --'"us.census.acs".B14001002_quantile', - --'"us.census.acs".B14001005_quantile', - --'"us.census.acs".B14001006_quantile', - --'"us.census.acs".B14001007_quantile', - --'"us.census.acs".B14001008_quantile', + '"us.census.acs".B14001001_quantile',-- + '"us.census.acs".B14001002_quantile',-- + '"us.census.acs".B14001005_quantile',-- + '"us.census.acs".B14001006_quantile',-- + '"us.census.acs".B14001007_quantile',-- + '"us.census.acs".B14001008_quantile',-- '"us.census.acs".B15003001_quantile', '"us.census.acs".B15003017_quantile', '"us.census.acs".B15003022_quantile', '"us.census.acs".B15003023_quantile', - --'"us.census.acs".B16001001_quantile', - --'"us.census.acs".B16001002_quantile', - --'"us.census.acs".B16001003_quantile', - --'"us.census.acs".B17001001_quantile', - --'"us.census.acs".B17001002_quantile', + '"us.census.acs".B16001001_quantile',-- + '"us.census.acs".B16001002_quantile',-- + '"us.census.acs".B16001003_quantile',-- + '"us.census.acs".B17001001_quantile',-- + '"us.census.acs".B17001002_quantile',-- '"us.census.acs".B19013001_quantile', '"us.census.acs".B19083001_quantile', '"us.census.acs".B19301001_quantile',