Separate geom from data calcs #267
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -536,9 +536,12 @@ RETURNS TABLE ( | |
| ) | ||
| AS $$ | ||
| DECLARE | ||
| geom_colspecs TEXT; | ||
| geom_tables TEXT; | ||
| geomrefs_alias TEXT; | ||
| geomrefs_noalias TEXT; | ||
| data_colspecs TEXT; | ||
| data_tables TEXT; | ||
| obs_wheres TEXT; | ||
| user_wheres TEXT; | ||
| geomtype TEXT; | ||
|
|
@@ -579,7 +582,20 @@ BEGIN | |
| (unnest($1))->>'api_method' api_method, | ||
| (unnest($1))->'api_args' api_args | ||
| ) | ||
| SELECT | ||
|
There was a problem hiding this comment. @michellemho This is where the geometry intersections are defined. |
||
| String_Agg(DISTINCT | ||
| 'CASE WHEN ST_Within(_geoms.geom, ' || geom_tablename || '.' || geom_colname || ') ' || | ||
| ' THEN ST_Area(_geoms.geom) / Nullif(ST_Area(' || geom_tablename || '.' || geom_colname || '), 0)' || | ||
| ' WHEN ST_Within(' || geom_tablename || '.' || geom_colname || ', _geoms.geom) ' || | ||
| ' THEN 1 ' || | ||
| ' ELSE ST_Area(cdb_observatory.safe_intersection(_geoms.geom, ' || | ||
| geom_tablename || '.' || geom_colname || ')) / ' || | ||
| 'Nullif(ST_Area(' || geom_tablename || '.' || geom_colname || '), 0) ' || | ||
| 'END pct_' || geom_tablename || | ||
| ', ' || geom_tablename || '.' || geom_colname || ' AS geom_' || geom_tablename | ||
| , ', ') AS geom_colspecs, | ||
| String_Agg(DISTINCT 'observatory.' || geom_tablename, ', ') AS geom_tables, | ||
| String_Agg( | ||
| 'JSON_Build_Object(' || CASE | ||
| -- api-delivered values | ||
| WHEN api_method IS NOT NULL THEN | ||
|
|
@@ -601,22 +617,10 @@ BEGIN | |
| -- SUM (numer * (% OBS geom in user geom)) / SUM (denom * (% OBS geom in user geom)) | ||
| ELSE | ||
| ' SUM(' || numer_tablename || '.' || numer_colname || ' ' || | ||
| ' * pct_' || geom_tablename || | ||
|
There was a problem hiding this comment. These parts where a lot of code was removed are possible because the geometry intersections were done in the CTE. |
||
| ' ) / NULLIF(SUM(' || denom_tablename || '.' || denom_colname || ' ' || | ||
| ' * pct_' || geom_tablename || '), 0) ' || | ||
| ' / (COUNT(*) / COUNT(distinct geomref_' || geom_tablename || ')) ' | ||
| END | ||
| -- areaNormalized | ||
| WHEN LOWER(normalization) LIKE 'area%' OR | ||
|
|
@@ -625,20 +629,15 @@ BEGIN | |
| -- areaNormalized point-in-poly | ||
| WHEN $2 = 'ST_Point' THEN | ||
| ' cdb_observatory.FIRST(' || numer_tablename || '.' || numer_colname || | ||
| ' / (Nullif(ST_Area(geom_' || geom_tablename || '::Geography), 0)/1000000)) ' | ||
| -- areaNormalized polygon interpolation | ||
| -- SUM (numer * (% OBS geom in user geom)) / area of big geom | ||
| ELSE | ||
| --' NULL END ' | ||
| ' SUM(' || numer_tablename || '.' || numer_colname || ' ' || | ||
| ' * pct_' || geom_tablename || | ||
| ' ) / (Nullif(ST_Area(cdb_observatory.FIRST(_procgeoms.geom)::Geography), 0) / 1000000) ' || | ||
| ' / (COUNT(*) / COUNT(distinct geomref_' || geom_tablename || ')) ' | ||
| END | ||
| -- median/average measures with universe | ||
| WHEN LOWER(numer_aggregate) IN ('median', 'average') AND | ||
|
|
@@ -655,22 +654,10 @@ BEGIN | |
| -- (10 * 1000 * 1 + 50 * 10 * 1) / (1000 + 10) = 10500 / 10000 = 10.5 | ||
| ' SUM(' || numer_tablename || '.' || numer_colname || | ||
| ' * ' || denom_tablename || '.' || denom_colname || | ||
| ' * pct_' || geom_tablename || | ||
| ' ) / Nullif(SUM(' || denom_tablename || '.' || denom_colname || | ||
| ' * pct_' || geom_tablename || '), 0) ' || | ||
| ' / (COUNT(*) / COUNT(distinct geomref_' || geom_tablename || ')) ' | ||
| END | ||
| -- prenormalized for summable measures. point or summable only! | ||
| WHEN numer_aggregate ILIKE 'sum' AND | ||
|
|
@@ -683,15 +670,8 @@ BEGIN | |
| -- predenominated polygon interpolation | ||
| -- SUM (numer * (% user geom in OBS geom)) | ||
| ' SUM(' || numer_tablename || '.' || numer_colname || ' ' || | ||
| ' * pct_' || geom_tablename || | ||
| ' ) / (COUNT(*) / COUNT(distinct geomref_' || geom_tablename || ')) ' | ||
| END | ||
| -- Everything else. Point only! | ||
| ELSE CASE | ||
|
|
@@ -709,9 +689,9 @@ BEGIN | |
|
|
||
| -- geometry | ||
| WHEN numer_id IS NULL THEN | ||
| '''geomref'', geomref_' || geom_tablename || ', ' || | ||
| '''value'', ' || 'cdb_observatory.FIRST(geom_' || geom_tablename || | ||
| ')::TEXT' | ||
| -- code below will return the intersection of the user's geom and the | ||
| -- OBS geom | ||
| --'''value'', ' || 'ST_Union(cdb_observatory.safe_intersection(_geoms.geom, ' || geom_tablename || | ||
|
|
@@ -725,8 +705,11 @@ BEGIN | |
| -- | ||
| -- api_method and geom_tablename are interchangeable since when an | ||
| -- api_method is passed, geom_tablename is ignored | ||
| String_Agg(DISTINCT COALESCE(geom_tablename, api_method) || '.' || geom_geomref_colname || | ||
| ' AS geomref_' || COALESCE(geom_tablename, api_method), ', ') AS geomrefs_alias, | ||
|
|
||
| String_Agg(DISTINCT 'geomref_' || COALESCE(geom_tablename, api_method) | ||
| , ', ') AS geomrefs_noalias, | ||
|
|
||
| (SELECT String_Agg(DISTINCT CASE | ||
| -- External API | ||
|
|
@@ -739,19 +722,18 @@ BEGIN | |
| SELECT DISTINCT UNNEST(tablenames_ary) tablename FROM ( | ||
| SELECT ARRAY_AGG(numer_tablename) || | ||
| ARRAY_AGG(denom_tablename) || | ||
| ARRAY_AGG('cdb_observatory.' || api_method || '(_geoms.geom' || COALESCE(', ' || | ||
| (SELECT STRING_AGG(REPLACE(val::text, '"', ''''), ', ') | ||
| FROM (SELECT json_array_elements(api_args) as val) as vals), | ||
| '') || ')') | ||
| tablenames_ary | ||
| ) tablenames_inner | ||
| ) tablenames_outer) data_tables, | ||
|
|
||
| String_Agg(DISTINCT array_to_string(ARRAY[ | ||
| CASE WHEN numer_tablename != geom_tablename | ||
| THEN numer_tablename || '.' || numer_geomref_colname || ' = ' || | ||
| '_procgeoms.geomref_' || geom_tablename | ||
| ELSE NULL END, | ||
| CASE WHEN numer_tablename != denom_tablename | ||
| THEN numer_tablename || '.' || numer_geomref_colname || ' = ' || | ||
|
|
@@ -767,7 +749,8 @@ BEGIN | |
| FROM _meta | ||
| ; | ||
| $query$ | ||
| INTO geom_colspecs, geom_tables, data_colspecs, geomrefs_alias, | ||
| geomrefs_noalias, data_tables, obs_wheres, user_wheres | ||
| USING (SELECT ARRAY(SELECT json_array_elements_text(params))::json[]), geomtype; | ||
|
|
||
| RETURN QUERY EXECUTE format($query$ | ||
|
|
@@ -778,17 +761,23 @@ BEGIN | |
| CASE WHEN (ST_NPoints(geom) > 500) | ||
| THEN ST_CollectionExtract(ST_MakeValid(ST_SimplifyVW(geom, 0.0001)), 3) | ||
| ELSE geom END geom | ||
| FROM _raw_geoms), | ||
| _procgeoms AS (SELECT _geoms.id, _geoms.geom, %s %s | ||
|
|
||
| FROM _geoms %s | ||
| %s | ||
| ) | ||
| SELECT _procgeoms.id::INT, Array_to_JSON(ARRAY[%s]::JSON[]) | ||
| FROM _procgeoms %s | ||
| %s | ||
| GROUP BY _procgeoms.id %s | ||
| ORDER BY _procgeoms.id | ||
| $query$, geomrefs_alias, | ||
| ', ' || NullIf(geom_colspecs, ''), | ||
| ', ' || NullIf(geom_tables, ''), | ||
| 'WHERE ' || NullIf( user_wheres, ''), | ||
| data_colspecs, ', ' || NullIf(data_tables, ''), | ||
| 'WHERE ' || NULLIF(obs_wheres, ''), | ||
| CASE WHEN merge IS False THEN ', ' || geomrefs_noalias ELSE '' END) | ||
| USING geomvals; | ||
| RETURN; | ||
| END; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@michellemho Starting here is where I made changes to use a CTE to do geometry intersections.