Skip to content

Commit

Permalink
update to go-whosonfirst-spatial v0.0.32; relect changes to go-reader…
Browse files Browse the repository at this point in the history
… and go-writer
  • Loading branch information
thisisaaronland committed Feb 20, 2021
1 parent 4c1bec7 commit 1f6d7e7
Show file tree
Hide file tree
Showing 16 changed files with 40 additions and 29 deletions.
6 changes: 3 additions & 3 deletions database.go
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ func (r *SQLiteSpatialDatabase) Read(ctx context.Context, str_uri string) (io.Re
return fh, nil
}

func (r *SQLiteSpatialDatabase) ReaderURI(str_uri string) string {
func (r *SQLiteSpatialDatabase) ReaderURI(ctx context.Context, str_uri string) string {
return str_uri
}

Expand All @@ -723,10 +723,10 @@ func (r *SQLiteSpatialDatabase) Write(ctx context.Context, key string, fh io.Rea
return 0, fmt.Errorf("Not implemented")
}

func (r *SQLiteSpatialDatabase) WriterURI(str_uri string) string {
func (r *SQLiteSpatialDatabase) WriterURI(ctx context.Context, str_uri string) string {
return str_uri
}

func (r *SQLiteSpatialDatabase) Close() error {
func (r *SQLiteSpatialDatabase) Close(ctx context.Context) error {
return nil
}
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ go 1.16
require (
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/skelterjohn/geom v0.0.0-20180103142417-96f3e8a219c5
github.com/whosonfirst/go-reader v0.4.0
github.com/whosonfirst/go-whosonfirst-flags v0.2.0
github.com/whosonfirst/go-whosonfirst-geojson-v2 v0.15.1
github.com/whosonfirst/go-whosonfirst-log v0.1.0
github.com/whosonfirst/go-whosonfirst-spatial v0.0.31
github.com/whosonfirst/go-whosonfirst-spatial v0.0.32
github.com/whosonfirst/go-whosonfirst-spr v0.1.0
github.com/whosonfirst/go-whosonfirst-sqlite v0.1.7
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.6
Expand Down
6 changes: 6 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ github.com/whosonfirst/go-reader v0.2.1 h1:URhO7a2rDZizElGPy7lrWDpV1c4ceInYMGNQP
github.com/whosonfirst/go-reader v0.2.1/go.mod h1:qUhz3OWefOUX/G1nzCEUzJskDjkF+l9oKPOM3K2fAJI=
github.com/whosonfirst/go-reader v0.3.0 h1:MlNNRzPQMqJKMoU6fueihOxLjtcw1KcfAdTyds+u29s=
github.com/whosonfirst/go-reader v0.3.0/go.mod h1:ffg8ww1158rNNqStFx64EGmDL5m5WZPsoMqR6wohOWE=
github.com/whosonfirst/go-reader v0.4.0 h1:9RQEVL+UYUbIuzj4oxSR9bd/sNIQ53/1jePNhpuYZKo=
github.com/whosonfirst/go-reader v0.4.0/go.mod h1:ffg8ww1158rNNqStFx64EGmDL5m5WZPsoMqR6wohOWE=
github.com/whosonfirst/go-reader-cachereader v0.0.0-20200520215638-b6af3cdb91ac/go.mod h1:i0ZGy4n48iBJ/3JABgd/IJ5kGZtUC5mcCTTO9efYYyQ=
github.com/whosonfirst/go-reader-github v0.2.0/go.mod h1:KBs4H6VvhJApfSHVWTwYe8I3O065vs4511fanNVtR34=
github.com/whosonfirst/go-reader-http v0.1.0/go.mod h1:He/0OcmeKl/zx7dDbI2bgVJPHj7TdlCBHL5ufQ+hnRw=
Expand Down Expand Up @@ -205,6 +207,8 @@ github.com/whosonfirst/go-whosonfirst-spatial v0.0.30 h1:4JgpZ4wIt8X1sWHLmMhCVe7
github.com/whosonfirst/go-whosonfirst-spatial v0.0.30/go.mod h1:53U9xQfhMPbWTYdE43hsJf7Ayi7WRZ2LEr5EyqlvcYc=
github.com/whosonfirst/go-whosonfirst-spatial v0.0.31 h1:/eXjh+iql/URM5cMoqr0cy5pfqzSQPMPR1NDMMz68c4=
github.com/whosonfirst/go-whosonfirst-spatial v0.0.31/go.mod h1:5GxJiQ3cUt2XQVJQhWrzLllWpGfdw1g3z9EHfs5Y87E=
github.com/whosonfirst/go-whosonfirst-spatial v0.0.32 h1:eZSaaYa7hcvI0a549WO5aZ512rGLSDXWvviB1rGyYiQ=
github.com/whosonfirst/go-whosonfirst-spatial v0.0.32/go.mod h1:uz8FeHcbJp6Z4XwsjtJcIpzjpp+NKEK68Z6lSeYvZBs=
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.6 h1:XhAlLoPm7y/4565du5H7R5Swjf/pBl+cuXHoAs6evLA=
Expand All @@ -224,6 +228,8 @@ github.com/whosonfirst/go-whosonfirst-uri v0.2.0 h1:iODHdyvW+8IXqHZTixZ/9GEZy1dV
github.com/whosonfirst/go-whosonfirst-uri v0.2.0/go.mod h1:8eaDVcc4v+HHHEDaRbApdmhPwM4/JQllw2PktvZcPVs=
github.com/whosonfirst/go-writer v0.3.0 h1:BQfYxKpnRXE7Rda3C7FLlJS/U3wrqlXve69TlATaaoE=
github.com/whosonfirst/go-writer v0.3.0/go.mod h1:kFzhremCFtnkJdmviwJEPLFYKQ5+vq6ocJPxt1bHPFY=
github.com/whosonfirst/go-writer v0.4.0 h1:pwZWJVvmRzdvTwoHKxRO4VY013ltp9NA7nsTTK4X/L8=
github.com/whosonfirst/go-writer v0.4.0/go.mod h1:kFzhremCFtnkJdmviwJEPLFYKQ5+vq6ocJPxt1bHPFY=
github.com/whosonfirst/walk v0.0.1 h1:t0QrqGwOdPMSeovFZSXfiS0GIGHrRXK3Wb9z5Uhs2bg=
github.com/whosonfirst/walk v0.0.1/go.mod h1:1KtP/VeooSlFOI61p+THc/C16Ra8Z5MjpjI0tsd3c1M=
github.com/whosonfirst/warning v0.1.0/go.mod h1:cAez7FpC/UEUrbiOXZO15v2JM8eijtFHQlN93AGFy1k=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/whosonfirst/go-reader/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/whosonfirst/go-reader/file.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions vendor/github.com/whosonfirst/go-reader/multi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/whosonfirst/go-reader/null.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/whosonfirst/go-reader/reader.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/whosonfirst/go-whosonfirst-spatial/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/whosonfirst/go-whosonfirst-spatial/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/whosonfirst/go-writer/file.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/whosonfirst/go-writer/io.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/whosonfirst/go-writer/null.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/whosonfirst/go-writer/stdout.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/whosonfirst/go-writer/writer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ github.com/tidwall/sjson
github.com/twpayne/go-geom
github.com/twpayne/go-geom/encoding/geojson
github.com/twpayne/go-geom/encoding/wkt
# github.com/whosonfirst/go-reader v0.3.0
# github.com/whosonfirst/go-reader v0.4.0
## explicit
github.com/whosonfirst/go-reader
github.com/whosonfirst/go-reader/ioutil
# github.com/whosonfirst/go-rfc-5646 v0.1.0
Expand Down Expand Up @@ -71,7 +72,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.31
# github.com/whosonfirst/go-whosonfirst-spatial v0.0.32
## explicit
github.com/whosonfirst/go-whosonfirst-spatial
github.com/whosonfirst/go-whosonfirst-spatial/database
Expand All @@ -95,7 +96,7 @@ github.com/whosonfirst/go-whosonfirst-sqlite-features/tables
# github.com/whosonfirst/go-whosonfirst-uri v0.2.0
## explicit
github.com/whosonfirst/go-whosonfirst-uri
# github.com/whosonfirst/go-writer v0.3.0
# github.com/whosonfirst/go-writer v0.4.0
github.com/whosonfirst/go-writer
# github.com/whosonfirst/walk v0.0.1
github.com/whosonfirst/walk

0 comments on commit 1f6d7e7

Please sign in to comment.