gemma: pkg/imports/sr.go comparison

comparison pkg/imports/sr.go @ 4827:f4abfd0ee8ad remove-octree-debris

Renamed octree package to mesh as there is no octree any more.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Tue, 05 Nov 2019 14:30:22 +0100
parents	1fef4679b07a
children	046a07a33b19

comparison

equal deleted inserted replaced

-:ec5afada70ec
+:f4abfd0ee8ad
 	"time"
 	shp "github.com/jonas-p/go-shp"
 	"gemma.intevation.de/gemma/pkg/common"
+	"gemma.intevation.de/gemma/pkg/mesh"
 	"gemma.intevation.de/gemma/pkg/models"
-	"gemma.intevation.de/gemma/pkg/octree"
 	"gemma.intevation.de/gemma/pkg/wkb"
 )
 // SoundingResult is a Job to import sounding reults
 // from a ZIP file into the database.
 		// LDC is cm. The data is in m.
 		ldc /= 100
 		xform = chainTransforms(
 			xform,
-			func(v octree.Vertex) octree.Vertex {
+			func(v mesh.Vertex) mesh.Vertex {
-				return octree.Vertex{X: v.X, Y: v.Y, Z: v.Z + ldc}
+				return mesh.Vertex{X: v.X, Y: v.Y, Z: v.Z + ldc}
 			})
 		m.DepthReference = depthReference
 	}
 	if err := m.Validate(ctx, conn); err != nil {
 		return nil, common.ToError(err)
 	}
-	var xyz octree.MultiPointZ
+	var xyz mesh.MultiPointZ
 	if z != nil { // Scanning ZIP file for *.xyz file.
 		var xyzf *zip.File
 		for _, ext := range []string{".xyz", ".txt"} {
 			feedback.Info("Looking for '*%s'", ext)
 	ctx context.Context,
 	tx *sql.Tx,
 	feedback Feedback,
 	importID int64,
 	m *models.SoundingResultMeta,
-	xyz octree.MultiPointZ,
+	xyz mesh.MultiPointZ,
 	boundary polygonSlice,
 ) (interface{}, error) {
 	if sr.singleBeam() {
 		feedback.Info("Processing as single beam scan.")
 		epsg, time.Since(start))
 	feedback.Info("Number of reprojected points: %d", len(xyz))
 	feedback.Info("Triangulate XYZ data.")
 	start = time.Now()
-	tri, err := octree.Triangulate(xyz)
+	tri, err := mesh.Triangulate(xyz)
 	if err != nil {
 		return nil, err
 	}
 	feedback.Info("Triangulation took %v.", time.Since(start))
 	feedback.Info("Number triangles: %d.", len(tri.Triangles)/3)
 	var (
-		clippingPolygon         octree.Polygon
+		clippingPolygon         mesh.Polygon
-		clippingPolygonBuffered octree.Polygon
+		clippingPolygonBuffered mesh.Polygon
 		removed                 map[int32]struct{}
 		polygonArea             float64
 		clippingPolygonWKB      []byte
-		tin                     *octree.Tin
+		tin                     *mesh.Tin
 	)
 	if boundary == nil {
 		feedback.Info("No boundary given. Calulate from XYZ data.")
 		tooLongEdge := tri.EstimateTooLong()
 		feedback.Info("Eliminate triangles with edges longer than %.2f meters.", tooLongEdge)
-		var polygon octree.LineStringZ
+		var polygon mesh.LineStringZ
 		start = time.Now()
 		polygon, removed = tri.ConcaveHull(tooLongEdge)
 		polygonArea = polygon.Area()
 		if polygonArea < 0.0 { // counter clockwise
 		}
 		tin := tri.Tin()
 		tin.EPSG = epsg
-		var str octree.STRTree
+		var str mesh.STRTree
 		str.Build(tin)
 		removed = str.Clip(&clippingPolygon)
 	}
 		feedback.Info("Build virtual DEM based on original XYZ data.")
 		start = time.Now()
 		tin := tri.Tin()
-		var virtual octree.STRTree
+		var virtual mesh.STRTree
 		virtual.BuildWithout(tin, removed)
 		feedback.Info("Building took %v", time.Since(start))
 		numPoints := int(math.Ceil(polygonArea * pointsPerSquareMeter))
 		feedback.Info("Generate %d random points for an average density of ~%.2f points/m².",
 			numPoints, pointsPerSquareMeter)
 		start = time.Now()
-		generated := make(octree.LineStringZ, 0, numPoints+clippingPolygon.NumVertices(0))
+		generated := make(mesh.LineStringZ, 0, numPoints+clippingPolygon.NumVertices(0))
-		octree.GenerateRandomVertices(
+		mesh.GenerateRandomVertices(
 			numPoints,
 			tin.Min, tin.Max,
 			virtual.Value,
-			func(vertices []octree.Vertex) {
+			func(vertices []mesh.Vertex) {
 				generated = append(generated, vertices...)
 			})
 		feedback.Info("Generating %d points took %v.", len(generated), time.Since(start))
 			if _, found := dupes[key]; found {
 				return
 			}
 			dupes[key] = struct{}{}
 			if z, ok := virtual.Value(x, y); ok {
-				generated = append(generated, octree.Vertex{X: x, Y: y, Z: z})
+				generated = append(generated, mesh.Vertex{X: x, Y: y, Z: z})
 			}
 		})
 		feedback.Info("Triangulate new point cloud.")
-		xyz = octree.MultiPointZ(generated)
+		xyz = mesh.MultiPointZ(generated)
 		start = time.Now()
-		tri, err = octree.Triangulate(xyz)
+		tri, err = mesh.Triangulate(xyz)
 		if err != nil {
 			return nil, err
 		}
 		feedback.Info("Second triangulation took %v.", time.Since(start))
 		feedback.Info("Number triangles: %d.", len(tri.Triangles)/3)
 	start = time.Now()
 	tin = tri.Tin()
 	tin.EPSG = epsg
-	var str octree.STRTree
+	var str mesh.STRTree
 	str.Build(tin)
 	feedback.Info("Building clipping index took %v", time.Since(start))
 	start = time.Now()
 	removed = str.Clip(&clippingPolygonBuffered)
 	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 := mesh.STRTree{Entries: 16}
 	final.BuildWithout(tin, removed)
 	feedback.Info("Building final mesh took %v.", time.Since(start))
 	feedback.Info("Store mesh.")
 	}
 	return &m, nil
 }
