# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1571059654 -7200
# Node ID 6eab3ac0e849ae94dbb89293fe2de8ef6b574a8b
# Parent  92a7551d626f09a6985104666ab0c478f8760e0d
Speak of meshes instead od octrees as they are not longer used.

diff -r 92a7551d626f -r 6eab3ac0e849 pkg/imports/sr.go
--- a/pkg/imports/sr.go	Mon Oct 14 14:59:31 2019 +0200
+++ b/pkg/imports/sr.go	Mon Oct 14 15:27:34 2019 +0200
@@ -153,7 +153,7 @@
   ST_AsBinary(ST_Buffer(ST_Transform(ST_GeomFromWKB($1, $2::integer), $3::integer), 0.1)),
   ST_Area(ST_Transform(ST_GeomFromWKB($1, $2::integer), $3::integer))`
 
-	insertOctreeSQL = `
+	insertMeshSQL = `
 UPDATE waterway.sounding_results SET
   mesh_checksum = $2, mesh_index = $3
 WHERE id = $1`
@@ -556,21 +556,21 @@
 
 	var str octree.STRTree
 	str.Build(tin)
-	feedback.Info("Building STR tree took %v", time.Since(start))
+	feedback.Info("Building clipping index took %v", time.Since(start))
 
 	start = time.Now()
 
 	clippingPolygonBuffered.Indexify()
 	removed = str.Clip(&clippingPolygonBuffered)
-	feedback.Info("Clipping STR tree took %v.", time.Since(start))
+	feedback.Info("Clipping took %v.", time.Since(start))
 	feedback.Info("Number of triangles to clip %d.", len(removed))
 
 	start = time.Now()
 	final := octree.STRTree{Entries: 16}
 	final.BuildWithout(tin, removed)
 
-	feedback.Info("Building octree took %v.", time.Since(start))
-	feedback.Info("Store octree.")
+	feedback.Info("Building final mesh took %v.", time.Since(start))
+	feedback.Info("Store mesh.")
 
 	start = time.Now()
 
@@ -616,11 +616,11 @@
 	h := sha1.New()
 	h.Write(index)
 	checksum := hex.EncodeToString(h.Sum(nil))
-	_, err = tx.ExecContext(ctx, insertOctreeSQL, id, checksum, index)
+	_, err = tx.ExecContext(ctx, insertMeshSQL, id, checksum, index)
 	if err != nil {
 		return nil, err
 	}
-	feedback.Info("Storing octree index took %s.", time.Since(start))
+	feedback.Info("Storing mesh index took %s.", time.Since(start))
 	err = generateIsos(ctx, tx, feedback, &final, id)
 	if err != nil {
 		return nil, err