Skip to content

Commit

Permalink
update to use whosonfirst/go-whosonfirst-export v2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sfomuseumbot committed Feb 7, 2023
1 parent b262f35 commit 4d9af17
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 59 deletions.
2 changes: 1 addition & 1 deletion cmd/wof-create/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
exportify "github.com/whosonfirst/go-whosonfirst-exportify"
wof_reader "github.com/whosonfirst/go-whosonfirst-reader"
hierarchy "github.com/whosonfirst/go-whosonfirst-spatial-hierarchy"
hierarchy_filter "github.com/whosonfirst/go-whosonfirst-spatial-hierarchy/filter"
hierarchy_filter "github.com/whosonfirst/go-whosonfirst-spatial-hierarchy/filter"
_ "github.com/whosonfirst/go-whosonfirst-spatial-sqlite"
"github.com/whosonfirst/go-whosonfirst-spatial/database"
"github.com/whosonfirst/go-whosonfirst-spatial/filter"
Expand Down
6 changes: 3 additions & 3 deletions cmd/wof-exportify/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"log"
"os"
"path/filepath"

"github.com/sfomuseum/go-flags/multi"
"github.com/whosonfirst/go-reader"
export "github.com/whosonfirst/go-whosonfirst-export/v2"
Expand Down Expand Up @@ -88,11 +88,11 @@ func main() {
}
}

