ensure IsPrincipalWOFRecord

Author: thisisaaronland

index.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/whosonfirst/go-whosonfirst-geojson-v2/feature"
 	wof_index "github.com/whosonfirst/go-whosonfirst-index"
+	wof_utils "github.com/whosonfirst/go-whosonfirst-index/utils"
 	"github.com/whosonfirst/go-whosonfirst-sqlite"
 	sql_index "github.com/whosonfirst/go-whosonfirst-sqlite-index"
 	"github.com/whosonfirst/warning"
@@ -22,12 +23,26 @@ func NewDefaultSQLiteFeaturesIndexer(db sqlite.Database, to_index []sqlite.Table
 		case <-ctx.Done():
 			return nil, nil
 		default:
+
 			path, err := wof_index.PathForContext(ctx)
 
 			if err != nil {
 				return nil, err
 			}
 
+			// skip alt files - see below for details
+			// (20190821/thisisaaronland)
+
+			ok, err := wof_utils.IsPrincipalWOFRecord(fh, ctx)
+
+			if err != nil {
+				return nil, err
+			}
+
+			if !ok {
+				return nil, nil
+			}
+
 			closer := ioutil.NopCloser(fh)
 
 			i, err := feature.LoadWOFFeatureFromReader(closer)

vendor/github.com/whosonfirst/go-whosonfirst-index/utils/utils.go

@@ -40,6 +40,7 @@ github.com/whosonfirst/go-whosonfirst-geojson-v2/utils
 github.com/whosonfirst/go-whosonfirst-hash
 # github.com/whosonfirst/go-whosonfirst-index v0.1.2
 github.com/whosonfirst/go-whosonfirst-index
+github.com/whosonfirst/go-whosonfirst-index/utils
 # github.com/whosonfirst/go-whosonfirst-log v0.1.0
 github.com/whosonfirst/go-whosonfirst-log
 # github.com/whosonfirst/go-whosonfirst-names v0.1.0