update to use paulmach/orb instead of skelterjohn/geom

whosonfirst · Oct 7, 2021 · 77cde4d · 77cde4d
1 parent 210dc71
commit 77cde4d
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 835 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/aaronland/go-roster v0.0.2
 	github.com/paulmach/orb v0.2.2
 	github.com/sfomuseum/go-flags v0.8.2
-	github.com/skelterjohn/geom v0.0.0-20180103142417-96f3e8a219c5
 	github.com/tidwall/gjson v1.9.2
 	github.com/tidwall/sjson v1.2.2
 	github.com/whosonfirst/go-reader v0.9.0

diff --git a/spatial.go b/spatial.go
@@ -2,18 +2,18 @@ package spatial
 
 import (
 	"context"
-	"github.com/skelterjohn/geom"
+	"github.com/paulmach/orb"
 	"github.com/whosonfirst/go-whosonfirst-flags"
 	"github.com/whosonfirst/go-whosonfirst-spr/v2"
 )
 
 type SpatialIndex interface {
 	IndexFeature(context.Context, []byte) error
-	RemoveFeature(context.Context, int64) error
-	PointInPolygon(context.Context, *geom.Coord, ...Filter) (spr.StandardPlacesResults, error)
-	PointInPolygonCandidates(context.Context, *geom.Coord, ...Filter) ([]*PointInPolygonCandidate, error)
-	PointInPolygonWithChannels(context.Context, chan spr.StandardPlacesResult, chan error, chan bool, *geom.Coord, ...Filter)
-	PointInPolygonCandidatesWithChannels(context.Context, chan *PointInPolygonCandidate, chan error, chan bool, *geom.Coord, ...Filter)
+	RemoveFeature(context.Context, string) error
+	PointInPolygon(context.Context, orb.Point, ...Filter) (spr.StandardPlacesResults, error)
+	PointInPolygonCandidates(context.Context, orb.Point, ...Filter) ([]*PointInPolygonCandidate, error)
+	PointInPolygonWithChannels(context.Context, chan spr.StandardPlacesResult, chan error, chan bool, orb.Point, ...Filter)
+	PointInPolygonCandidatesWithChannels(context.Context, chan *PointInPolygonCandidate, chan error, chan bool, orb.Point, ...Filter)
 	Disconnect(context.Context) error
 }
 
@@ -22,7 +22,7 @@ type PointInPolygonCandidate struct {
 	FeatureId string
 	IsAlt     bool
 	AltLabel  string
-	Bounds    *geom.Rect
+	Bounds    orb.Bound
 }
 
 type PropertiesResponse map[string]interface{}

diff --git a/vendor/github.com/skelterjohn/geom/.gitignore b/vendor/github.com/skelterjohn/geom/.gitignore
diff --git a/vendor/github.com/skelterjohn/geom/LICENSE b/vendor/github.com/skelterjohn/geom/LICENSE
diff --git a/vendor/github.com/skelterjohn/geom/README b/vendor/github.com/skelterjohn/geom/README
diff --git a/vendor/github.com/skelterjohn/geom/coord.go b/vendor/github.com/skelterjohn/geom/coord.go
diff --git a/vendor/github.com/skelterjohn/geom/debug.go b/vendor/github.com/skelterjohn/geom/debug.go
diff --git a/vendor/github.com/skelterjohn/geom/geom.go b/vendor/github.com/skelterjohn/geom/geom.go
diff --git a/vendor/github.com/skelterjohn/geom/line.go b/vendor/github.com/skelterjohn/geom/line.go