changeset 4769:ea570f43d7a9 direct-diff

Loading of concrete clipping polygon is not needed any more.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 21 Oct 2019 09:50:32 +0200
parents a2f16bbcc846
children e16babbed40d
files pkg/octree/polygon.go
diffstat 1 files changed, 0 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/octree/polygon.go	Mon Oct 21 02:01:56 2019 +0200
+++ b/pkg/octree/polygon.go	Mon Oct 21 09:50:32 2019 +0200
@@ -15,13 +15,10 @@
 
 import (
 	"bytes"
-	"context"
-	"database/sql"
 	"encoding/binary"
 	"fmt"
 	"log"
 	"math"
-	"time"
 
 	"github.com/tidwall/rtree"
 
@@ -42,56 +39,11 @@
 )
 
 const (
-	clippingPolygonSQL = `
-WITH joined AS (
-  SELECT
-    sr.area      AS area,
-    sr.date_info AS date_info
-  FROM waterway.sounding_results sr
-  WHERE sr.bottleneck_id = $1
-)
-SELECT ST_AsBinary(
-  ST_Buffer(ST_intersection(
-    (SELECT ST_Transform(area::geometry, $2::int) FROM joined WHERE date_info = $3::date),
-    (SELECT ST_Transform(area::geometry, $2::int) FROM joined WHERE date_info = $4::date)
-  ), 0.1)
-  ) AS area
-`
-)
-
-const (
 	IntersectionInside IntersectionType = iota
 	IntersectionOutSide
 	IntersectionOverlaps
 )
 
-func LoadClippingPolygon(
-	ctx context.Context,
-	conn *sql.Conn,
-	epsg uint32,
-	bottleneck string,
-	first, second time.Time,
-) (*Polygon, error) {
-
-	var clip []byte
-
-	if err := conn.QueryRowContext(
-		ctx, clippingPolygonSQL,
-		bottleneck,
-		epsg,
-		first, second,
-	).Scan(&clip); err != nil {
-		return nil, err
-	}
-
-	var polygon Polygon
-	if err := polygon.FromWKB(clip); err != nil {
-		return nil, err
-	}
-	polygon.Indexify()
-	return &polygon, nil
-}
-
 func (ls lineSegment) Rect(interface{}) ([]float64, []float64) {
 
 	var min, max [2]float64