Mercurial > gemma

changeset 2587:857bb070b9f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Morphological differences: Bottleneck_id is an integer represented as a string.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 11 Mar 2019 18:20:34 +0100
parents bc1b43885a4d
children 2fcb2f969321
files pkg/controllers/diff.go pkg/octree/polygon.go
diffstat 2 files changed, 9 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/diff.go	Mon Mar 11 17:31:39 2019 +0100
+++ b/pkg/controllers/diff.go	Mon Mar 11 18:20:34 2019 +0100
@@ -38,19 +38,17 @@
 SELECT sd.id FROM
   caching.sounding_differences sd JOIN 
   waterway.sounding_results srm ON sd.minuend = srm.id JOIN
-  waterway.sounding_results srs ON sd.subtrahend = srs.id JOIN
-  waterway.bottlenecks      bns ON srm.bottleneck_id = bns.id
+  waterway.sounding_results srs ON sd.subtrahend = srs.id
 WHERE srm.bottleneck_id = srs.bottleneck_id AND
-  bns.objnam = $1 AND
-  srs.date_info = $2::date AND
-  srm.date_info = $3::date
+  srm.bottleneck_id = $1 AND
+  srm.date_info = $2::date AND
+  srs.date_info = $3::date
 `
 	insertDiffSQL = `
 WITH soundings AS (
   SELECT sr.id AS id, sr.date_info AS date_info FROM
-  waterway.sounding_results sr JOIN
-  waterway.bottlenecks bns ON sr.bottleneck_id = bns.id
-  WHERE bns.objnam = $1
+  waterway.sounding_results sr
+  WHERE sr.bottleneck_id = $1
 )
 INSERT INTO caching.sounding_differences (minuend, subtrahend)
 SELECT m.id, s.id FROM soundings m, soundings s
@@ -58,7 +56,7 @@
 RETURNING id
 `
 	insertDiffContourSQL = `
-INSERT INTO caching.caching.sounding_differences_contour_lines (
+INSERT INTO caching.sounding_differences_contour_lines (
   sounding_differences_id,
   height,
   lines
--- a/pkg/octree/polygon.go	Mon Mar 11 17:31:39 2019 +0100
+++ b/pkg/octree/polygon.go	Mon Mar 11 18:20:34 2019 +0100
@@ -47,9 +47,8 @@
   SELECT
     sr.area      AS area,
     sr.date_info AS date_info
-  FROM waterway.sounding_results sr JOIN
-     waterway.bottlenecks bn ON sr.bottleneck_id = bn.id
-  WHERE bn.bottleneck_id = $1
+  FROM waterway.sounding_results sr
+  WHERE sr.bottleneck_id = $1
 )
 SELECT ST_AsBinary(
   ST_intersection(