Skip to content

Commit 6f3716a

Browse files
committed
Fixes a false negative for intersecting rings
tidwall/geojson@ac08098
1 parent 644f65c commit 6f3716a

File tree

8 files changed

+25
-30
lines changed

8 files changed

+25
-30
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/tidwall/buntdb v1.1.0
2929
github.com/tidwall/cities v0.0.0-20190730194520-dbe1ae0b862c // indirect
3030
github.com/tidwall/geoindex v1.1.0
31-
github.com/tidwall/geojson v1.1.7
31+
github.com/tidwall/geojson v1.1.8
3232
github.com/tidwall/gjson v1.3.2
3333
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb // indirect
3434
github.com/tidwall/lotsa v0.0.0-20180225195211-a03631ac7f1c // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ github.com/tidwall/cities v0.0.0-20190730194520-dbe1ae0b862c h1:K/6v4woP8qym96ZK
5959
github.com/tidwall/cities v0.0.0-20190730194520-dbe1ae0b862c/go.mod h1:lV/HDp2gCcRcHJWqgt6Di54GiDrTZwh1aG2ZUPNbqa4=
6060
github.com/tidwall/geoindex v1.1.0 h1:d/pGCgKUonfQINd1235kKqx9gWBU4N7GjDS9WvbPvLY=
6161
github.com/tidwall/geoindex v1.1.0/go.mod h1:3gTa91BW+eiVIipuR6aU1Y9Sa0q75b1teE/NP2vfsTc=
62-
github.com/tidwall/geojson v1.1.7 h1:uNeIRbzYzGpFw88CLajyrN3d0To5GcMW5YJSmPqkhH0=
63-
github.com/tidwall/geojson v1.1.7/go.mod h1:tBjfxeALRFLc25LLpjtWzy2nIrNmW1ze1EAhLtd8+QQ=
62+
github.com/tidwall/geojson v1.1.8 h1:n/WT/PG0OEHrxUJQoeqkupWDt3pwbHMynl6OF9xKIM0=
63+
github.com/tidwall/geojson v1.1.8/go.mod h1:tBjfxeALRFLc25LLpjtWzy2nIrNmW1ze1EAhLtd8+QQ=
6464
github.com/tidwall/gjson v1.3.2 h1:+7p3qQFaH3fOMXAJSrdZwGKcOO/lYdGS0HqGhPqDdTI=
6565
github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
6666
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb h1:5NSYaAdrnblKByzd7XByQEJVT8+9v0W/tIY0Oo4OwrE=

scripts/build.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ core/gen.sh
3030
# Set final Go environment options
3131
LDFLAGS="$LDFLAGS -extldflags '-static'"
3232
export CGO_ENABLED=0
33-
export GO111MODULE=on
34-
export GOFLAGS=-mod=vendor
33+
34+
if [ "$NOMODULES" != "1" ]; then
35+
export GO111MODULE=on
36+
export GOFLAGS=-mod=vendor
37+
fi
3538

3639
# Build and store objects into original directory.
3740
go build -ldflags "$LDFLAGS" -o $1 cmd/$1/*.go

scripts/test.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ set -e
44
cd $(dirname "${BASH_SOURCE[0]}")/..
55

66
export CGO_ENABLED=0
7-
export GO111MODULE=on
8-
export GOFLAGS=-mod=vendor
7+
8+
if [ "$NOMODULES" != "1" ]; then
9+
export GO111MODULE=on
10+
export GOFLAGS=-mod=vendor
11+
fi
912

1013
cd tests && go test && cd ..
1114
go test $(go list ./... | grep -v /vendor/ | grep -v /tests)

vendor/github.com/tidwall/geojson/circle.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/tidwall/geojson/geo/geo.go

+1-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/tidwall/geojson/geometry/ring.go

+5-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ github.com/tidwall/buntdb
8181
# github.com/tidwall/geoindex v1.1.0
8282
github.com/tidwall/geoindex
8383
github.com/tidwall/geoindex/child
84-
# github.com/tidwall/geojson v1.1.7
84+
# github.com/tidwall/geojson v1.1.8
8585
github.com/tidwall/geojson
8686
github.com/tidwall/geojson/geo
8787
github.com/tidwall/geojson/geometry

0 commit comments

Comments
 (0)