diff --git a/DEPS.bzl b/DEPS.bzl
index 4050acef18c7..eb808cc2c4e0 100644
--- a/DEPS.bzl
+++ b/DEPS.bzl
@@ -3240,8 +3240,8 @@ def go_deps():
         name = "com_github_twpayne_go_geom",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/twpayne/go-geom",
-        sum = "h1:yh2fcro1FLk9uTYi3OSXxtI3JRzaghtsNgaku2ASZbE=",
-        version = "v1.3.7-0.20210224233516-acd1d64d533a",
+        sum = "h1:SRMQNnhXCCgFBGAYFnM8iOSMYcOlOwkaTP3pwRCcuOY=",
+        version = "v1.3.7-0.20210228220813-9d9885b50d3e",
     )
     go_repository(
         name = "com_github_twpayne_go_kml",
diff --git a/go.mod b/go.mod
index daaede2e2cdb..c95f0cfc22bc 100644
--- a/go.mod
+++ b/go.mod
@@ -139,7 +139,7 @@ require (
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1
-	github.com/twpayne/go-geom v1.3.7-0.20210224233516-acd1d64d533a
+	github.com/twpayne/go-geom v1.3.7-0.20210228220813-9d9885b50d3e
 	github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
 	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
 	github.com/zabawaba99/go-gitignore v0.0.0-20200117185801-39e6bddfb292
diff --git a/go.sum b/go.sum
index 8e00b6dd08bb..1f7de340d5d6 100644
--- a/go.sum
+++ b/go.sum
@@ -964,8 +964,8 @@ github.com/tinylib/msgp v1.1.1/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDW
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/twpayne/go-geom v1.3.7-0.20210224233516-acd1d64d533a h1:yh2fcro1FLk9uTYi3OSXxtI3JRzaghtsNgaku2ASZbE=
-github.com/twpayne/go-geom v1.3.7-0.20210224233516-acd1d64d533a/go.mod h1:XTyWHR6+l9TUYONbbK4ImUTYbWDCu2ySSPrZmmiA0Pg=
+github.com/twpayne/go-geom v1.3.7-0.20210228220813-9d9885b50d3e h1:SRMQNnhXCCgFBGAYFnM8iOSMYcOlOwkaTP3pwRCcuOY=
+github.com/twpayne/go-geom v1.3.7-0.20210228220813-9d9885b50d3e/go.mod h1:XTyWHR6+l9TUYONbbK4ImUTYbWDCu2ySSPrZmmiA0Pg=
 github.com/twpayne/go-kml v1.5.1 h1:RI0JKh/VzdK/d+ZxdJzt8Ar921KMYPfg9qkw7vsbAGw=
 github.com/twpayne/go-kml v1.5.1/go.mod h1:kz8jAiIz6FIdU2Zjce9qGlVtgFYES9vt7BTPBHf5jl4=
 github.com/twpayne/go-polyline v1.0.0/go.mod h1:ICh24bcLYBX8CknfvNPKqoTbe+eg+MX1NPyJmSBo7pU=
diff --git a/pkg/geo/geomfn/affine_transforms_test.go b/pkg/geo/geomfn/affine_transforms_test.go
index 1de0b688a444..e72a4bcf7dc0 100644
--- a/pkg/geo/geomfn/affine_transforms_test.go
+++ b/pkg/geo/geomfn/affine_transforms_test.go
@@ -280,10 +280,10 @@ func TestCollectionScaleRelativeToOrigin(t *testing.T) {
 		},
 		{
 			desc:     "scale empty collection",
-			input:    geom.NewGeometryCollection(),
+			input:    geom.NewGeometryCollection().MustSetLayout(geom.XY),
 			factor:   geom.NewPointFlat(geom.XY, []float64{2, 2}),
 			origin:   geom.NewPointFlat(geom.XY, []float64{1, 1}),
-			expected: geom.NewGeometryCollection(),
+			expected: geom.NewGeometryCollection().MustSetLayout(geom.XY),
 		},
 	}
 
diff --git a/pkg/geo/geomfn/flip_coordinates_test.go b/pkg/geo/geomfn/flip_coordinates_test.go
index c30e10f27d81..3e0e691a7731 100644
--- a/pkg/geo/geomfn/flip_coordinates_test.go
+++ b/pkg/geo/geomfn/flip_coordinates_test.go
@@ -110,8 +110,8 @@ func TestFlipCoordinates(t *testing.T) {
 		},
 		{
 			desc:     "flip coordinates of an empty collection",
-			input:    geom.NewGeometryCollection(),
-			expected: geom.NewGeometryCollection(),
+			input:    geom.NewGeometryCollection().MustSetLayout(geom.XY),
+			expected: geom.NewGeometryCollection().MustSetLayout(geom.XY),
 		},
 	}
 
diff --git a/vendor b/vendor
index 797f916a0d9c..ac4d2de45c43 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 797f916a0d9c283c8f05e4d7af9790d4b165b834
+Subproject commit ac4d2de45c4319ec41f3552865fd0e8f60421def