# HG changeset patch
# User Markus Kottlaender <markus@intevation.de>
# Date 1543320333 -3600
# Node ID e27176811d2f9e16d0d6676a5918c52e4ca6acbe
# Parent  fabfffa54926b7a93ef53132cefe869fae4f9725# Parent  353d36dd2571a890babdae6227465643d7071f14
merge

diff -r fabfffa54926 -r e27176811d2f pkg/controllers/cross.go
--- a/pkg/controllers/cross.go	Tue Nov 27 13:04:40 2018 +0100
+++ b/pkg/controllers/cross.go	Tue Nov 27 13:05:33 2018 +0100
@@ -25,8 +25,6 @@
 	"gemma.intevation.de/gemma/pkg/octree"
 )
 
-const WGS84 = 4326
-
 func reproject(
 	ctx context.Context,
 	rp *models.Reprojector,
@@ -105,7 +103,7 @@
 	var rp *models.Reprojector
 	if rp, err = models.NewReprojector(
 		ctx, conn,
-		WGS84, tree.EPSG,
+		models.WGS84, tree.EPSG,
 	); err != nil {
 		return
 	}
diff -r fabfffa54926 -r e27176811d2f pkg/models/common.go
--- a/pkg/models/common.go	Tue Nov 27 13:04:40 2018 +0100
+++ b/pkg/models/common.go	Tue Nov 27 13:05:33 2018 +0100
@@ -19,3 +19,6 @@
 	errNoString    = errors.New("Not a string")
 	errNoByteSlice = errors.New("Not a byte slice")
 )
+
+// WGS84 is the EPSG of the World Geodetic System 1984.
+const WGS84 = 4326
diff -r fabfffa54926 -r e27176811d2f pkg/models/sr.go
--- a/pkg/models/sr.go	Tue Nov 27 13:04:40 2018 +0100
+++ b/pkg/models/sr.go	Tue Nov 27 13:05:33 2018 +0100
@@ -24,10 +24,7 @@
 	"time"
 )
 
-const (
-	SoundingResultDateFormat = "2006-01-02"
-	WGS84                    = 4326
-)
+const SoundingResultDateFormat = "2006-01-02"
 
 type (
 	SoundingResultDate struct{ time.Time }
diff -r fabfffa54926 -r e27176811d2f pkg/octree/tin.go
--- a/pkg/octree/tin.go	Tue Nov 27 13:04:40 2018 +0100
+++ b/pkg/octree/tin.go	Tue Nov 27 13:05:33 2018 +0100
@@ -23,6 +23,8 @@
 	"io"
 	"log"
 	"math"
+
+	"gemma.intevation.de/gemma/pkg/models"
 )
 
 var (
@@ -30,8 +32,6 @@
 	errTooLessPoints = errors.New("Too less points")
 )
 
-const wgs84 = 4326
-
 type Tin struct {
 	EPSG      uint32
 	Vertices  []Vertex
@@ -170,7 +170,7 @@
 		min.X, min.Y, max.X, max.Y)
 
 	*t = Tin{
-		EPSG:      wgs84,
+		EPSG:      models.WGS84,
 		Vertices:  vertices,
 		Triangles: triangles,
 		Min:       min,