update docs (#15)

Co-authored-by: sfomuseumbot <sfomuseumbot@localhost>

README.md

@@ -79,6 +79,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	
 	_ "github.com/whosonfirst/go-whosonfirst-spatial-sqlite"
 	"github.com/whosonfirst/go-whosonfirst-spatial/database"
 	"github.com/whosonfirst/go-whosonfirst-spatial/filter"
@@ -130,15 +131,15 @@ _To be written_
 $> ./bin/pip -h
   -alternate-geometry value
     	One or more alternate geometry labels (wof:alt_label) values to filter results by.
-  -cessation-date string
+  -cessation string
     	A valid EDTF date string.
   -custom-placetypes string
     	A JSON-encoded string containing custom placetypes defined using the syntax described in the whosonfirst/go-whosonfirst-placetypes repository.
   -enable-custom-placetypes
     	Enable wof:placetype values that are not explicitly defined in the whosonfirst/go-whosonfirst-placetypes repository.
   -geometries string
     	Valid options are: all, alt, default. (default "all")
-  -inception-date string
+  -inception string
     	A valid EDTF date string.
   -is-ceased value
     	One or more existential flags (-1, 0, 1) to filter results by.
@@ -152,18 +153,26 @@ $> ./bin/pip -h
     	One or more existential flags (-1, 0, 1) to filter results by.
   -is-wof
     	Input data is WOF-flavoured GeoJSON. (Pass a value of '0' or 'false' if you need to index non-WOF documents. (default true)
+  -iterator-uri value
+    	Zero or more URIs denoting data sources to use for indexing the spatial database at startup. URIs take the form of {ITERATOR_URI} + "#" + {PIPE-SEPARATED LIST OF ITERATOR SOURCES}. Where {ITERATOR_URI} is expected to be a registered whosonfirst/go-whosonfirst-iterate/v2 iterator (emitter) URI and {ITERATOR SOURCES} are valid input paths for that iterator. Supported whosonfirst/go-whosonfirst-iterate/v2 iterator schemes are: cwd://, directory://, featurecollection://, file://, filelist://, geojsonl://, null://, repo://.
   -latitude float
     	A valid latitude.
   -longitude float
     	A valid longitude.
+  -mode string
+    	Valid options are: cli (default "cli")
   -placetype value
     	One or more place types to filter results by.
   -properties-reader-uri string
-    	A valid whosonfirst/go-reader.Reader URI. Available options are: [file:// fs:// null://]
+    	A valid whosonfirst/go-reader.Reader URI. Available options are: [fs:// null:// repo:// sqlite:// stdin://]. If the value is {spatial-database-uri} then the value of the '-spatial-database-uri' implements the reader.Reader interface and will be used.
   -property value
     	One or more Who's On First properties to append to each result.
+  -server-uri string
+    	A valid aaronland/go-http-server URI. (default "http://localhost:8080")
+  -sort-uri value
+    	Zero or more whosonfirst/go-whosonfirst-spr/sort URIs.
   -spatial-database-uri string
-    	A valid whosonfirst/go-whosonfirst-spatial/data.SpatialDatabase URI. options are: [sqlite://]
+    	A valid whosonfirst/go-whosonfirst-spatial/data.SpatialDatabase URI. options are: [rtree:// sqlite://] (default "rtree://")
   -verbose
     	Be chatty.
 ```
@@ -252,7 +261,7 @@ $> ./bin/pip \
 But when filtered using the `-is-current 1` flag there is only a single result:
 
 ```
-> ./bin/pip \
+$> ./bin/pip \
 	-spatial-database-uri 'sqlite://?dsn=/usr/local/data/sfom-arch.db' \
 	-latitude 37.616951 \
 	-longitude -122.383747 \
@@ -382,7 +391,7 @@ _Big thanks to @psanford 's [sqlitevfshttp](https://github.com/psanford/sqlite3v
 ### http-server
 
 ```
-> ./bin/http-server -h
+$> ./bin/http-server -h
   -authenticator-uri string
     	A valid sfomuseum/go-http-auth URI. (default "null://")
   -cors-allow-credentials
@@ -401,10 +410,8 @@ _Big thanks to @psanford 's [sqlitevfshttp](https://github.com/psanford/sqlite3v
     	Enable gzip-encoding for data-related and API handlers.
   -enable-www
     	Enable the interactive /debug endpoint to query points and display results.
-  -is-wof
-    	Input data is WOF-flavoured GeoJSON. (Pass a value of '0' or 'false' if you need to index non-WOF documents. (default true)
-  -iterator-uri string
-    	A valid whosonfirst/go-whosonfirst-iterate/v2 URI. Supported schemes are: directory://, featurecollection://, file://, filelist://, geojsonl://, null://, repo://. (default "repo://")
+  -iterator-uri value
+    	Zero or more URIs denoting data sources to use for indexing the spatial database at startup. URIs take the form of {ITERATOR_URI} + "#" + {PIPE-SEPARATED LIST OF ITERATOR SOURCES}. Where {ITERATOR_URI} is expected to be a registered whosonfirst/go-whosonfirst-iterate/v2 iterator (emitter) URI and {ITERATOR SOURCES} are valid input paths for that iterator. Supported whosonfirst/go-whosonfirst-iterate/v2 iterator schemes are: cwd://, directory://, featurecollection://, file://, filelist://, geojsonl://, null://, repo://.
   -leaflet-initial-latitude float
     	The initial latitude for map views to use. (default 37.616906)
   -leaflet-initial-longitude float
@@ -562,8 +569,8 @@ $> ./bin/grpc-server -h
     	The host to listen for requests on (default "localhost")
   -is-wof
     	Input data is WOF-flavoured GeoJSON. (Pass a value of '0' or 'false' if you need to index non-WOF documents. (default true)
-  -iterator-uri string
-    	A valid whosonfirst/go-whosonfirst-iterate/v2 URI. Supported schemes are: directory://, featurecollection://, file://, filelist://, geojsonl://, null://, repo://. (default "repo://")
+  -iterator-uri value
+    	Zero or more URIs denoting data sources to use for indexing the spatial database at startup. URIs take the form of {ITERATOR_URI} + "#" + {PIPE-SEPARATED LIST OF ITERATOR SOURCES}. Where {ITERATOR_URI} is expected to be a registered whosonfirst/go-whosonfirst-iterate/v2 iterator (emitter) URI and {ITERATOR SOURCES} are valid input paths for that iterator. Supported whosonfirst/go-whosonfirst-iterate/v2 iterator schemes are: cwd://, directory://, featurecollection://, file://, filelist://, geojsonl://, null://, repo://.
   -port int
     	The port to listen for requests on (default 8082)
   -properties-reader-uri string

cmd/grpc-client/main.go

@@ -4,17 +4,15 @@ import (
 	"context"
 	"log"
 
-	"github.com/whosonfirst/go-whosonfirst-spatial-grpc/app/client"	
+	"github.com/whosonfirst/go-whosonfirst-spatial-grpc/app/client"
 )
 
 func main() {
 
 	ctx := context.Background()
-	logger := log.Default()
-
-	err := client.Run(ctx, logger)
+	err := client.Run(ctx)
 
 	if err != nil {
-		logger.Fatalf("Failed to run client, %v", err)
+		log.Fatalf("Failed to run client, %v", err)
 	}
 }

cmd/grpc-server/main.go

@@ -1,24 +1,19 @@
 package main
 
-import (
-	_ "github.com/whosonfirst/go-whosonfirst-spatial-sqlite"
-)
-
 import (
 	"context"
 	"log"
 
-	"github.com/whosonfirst/go-whosonfirst-spatial-grpc/app/server"	
+	"github.com/whosonfirst/go-whosonfirst-spatial-grpc/app/server"
+	_ "github.com/whosonfirst/go-whosonfirst-spatial-sqlite"
 )
 
 func main() {
 
 	ctx := context.Background()
-	logger := log.Default()
-
-	err := server.Run(ctx, logger)
+	err := server.Run(ctx)
 
 	if err != nil {
-		logger.Fatalf("Failed to run client, %v", err)
+		log.Fatalf("Failed to run client, %v", err)
 	}
 }

cmd/http-server/main.go

@@ -2,8 +2,7 @@ package main
 
 import (
 	"context"
-	"log/slog"
-	"os"
+	"log"
 
 	_ "github.com/whosonfirst/go-whosonfirst-spatial-sqlite"
 	"github.com/whosonfirst/go-whosonfirst-spatial-www/app/server"
@@ -12,12 +11,9 @@ import (
 func main() {
 
 	ctx := context.Background()
-	logger := slog.Default()
-
-	err := server.Run(ctx, logger)
+	err := server.Run(ctx)
 
 	if err != nil {
-		logger.Error("Failed to run server", "error", err)
-		os.Exit(1)
+		log.Fatalf("Failed to run server, %v", err)
 	}
 }

cmd/pip/main.go

@@ -11,11 +11,9 @@ import (
 func main() {
 
 	ctx := context.Background()
-	logger := log.Default()
-
-	err := pip.Run(ctx, logger)
+	err := pip.Run(ctx)
 
 	if err != nil {
-		logger.Fatal(err)
+		log.Fatal(err)
 	}
 }

cmd/update-hierarchies/main.go

@@ -11,11 +11,9 @@ import (
 func main() {
 
 	ctx := context.Background()
-	logger := log.Default()
-
-	err := update.Run(ctx, logger)
+	err := update.Run(ctx)
 
 	if err != nil {
-		logger.Fatal(err)
+		log.Fatal(err)
 	}
 }

go.mod

@@ -1,6 +1,8 @@
 module github.com/whosonfirst/go-whosonfirst-spatial-sqlite
 
-go 1.22.3
+go 1.23
+
+toolchain go1.23.2
 
 require (
 	github.com/aaronland/go-sqlite-modernc v0.0.3
@@ -10,7 +12,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/whosonfirst/go-ioutil v1.0.2
 	github.com/whosonfirst/go-reader v1.0.2
-	github.com/whosonfirst/go-whosonfirst-spatial v0.10.1
+	github.com/whosonfirst/go-whosonfirst-spatial v0.10.2
 	github.com/whosonfirst/go-whosonfirst-spatial-grpc v0.1.2
 	github.com/whosonfirst/go-whosonfirst-spatial-www v0.2.0
 	github.com/whosonfirst/go-whosonfirst-spr/v2 v2.3.7
@@ -35,7 +37,7 @@ require (
 	github.com/aaronland/go-http-server v1.4.1 // indirect
 	github.com/aaronland/go-http-static v0.0.3 // indirect
 	github.com/aaronland/go-http-tangramjs v0.3.0 // indirect
-	github.com/aaronland/go-json-query v0.1.4 // indirect
+	github.com/aaronland/go-json-query v0.1.5 // indirect
 	github.com/aaronland/go-log/v2 v2.0.0 // indirect
 	github.com/aaronland/go-pagination v0.2.0 // indirect
 	github.com/aaronland/go-pagination-sql v0.2.0 // indirect
@@ -44,7 +46,7 @@ require (
 	github.com/aaronland/go-string v1.0.0 // indirect
 	github.com/aaronland/go-uid v0.4.0 // indirect
 	github.com/aaronland/go-uid-artisanal v0.0.4 // indirect
-	github.com/aaronland/go-uid-proxy v0.2.0 // indirect
+	github.com/aaronland/go-uid-proxy v0.3.0 // indirect
 	github.com/aaronland/go-uid-whosonfirst v0.0.5 // indirect
 	github.com/akrylysov/algnhsa v1.1.0 // indirect
 	github.com/aws/aws-lambda-go v1.47.0 // indirect
@@ -99,26 +101,26 @@ require (
 	github.com/sfomuseum/go-sfomuseum-mapshaper v0.0.3 // indirect
 	github.com/sfomuseum/go-sfomuseum-pmtiles v1.2.0 // indirect
 	github.com/sfomuseum/go-template v1.8.0 // indirect
-	github.com/sfomuseum/go-timings v1.3.0 // indirect
+	github.com/sfomuseum/go-timings v1.4.0 // indirect
 	github.com/sfomuseum/iso8601duration v1.1.0 // indirect
 	github.com/sfomuseum/runtimevar v1.1.2 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/tdewolff/minify/v2 v2.19.10 // indirect
 	github.com/tdewolff/parse/v2 v2.6.8 // indirect
-	github.com/tidwall/gjson v1.17.3 // indirect
+	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/tilezen/go-tilepacks v0.0.0-20230902185537-9a48755ab988 // indirect
 	github.com/whosonfirst/go-rfc-5646 v0.1.0 // indirect
 	github.com/whosonfirst/go-sanitize v0.1.0 // indirect
 	github.com/whosonfirst/go-whosonfirst-crawl v0.2.2 // indirect
-	github.com/whosonfirst/go-whosonfirst-export/v2 v2.8.2 // indirect
+	github.com/whosonfirst/go-whosonfirst-export/v2 v2.8.3 // indirect
 	github.com/whosonfirst/go-whosonfirst-feature v0.0.28 // indirect
 	github.com/whosonfirst/go-whosonfirst-flags v0.5.2 // indirect
 	github.com/whosonfirst/go-whosonfirst-format v0.4.1 // indirect
-	github.com/whosonfirst/go-whosonfirst-id v1.2.4 // indirect
-	github.com/whosonfirst/go-whosonfirst-iterate/v2 v2.4.1 // indirect
+	github.com/whosonfirst/go-whosonfirst-id v1.2.5 // indirect
+	github.com/whosonfirst/go-whosonfirst-iterate/v2 v2.5.0 // indirect
 	github.com/whosonfirst/go-whosonfirst-names v0.1.0 // indirect
 	github.com/whosonfirst/go-whosonfirst-placetypes v0.7.3 // indirect
 	github.com/whosonfirst/go-whosonfirst-reader v1.0.2 // indirect

go.sum

@@ -41,8 +41,8 @@ github.com/aaronland/go-http-static v0.0.3 h1:0MnYXNwGVDCzre5YwinfPSdAFHInbBbmBv
 github.com/aaronland/go-http-static v0.0.3/go.mod h1:/s6lHGXq95ZR9nMJmE9slE4uMi92GP34CuG3f9xlfsY=
 github.com/aaronland/go-http-tangramjs v0.3.0 h1:cXFIC6bHffk5qXogT8AwFX287CYURY5L/BlXeKV+LGk=
 github.com/aaronland/go-http-tangramjs v0.3.0/go.mod h1:wGX2oqMxHvwOpVE6k4BM3S3m2mJJ71Q4ao1GVeKTnRY=
-github.com/aaronland/go-json-query v0.1.4 h1:iM5GkF0VDsOeVgp0/WrDaFUB64ubJvmm+TZ0H4OQxxM=
-github.com/aaronland/go-json-query v0.1.4/go.mod h1:S7V5eQko+XDPq+dfdSYub5mZI0VapVgUH2NLG0buZr4=
+github.com/aaronland/go-json-query v0.1.5 h1:fSNnOKrNmQzw86Ih6L+xlL4hmJuiEK17HXo9rArYC4o=
+github.com/aaronland/go-json-query v0.1.5/go.mod h1:MoyWsbG6fkcX0nXIg2ELGdNMcmLOFv+Xr+29xgr/RdU=
 github.com/aaronland/go-log/v2 v2.0.0 h1:lMoaVDHd4Etaz2+ibze3ReqvHHG68z2SpuxYXv12WlE=
 github.com/aaronland/go-log/v2 v2.0.0/go.mod h1:jOLBCaHVyOC7DQpbVFFQSiuU8CA8MRMrqA1mMSJQtLs=
 github.com/aaronland/go-pagination v0.2.0 h1:ZZ8mNu5oEK5wanAjbYAaE3w5eyQKzFOWu/gsloW1vdw=
@@ -63,8 +63,8 @@ github.com/aaronland/go-uid v0.4.0 h1:2qQ2yRQarrUCEU9ApvBpaC9osAcqTCCvD77rOkDp7m
 github.com/aaronland/go-uid v0.4.0/go.mod h1:HwQ09mooJ8j684z3W5lPKO6Odf557O6h3P3o1PquqXE=
 github.com/aaronland/go-uid-artisanal v0.0.4 h1:I/29nzNnj32gax6rkBLeNtnwtXLqLAIE0mOlMq6KWWY=
 github.com/aaronland/go-uid-artisanal v0.0.4/go.mod h1:fNtTeUssikRxhttmzQeR3yDLJpSchzwTVqvsOIlglks=
-github.com/aaronland/go-uid-proxy v0.2.0 h1:owPhro/6SlHkxKAIuO60oGIScs4MJjTAVwLj2zfttF4=
-github.com/aaronland/go-uid-proxy v0.2.0/go.mod h1:LFZBtJBMR7HNOv2Qvd1C2uCsOsHeL6xpXEVrqiC+6tM=
+github.com/aaronland/go-uid-proxy v0.3.0 h1:GxAgpLdtHuHW/cTyx+FhWLQxKIiDasCgLu+QTlWseZo=
+github.com/aaronland/go-uid-proxy v0.3.0/go.mod h1:LFZBtJBMR7HNOv2Qvd1C2uCsOsHeL6xpXEVrqiC+6tM=
 github.com/aaronland/go-uid-whosonfirst v0.0.5 h1:j5/vWjq/im3YPcx43R/8sJDJ4F2e7LlnQSK9/MMfsWw=
 github.com/aaronland/go-uid-whosonfirst v0.0.5/go.mod h1:Z/VSvb6IzCBnSNjDzgiuiJyptUbKSWhwexrjLEO4+24=
 github.com/akrylysov/algnhsa v1.1.0 h1:G0SoP16tMRyiism7VNc3JFA0wq/cVgEkp/ExMVnc6PQ=
@@ -271,8 +271,8 @@ github.com/sfomuseum/go-sfomuseum-pmtiles v1.2.0 h1:KMBzPURe73GI0uai8Hg6iwat8xyM
 github.com/sfomuseum/go-sfomuseum-pmtiles v1.2.0/go.mod h1:R2YN78nGHl6SckPXd6CL7JDVgNsMQUx1QTvGKkrzzHU=
 github.com/sfomuseum/go-template v1.8.0 h1:upXRQ+oeUbfz0KxH79ws/kS2gKF+y5pSXVEQOgvv6IM=
 github.com/sfomuseum/go-template v1.8.0/go.mod h1:el1YP8YUqKbSmQxnWxh7s8Z6HVNUzKUuNKtu5tvQ4aU=
-github.com/sfomuseum/go-timings v1.3.0 h1:dAn5CLqp7GF0JoeDGgg9WlQL7Veq2w16n3wMffrbcBE=
-github.com/sfomuseum/go-timings v1.3.0/go.mod h1:jZrCwV4uoY5s4sOZWZLn6xQ2LhsMy2ZvdB3tzLPO76c=
+github.com/sfomuseum/go-timings v1.4.0 h1:48TyPhrSlTVbFKI2psZiPD11GA0zXnrPJAyLmtBBmPg=
+github.com/sfomuseum/go-timings v1.4.0/go.mod h1:FcDhHe439Uy6i+WpLHrTJirtv37sf6/TxBhAngUQP7M=
 github.com/sfomuseum/iso8601duration v1.1.0 h1:kMYzbamrZp9dRxi5iFuhjl5CzHXK6s6Bzz/c75wsq8Q=
 github.com/sfomuseum/iso8601duration v1.1.0/go.mod h1:6EenGWM7y8uVquMPEZwoR+ihpIMJluw7iYiHhDTuOAk=
 github.com/sfomuseum/runtimevar v1.1.2 h1:YcgxdB39gEqKN1H3wS9E773JsPWYKBVDdk/HF08BLFc=
@@ -298,8 +298,8 @@ github.com/tdewolff/parse/v2 v2.6.8/go.mod h1:XHDhaU6IBgsryfdnpzUXBlT6leW/l25yrF
 github.com/tdewolff/test v1.0.9 h1:SswqJCmeN4B+9gEAi/5uqT0qpi1y2/2O47V/1hhGZT0=
 github.com/tdewolff/test v1.0.9/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=
-github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -319,18 +319,18 @@ github.com/whosonfirst/go-sanitize v0.1.0 h1:ygSqCnakwdzH/m8UEa15zXGDsoo5/JJeRkg
 github.com/whosonfirst/go-sanitize v0.1.0/go.mod h1:p/emgbafMM0p5iVAz2XWwecYPl06Tw4Jos9rhTKIrt8=
 github.com/whosonfirst/go-whosonfirst-crawl v0.2.2 h1:7nwpNV/BFoPR0R7KMMy1iiYAer7wlHJBUOiL+NLzIFs=
 github.com/whosonfirst/go-whosonfirst-crawl v0.2.2/go.mod h1:2GZkaK9jaOisWRnBQGWzmb7H55TUFl9y9F30lrk2hwk=
-github.com/whosonfirst/go-whosonfirst-export/v2 v2.8.2 h1:Jg8Ed4trgPZVKiXjhnH8oFfG9LeosrdgfDRNsYG4k7s=
-github.com/whosonfirst/go-whosonfirst-export/v2 v2.8.2/go.mod h1:7LEVZByKDtHRLtu40mNR3/q9Mp0f8Db5YEh7gk7oLaY=
+github.com/whosonfirst/go-whosonfirst-export/v2 v2.8.3 h1:mq1OjMP2Trenb+1wJGrYdKaFzkwWWHYSjdfPjok437A=
+github.com/whosonfirst/go-whosonfirst-export/v2 v2.8.3/go.mod h1:e75gUUyEq8WhG+BVQ0wktZ6IqDLeJZlONDtXHpjxGtg=
 github.com/whosonfirst/go-whosonfirst-feature v0.0.28 h1:XCNNzjnk1i50UnqrNtrN9xNvJDwZGjsPHbb3HRPixXA=
 github.com/whosonfirst/go-whosonfirst-feature v0.0.28/go.mod h1:8kc2Ei7mCankyWQcfzLHdKAc1//B/ptY7uEFsT5I8m4=
 github.com/whosonfirst/go-whosonfirst-flags v0.5.2 h1:vSx7fcM04HiSAEF+WOKfuyJawac99skN9HJAeqBXWpI=
 github.com/whosonfirst/go-whosonfirst-flags v0.5.2/go.mod h1:kozBozsyI8cKekUces1m10vJ301sH2EqLZtjX1xCSqQ=
 github.com/whosonfirst/go-whosonfirst-format v0.4.1 h1:TVSrbbB/sXhAgyaTenaS93lERRITGQHBKIDwoEgxoqA=
 github.com/whosonfirst/go-whosonfirst-format v0.4.1/go.mod h1:lMBIXCnD9ZA+wCNtu6XFYoq5DTfnEALO8k6OkEn11MM=
-github.com/whosonfirst/go-whosonfirst-id v1.2.4 h1:KC5VGR+mweXcECFL5MGfX3GcrlbZscCa+aSoU7OAAtM=
-github.com/whosonfirst/go-whosonfirst-id v1.2.4/go.mod h1:3Tr/dxs4o8dvfcTyJrkS0wQ93Os+YjAVcWMD81BCFHE=
-github.com/whosonfirst/go-whosonfirst-iterate/v2 v2.4.1 h1:GKm+MmZ878vFr8K/Bk9RLXKPt+va9TUqP3/JCnmynVI=
-github.com/whosonfirst/go-whosonfirst-iterate/v2 v2.4.1/go.mod h1:kDIvHxJTo6XgFKmLHliGLxlqeeHhxuYtdeVZBAcP68g=
+github.com/whosonfirst/go-whosonfirst-id v1.2.5 h1:WEQafWDflwiHG9zA4XKvo7+k/Tjvb/yf0+6lpXqdRyk=
+github.com/whosonfirst/go-whosonfirst-id v1.2.5/go.mod h1:V0xr7Bs7Uuo+JJMRRoALlME6/R2K5CDm0BRp5NNThxc=
+github.com/whosonfirst/go-whosonfirst-iterate/v2 v2.5.0 h1:aLThv46NCuScTnulbsgmKPZiCqnv7UH8X4ojO2151KI=
+github.com/whosonfirst/go-whosonfirst-iterate/v2 v2.5.0/go.mod h1:wF/nVhSEVJdkWd24+TcXb5Pir92WDUqRa9oLu/qf9N4=
 github.com/whosonfirst/go-whosonfirst-names v0.1.0 h1:uXop/DwQqH60uDBZvHCPg1yRSQLScbm6VZyqcaED2KE=
 github.com/whosonfirst/go-whosonfirst-names v0.1.0/go.mod h1:0z86/nedM9T/5C8cAdbCMfRuBrkc33oEQ6vdJ6WybSg=
 github.com/whosonfirst/go-whosonfirst-placetypes v0.7.3 h1:BuKRV3pal5wanOZxWue7hWFZXlsWevmCY3X06bU+J6s=
@@ -339,8 +339,8 @@ github.com/whosonfirst/go-whosonfirst-reader v1.0.2 h1:yLsDd6GJOsfMVJz63noH5Haoo
 github.com/whosonfirst/go-whosonfirst-reader v1.0.2/go.mod h1:1M6osxb9qXB3+ARINW4vuEaCTIN55abLRBGbBtfpGJ0=
 github.com/whosonfirst/go-whosonfirst-sources v0.1.0 h1:JuKLa6KWke22jBfJ1pM9WQHoz1/3pbDv2C+aR+THPPQ=
 github.com/whosonfirst/go-whosonfirst-sources v0.1.0/go.mod h1:EUMHyGzUmqPPxlMmOp+28BFeoBdxxE0HCKRd67lkqGM=
-github.com/whosonfirst/go-whosonfirst-spatial v0.10.1 h1:TZtRZXUPh5OWwKWzLAt9v7bbC8kjS8LGshYd00BXzzo=
-github.com/whosonfirst/go-whosonfirst-spatial v0.10.1/go.mod h1:MxGPCoIaIA5BnROQohjyeHHhDsf+Sq9pq8J2RUz7gSM=
+github.com/whosonfirst/go-whosonfirst-spatial v0.10.2 h1:WAa3Wndk874QPVWxniPSvjZwovIj8KYPJUdPAeAffI4=
+github.com/whosonfirst/go-whosonfirst-spatial v0.10.2/go.mod h1:ja79l9imEriYcWFVX1vbW4eMAf407/GqEQ3q5Fpa/1A=
 github.com/whosonfirst/go-whosonfirst-spatial-grpc v0.1.2 h1:0a+lES3zv/1iz0ppqMiuLIMxHW+IxO4VTwV7yIo+mw0=
 github.com/whosonfirst/go-whosonfirst-spatial-grpc v0.1.2/go.mod h1:giIqrHTO6grd1Geu3gBa2EY2D+GoVSZAY2l9oJYbtRk=
 github.com/whosonfirst/go-whosonfirst-spatial-www v0.2.0 h1:LpjuvmBznHQnYbYquo0YPYSJy0dab2sBRP5t6I5A9HU=