From 765cbfccccea16379f7e4bf1e6501a0cf6660cf7 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Fri, 10 Mar 2017 16:32:31 +0000 Subject: [PATCH] only do polygon operations when polygons passed in --- src/pg/sql/41_observatory_augmentation.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index 7655538..b8af416 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -596,7 +596,7 @@ BEGIN ' Nullif(ST_Area(' || geom_tablename || '.' || geom_colname || '::Geography), 0)/1000000 ' || ' AS area_' || geom_tablename -- for numeric areas, include more complex calcs - ELSE + WHEN $2 != 'ST_Point' THEN '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) ' || @@ -605,6 +605,7 @@ BEGIN geom_tablename || '.' || geom_colname || ')) / ' || 'Nullif(ST_Area(' || geom_tablename || '.' || geom_colname || '), 0) ' || 'END pct_' || geom_tablename + ELSE NULL END ELSE NULL END , ', ') AS geom_colspecs,