gemma: pkg/imports/sr.go comparison

comparison pkg/imports/sr.go @ 3591:062dc9b54b86

SR import: Using context.Context aware SQL statements.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Tue, 04 Jun 2019 13:19:28 +0200
parents	a9d140c7db8d
children	eeeb7bf14217

comparison

equal deleted inserted replaced

-:309084558808
+:062dc9b54b86
 JOIN waterway.bottlenecks bns
 ON grwl.location = bns.gauge_location
 AND grwl.validity = bns.gauge_validity
 WHERE bns.objnam = $1 AND grwl.depth_reference like 'LDC%'
 `
+	reprojectPointsSingleBeamSQL = `
+SELECT ST_AsBinary(
+ST_Transform(
+ST_GeomFromWKB($1, $2::integer),
+	best_utm(ST_GeomFromWKB($1, $2::integer)))),
+	best_utm(ST_GeomFromWKB($1, $2::integer)
+`
 )
 func (sr *SoundingResult) isSingleBeam() bool {
 	return sr.SingleBeam != nil && *sr.SingleBeam
 }
 	if len(xyz) == 0 {
 		return nil, errors.New("XYZ does not contain any vertices")
 	}
 	// Is there a boundary shapefile in the ZIP archive?
-	polygon, err := loadBoundary(z)
+	boundary, err := loadBoundary(z)
 	if err != nil {
 		return nil, err
 	}
 	tx, err := conn.BeginTx(ctx, nil)
 			tx,
 			feedback,
 			importID,
 			m,
 			xyz,
-			polygon,
+			boundary,
 		)
 	} else {
 		summary, err = sr.multiBeamScan(
 			ctx,
 			tx,
 			feedback,
 			importID,
 			m,
 			xyz,
-			polygon,
+			boundary,
 		)
 	}
 	if err != nil {
 		return nil, err
 	}
 	tx *sql.Tx,
 	feedback Feedback,
 	importID int64,
 	m *models.SoundingResultMeta,
 	xyz octree.MultiPointZ,
-	polygon polygonSlice,
+	boundary polygonSlice,
 ) (interface{}, error) {
+	feedback.Info("Processing as single beam scan.")
+	start := time.Now()
+	xyzWKB := xyz.AsWKB()
+	var reproj []byte
+	var epsg uint
+	if err := tx.QueryRowContext(
+		ctx,
+		reprojectPointsSingleBeamSQL,
+		xyzWKB,
+		m.EPSG,
+	).Scan(&reproj, &epsg); err != nil {
+		return nil, err
+	}
+	feedback.Info("Reprojecting points to EPSG %d took %v.",
+		epsg, time.Since(start))
 	// TODO: Implement me!
 	return nil, errors.New("Not implemented, yet!")
 }
 func (sr *SoundingResult) multiBeamScan(
 	tx *sql.Tx,
 	feedback Feedback,
 	importID int64,
 	m *models.SoundingResultMeta,
 	xyz octree.MultiPointZ,
-	polygon polygonSlice,
+	boundary polygonSlice,
 ) (interface{}, error) {
 	feedback.Info("Processing as multi beam scan.")
 	var (
 		id       int64
 		epsg     uint32
 		lat, lon float64
 	var hull []byte
 	xyzWKB := xyz.AsWKB()
-	err := tx.QueryRow(insertHullSQL,
+	err := tx.QueryRowContext(
+		ctx,
+		insertHullSQL,
 		m.Bottleneck,
 		m.Date.Time,
 		m.DepthReference,
 		xyzWKB,
-		polygon.asWKB(),
+		boundary.asWKB(),
 		m.EPSG,
 	).Scan(
 		&id,
 		&lat,
 		&lon,
 		&epsg,
 		&hull,
 	)
-	xyz, polygon = nil, nil // not need from now on.
+	xyz, boundary = nil, nil // not need from now on.
 	feedback.Info("Calculating hull took %s.", time.Since(start))
 	if err != nil {
 		return nil, err
 	}
 	feedback.Info("Best suited UTM EPSG: %d", epsg)
 	start = time.Now()
 	var reproj []byte
-	if err = tx.QueryRow(reprojectPointsSQL,
+	if err = tx.QueryRowContext(
+		ctx,
+		reprojectPointsSQL,
 		xyzWKB,
 		m.EPSG,
 		epsg,
 	).Scan(&reproj); err != nil {
 		return nil, err
 	start = time.Now()
 	h := sha1.New()
 	h.Write(octreeIndex)
 	checksum := hex.EncodeToString(h.Sum(nil))
-	_, err = tx.Exec(insertOctreeSQL, id, checksum, octreeIndex)
+	_, err = tx.ExecContext(ctx, insertOctreeSQL, id, checksum, octreeIndex)
 	if err != nil {
 		return nil, err
 	}
 	feedback.Info("Storing octree index took %s.", time.Since(start))
 	tree := builder.Tree()
 	start = time.Now()
-	err = generateContours(tree, tx, id)
+	err = generateContours(ctx, tx, tree, id)
 	if err != nil {
 		return nil, err
 	}
 	feedback.Info("Generating and storing contour lines took %s.",
 		time.Since(start))
 	}
 	return shapeToPolygon(s)
 }
-func generateContours(tree *octree.Tree, tx *sql.Tx, id int64) error {
+func generateContours(
-	stmt, err := tx.Prepare(insertContourSQL)
+	ctx context.Context,
+	tx *sql.Tx,
+	tree *octree.Tree,
+	id int64,
+) error {
+	stmt, err := tx.PrepareContext(ctx, insertContourSQL)
 	if err != nil {
 		return err
 	}
 	defer stmt.Close()
 		heights = append(heights, h)
 	}
 	octree.DoContours(tree, heights, func(res *octree.ContourResult) {
 		if err == nil && len(res.Lines) > 0 {
-			_, err = stmt.Exec(
+			_, err = stmt.ExecContext(
+				ctx,
 				id, res.Height, tree.EPSG,
 				res.Lines.AsWKB2D(),
 				contourTolerance)
 		}
 	})

Mercurial > gemma

comparison pkg/imports/sr.go @ 3591:062dc9b54b86