for _, str_id := range flag.Args(){
for _, str_id := range flag.Args() {

ids.Set(str_id)
}

ctx := context.Background()

ex, err := export.NewExporter(ctx, *exporter_uri)
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ require (
github.com/tidwall/gjson v1.14.4
github.com/tidwall/sjson v1.2.5
github.com/whosonfirst/go-reader v1.0.2
github.com/whosonfirst/go-whosonfirst-export/v2 v2.6.1
github.com/whosonfirst/go-whosonfirst-export/v2 v2.7.0
github.com/whosonfirst/go-whosonfirst-iterate-reader v1.0.0
github.com/whosonfirst/go-whosonfirst-iterate/v2 v2.3.1
github.com/whosonfirst/go-whosonfirst-reader v1.0.1
github.com/whosonfirst/go-whosonfirst-spatial v0.5.4
github.com/whosonfirst/go-whosonfirst-spatial-hierarchy v0.3.3
github.com/whosonfirst/go-whosonfirst-spatial-hierarchy v0.4.0
github.com/whosonfirst/go-whosonfirst-spatial-sqlite v0.6.4
github.com/whosonfirst/go-whosonfirst-uri v1.2.0
github.com/whosonfirst/go-whosonfirst-writer/v3 v3.0.0
github.com/whosonfirst/go-writer-featurecollection/v3 v3.0.0
github.com/whosonfirst/go-writer-featurecollection/v3 v3.0.1
github.com/whosonfirst/go-writer-jsonl/v3 v3.0.1
github.com/whosonfirst/go-writer/v3 v3.1.0
)
Expand Down Expand Up @@ -57,7 +57,7 @@ require (
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.1 // indirect
github.com/whosonfirst/go-whosonfirst-feature v0.0.25 // indirect
github.com/whosonfirst/go-whosonfirst-feature v0.0.26 // indirect
github.com/whosonfirst/go-whosonfirst-flags v0.4.4 // indirect
github.com/whosonfirst/go-whosonfirst-format v0.4.1 // indirect
github.com/whosonfirst/go-whosonfirst-id v1.2.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ 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.1 h1:nNG7r7/4MaII/NM8Df2oqgfgVNBDoIKlseleoX1vw1Q=
github.com/whosonfirst/go-whosonfirst-crawl v0.2.1/go.mod h1:MTD1TCgAkXlAtysPU98ylrz9Y5+ZCfRrsrBnRyiH/t8=
github.com/whosonfirst/go-whosonfirst-export/v2 v2.6.1 h1:u2/HPnz8OwlTIeyuFogDLKMwHVg9CgNHvy5cEEynlxU=
github.com/whosonfirst/go-whosonfirst-export/v2 v2.6.1/go.mod h1:nOKxHWpoM31OvZoNxzPCbhK+CnMgTVsXnZvYNK/jwCA=
github.com/whosonfirst/go-whosonfirst-export/v2 v2.7.0 h1:WuneueMbfjVWKh4sESLBfSFm+0rhIsgYdy0K2JLeLm4=
github.com/whosonfirst/go-whosonfirst-export/v2 v2.7.0/go.mod h1:w0O954Le3iSTHX0Ivfg6SVuzd7oUne6QmELfsfhAjZc=
github.com/whosonfirst/go-whosonfirst-feature v0.0.23/go.mod h1:3cvRigFFG2a99M64lZzfy5amHacWu8Os5fXZdGjPnLM=
github.com/whosonfirst/go-whosonfirst-feature v0.0.25 h1:6s2to+aWB9Fo+IcwSvsB2UiuymJPKSe8g0TwuRasLhE=
github.com/whosonfirst/go-whosonfirst-feature v0.0.25/go.mod h1:JTauqAjTuZDfOTHxv5hFUzknF0NGgxvHTT5maTej9Co=
github.com/whosonfirst/go-whosonfirst-feature v0.0.26 h1:Dba+7aNMzxAaSVh9WzlPdrYhwT8T03cjNANjZvhcNsY=
github.com/whosonfirst/go-whosonfirst-feature v0.0.26/go.mod h1:ntGT7tkg89WyEalg+Aocl0R27tPx2wBp7Prfx9a5tUg=
github.com/whosonfirst/go-whosonfirst-flags v0.4.3/go.mod h1:pL17Ryo60FH8RYaQRgfu5XnxhrNRK3x+rn03TYD6Gc8=
github.com/whosonfirst/go-whosonfirst-flags v0.4.4 h1:pwUnE8btx4Po6N5+uq0IrKVF0WraY5YW3tc3saIDg3A=
github.com/whosonfirst/go-whosonfirst-flags v0.4.4/go.mod h1:C9X7vQvNR/u55AfOHYUT8o7dRACWV++ZV4B0kylnIaY=
Expand All @@ -154,8 +154,8 @@ github.com/whosonfirst/go-whosonfirst-sources v0.1.0 h1:JuKLa6KWke22jBfJ1pM9WQHo
github.com/whosonfirst/go-whosonfirst-sources v0.1.0/go.mod h1:EUMHyGzUmqPPxlMmOp+28BFeoBdxxE0HCKRd67lkqGM=
github.com/whosonfirst/go-whosonfirst-spatial v0.5.4 h1:JJO2K+xLyciyWVPmpQ/VKZqXAswYm0O4yaXohFCBp/c=
github.com/whosonfirst/go-whosonfirst-spatial v0.5.4/go.mod h1:Q8SCUVV0mcGZpMB3Lq9GiBXkm6ZVS/kor4GuPQGvaCA=
github.com/whosonfirst/go-whosonfirst-spatial-hierarchy v0.3.3 h1:83M/8Awd8xDfzIXcAqnAaAJHctXw/1TsXl+8EmEFUQE=
github.com/whosonfirst/go-whosonfirst-spatial-hierarchy v0.3.3/go.mod h1:b455foAMOzfInf6OtcuiZ3wdvEBuSi9IhknW3fDhWIs=
github.com/whosonfirst/go-whosonfirst-spatial-hierarchy v0.4.0 h1:/Avg3xQmcG5b/LQCkKMkkmQPvvUZBc6+d+kDEA4Eg0o=
github.com/whosonfirst/go-whosonfirst-spatial-hierarchy v0.4.0/go.mod h1:uG6FVI2SPZxNTFWxxjMK5JjYbU1oXQXZeTZA4hC4lKY=
github.com/whosonfirst/go-whosonfirst-spatial-sqlite v0.6.4 h1:rhh5BycxB99bAal4GtZ0TYdr4+3jOPc5f3ej1Rmlmoo=
github.com/whosonfirst/go-whosonfirst-spatial-sqlite v0.6.4/go.mod h1:7Dy0+ECgz53IxnSomcAy9j02Fw8kMRlgXAo33UnyUDI=
github.com/whosonfirst/go-whosonfirst-spr/v2 v2.3.3 h1:dc7BdkGrSKtGyIEO8jW4h6xS0DMdKANwMHFRc1+WcnM=
Expand All @@ -169,8 +169,8 @@ github.com/whosonfirst/go-whosonfirst-uri v1.2.0 h1:lhmRsIhcpTr5HAo+kXKRGsSt76HT
github.com/whosonfirst/go-whosonfirst-uri v1.2.0/go.mod h1:CuVygTCUpMG945MMvqHyqxvc/L5YkDaMrrVpRFr7ZxY=
github.com/whosonfirst/go-whosonfirst-writer/v3 v3.0.0 h1:snhEF7nNPP1E0reD8cbwRHdFpk9WaNmljvlZF6yFvU8=
github.com/whosonfirst/go-whosonfirst-writer/v3 v3.0.0/go.mod h1:zr1HVHJ0Q8/azLtC0aeu8zgeALqPxrgPgxUe1SKnDyo=
github.com/whosonfirst/go-writer-featurecollection/v3 v3.0.0 h1:5JxJ4hUV/WN73gEWGp6EtAX9uZ/ODLkGZpK6Bxg2jXc=
github.com/whosonfirst/go-writer-featurecollection/v3 v3.0.0/go.mod h1:R6Rg3Mlb+Swbr0177vQP8GTV2REJue6Vc//AWbm2bb8=
github.com/whosonfirst/go-writer-featurecollection/v3 v3.0.1 h1:lejRWv24cXLD7t/CVCarkOolwjet3YAGV6vIQckqG9o=
github.com/whosonfirst/go-writer-featurecollection/v3 v3.0.1/go.mod h1:viwrSnGMsMhpkn2i1CQTc2Cl+TbSaF1h9rbhNeBvaB8=
github.com/whosonfirst/go-writer-jsonl/v3 v3.0.1 h1:ECVwoNFX0XIVLXPCa/fDeOw0Cf7dvS6IlULofNYk+Qs=
github.com/whosonfirst/go-writer-jsonl/v3 v3.0.1/go.mod h1:zPIzNWCiiGt0UoNFVbt+jOCS2lLOf3oH/sb08e8UUnA=
github.com/whosonfirst/go-writer/v3 v3.1.0 h1:lEZ6TIYvZb5NJ6e2OXYRM1j+MM2svKCSlb+6Vzbz+/M=
Expand Down
75 changes: 53 additions & 22 deletions vendor/github.com/whosonfirst/go-whosonfirst-export/v2/export.go

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

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

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

Loading

0 comments on commit 4d9af17

Please sign in to comment.