From a7de1f222875ba7e08e6636ee1214d77dd0e1a36 Mon Sep 17 00:00:00 2001 From: John Krauss Date: Wed, 13 Jul 2016 16:57:27 -0400 Subject: [PATCH] intersects, not overlaps --- src/pg/sql/41_observatory_augmentation.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pg/sql/41_observatory_augmentation.sql b/src/pg/sql/41_observatory_augmentation.sql index fb338d0..3b2f196 100644 --- a/src/pg/sql/41_observatory_augmentation.sql +++ b/src/pg/sql/41_observatory_augmentation.sql @@ -420,7 +420,7 @@ BEGIN sql = format('WITH _geom AS (SELECT ST_Area(ST_Intersection(%L, geom.%I)) / ST_Area(geom.%I) overlap, geom.%I geom_ref FROM observatory.%I geom - WHERE ST_Overlaps(%L, geom.%I)) + WHERE ST_Intersects(%L, geom.%I)) SELECT SUM(numer.%I * (SELECT _geom.overlap FROM _geom WHERE _geom.geom_ref = numer.%I)) / ST_Area(%L::Geography) FROM observatory.%I numer @@ -434,7 +434,7 @@ BEGIN sql = format('WITH _geom AS (SELECT ST_Area(ST_Intersection(%L, geom.%I)) / ST_Area(geom.%I) overlap, geom.%I geom_ref FROM observatory.%I geom - WHERE ST_Overlaps(%L, geom.%I)), + WHERE ST_Intersects(%L, geom.%I)), _denom AS (SELECT denom.%I, denom.%I geom_ref FROM observatory.%I denom WHERE denom.%I IN (SELECT geom_ref FROM _geom)) @@ -465,7 +465,7 @@ BEGIN sql = format('WITH _geom AS (SELECT ST_Area(ST_Intersection(%L, geom.%I)) / ST_Area(geom.%I) overlap, geom.%I geom_ref FROM observatory.%I geom - WHERE ST_Overlaps(%L, geom.%I)) + WHERE ST_Intersects(%L, geom.%I)) SELECT SUM(numer.%I * (SELECT _geom.overlap FROM _geom WHERE _geom.geom_ref = numer.%I)) FROM observatory.%I numer WHERE numer.%I IN (SELECT geom_ref FROM _geom)',