Skip to content

Commit

Permalink
Revert movement of geomvals to summary CTE in order to avoid possible…
Browse files Browse the repository at this point in the history
… future problems
  • Loading branch information
Mario de Frutos committed Jun 16, 2017
1 parent 0b52eba commit cb332f6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Changelog

## 0.55.5
Released 2017-mm-dd

Released 2017-06-16

- Revert change in the DO analysis where geomvals where moved to the _summary CTE to avoid possible problems

## 0.55.4
Released 2017-06-14
Released 2017-06-15

- Fixed issue to filter NULL geometries in the DO node queries because could cause errors in the data calculation from DO #312

Expand Down
3 changes: 1 addition & 2 deletions lib/node/nodes/data-observatory-multiple-measures.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ var queryTemplate = Node.template([
'_summary AS ( ',
' SELECT',
' ST_SetSRID(ST_Extent(the_geom), 4326) extent, ',
' ARRAY_AGG((the_geom, cartodb_id)::geomval) geomvals,',
' count(*)::INT numgeoms',
' FROM _source',
' WHERE the_geom IS NOT NULL',
Expand All @@ -125,7 +124,7 @@ var queryTemplate = Node.template([
'_data AS ( ',
' SELECT id AS __obs_id__, {{=it.obsColumns}}',
' FROM cdb_dataservices_client._OBS_GetData_exception_safe(',
' (SELECT geomvals FROM _summary),',
' (SELECT ARRAY_AGG((the_geom, cartodb_id)::geomval) FROM _source WHERE the_geom IS NOT NULL),',
' (SELECT meta FROM _meta)',
' ) AS _camshaft_do_measure_analysis_data',
')',
Expand Down

0 comments on commit cb332f6

Please sign in to comment.