diff pkg/imports/wkb.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 f54ac71db1ac
children 8b75ac5e243e
line wrap: on
line diff
--- a/pkg/imports/wkb.go	Tue Feb 26 11:01:06 2019 +0100
+++ b/pkg/imports/wkb.go	Tue Feb 26 11:34:15 2019 +0100
@@ -20,6 +20,8 @@
 	"math"
 
 	shp "github.com/jonas-p/go-shp"
+
+	"gemma.intevation.de/gemma/pkg/wkb"
 )
 
 type (
@@ -28,22 +30,14 @@
 	polygonSlice [][][]float64
 )
 
-const (
-	wkbNDR byte = 1
-
-	wkbPoint      uint32 = 1
-	wkbLineString uint32 = 2
-	wkbPolygon    uint32 = 3
-)
-
 func (l lineSlice) asWKB() []byte {
 
 	size := 1 + 4 + 4 + len(l)*(2*8)
 
 	buf := bytes.NewBuffer(make([]byte, 0, size))
 
-	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(l)))
 
 	for _, c := range l {
@@ -67,8 +61,8 @@
 
 	buf := bytes.NewBuffer(make([]byte, 0, size))
 
-	binary.Write(buf, binary.LittleEndian, wkbNDR)
-	binary.Write(buf, binary.LittleEndian, wkbPoint)
+	binary.Write(buf, binary.LittleEndian, wkb.NDR)
+	binary.Write(buf, binary.LittleEndian, wkb.Point)
 
 	var lat, lon float64
 	if len(p) > 0 {
@@ -95,8 +89,8 @@
 
 	buf := bytes.NewBuffer(make([]byte, 0, size))
 
-	binary.Write(buf, binary.LittleEndian, wkbNDR)
-	binary.Write(buf, binary.LittleEndian, wkbPolygon)
+	binary.Write(buf, binary.LittleEndian, wkb.NDR)
+	binary.Write(buf, binary.LittleEndian, wkb.Polygon)
 	binary.Write(buf, binary.LittleEndian, uint32(len(p)))
 
 	for _, ring := range p {