Implement DumpCoordinates for GeometryCollection

peterstace · Jul 31, 2021 · 5d581a5 · 5d581a5
1 parent 5d42f9c
commit 5d581a5
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 7 deletions.
diff --git a/geom/dump_coordinates_test.go b/geom/dump_coordinates_test.go
@@ -281,6 +281,45 @@ func TestDumpCoordinatesMultiPolygon(t *testing.T) {
 	}
 }
 
+func TestDumpCoordinatesGeometryCollection(t *testing.T) {
+	for _, tc := range []struct {
+		description string
+		inputWKT    string
+		want        Sequence
+	}{
+		{
+			description: "empty",
+			inputWKT:    "GEOMETRYCOLLECTION EMPTY",
+			want:        NewSequence(nil, DimXY),
+		},
+		{
+			description: "empty z",
+			inputWKT:    "GEOMETRYCOLLECTION Z EMPTY",
+			want:        NewSequence(nil, DimXYZ),
+		},
+		{
+			description: "single point",
+			inputWKT:    "GEOMETRYCOLLECTION(POINT(1 2))",
+			want:        NewSequence([]float64{1, 2}, DimXY),
+		},
+		{
+			description: "single point z",
+			inputWKT:    "GEOMETRYCOLLECTION Z(POINT Z(1 2 0))",
+			want:        NewSequence([]float64{1, 2, 0}, DimXYZ),
+		},
+		{
+			description: "nested",
+			inputWKT:    "GEOMETRYCOLLECTION Z(GEOMETRYCOLLECTION Z(POINT Z(1 2 0)))",
+			want:        NewSequence([]float64{1, 2, 0}, DimXYZ),
+		},
+	} {
+		t.Run(tc.description, func(t *testing.T) {
+			got := geomFromWKT(t, tc.inputWKT).AsGeometryCollection().DumpCoordinates()
+			expectSequenceEq(t, got, tc.want)
+		})
+	}
+}
+
 func TestDumpCoordinatesGeometry(t *testing.T) {
 	for _, tc := range []struct {
 		description string
@@ -317,11 +356,11 @@ func TestDumpCoordinatesGeometry(t *testing.T) {
 			inputWKT:    "MULTIPOLYGON Z(((0 0 1,0 1 1,1 0 1,0 0 1)))",
 			want:        NewSequence([]float64{0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1}, DimXYZ),
 		},
-		//{
-		//	description: "GeometryCollection",
-		//	inputWKT:    "GEOMETRYCOLLECTION Z(POINT Z(0 1 2))",
-		//	want:        NewSequence([]float64{0, 1, 2}, DimXYZ),
-		//},
+		{
+			description: "GeometryCollection",
+			inputWKT:    "GEOMETRYCOLLECTION Z(POINT Z(0 1 2))",
+			want:        NewSequence([]float64{0, 1, 2}, DimXYZ),
+		},
 	} {
 		t.Run(tc.description, func(t *testing.T) {
 			got := geomFromWKT(t, tc.inputWKT).DumpCoordinates()

diff --git a/geom/type_geometry.go b/geom/type_geometry.go
@@ -773,7 +773,7 @@ func (g Geometry) appendDump(gs []Geometry) []Geometry {
 func (g Geometry) DumpCoordinates() Sequence {
 	switch g.gtype {
 	case TypeGeometryCollection:
-		panic("GeometryCollection not yet handled")
+		return g.AsGeometryCollection().DumpCoordinates()
 	case TypePoint:
 		return g.AsPoint().DumpCoordinates()
 	case TypeLineString:
@@ -787,6 +787,6 @@ func (g Geometry) DumpCoordinates() Sequence {
 	case TypeMultiPolygon:
 		return g.AsMultiPolygon().DumpCoordinates()
 	default:
-		panic("invalid")
+		panic("unknown type: " + g.Type().String())
 	}
 }
diff --git a/geom/type_geometry_collection.go b/geom/type_geometry_collection.go
@@ -448,3 +448,13 @@ func (c GeometryCollection) Dump() []Geometry {
 	}
 	return gs
 }
+
+// DumpCoordinates returns a Sequence holding all control points in the
+// GeometryCollection.
+func (c GeometryCollection) DumpCoordinates() Sequence {
+	var coords []float64
+	for _, g := range c.geoms {
+		coords = g.DumpCoordinates().appendAllPoints(coords)
+	}
+	return NewSequence(coords, c.ctype)
+}