update to go-whosonfirst-sqlite-features v0.6.2; update cli tools to index geometry and properties tables

Author: thisisaaronland

README.md

@@ -7,6 +7,8 @@ Go package for indexing Who's On First features in SQLite databases.
 ### wof-sqlite-index-features
 
 ```
+$> ./bin/wof-sqlite-index-features -h
+Usage of ./bin/wof-sqlite-index-features:
   -all
     	Index all tables (except the 'search' and 'geometries' tables which you need to specify explicitly)
   -ancestors
@@ -21,12 +23,14 @@ Go package for indexing Who's On First features in SQLite databases.
     	Index the 'geojson' table
   -geometries
     	Index the 'geometries' table (requires that libspatialite already be installed)
+  -geometry
+    	Index the 'geometry' table
   -index-alt-files
     	Index alt geometries
   -index-relations
     	Index the records related to a feature, specifically wof:belongsto, wof:depicts and wof:involves. Alt files for relations are not indexed at this time.
   -index-relations-reader-uri string
-    	A valid go-reader.Reader URI from which to read data for a relations candidate.	
+    	A valid go-reader.Reader URI from which to read data for a relations candidate.
   -live-hard-die-fast
     	Enable various performance-related pragmas at the expense of possible (unlikely) database corruption (default true)
   -mode string
@@ -37,8 +41,10 @@ Go package for indexing Who's On First features in SQLite databases.
     	Attempt to optimize the database before closing connection (default true)
   -processes int
     	The number of concurrent processes to index data with (default 8)
+  -properties
+    	Index the 'properties' table
   -rtree
-    	Index the 'rtree' table	
+    	Index the 'rtree' table
   -search
     	Index the 'search' table (using SQLite FTS4 full-text indexer)
   -spr

cmd/wof-sqlite-index-features/main.go

@@ -42,6 +42,8 @@ func main() {
 	geometries := flag.Bool("geometries", false, "Index the 'geometries' table (requires that libspatialite already be installed)")
 	names := flag.Bool("names", false, "Index the 'names' table")
 	rtree := flag.Bool("rtree", false, "Index the 'rtree' table")
+	geometry := flag.Bool("geometry", false, "Index the 'geometry' table")
+	properties := flag.Bool("properties", false, "Index the 'properties' table")
 	search := flag.Bool("search", false, "Index the 'search' table (using SQLite FTS4 full-text indexer)")
 	spr := flag.Bool("spr", false, "Index the 'spr' table")
 	live_hard := flag.Bool("live-hard-die-fast", true, "Enable various performance-related pragmas at the expense of possible (unlikely) database corruption")
@@ -145,6 +147,44 @@ func main() {
 		to_index = append(to_index, gt)
 	}
 
+	if *geometry || *all {
+
+		geometry_opts, err := tables.DefaultGeometryTableOptions()
+
+		if err != nil {
+			logger.Fatal("failed to create 'geometry' table options because %s", err)
+		}
+
+		geometry_opts.IndexAltFiles = *alt_files
+
+		gt, err := tables.NewGeometryTableWithDatabaseAndOptions(db, geometry_opts)
+
+		if err != nil {
+			logger.Fatal("failed to create 'geometry' table because %s", err)
+		}
+
+		to_index = append(to_index, gt)
+	}
+
+	if *properties || *all {
+
+		properties_opts, err := tables.DefaultPropertiesTableOptions()
+
+		if err != nil {
+			logger.Fatal("failed to create 'properties' table options because %s", err)
+		}
+
+		properties_opts.IndexAltFiles = *alt_files
+
+		gt, err := tables.NewPropertiesTableWithDatabaseAndOptions(db, properties_opts)
+
+		if err != nil {
+			logger.Fatal("failed to create 'properties' table because %s", err)
+		}
+
+		to_index = append(to_index, gt)
+	}
+
 	if *spr || *all {
 
 		spr_opts, err := tables.DefaultSPRTableOptions()
@@ -154,7 +194,7 @@ func main() {
 		}
 
 		spr_opts.IndexAltFiles = *alt_files
-		
+
 		st, err := tables.NewSPRTableWithDatabaseAndOptions(db, spr_opts)
 
 		if err != nil {

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/whosonfirst/go-whosonfirst-log v0.1.0
 	github.com/whosonfirst/go-whosonfirst-reader v0.0.1
 	github.com/whosonfirst/go-whosonfirst-sqlite v0.1.6
-	github.com/whosonfirst/go-whosonfirst-sqlite-features v0.5.0
+	github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.2
 	github.com/whosonfirst/go-whosonfirst-sqlite-index v0.2.0
 	github.com/whosonfirst/warning v0.1.1
 )

go.sum

@@ -241,6 +241,12 @@ github.com/whosonfirst/go-whosonfirst-sqlite-features v0.4.0 h1:hogsGiJCxzyHo7L+
 github.com/whosonfirst/go-whosonfirst-sqlite-features v0.4.0/go.mod h1:FG3V5mkagABuTB5hOeLm1LKq80pSJpW67TdC4vNPMaY=
 github.com/whosonfirst/go-whosonfirst-sqlite-features v0.5.0 h1:4i3I4vKtTEf493DrZOM7tqwL0dxi53/JRuIFrIWE8pg=
 github.com/whosonfirst/go-whosonfirst-sqlite-features v0.5.0/go.mod h1:A964SQ/vZe/Yo0+AMGQMW55FYngGHQFXMgoewgOZXoY=
+github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.0 h1:48AFPCN1kUEF7nbTqEsPvauy4gRVBpk/0QSzIRv1epE=
+github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.0/go.mod h1:jZXXBBarIOYmkFl/LiKPjE4dQEunUZjV4fGqQImnXYQ=
+github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.1 h1:2F9503zBzinncf3Fox5w5NRygiZlx9CvfPeFCyAEwNk=
+github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.1/go.mod h1:jZXXBBarIOYmkFl/LiKPjE4dQEunUZjV4fGqQImnXYQ=
+github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.2 h1:7eWyeIwsHZTeMmSdmRVuj6X9bvjEUamE2caDrOZ0uXw=
+github.com/whosonfirst/go-whosonfirst-sqlite-features v0.6.2/go.mod h1:jZXXBBarIOYmkFl/LiKPjE4dQEunUZjV4fGqQImnXYQ=
 github.com/whosonfirst/go-whosonfirst-sqlite-index v0.0.1 h1:/GuAgxIHn5vZwAEDA4XUSWe7rYWZW30I4HLQRTpBeJY=
 github.com/whosonfirst/go-whosonfirst-sqlite-index v0.0.1/go.mod h1:5fY1ikCDhe1u0umawonTOICPzv/2CgfFT9hTAen5nsI=
 github.com/whosonfirst/go-whosonfirst-sqlite-index v0.1.0 h1:/tljUy2rchRC9XE4FDteNmYZYhYqxWX2uF4c61WlocU=