diff pkg/imports/isr.go @ 4658:4bbfe3dd2ab5 stree-experiment

Completed usage of STRTrees.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 14 Oct 2019 14:58:04 +0200
parents fb09a43b062e
children 65845c6522fb
line wrap: on
line diff
--- a/pkg/imports/isr.go	Mon Oct 14 13:18:15 2019 +0200
+++ b/pkg/imports/isr.go	Mon Oct 14 14:58:04 2019 +0200
@@ -171,11 +171,11 @@
 
 	// For all sounding results in bottleneck.
 	for _, sr := range bn.srs {
-		tree, err := octree.FetchOctreeDirectly(ctx, tx, sr)
+		tree, err := octree.FetchMeshDirectly(ctx, tx, sr)
 		if err != nil {
 			return err
 		}
-		hs := octree.ExtrapolateClassBreaks(heights, tree.Min.Z, tree.Max.Z)
+		hs := octree.ExtrapolateClassBreaks(heights, tree.Min().Z, tree.Max().Z)
 		hs = common.DedupFloat64s(hs)
 
 		// Delete the old iso areas.
@@ -184,7 +184,7 @@
 		}
 
 		// Calculate and store the iso areas.
-		areas := octree.TraceAreas(hs, isoCellSize, tree.Min, tree.Max, tree.Value)
+		areas := octree.TraceAreas(hs, isoCellSize, tree.Min(), tree.Max(), tree.Value)
 		for i, a := range areas {
 			if len(a) == 0 {
 				continue