cartodb4/observatory-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return numeric instead of json for obs_getmeasure and obs_getuscensusmeasure

Browse Source
This commit is contained in:
John Krauss
2016-04-22 12:23:14 -04:00
parent 0baa3b4a33
commit 22549206c2
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pg/sql/41_observatory_augmentation.sql
View File

@@ -408,7 +408,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetMeasure(
boundary_id TEXT DEFAULT NULL,
time_span TEXT DEFAULT NULL
)
RETURNS JSON
RETURNS NUMERIC
AS $$
DECLARE
names TEXT[];
@@ -448,10 +448,9 @@ BEGIN
USING geom, measure_ids, time_span, boundary_id;
IF normalize ILIKE 'denominator' THEN
RETURN json_build_object('name', format('%I over %I', names[1], names[2]),
'value', vals[1]/ vals[2]);
RETURN (vals)[1]/(vals)[2];
ELSE
RETURN json_build_object('name', (names)[1], 'value', (vals)[1]);
RETURN (vals)[1];
END IF;
END;
@@ -464,7 +463,7 @@ CREATE OR REPLACE FUNCTION cdb_observatory.OBS_GetUSCensusMeasure(
boundary_id TEXT DEFAULT NULL,
time_span TEXT DEFAULT NULL
)
RETURNS JSON AS $$
RETURNS NUMERIC AS $$
DECLARE
standardized_name text;
measure_id text;