diff pkg/octree/vertex.go @ 2471:63475c8e710e octree-diff

Moved WKB constants to own package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 26 Feb 2019 11:34:15 +0100
parents a1e751c08c56
children db0e4ab57977
line wrap: on
line diff
--- a/pkg/octree/vertex.go	Tue Feb 26 11:01:06 2019 +0100
+++ b/pkg/octree/vertex.go	Tue Feb 26 11:34:15 2019 +0100
@@ -20,6 +20,8 @@
 	"log"
 	"math"
 	"sort"
+
+	"gemma.intevation.de/gemma/pkg/wkb"
 )
 
 type (
@@ -421,13 +423,13 @@
 
 	buf := bytes.NewBuffer(make([]byte, 0, size))
 
-	binary.Write(buf, binary.LittleEndian, wkbNDR)
-	binary.Write(buf, binary.LittleEndian, wkbMultiLineStringZ)
+	binary.Write(buf, binary.LittleEndian, wkb.NDR)
+	binary.Write(buf, binary.LittleEndian, wkb.MultiLineStringZ)
 	binary.Write(buf, binary.LittleEndian, uint32(len(mls)))
 
 	for _, ml := range mls {
-		binary.Write(buf, binary.LittleEndian, wkbNDR)
-		binary.Write(buf, binary.LittleEndian, wkbLineStringZ)
+		binary.Write(buf, binary.LittleEndian, wkb.NDR)
+		binary.Write(buf, binary.LittleEndian, wkb.LineStringZ)
 		binary.Write(buf, binary.LittleEndian, uint32(len(ml)))
 		for _, p := range ml {
 			binary.Write(buf, binary.LittleEndian, math.Float64bits(p.X))
@@ -451,13 +453,13 @@
 
 	buf := bytes.NewBuffer(make([]byte, 0, size))
 
-	binary.Write(buf, binary.LittleEndian, wkbNDR)
-	binary.Write(buf, binary.LittleEndian, wkbMultiLineString)
+	binary.Write(buf, binary.LittleEndian, wkb.NDR)
+	binary.Write(buf, binary.LittleEndian, wkb.MultiLineString)
 	binary.Write(buf, binary.LittleEndian, uint32(len(mls)))
 
 	for _, ml := range mls {
-		binary.Write(buf, binary.LittleEndian, wkbNDR)
-		binary.Write(buf, binary.LittleEndian, wkbLineString)
+		binary.Write(buf, binary.LittleEndian, wkb.NDR)
+		binary.Write(buf, binary.LittleEndian, wkb.LineString)
 		binary.Write(buf, binary.LittleEndian, uint32(len(ml)))
 		for _, p := range ml {
 			binary.Write(buf, binary.LittleEndian, math.Float64bits(p.X))
@@ -918,13 +920,13 @@
 
 	buf := bytes.NewBuffer(make([]byte, 0, size))
 
-	binary.Write(buf, binary.LittleEndian, wkbNDR)
-	binary.Write(buf, binary.LittleEndian, wkbMultiPointZ)
+	binary.Write(buf, binary.LittleEndian, wkb.NDR)
+	binary.Write(buf, binary.LittleEndian, wkb.MultiPointZ)
 	binary.Write(buf, binary.LittleEndian, uint32(len(mpz)))
 
 	for _, p := range mpz {
-		binary.Write(buf, binary.LittleEndian, wkbNDR)
-		binary.Write(buf, binary.LittleEndian, wkbPointZ)
+		binary.Write(buf, binary.LittleEndian, wkb.NDR)
+		binary.Write(buf, binary.LittleEndian, wkb.PointZ)
 		binary.Write(buf, binary.LittleEndian, math.Float64bits(p.X))
 		binary.Write(buf, binary.LittleEndian, math.Float64bits(p.Y))
 		binary.Write(buf, binary.LittleEndian, math.Float64bits(p.Z))