Use WKB instead of WKT for Value method on each geometry

peterstace · Aug 20, 2019 · 432d8c6 · 432d8c6
1 parent cd48678
commit 432d8c6
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 14 deletions.
diff --git a/fuzztests/postgis.go b/fuzztests/postgis.go
@@ -66,15 +66,15 @@ func (p PostGIS) GeoJSONIsValidWithReason(t *testing.T, geojson string) (bool, s
 
 func (p PostGIS) AsText(t *testing.T, g geom.Geometry) string {
 	var asText string
-	if err := p.db.QueryRow(`SELECT ST_AsText($1)`, g).Scan(&asText); err != nil {
+	if err := p.db.QueryRow(`SELECT ST_AsText(ST_GeomFromWKB($1))`, g).Scan(&asText); err != nil {
 		t.Fatalf("pg error: %v", err)
 	}
 	return asText
 }
 
 func (p PostGIS) AsBinary(t *testing.T, g geom.Geometry) []byte {
 	var asBinary []byte
-	if err := p.db.QueryRow(`SELECT ST_AsBinary($1::geometry)`, g).Scan(&asBinary); err != nil {
+	if err := p.db.QueryRow(`SELECT ST_AsBinary(ST_GeomFromWKB($1))`, g).Scan(&asBinary); err != nil {
 		t.Fatalf("pg error: %v", err)
 	}
 	return asBinary

diff --git a/geom/sql_test.go b/geom/sql_test.go
@@ -68,7 +68,9 @@ func TestValuerConcrete(t *testing.T) {
 			geom := geomFromWKT(t, wkt).(driver.Valuer)
 			val, err := geom.Value()
 			expectNoErr(t, err)
-			expectDeepEqual(t, geom, geomFromWKT(t, val.(string)))
+			g, err := UnmarshalWKB(bytes.NewReader(val.([]byte)))
+			expectNoErr(t, err)
+			expectDeepEqual(t, geom, g)
 		})
 	}
 }
@@ -77,5 +79,7 @@ func TestValuerLinearRing(t *testing.T) {
 	geom := geomFromWKT(t, "LINEARRING(0 0,1 0,0 1,0 0)").(driver.Valuer)
 	val, err := geom.Value()
 	expectNoErr(t, err)
-	expectDeepEqual(t, geomFromWKT(t, "LINESTRING(0 0,1 0,0 1,0 0)"), geomFromWKT(t, val.(string)))
+	g, err := UnmarshalWKB(bytes.NewReader(val.([]byte)))
+	expectNoErr(t, err)
+	expectDeepEqual(t, geomFromWKT(t, "LINESTRING(0 0,1 0,0 1,0 0)"), g)
 }
diff --git a/geom/type_empty.go b/geom/type_empty.go
@@ -63,7 +63,7 @@ func (e EmptySet) Boundary() Geometry {
 }
 
 func (e EmptySet) Value() (driver.Value, error) {
-	return e.AsText(), nil
+	return wkbAsBytes(e)
 }
 
 func (e EmptySet) AsBinary(w io.Writer) error {

diff --git a/geom/type_geometry_collection.go b/geom/type_geometry_collection.go
@@ -120,7 +120,7 @@ func (c GeometryCollection) Boundary() Geometry {
 }
 
 func (c GeometryCollection) Value() (driver.Value, error) {
-	return c.AsText(), nil
+	return wkbAsBytes(c)
 }
 
 func (c GeometryCollection) AsBinary(w io.Writer) error {

diff --git a/geom/type_line.go b/geom/type_line.go
@@ -99,7 +99,7 @@ func (n Line) Boundary() Geometry {
 }
 
 func (n Line) Value() (driver.Value, error) {
-	return n.AsText(), nil
+	return wkbAsBytes(n)
 }
 
 func (n Line) AsBinary(w io.Writer) error {

diff --git a/geom/type_line_string.go b/geom/type_line_string.go
@@ -165,7 +165,7 @@ func (s LineString) Boundary() Geometry {
 }
 
 func (s LineString) Value() (driver.Value, error) {
-	return s.AsText(), nil
+	return wkbAsBytes(s)
 }
 
 func (s LineString) AsBinary(w io.Writer) error {

diff --git a/geom/type_linear_ring.go b/geom/type_linear_ring.go
@@ -103,7 +103,7 @@ func (r LinearRing) Boundary() Geometry {
 }
 
 func (r LinearRing) Value() (driver.Value, error) {
-	return r.AsText(), nil
+	return wkbAsBytes(r)
 }
 
 func (r LinearRing) AsBinary(w io.Writer) error {

diff --git a/geom/type_multi_line_string.go b/geom/type_multi_line_string.go
@@ -156,7 +156,7 @@ func (m MultiLineString) Boundary() Geometry {
 }
 
 func (m MultiLineString) Value() (driver.Value, error) {
-	return m.AsText(), nil
+	return wkbAsBytes(m)
 }
 
 func (m MultiLineString) AsBinary(w io.Writer) error {

diff --git a/geom/type_multi_point.go b/geom/type_multi_point.go
@@ -122,7 +122,7 @@ func (m MultiPoint) Boundary() Geometry {
 }
 
 func (m MultiPoint) Value() (driver.Value, error) {
-	return m.AsText(), nil
+	return wkbAsBytes(m)
 }
 
 func (m MultiPoint) AsBinary(w io.Writer) error {

diff --git a/geom/type_multi_polygon.go b/geom/type_multi_polygon.go
@@ -221,7 +221,7 @@ func (m MultiPolygon) Boundary() Geometry {
 }
 
 func (m MultiPolygon) Value() (driver.Value, error) {
-	return m.AsText(), nil
+	return wkbAsBytes(m)
 }
 
 func (m MultiPolygon) AsBinary(w io.Writer) error {

diff --git a/geom/type_point.go b/geom/type_point.go
@@ -85,7 +85,7 @@ func (p Point) Boundary() Geometry {
 }
 
 func (p Point) Value() (driver.Value, error) {
-	return p.AsText(), nil
+	return wkbAsBytes(p)
 }
 
 func (p Point) AsBinary(w io.Writer) error {

diff --git a/geom/type_polygon.go b/geom/type_polygon.go
@@ -182,7 +182,7 @@ func (p Polygon) Boundary() Geometry {
 }
 
 func (p Polygon) Value() (driver.Value, error) {
-	return p.AsText(), nil
+	return wkbAsBytes(p)
 }
 
 func (p Polygon) AsBinary(w io.Writer) error {

diff --git a/geom/wkb_marshal.go b/geom/wkb_marshal.go
@@ -1,10 +1,18 @@
 package geom
 
 import (
+	"bytes"
+	"database/sql/driver"
 	"encoding/binary"
 	"io"
 )
 
+func wkbAsBytes(g Geometry) (driver.Value, error) {
+	var buf bytes.Buffer
+	err := g.AsBinary(&buf)
+	return buf.Bytes(), err
+}
+
 type wkbMarshaller struct {
 	w   io.Writer
 	err error