Merge branch 'gomod' of github.com:whosonfirst/go-whosonfirst-bundles…

… into gomod

bundles.go

@@ -9,6 +9,9 @@ import (
 	"github.com/whosonfirst/go-whosonfirst-geojson-v2/feature"
 	"github.com/whosonfirst/go-whosonfirst-geojson-v2/properties/whosonfirst"
 	"github.com/whosonfirst/go-whosonfirst-index"
+	_ "github.com/whosonfirst/go-whosonfirst-index/fs"
+	_ "github.com/whosonfirst/go-whosonfirst-index-csv"
+	_ "github.com/whosonfirst/go-whosonfirst-index-sqlite"		
 	"github.com/whosonfirst/go-whosonfirst-log"
 	"github.com/whosonfirst/go-whosonfirst-meta"
 	"github.com/whosonfirst/go-whosonfirst-sqlite-features/tables"

cmd/wof-bundle/main.go

@@ -5,15 +5,21 @@ import (
 	"flag"
 	"github.com/whosonfirst/go-whosonfirst-bundles"
 	"github.com/whosonfirst/go-whosonfirst-log"
+	"github.com/whosonfirst/go-whosonfirst-index"	
 	"io"
 	_ "log"
 	"os"
+	"fmt"
+	"strings"
 )
 
 func main() {
 
+	valid_modes := strings.Join(index.Modes(), ",")
+	desc_modes := fmt.Sprintf("The mode to use importing data. Valid modes are: %s.", valid_modes)
+
 	var dest = flag.String("dest", "", "Where to write files")
-	var mode = flag.String("mode", "repo", "...")
+	var mode = flag.String("mode", "repo", desc_modes)
 
 	var sqlite = flag.Bool("sqlite", false, "...")
 	var dsn = flag.String("sqlite-dsn", "", "...")

go.mod

@@ -4,10 +4,11 @@ go 1.12
 
 require (
 	github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5
-	github.com/skelterjohn/geom v0.0.0-20180103142417-96f3e8a219c5 // indirect
 	github.com/whosonfirst/go-whosonfirst-csv v0.1.0
 	github.com/whosonfirst/go-whosonfirst-geojson-v2 v0.11.1
 	github.com/whosonfirst/go-whosonfirst-index v0.2.2
+	github.com/whosonfirst/go-whosonfirst-index-csv v0.0.0-20191002171239-c6712fe20972
+	github.com/whosonfirst/go-whosonfirst-index-sqlite v0.0.2
 	github.com/whosonfirst/go-whosonfirst-log v0.1.0
 	github.com/whosonfirst/go-whosonfirst-meta v0.2.0
 	github.com/whosonfirst/go-whosonfirst-sqlite v0.1.4

go.sum

@@ -51,6 +51,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shaxbee/go-spatialite v0.0.0-20180425212100-9b4c81899e0e/go.mod h1:tRDdwai9gBsMVwqexZx2+O5F9QY49MxJFo1zlI/MdkU=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/skelterjohn/geom v0.0.0-20180103000000-96f3e8a219c5f4276b0dda3568d80c4e02a50116 h1:3viuBF2tRGd2HlEs/uL4LLmdjOj8kAO6Y2c8Ii4H0oI=
 github.com/skelterjohn/geom v0.0.0-20180103000000-96f3e8a219c5f4276b0dda3568d80c4e02a50116/go.mod h1:w8cQIijHlvvZM7afYlixPThHAdD+AkRFw3Mb9yQ2Y+I=
 github.com/skelterjohn/geom v0.0.0-20180103142417-96f3e8a219c5 h1:qQF/q/+xaKD4CAVz3zfuvpij8U4ihSGIhHfOROI4NFc=
 github.com/skelterjohn/geom v0.0.0-20180103142417-96f3e8a219c5/go.mod h1:w8cQIijHlvvZM7afYlixPThHAdD+AkRFw3Mb9yQ2Y+I=
@@ -94,6 +95,10 @@ github.com/whosonfirst/go-whosonfirst-hash v0.1.0/go.mod h1:1ZdCFZTnQt5bwnsj2daB
 github.com/whosonfirst/go-whosonfirst-index v0.1.1/go.mod h1:vgUaNF7Y7gFrqQ67UTkkMioXdGNUY4KpSlqhGy46wfg=
 github.com/whosonfirst/go-whosonfirst-index v0.2.2 h1:P+dgqipNHgIX8a/u03sT3bHc/rqxopKIUn21mu0c/Bw=
 github.com/whosonfirst/go-whosonfirst-index v0.2.2/go.mod h1:n3rY2Hza4+MFtKES9C1sS4AAIkA5va/nagzvt+4ZFBw=
+github.com/whosonfirst/go-whosonfirst-index-csv v0.0.0-20191002171239-c6712fe20972 h1:xPrg89CfHOG3u7eaW6fa9ke4Px5kErS21D4mBf6usXE=
+github.com/whosonfirst/go-whosonfirst-index-csv v0.0.0-20191002171239-c6712fe20972/go.mod h1:TNMdhUDIVyCrcr9WziZRt9UARQAvM/T1x4h69gVkxsA=
+github.com/whosonfirst/go-whosonfirst-index-sqlite v0.0.2 h1:rmp0Nm6adNVPEZ7A/LlvNjK8ANHzLm6z03aNR9yQ028=
+github.com/whosonfirst/go-whosonfirst-index-sqlite v0.0.2/go.mod h1:x2m5HtZRusbCjy02MVAtwoBVHtdiHDbt1E7Cuz818sc=
 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-meta v0.2.0 h1:/eAHdPny10gOR22cu1QvslkxSQfuL5CJfKQ6vy8VgTU=
@@ -109,6 +114,7 @@ github.com/whosonfirst/go-whosonfirst-spr v0.1.0 h1:5qE629nCiucF2upy5NjPOEl9cFat
 github.com/whosonfirst/go-whosonfirst-spr v0.1.0/go.mod h1:R8GtEVz1GVSnwwOjzcoVUd172ZK26Q7hQSLI6SGG7lM=
 github.com/whosonfirst/go-whosonfirst-sqlite v0.0.2/go.mod h1:JmSK+NaXOzmZJXkzOdy2mHwMJvAbUzKw//B3dVr98H0=
 github.com/whosonfirst/go-whosonfirst-sqlite v0.1.0/go.mod h1:mm4RnFLe1ydCn1sItwU+Jfy2SYTHNp2zMSZasmM3/1M=
+github.com/whosonfirst/go-whosonfirst-sqlite v0.1.1/go.mod h1:0/8mpMRT0BFcJcEX5TybAsSMFLKWYEO32H7b1wTPJkk=
 github.com/whosonfirst/go-whosonfirst-sqlite v0.1.2/go.mod h1:Qxeir367TNvNT1XAm2khUrVefn24MKBAxtS9CfS7o+Q=
 github.com/whosonfirst/go-whosonfirst-sqlite v0.1.4 h1:7ptP/Qre9VxzaIxeqKXGhBFhoIz5YufK4dBzLrX/3jQ=
 github.com/whosonfirst/go-whosonfirst-sqlite v0.1.4/go.mod h1:Qxeir367TNvNT1XAm2khUrVefn24MKBAxtS9CfS7o+Q=