From 3d58fd284ace67fbe6bdf41b209269bba39441d7 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Fri, 22 Jul 2016 19:24:19 +0000 Subject: [PATCH] fix #159 ensure getuscensusmeasure and getpopulation work as expected with NULL passed explicitly as normalization --- .../expected/41_observatory_augmentation_test.out | 6 ++++++ src/pg/test/sql/41_observatory_augmentation_test.sql | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/pg/test/expected/41_observatory_augmentation_test.out b/src/pg/test/expected/41_observatory_augmentation_test.out index 2136326..c0476a6 100644 --- a/src/pg/test/expected/41_observatory_augmentation_test.out +++ b/src/pg/test/expected/41_observatory_augmentation_test.out @@ -63,12 +63,18 @@ t obs_getpopulation_polygon_test t (1 row) +obs_getpopulation_polygon_null_test +t +(1 row) obs_getuscensusmeasure_point_male_pop t (1 row) obs_getuscensusmeasure t (1 row) +obs_getuscensusmeasure_null +t +(1 row) obs_getuscensuscategory_point t (1 row) diff --git a/src/pg/test/sql/41_observatory_augmentation_test.sql b/src/pg/test/sql/41_observatory_augmentation_test.sql index 0a6808e..cf162f4 100644 --- a/src/pg/test/sql/41_observatory_augmentation_test.sql +++ b/src/pg/test/sql/41_observatory_augmentation_test.sql @@ -187,6 +187,13 @@ FROM cdb_observatory._TestArea() ) As m(obs_getpopulation_polygon); +-- Poly-based OBS_GetPopulation, default normalization (none) specified as NULL +SELECT (abs(obs_getpopulation_polygon_null - 12327.3133495107) / 12327.3133495107) < 0.001 As obs_getpopulation_polygon_null_test +FROM + cdb_observatory.OBS_GetPopulation( + cdb_observatory._TestArea(), NULL + ) As m(obs_getpopulation_polygon_null); + -- Point-based OBS_GetUSCensusMeasure, default normalization (area) SELECT (abs(cdb_observatory.obs_getuscensusmeasure( cdb_observatory._testpoint(), 'male population') - 6789.5647735060920500) / 6789.5647735060920500) < 0.001 As obs_getuscensusmeasure_point_male_pop; @@ -195,6 +202,11 @@ SELECT (abs(cdb_observatory.obs_getuscensusmeasure( SELECT (abs(cdb_observatory.obs_getuscensusmeasure( cdb_observatory._testarea(), 'male population') - 6043.63061042765) / 6043.63061042765) < 0.001 As obs_getuscensusmeasure; +-- Poly-based OBS_GetUSCensusMeasure, default normalization (none) specified +-- with NULL +SELECT (abs(cdb_observatory.obs_getuscensusmeasure( + cdb_observatory._testarea(), 'male population', NULL) - 6043.63061042765) / 6043.63061042765) < 0.001 As obs_getuscensusmeasure_null; + -- Point-based OBS_GetUSCensusCategory SELECT cdb_observatory.OBS_GetUSCensusCategory( cdb_observatory._testpoint(), 'Spielman-Singleton Segments: 10 Clusters') = 'Wealthy, urban without Kids' As OBS_GetUSCensusCategory_point;