From 77f390c2555445229d453c5085de6533cea96309 Mon Sep 17 00:00:00 2001
From: thisisaaronland <devnull@localhost>
Date: Wed, 9 Dec 2020 12:44:51 -0500
Subject: [PATCH] fix go module declaration; update vendor deps

---
 cmd/query/main.go                                         | 8 --------
 go.mod                                                    | 2 +-
 go.sum                                                    | 2 ++
 .../go-whosonfirst-spatial/database/database.go           | 6 ++++++
 .../go-whosonfirst-spatial/properties/properties.go       | 6 ++++++
 vendor/modules.txt                                        | 2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/cmd/query/main.go b/cmd/query/main.go
index 91007295..2025fa17 100644
--- a/cmd/query/main.go
+++ b/cmd/query/main.go
@@ -26,14 +26,6 @@ func main() {
 	flag.Var(&props, "properties", "...")
 
 	flag.Parse()
-
-	/*
-	props := []string{
-		"wof:concordances",
-		"wof:hierarchy",
-		"sfomuseum:*",
-	}
-	*/
 	
 	ctx := context.Background()
 	db, err := database.NewSpatialDatabase(ctx, *database_uri)
diff --git a/go.mod b/go.mod
index 00f57209..e2399f97 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/tidwall/gjson v1.6.4
 	github.com/whosonfirst/go-whosonfirst-geojson-v2 v0.12.3
 	github.com/whosonfirst/go-whosonfirst-log v0.1.0
-	github.com/whosonfirst/go-whosonfirst-spatial v0.0.6
+	github.com/whosonfirst/go-whosonfirst-spatial v0.0.7
 	github.com/whosonfirst/go-whosonfirst-spr v0.1.0
 	github.com/whosonfirst/go-whosonfirst-sqlite v0.1.6
 	github.com/whosonfirst/go-whosonfirst-sqlite-features v0.3.0
diff --git a/go.sum b/go.sum
index 127bca43..de73cfe3 100644
--- a/go.sum
+++ b/go.sum
@@ -122,6 +122,8 @@ github.com/whosonfirst/go-whosonfirst-spatial v0.0.4 h1:3CbSlmVjq4XB9TEjGSL39+eA
 github.com/whosonfirst/go-whosonfirst-spatial v0.0.4/go.mod h1:lVjcZgLF4JM3HpocC3nHofyX0ojtacPj7oJsUlP36pA=
 github.com/whosonfirst/go-whosonfirst-spatial v0.0.6 h1:vAvZyWbPBfM619VWVXLf1V4QEki4OgD6XL9H5XtnRSw=
 github.com/whosonfirst/go-whosonfirst-spatial v0.0.6/go.mod h1:h8MYSHoAPrWsNA6zVOOa5vr/TRvGhf068741Z1CMOd8=
+github.com/whosonfirst/go-whosonfirst-spatial v0.0.7 h1:otmk8XIKiIQbP3xm0+dqcRThGc8/kGpr30hQ/j+tNhw=
+github.com/whosonfirst/go-whosonfirst-spatial v0.0.7/go.mod h1:h8MYSHoAPrWsNA6zVOOa5vr/TRvGhf068741Z1CMOd8=
 github.com/whosonfirst/go-whosonfirst-spr v0.1.0 h1:5qE629nCiucF2upy5NjPOEl9cFatsljykYY0l2JKgAk=
 github.com/whosonfirst/go-whosonfirst-spr v0.1.0/go.mod h1:R8GtEVz1GVSnwwOjzcoVUd172ZK26Q7hQSLI6SGG7lM=
 github.com/whosonfirst/go-whosonfirst-sqlite v0.1.5/go.mod h1:JGveApxJW/FUeB+LQxxX0U8kSunVP7NiurXP/aUo/0g=
diff --git a/vendor/github.com/whosonfirst/go-whosonfirst-spatial/database/database.go b/vendor/github.com/whosonfirst/go-whosonfirst-spatial/database/database.go
index 86138eb8..e1b7e272 100644
--- a/vendor/github.com/whosonfirst/go-whosonfirst-spatial/database/database.go
+++ b/vendor/github.com/whosonfirst/go-whosonfirst-spatial/database/database.go
@@ -59,6 +59,12 @@ func Schemes() []string {
 	ctx := context.Background()
 	schemes := []string{}
 
+	err := ensureSpatialRoster()
+
+	if err != nil {
+		return schemes
+	}
+	
 	for _, dr := range spatial_databases.Drivers(ctx) {
 		scheme := fmt.Sprintf("%s://", dr)
 		schemes = append(schemes, scheme)
diff --git a/vendor/github.com/whosonfirst/go-whosonfirst-spatial/properties/properties.go b/vendor/github.com/whosonfirst/go-whosonfirst-spatial/properties/properties.go
index 3770976b..f475bfc5 100644
--- a/vendor/github.com/whosonfirst/go-whosonfirst-spatial/properties/properties.go
+++ b/vendor/github.com/whosonfirst/go-whosonfirst-spatial/properties/properties.go
@@ -60,6 +60,12 @@ func Schemes() []string {
 	ctx := context.Background()
 	schemes := []string{}
 
+	err := ensurePropertiesRoster()
+
+	if err != nil {
+		return schemes
+	}
+	
 	for _, dr := range properties_readers.Drivers(ctx) {
 		scheme := fmt.Sprintf("%s://", dr)
 		schemes = append(schemes, scheme)
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 6a370efa..eab485e1 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -52,7 +52,7 @@ github.com/whosonfirst/go-whosonfirst-placetypes/placetypes
 # github.com/whosonfirst/go-whosonfirst-sources v0.1.0
 github.com/whosonfirst/go-whosonfirst-sources
 github.com/whosonfirst/go-whosonfirst-sources/sources
-# github.com/whosonfirst/go-whosonfirst-spatial v0.0.6
+# github.com/whosonfirst/go-whosonfirst-spatial v0.0.7
 github.com/whosonfirst/go-whosonfirst-spatial/cache
 github.com/whosonfirst/go-whosonfirst-spatial/database
 github.com/whosonfirst/go-whosonfirst-spatial/filter