add spatial.PointInPolygonCandidate; rip out geojson stuff from datab…

…ase interface
whosonfirst · Dec 16, 2020 · b821a96 · b821a96
1 parent e62a5cf
commit b821a96
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -141,7 +141,6 @@ type SpatialDatabase interface {
 	PointInPolygonCandidates(context.Context, *geom.Coord) (*geojson.FeatureCollection, error)
 	PointInPolygonWithChannels(context.Context, chan spr.StandardPlacesResult, chan error, chan bool, *geom.Coord, ...filter.Filter)
 	PointInPolygonCandidatesWithChannels(context.Context, *geom.Coord, chan *geojson.Feature, chan error, chan bool)
-	StandardPlacesResultsToFeatureCollection(context.Context, spr.StandardPlacesResults) (*geojson.FeatureCollection, error)
 	Close(context.Context) error
 }
 ```

diff --git a/database/database.go b/database/database.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 	"github.com/aaronland/go-roster"
-	"github.com/paulmach/go.geojson"
 	"github.com/skelterjohn/geom"
 	wof_geojson "github.com/whosonfirst/go-whosonfirst-geojson-v2"
+	"github.com/whosonfirst/go-whosonfirst-spatial"	
 	"github.com/whosonfirst/go-whosonfirst-spatial/filter"
 	"github.com/whosonfirst/go-whosonfirst-spr"
 	"net/url"
@@ -17,10 +17,9 @@ import (
 type SpatialDatabase interface {
 	IndexFeature(context.Context, wof_geojson.Feature) error
 	PointInPolygon(context.Context, *geom.Coord, ...filter.Filter) (spr.StandardPlacesResults, error)
-	PointInPolygonCandidates(context.Context, *geom.Coord, ...filter.Filter) (*geojson.FeatureCollection, error)
+	PointInPolygonCandidates(context.Context, *geom.Coord, ...filter.Filter) ([]*spatial.PointInPolygonCandidate, error)
 	PointInPolygonWithChannels(context.Context, chan spr.StandardPlacesResult, chan error, chan bool, *geom.Coord, ...filter.Filter)
-	PointInPolygonCandidatesWithChannels(context.Context, chan *geojson.Feature, chan error, chan bool, *geom.Coord, ...filter.Filter)
-	StandardPlacesResultsToFeatureCollection(context.Context, spr.StandardPlacesResults) (*geojson.FeatureCollection, error)
+	PointInPolygonCandidatesWithChannels(context.Context, chan *spatial.PointInPolygonCandidate, chan error, chan bool, *geom.Coord, ...filter.Filter)
 	Close(context.Context) error
 }
 

diff --git a/spatial.go b/spatial.go
@@ -1 +1,12 @@
 package spatial
+
+import (
+	"github.com/skelterjohn/geom"
+)
+
+type PointInPolygonCandidate struct {
+	Id int64
+	WOFId string
+	AltLabel string
+	Bounds *geom.Rect
+}