From c75a144b836beb04d4569df934d5cd1d5ffc03ec Mon Sep 17 00:00:00 2001 From: tidwall Date: Mon, 3 Dec 2018 17:19:18 -0700 Subject: [PATCH] Fixed MultiPolygon intersect failure close #394 --- Gopkg.lock | 4 ++-- vendor/github.com/tidwall/geojson/object.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 07b0df10..ea213258 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -254,7 +254,7 @@ [[projects]] branch = "master" - digest = "1:3307384a763736cbcfa625076939fe9a240e5f5c9d6ace507fa4fd1f4f6944d6" + digest = "1:36ee77434dbfa0fafc20f0788cfc0a30f7dda8aea228b2574028be818cfabc31" name = "github.com/tidwall/geojson" packages = [ ".", @@ -262,7 +262,7 @@ "geometry", ] pruneopts = "" - revision = "553da6f08f84f544b5482743fe73c3989facc578" + revision = "0d533c870e85d0cb1909818503e0127f9e543d92" [[projects]] digest = "1:3ddca2bd5496c6922a2a9e636530e178a43c2a534ea6634211acdc7d10222794" diff --git a/vendor/github.com/tidwall/geojson/object.go b/vendor/github.com/tidwall/geojson/object.go index a05b3f98..2b02a740 100644 --- a/vendor/github.com/tidwall/geojson/object.go +++ b/vendor/github.com/tidwall/geojson/object.go @@ -269,12 +269,14 @@ func appendJSONSeries( func unionRects(a, b geometry.Rect) geometry.Rect { if b.Min.X < a.Min.X { a.Min.X = b.Min.X - } else if b.Max.X > a.Max.X { + } + if b.Max.X > a.Max.X { a.Max.X = b.Max.X } if b.Min.Y < a.Min.Y { a.Min.Y = b.Min.Y - } else if b.Max.Y > a.Max.Y { + } + if b.Max.Y > a.Max.Y { a.Max.Y = b.Max.Y } return a