diff cmd/octree2contour/loader.go @ 726:5af9ab39e715

Renamed a few types to uppercase names to prepare the move to the octree package.
author Sascha L. Teichmann <teichmann@intevation.de>
date Sat, 22 Sep 2018 21:34:12 +0200
parents 9db4ae29ded9
children
line wrap: on
line diff
--- a/cmd/octree2contour/loader.go	Sat Sep 22 09:55:42 2018 +0200
+++ b/cmd/octree2contour/loader.go	Sat Sep 22 21:34:12 2018 +0200
@@ -3,52 +3,32 @@
 import (
 	"bufio"
 	"encoding/binary"
-	"io"
 	"log"
-	"math"
 	"os"
 
 	"github.com/golang/snappy"
 )
 
-func (v *vertex) read(r io.Reader) error {
-	var buf [8]byte
-	b := buf[:]
-	if _, err := io.ReadFull(r, b); err != nil {
-		return nil
-	}
-	v.x = math.Float64frombits(binary.LittleEndian.Uint64(b))
-	if _, err := io.ReadFull(r, b); err != nil {
-		return nil
-	}
-	v.y = math.Float64frombits(binary.LittleEndian.Uint64(b))
-	if _, err := io.ReadFull(r, b); err != nil {
-		return nil
-	}
-	v.z = math.Float64frombits(binary.LittleEndian.Uint64(b))
-	return nil
-}
+func loadOctreeReader(r *bufio.Reader) (*Octree, error) {
+	tree := new(Octree)
 
-func loadOctreeReader(r *bufio.Reader) (*octree, error) {
-	tree := new(octree)
-
-	if err := binary.Read(r, binary.LittleEndian, &tree.epsg); err != nil {
+	if err := binary.Read(r, binary.LittleEndian, &tree.EPSG); err != nil {
 		return nil, err
 	}
 
-	log.Printf("EPSG: %d\n", tree.epsg)
+	log.Printf("EPSG: %d\n", tree.EPSG)
 
-	if err := tree.min.read(r); err != nil {
+	if err := tree.Min.read(r); err != nil {
 		return nil, err
 	}
 
-	if err := tree.max.read(r); err != nil {
+	if err := tree.Max.read(r); err != nil {
 		return nil, err
 	}
 
 	log.Printf("BBOX: [[%f, %f, %f], [%f, %f, %f]]\n",
-		tree.min.x, tree.min.y, tree.min.z,
-		tree.max.x, tree.max.y, tree.max.z)
+		tree.Min.x, tree.Min.y, tree.Min.z,
+		tree.Max.x, tree.Max.y, tree.Max.z)
 
 	var numVertices uint32
 	if err := binary.Read(r, binary.LittleEndian, &numVertices); err != nil {
@@ -57,7 +37,7 @@
 
 	log.Printf("vertices: %d\n", numVertices)
 
-	vertices := make([]vertex, numVertices)
+	vertices := make([]Vertex, numVertices)
 	tree.vertices = vertices
 
 	for i := range vertices {
@@ -118,7 +98,7 @@
 	return tree, nil
 }
 
-func loadOctree(fname string) (*octree, error) {
+func LoadOctree(fname string) (*Octree, error) {
 
 	f, err := os.Open(fname)
 	if err != nil {