gemma: pkg/octree/tin.go comparison

To make golint happier made context.Context to be the first argument in all calls.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Sun, 25 Nov 2018 16:26:41 +0100
parents	a244b18cb916
children	84e78d2e2d95

comparison

equal deleted inserted replaced

-:cabf4789e02b
+:d753ce6cf588
 	"errors"
 	"fmt"
 	"io"
 	"log"
 	"math"
-	"time"
 )
 var (
 	errNoByteSlice   = errors.New("Not a byte slice")
 	errTooLessPoints = errors.New("Too less points")
 FROM trans) t
 )
 SELECT ST_AsBinary(ST_Collect(triangles.geom)) FROM triangles, trans
 WHERE ST_Covers(trans.area, triangles.poly)`
-	loadTinSQL     = tinSQLPrefix + `WHERE bottleneck_id = $2 AND date_info = $3` + tinSQLSuffix
 	loadTinByIDSQL = tinSQLPrefix + `WHERE id = $2` + tinSQLSuffix
 )
-func GenerateTin(
+func GenerateTinByID(
+	ctx context.Context,
 	conn *sql.Conn,
-	ctx context.Context,
-	bottleneck string,
-	date time.Time,
-	epsg uint32,
-) (*Tin, error) {
-	var tin Tin
-	err := conn.QueryRowContext(ctx, loadTinSQL, epsg, bottleneck, date).Scan(&tin)
-	switch {
-	case err == sql.ErrNoRows:
-		return nil, nil
-	case err != nil:
-		return nil, err
-	}
-	tin.EPSG = epsg
-	return &tin, nil
-}
-func GenerateTinByID(
-	conn *sql.Conn,
-	ctx context.Context,
 	id int64,
 	epsg uint32,
 ) (*Tin, error) {
 	var tin Tin
 	err := conn.QueryRowContext(ctx, loadTinByIDSQL, epsg, id).Scan(&tin)

Mercurial > gemma