-type vertexTransform func(octree.Vertex) octree.Vertex
+type vertexTransform func(mesh.Vertex) mesh.Vertex
-func identityTransform(v octree.Vertex) octree.Vertex { return v }
+func identityTransform(v mesh.Vertex) mesh.Vertex { return v }
-func negateZTransform(v octree.Vertex) octree.Vertex {
+func negateZTransform(v mesh.Vertex) mesh.Vertex {
-	return octree.Vertex{X: v.X, Y: v.Y, Z: -v.Z}
+	return mesh.Vertex{X: v.X, Y: v.Y, Z: -v.Z}
 }
 func chainTransforms(a, b vertexTransform) vertexTransform {
-	return func(v octree.Vertex) octree.Vertex { return b(a(v)) }
+	return func(v mesh.Vertex) mesh.Vertex { return b(a(v)) }
 }
-func loadXYZReader(r io.Reader, feedback Feedback, xform vertexTransform) (octree.MultiPointZ, error) {
+func loadXYZReader(r io.Reader, feedback Feedback, xform vertexTransform) (mesh.MultiPointZ, error) {
-	mpz := make(octree.MultiPointZ, 0, 250000)
+	mpz := make(mesh.MultiPointZ, 0, 250000)
 	s := bufio.NewScanner(r)
 	warnLimiter := common.WarningLimiter{Log: feedback.Warn, MaxWarnings: 100}
 	warn := warnLimiter.Warn
 	defer warnLimiter.Close()
 	for line := 1; s.Scan(); line++ {
 		text := s.Text()
-		var p octree.Vertex
+		var p mesh.Vertex
 		// fmt.Sscanf(text, "%f,%f,%f") is 4 times slower.
 		idx := strings.IndexByte(text, ',')
 		if idx == -1 {
 			warn("format error in line %d", line)
 			continue
 	}
 	return mpz, nil
 }
-func loadXYZ(f *zip.File, feedback Feedback, xform vertexTransform) (octree.MultiPointZ, error) {
+func loadXYZ(f *zip.File, feedback Feedback, xform vertexTransform) (mesh.MultiPointZ, error) {
 	r, err := f.Open()
 	if err != nil {
 		return nil, err
 	}
 	defer r.Close()
 	return loadXYZReader(r, feedback, xform)
 }
-func loadXYZFile(f string, feedback Feedback, xform vertexTransform) (octree.MultiPointZ, error) {
+func loadXYZFile(f string, feedback Feedback, xform vertexTransform) (mesh.MultiPointZ, error) {
 	r, err := os.Open(f)
 	if err != nil {
 		return nil, err
 	}
 	defer r.Close()
 func generateIsos(
 	ctx context.Context,
 	tx *sql.Tx,
 	feedback Feedback,
-	tree *octree.STRTree,
+	tree *mesh.STRTree,
 	id int64,
 ) error {
-	heights, err := octree.LoadClassBreaks(
+	heights, err := mesh.LoadClassBreaks(
 		ctx, tx,
 		"morphology_classbreaks",
 	)
 	minZ, maxZ := tree.Min().Z, tree.Max().Z
 		h := contourStepWidth * math.Ceil(minZ/contourStepWidth)
 		for ; h <= maxZ; h += contourStepWidth {
 			heights = append(heights, h)
 		}
 	} else {
-		heights = octree.ExtrapolateClassBreaks(heights, minZ, maxZ)
+		heights = mesh.ExtrapolateClassBreaks(heights, minZ, maxZ)
 	}
 	/*
 		for i, v := range heights {
 			fmt.Printf("%d %.2f\n", i, v)
 func generateIsoAreas(
 	ctx context.Context,
 	tx *sql.Tx,
 	feedback Feedback,
-	tree *octree.STRTree,
+	tree *mesh.STRTree,
 	heights []float64,
 	id int64,
 ) error {
 	feedback.Info("Generate iso areas")
 	total := time.Now()
 	defer func() {
 		feedback.Info("Generating iso areas took %s.",
 			time.Since(total))
 	}()
-	box := octree.Box2D{
+	box := mesh.Box2D{
 		X1: tree.Min().X,
 		Y1: tree.Min().Y,
 		X2: tree.Max().X,
 		Y2: tree.Max().Y,
 	}
-	raster := octree.NewRaster(box, isoCellSize)
+	raster := mesh.NewRaster(box, isoCellSize)
 	raster.Rasterize(tree.Value)
 	areas := raster.Trace(heights)
 	return storeAreas(
 		ctx, tx, feedback,

Mercurial > gemma

comparison pkg/imports/sr.go @ 4827:f4abfd0ee8ad remove-octree-debris