Merge #61096

61096: vendor: upgrade twpayne/go-geom r=andyyang890 a=otan This contains a critical GeometryCollection layout fix that allows GEOMETRYCOLLECTION EMPTY to work. Release justification: low-risk updates to new functionality Release note: None Co-authored-by: Oliver Tan <[email protected]>
cockroachdb · Feb 25, 2021 · da025e5 · da025e5
2 parents 059c22b + 3aaaf9b
commit da025e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -2433,8 +2433,8 @@ def go_deps():
         name = "com_github_twpayne_go_geom",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/twpayne/go-geom",
-        sum = "h1:O27mIXZnMYiZi0ZD8ewjs/IT/ZOFVbZHBzPjA9skdmg=",
-        version = "v1.3.6",
+        sum = "h1:yh2fcro1FLk9uTYi3OSXxtI3JRzaghtsNgaku2ASZbE=",
+        version = "v1.3.7-0.20210224233516-acd1d64d533a",
     )
     go_repository(
         name = "com_github_twpayne_go_kml",

diff --git a/go.mod b/go.mod
@@ -142,7 +142,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.6
+	github.com/twpayne/go-geom v1.3.7-0.20210224233516-acd1d64d533a
 	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
@@ -730,8 +730,8 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/the42/cartconvert v0.0.0-20131203171324-aae784c392b8 h1:I4DY8wLxJXCrMYzDM6lKCGc3IQwJX0PlTLsd3nQqI3c=
 github.com/the42/cartconvert v0.0.0-20131203171324-aae784c392b8/go.mod h1:fWO/msnJVhHqN1yX6OBoxSyfj7TEj1hHiL8bJSQsK30=
-github.com/twpayne/go-geom v1.3.6 h1:O27mIXZnMYiZi0ZD8ewjs/IT/ZOFVbZHBzPjA9skdmg=
-github.com/twpayne/go-geom v1.3.6/go.mod h1:XTyWHR6+l9TUYONbbK4ImUTYbWDCu2ySSPrZmmiA0Pg=
+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-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/vendor b/vendor
+4 −0		github.com/twpayne/go-geom/.golangci.yml
+25 −8		github.com/twpayne/go-geom/Makefile
+0 −1		github.com/twpayne/go-geom/README.md
+0 −2		github.com/twpayne/go-geom/bigxy/big_cga.go
+6 −0		github.com/twpayne/go-geom/encoding/ewkb/ewkb.go
+6 −0		github.com/twpayne/go-geom/encoding/wkb/wkb.go
+5 −5		github.com/twpayne/go-geom/geom.go
+49 −2		github.com/twpayne/go-geom/geometrycollection.go
+1 −2		github.com/twpayne/go-geom/xy/lineintersector/nonrobust_line_intersector.go
+1 −2		github.com/twpayne/go-geom/xy/lineintersector/robust_line_intersector.go
+1 −1		modules.txt