From 7c8c5cca0a719c658a65bc13673e77e82d22ad43 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Wed, 13 Jul 2016 16:42:02 -0400 Subject: [PATCH] fix params --- src/pg/sql/41_observatory_augmentation.sql | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index a28d170..cd0d9ed 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -439,15 +439,22 @@ BEGIN FROM observatory.%I denom WHERE denom.%I IN (SELECT geom_ref FROM _geom)) SELECT SUM(numer.%I * (SELECT _geom.overlap FROM _geom WHERE _geom.geom_ref = numer.%I)) / - SUM(denom.%I * (SELECT _geom.overlap FROM _geom WHERE _geom.geom_ref = denom.%I)) + SUM(SELECT _denom.%I * (SELECT _geom.overlap + FROM _geom WHERE _geom.geom_ref = _denom.geom_ref) + WHERE _denom.geom_ref = numer.%I) FROM observatory.%I numer WHERE numer.%I IN (SELECT geom_ref FROM _geom)', - geom, geom_colname, geom_colname, - geom_geomref_colname, geom_tablename, + geom, geom_colname, + geom_colname, geom_geomref_colname, + geom_tablename, geom, geom_colname, denom_colname, denom_geomref_colname, - denom_tablename, denom_geomref_colname, - numer_colname, geom, numer_tablename, + denom_tablename, + denom_geomref_colname, + numer_colname, numer_geomref_colname, + denom_colname, + numer_geomref_colname, + numer_tablename, numer_geomref_colname); ELSIF map_type = 'predenominated' THEN IF numer_aggregate NOT ILIKE 'sum' THEN