Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: upgrade go-geom to pickup more GEOMETRYCOLLECTION EMPTY fixes #61240

Merged
merged 1 commit into from
Mar 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions pkg/geo/geomfn/affine_transforms_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/geo/geomfn/flip_coordinates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
}

Expand Down