From 993ae683005fbdbb7db6e999e098e77dd2394060 Mon Sep 17 00:00:00 2001 From: thisisaaronland Date: Tue, 23 Feb 2021 17:12:56 -0800 Subject: [PATCH] update to use whosonfirst/go-whosonfirst-iterate v1.0.1; update to use whosonfirst/go-ioutil --- go.mod | 3 ++- go.sum | 4 +++ sqlite.go | 2 +- .../whosonfirst/go-ioutil/.gitignore | 11 ++++++++ .../github.com/whosonfirst/go-ioutil/LICENSE | 27 +++++++++++++++++++ .../whosonfirst/go-ioutil/README.md | 5 ++++ .../github.com/whosonfirst/go-ioutil/go.mod | 3 +++ .../ioutil => go-ioutil}/readseekcloser.go | 0 .../emitter/featurecollection.go | 2 +- .../emitter/geojsonls.go | 2 +- vendor/modules.txt | 6 +++-- 11 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 vendor/github.com/whosonfirst/go-ioutil/.gitignore create mode 100644 vendor/github.com/whosonfirst/go-ioutil/LICENSE create mode 100644 vendor/github.com/whosonfirst/go-ioutil/README.md create mode 100644 vendor/github.com/whosonfirst/go-ioutil/go.mod rename vendor/github.com/whosonfirst/{go-whosonfirst-iterate/ioutil => go-ioutil}/readseekcloser.go (100%) diff --git a/go.mod b/go.mod index 52f89d5..b3858c9 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/whosonfirst/go-whosonfirst-iterate-sqlite go 1.16 require ( - github.com/whosonfirst/go-whosonfirst-iterate v1.0.0 + github.com/whosonfirst/go-ioutil v0.0.1 + github.com/whosonfirst/go-whosonfirst-iterate v1.0.1 github.com/whosonfirst/go-whosonfirst-sqlite v0.1.7 ) diff --git a/go.sum b/go.sum index d6c829b..617648c 100644 --- a/go.sum +++ b/go.sum @@ -56,6 +56,8 @@ github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc= github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/whosonfirst/go-ioutil v0.0.1 h1:cCrEYen6NDvHfjzV2q4u/VB21u2kTOwDnUGRlMI8Z9o= +github.com/whosonfirst/go-ioutil v0.0.1/go.mod h1:2dS1vWdAIkiHDvDF8fYyjv6k2NISmwaIjJJeEDBEdvg= github.com/whosonfirst/go-spatialite v0.0.0-20180220171945-cb1d9ed624a8/go.mod h1:JnzadIex2v6ZyX6pLrjJ5CJ69e/ljYBCqxarHDMkMJ4= github.com/whosonfirst/go-spatialite v0.1.0 h1:jKbVmIeUSsDfPX4DWTeiSR9zGJFETIF1A3YdK6IShBY= github.com/whosonfirst/go-spatialite v0.1.0/go.mod h1:w1O/DKimk4wiV+5d2BzWYnxvbdhMhkeU01cpfIeEorQ= @@ -90,6 +92,8 @@ github.com/whosonfirst/go-whosonfirst-index/v2 v2.0.0 h1:PnPLYvCnBrg7Vvw3ho8tc2l github.com/whosonfirst/go-whosonfirst-index/v2 v2.0.0/go.mod h1:BiIcEdIv7W6CZd/sc9m2npVo/rXCVUvWL7dldUb4bu8= github.com/whosonfirst/go-whosonfirst-iterate v1.0.0 h1:ioIfP81ovXs1wr2vyickbG9o8DUahmcmJyP9Ih1DAOQ= github.com/whosonfirst/go-whosonfirst-iterate v1.0.0/go.mod h1:nxCcHykhwN5E5ropkHetMsi1Gi/Mh2gooK93i02nXsI= +github.com/whosonfirst/go-whosonfirst-iterate v1.0.1 h1:XTQ6cvfEnNLS5sgx7WLKR9YwkSCuZRh4p6+EqxYjQAU= +github.com/whosonfirst/go-whosonfirst-iterate v1.0.1/go.mod h1:ceLMHQ9s3naZLFcKeUvokP0Sw7/BmwuZJiaQt/mVO0I= github.com/whosonfirst/go-whosonfirst-log v0.1.0 h1:mWYI5hn16uyeLxBmPsLSvYV4rQKK/cxGVhM+bC2ZoGc= github.com/whosonfirst/go-whosonfirst-log v0.1.0/go.mod h1:pmgBbxZSnjGVy2nsUJBBMcFagxwIKLlmRsW7ClkXmac= github.com/whosonfirst/go-whosonfirst-placetypes v0.1.0/go.mod h1:Jdmug2QQLbrmg+UcYGz8k575GnrOEg63vZVS46e5fMs= diff --git a/sqlite.go b/sqlite.go index 0f04af4..2858207 100644 --- a/sqlite.go +++ b/sqlite.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/whosonfirst/go-whosonfirst-iterate/emitter" "github.com/whosonfirst/go-whosonfirst-iterate/filters" - "github.com/whosonfirst/go-whosonfirst-iterate/ioutil" + "github.com/whosonfirst/go-ioutil" "github.com/whosonfirst/go-whosonfirst-sqlite/database" "github.com/whosonfirst/go-whosonfirst-sqlite/utils" "net/url" diff --git a/vendor/github.com/whosonfirst/go-ioutil/.gitignore b/vendor/github.com/whosonfirst/go-ioutil/.gitignore new file mode 100644 index 0000000..afa44cd --- /dev/null +++ b/vendor/github.com/whosonfirst/go-ioutil/.gitignore @@ -0,0 +1,11 @@ +*~ +pkg +src +!vendor/src +bin +!bin/.gitignore +*.log +*.json +.travis.yml +*.db +testdata/*.txt \ No newline at end of file diff --git a/vendor/github.com/whosonfirst/go-ioutil/LICENSE b/vendor/github.com/whosonfirst/go-ioutil/LICENSE new file mode 100644 index 0000000..7832dde --- /dev/null +++ b/vendor/github.com/whosonfirst/go-ioutil/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2021, Aaron Straup Cope +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the {organization} nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/whosonfirst/go-ioutil/README.md b/vendor/github.com/whosonfirst/go-ioutil/README.md new file mode 100644 index 0000000..5992016 --- /dev/null +++ b/vendor/github.com/whosonfirst/go-ioutil/README.md @@ -0,0 +1,5 @@ +# go-ioutil + +## Important + +Work in progress. Documentation to follow. \ No newline at end of file diff --git a/vendor/github.com/whosonfirst/go-ioutil/go.mod b/vendor/github.com/whosonfirst/go-ioutil/go.mod new file mode 100644 index 0000000..7e37699 --- /dev/null +++ b/vendor/github.com/whosonfirst/go-ioutil/go.mod @@ -0,0 +1,3 @@ +module github.com/whosonfirst/go-ioutil + +go 1.16 diff --git a/vendor/github.com/whosonfirst/go-whosonfirst-iterate/ioutil/readseekcloser.go b/vendor/github.com/whosonfirst/go-ioutil/readseekcloser.go similarity index 100% rename from vendor/github.com/whosonfirst/go-whosonfirst-iterate/ioutil/readseekcloser.go rename to vendor/github.com/whosonfirst/go-ioutil/readseekcloser.go diff --git a/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/featurecollection.go b/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/featurecollection.go index 29bc0ab..8e9cd1a 100644 --- a/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/featurecollection.go +++ b/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/featurecollection.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" "github.com/whosonfirst/go-whosonfirst-iterate/filters" - "github.com/whosonfirst/go-whosonfirst-iterate/ioutil" + "github.com/whosonfirst/go-ioutil" "io" ) diff --git a/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/geojsonls.go b/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/geojsonls.go index 215aad7..bf7f666 100644 --- a/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/geojsonls.go +++ b/vendor/github.com/whosonfirst/go-whosonfirst-iterate/emitter/geojsonls.go @@ -6,7 +6,7 @@ import ( "context" "fmt" "github.com/whosonfirst/go-whosonfirst-iterate/filters" - "github.com/whosonfirst/go-whosonfirst-iterate/ioutil" + "github.com/whosonfirst/go-ioutil" "io" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index f1fa2b4..9775ce8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -10,6 +10,9 @@ github.com/tidwall/gjson github.com/tidwall/match # github.com/tidwall/pretty v1.0.0 github.com/tidwall/pretty +# github.com/whosonfirst/go-ioutil v0.0.1 +## explicit +github.com/whosonfirst/go-ioutil # github.com/whosonfirst/go-spatialite v0.1.1 github.com/whosonfirst/go-spatialite # github.com/whosonfirst/go-whosonfirst-crawl v0.2.1 @@ -17,11 +20,10 @@ github.com/whosonfirst/go-whosonfirst-crawl # github.com/whosonfirst/go-whosonfirst-flags v0.2.0 github.com/whosonfirst/go-whosonfirst-flags github.com/whosonfirst/go-whosonfirst-flags/existential -# github.com/whosonfirst/go-whosonfirst-iterate v1.0.0 +# github.com/whosonfirst/go-whosonfirst-iterate v1.0.1 ## explicit github.com/whosonfirst/go-whosonfirst-iterate/emitter github.com/whosonfirst/go-whosonfirst-iterate/filters -github.com/whosonfirst/go-whosonfirst-iterate/ioutil github.com/whosonfirst/go-whosonfirst-iterate/iterator github.com/whosonfirst/go-whosonfirst-iterate/publisher # github.com/whosonfirst/go-whosonfirst-sqlite v0.1.7