# HG changeset patch
# User Thomas Junk <thomas.junk@intevation.de>
# Date 1626171885 -7200
# Node ID 4d1b1df61f71b7e3061a5fa2fd0fdef768a12ec9
# Parent  eeee1c411576751edc8ed154c03fe4e40aedbfe4# Parent  a65b0891e8fd60fc97727f45f7f6734bf63b632d
merge

diff -r eeee1c411576 -r 4d1b1df61f71 pkg/imports/isr.go
--- a/pkg/imports/isr.go	Tue Jul 13 12:24:29 2021 +0200
+++ b/pkg/imports/isr.go	Tue Jul 13 12:24:45 2021 +0200
@@ -65,7 +65,7 @@
 WHERE sounding_result_id = $1`
 
 	fetchMarkingPointsSQL = `
-SELECT ST_AsBinary(ST_Transform(points, 4326))
+SELECT ST_AsBinary(points::geometry(MULTIPOINTZ))
 FROM waterway.sounding_results_marking_points
 WHERE sounding_result_id = $1`
 
@@ -165,7 +165,8 @@
 		start := time.Now()
 		feedback.Info("Processing bottleneck '%s' ...", bns[i].bn)
 		err := isr.processBottleneck(
-			ctx, conn, isrs,
+			ctx, conn, feedback,
+			isrs,
 			heights,
 			&bns[i],
 		)
@@ -224,6 +225,7 @@
 func (isr *IsoRefresh) processBottleneck(
 	ctx context.Context,
 	conn *sql.Conn,
+	feedback Feedback,
 	isrs *isrStmts,
 	heights mesh.ClassBreaks,
 	bn *bottleneckSoundingResults,
@@ -243,10 +245,13 @@
 		insertMarkingPoints = tx.StmtContext(ctx, isrs.insertMarkingPoints)
 	)
 
+	var markings, beams int
+
 	// For all sounding results in bottleneck.
 	for _, sr := range bn.srs {
 		switch sr.surveyType {
 		case models.SurveyTypeMarking:
+			markings++
 
 			// Read all points back in.
 
@@ -297,6 +302,8 @@
 			}
 
 		case models.SurveyTypeMultiBeam, models.SurveyTypeSingleBeam:
+			beams++
+
 			tree, err := mesh.FetchMeshDirectly(ctx, tx, sr.id)
 			if err != nil {
 				return err
@@ -304,7 +311,7 @@
 			hs := heights.ExtrapolateClassBreaks(tree.Min().Z, tree.Max().Z).Dedup()
 
 			// Delete the old iso areas.
-			if _, err := deleteAreas.ExecContext(ctx, sr); err != nil {
+			if _, err := deleteAreas.ExecContext(ctx, sr.id); err != nil {
 				return err
 			}
 
@@ -326,7 +333,7 @@
 				}
 				if _, err := insertAreas.ExecContext(
 					ctx,
-					sr, hs[i], tree.EPSG(),
+					sr.id, hs[i], tree.EPSG(),
 					a.AsWKB(),
 					contourTolerance,
 				); err != nil {
@@ -337,6 +344,7 @@
 			log.Printf("error: unknown survey type '%s'\n", sr.surveyType)
 		}
 	}
+	feedback.Info("Scan types: Single/Multi: %d Marking: %d", beams, markings)
 
 	return tx.Commit()
 }