Skip to content
This repository was archived by the owner on Dec 13, 2024. It is now read-only.

Commit 1db5794

Browse files
author
thisisaaronland
committed
snapshot: compiles, untested
1 parent 8996d34 commit 1db5794

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+5080
-1117
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ package main
22

33
import (
44
_ "github.com/whosonfirst/go-reader-http"
5-
_ "github.com/whosonfirst/go-whosonfirst-iterate-git"
5+
_ "github.com/whosonfirst/go-whosonfirst-iterate-git"
66
)
77

88
import (
99
"context"
1010
"flag"
1111
"fmt"
12+
"github.com/aaronland/go-sqlite"
13+
"github.com/aaronland/go-sqlite/database"
1214
"github.com/whosonfirst/go-reader"
1315
"github.com/whosonfirst/go-whosonfirst-iterate/emitter"
1416
"github.com/whosonfirst/go-whosonfirst-log"
15-
"github.com/whosonfirst/go-whosonfirst-sqlite"
1617
"github.com/whosonfirst/go-whosonfirst-sqlite-features-index"
1718
"github.com/whosonfirst/go-whosonfirst-sqlite-features/tables"
1819
sql_index "github.com/whosonfirst/go-whosonfirst-sqlite-index"
19-
"github.com/whosonfirst/go-whosonfirst-sqlite/database"
2020
"io"
2121
"os"
2222
"runtime"
@@ -30,7 +30,7 @@ func main() {
3030

3131
iterator_uri := flag.String("iterator-uri", "repo://", iterator_desc)
3232

33-
mode_desc := fmt.Sprintf("%s. THIS FLAG IS DEPRECATED, please use -iterator-uri instead.", iterator_desc)
33+
mode_desc := fmt.Sprintf("%s. THIS FLAG IS DEPRECATED, please use -iterator-uri instead.", iterator_desc)
3434
mode := flag.String("mode", "repo://", mode_desc)
3535

3636
dsn := flag.String("dsn", ":memory:", "")
@@ -63,11 +63,11 @@ func main() {
6363

6464
flag.Parse()
6565

66+
ctx := context.Background()
67+
6668
if *iterator_uri == "" {
6769
*iterator_uri = *mode
6870
}
69-
70-
ctx := context.Background()
7171

7272
runtime.GOMAXPROCS(*procs)
7373

@@ -80,7 +80,7 @@ func main() {
8080
logger.Fatal("you asked to index geometries but specified the '%s' driver instead of spatialite", *driver)
8181
}
8282

83-
db, err := database.NewDBWithDriver(*driver, *dsn)
83+
db, err := database.NewDBWithDriver(ctx, *driver, *dsn)
8484

8585
if err != nil {
8686
logger.Fatal("unable to create database (%s) because %s", *dsn, err)
@@ -128,7 +128,7 @@ func main() {
128128

129129
geojson_opts.IndexAltFiles = *alt_files
130130

131-
gt, err := tables.NewGeoJSONTableWithDatabaseAndOptions(db, geojson_opts)
131+
gt, err := tables.NewGeoJSONTableWithDatabaseAndOptions(ctx, db, geojson_opts)
132132

133133
if err != nil {
134134
logger.Fatal("failed to create 'geojson' table because %s", err)
@@ -139,7 +139,7 @@ func main() {
139139

140140
if *supersedes || *all {
141141

142-
t, err := tables.NewSupersedesTableWithDatabase(db)
142+
t, err := tables.NewSupersedesTableWithDatabase(ctx, db)
143143

144144
if err != nil {
145145
logger.Fatal("failed to create 'supersedes' table because %s", err)
@@ -158,7 +158,7 @@ func main() {
158158

159159
rtree_opts.IndexAltFiles = *alt_files
160160

161-
gt, err := tables.NewRTreeTableWithDatabaseAndOptions(db, rtree_opts)
161+
gt, err := tables.NewRTreeTableWithDatabaseAndOptions(ctx, db, rtree_opts)
162162

163163
if err != nil {
164164
logger.Fatal("failed to create 'rtree' table because %s", err)
@@ -177,7 +177,7 @@ func main() {
177177

178178
geometry_opts.IndexAltFiles = *alt_files
179179

180-
gt, err := tables.NewGeometryTableWithDatabaseAndOptions(db, geometry_opts)
180+
gt, err := tables.NewGeometryTableWithDatabaseAndOptions(ctx, db, geometry_opts)
181181

182182
if err != nil {
183183
logger.Fatal("failed to create 'geometry' table because %s", err)
@@ -196,7 +196,7 @@ func main() {
196196

197197
properties_opts.IndexAltFiles = *alt_files
198198

199-
gt, err := tables.NewPropertiesTableWithDatabaseAndOptions(db, properties_opts)
199+
gt, err := tables.NewPropertiesTableWithDatabaseAndOptions(ctx, db, properties_opts)
200200

201201
if err != nil {
202202
logger.Fatal("failed to create 'properties' table because %s", err)
@@ -215,7 +215,7 @@ func main() {
215215

216216
spr_opts.IndexAltFiles = *alt_files
217217

218-
st, err := tables.NewSPRTableWithDatabaseAndOptions(db, spr_opts)
218+
st, err := tables.NewSPRTableWithDatabaseAndOptions(ctx, db, spr_opts)
219219

220220
if err != nil {
221221
logger.Fatal("failed to create 'spr' table because %s", err)
@@ -226,7 +226,7 @@ func main() {
226226

227227
if *names || *all {
228228

229-
nm, err := tables.NewNamesTableWithDatabase(db)
229+
nm, err := tables.NewNamesTableWithDatabase(ctx, db)
230230

231231
if err != nil {
232232
logger.Fatal("failed to create 'names' table because %s", err)
@@ -237,7 +237,7 @@ func main() {
237237

238238
if *ancestors || *all {
239239

240-
an, err := tables.NewAncestorsTableWithDatabase(db)
240+
an, err := tables.NewAncestorsTableWithDatabase(ctx, db)
241241

242242
if err != nil {
243243
logger.Fatal("failed to create 'ancestors' table because %s", err)
@@ -248,7 +248,7 @@ func main() {
248248

249249
if *concordances || *all {
250250

251-
cn, err := tables.NewConcordancesTableWithDatabase(db)
251+
cn, err := tables.NewConcordancesTableWithDatabase(ctx, db)
252252

253253
if err != nil {
254254
logger.Fatal("failed to create 'concordances' table because %s", err)
@@ -270,7 +270,7 @@ func main() {
270270

271271
geometries_opts.IndexAltFiles = *alt_files
272272

273-
gm, err := tables.NewGeometriesTableWithDatabaseAndOptions(db, geometries_opts)
273+
gm, err := tables.NewGeometriesTableWithDatabaseAndOptions(ctx, db, geometries_opts)
274274

275275
if err != nil {
276276
logger.Fatal("failed to create 'geometries' table because %s", err)
@@ -285,7 +285,7 @@ func main() {
285285

286286
if *search {
287287

288-
st, err := tables.NewSearchTableWithDatabase(db)
288+
st, err := tables.NewSearchTableWithDatabase(ctx, db)
289289

290290
if err != nil {
291291
logger.Fatal("failed to create 'search' table because %s", err)

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ module github.com/whosonfirst/go-whosonfirst-sqlite-features-index
33
go 1.16
44

55
require (
6-
github.com/tidwall/gjson v1.8.0
7-
github.com/whosonfirst/go-reader v0.5.0
6+
github.com/aaronland/go-sqlite v0.0.3
7+
github.com/tidwall/gjson v1.8.1
8+
github.com/whosonfirst/go-reader v0.7.0
89
github.com/whosonfirst/go-reader-http v0.2.2
910
github.com/whosonfirst/go-whosonfirst-geojson-v2 v0.16.3
10-
github.com/whosonfirst/go-whosonfirst-iterate v1.1.1
11+
github.com/whosonfirst/go-whosonfirst-iterate v1.2.0
1112
github.com/whosonfirst/go-whosonfirst-iterate-git v1.0.2
1213
github.com/whosonfirst/go-whosonfirst-log v0.1.0
13-
github.com/whosonfirst/go-whosonfirst-sqlite v0.1.7
14-
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.8.0
15-
github.com/whosonfirst/go-whosonfirst-sqlite-index v1.0.0
16-
github.com/whosonfirst/go-whosonfirst-uri v1.0.1
14+
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.9.0
15+
github.com/whosonfirst/go-whosonfirst-sqlite-index v1.1.0
16+
github.com/whosonfirst/go-whosonfirst-uri v1.1.0
1717
github.com/whosonfirst/warning v0.1.1
1818
)

‎go.sum

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8
1010
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
1111
github.com/aaronland/go-json-query v0.0.2 h1:cKw/DnxtGaPsClb78ONgmXPOJkqHhaBMU2RTBbPoXos=
1212
github.com/aaronland/go-json-query v0.0.2/go.mod h1:dGc7y824R93ugQMTldL7PFD/SPVGPwKdqrUJFLE/ILU=
13+
github.com/aaronland/go-json-query v0.1.0 h1:ZHtbpW8jiGYuOXKDEscWDrDjyVXZhU9Qqfi3nkyI9Ho=
14+
github.com/aaronland/go-json-query v0.1.0/go.mod h1:Mj1i+9hS3cd2Nj7qlnahcUeRC5uydPuJ/3xZGlIgBFU=
1315
github.com/aaronland/go-roster v0.0.1 h1:r1l4n1HfWvEtOXZvhfXX0Won9Xf6QJsigdUdzOtuy/M=
1416
github.com/aaronland/go-roster v0.0.1/go.mod h1:AcovpxlG1XxJxX2Fjqlm63fEIBhCjEIBV4lP87FZDmI=
1517
github.com/aaronland/go-roster v0.0.2 h1:2Fu7v4VQLRLRL/Zgr6R9S5JxsW75Ab/K88QtMVX532s=
1618
github.com/aaronland/go-roster v0.0.2/go.mod h1:AcovpxlG1XxJxX2Fjqlm63fEIBhCjEIBV4lP87FZDmI=
19+
github.com/aaronland/go-sqlite v0.0.3 h1:pa8L74JdbkmONxqLqMqZFZtHpARHM46JmX1A/hZ44KU=
20+
github.com/aaronland/go-sqlite v0.0.3/go.mod h1:b/FfLh8xBZ1dhjyehPsFli46VhGqWAz2rKR4udvTHJw=
1721
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
1822
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
1923
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
@@ -47,6 +51,7 @@ github.com/go-ini/ini v1.42.0 h1:TWr1wGj35+UiWHlBA8er89seFXxzwFn11spilrrj+38=
4751
github.com/go-ini/ini v1.42.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
4852
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
4953
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
54+
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
5055
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
5156
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
5257
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce h1:prjrVgOk2Yg6w+PflHoszQNLTUh4kaByUcEWM/9uin4=
@@ -76,6 +81,7 @@ github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK86
7681
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
7782
github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q=
7883
github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
84+
github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
7985
github.com/mattn/go-sqlite3 v2.0.2+incompatible h1:qzw9c2GNT8UFrgWNDhCTqRqYUSmu/Dav/9Z58LGpk7U=
8086
github.com/mattn/go-sqlite3 v2.0.2+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
8187
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
@@ -101,6 +107,10 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
101107
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
102108
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
103109
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
110+
github.com/psanford/sqlite3vfs v0.0.0-20210810192024-980beb1874e4 h1:Oun5zFH1CMQCKAS4hWzHX/SaysoOAhOiDqBkKj3n1/w=
111+
github.com/psanford/sqlite3vfs v0.0.0-20210810192024-980beb1874e4/go.mod h1:4CnLWpNEluUrLmUVLGEvkn0ZSEm9zdZmTtUlKRZp5Ag=
112+
github.com/psanford/sqlite3vfshttp v0.0.0-20210810192816-7ed3ddba507d h1:KihA6nWlH32n8xWltDBwUWvjWk1vbclEm2TdVUr8g4U=
113+
github.com/psanford/sqlite3vfshttp v0.0.0-20210810192816-7ed3ddba507d/go.mod h1:hQKK0GFcSapdHKElLpXRFo7SUvriHB22EuK+OQIpkuU=
104114
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
105115
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
106116
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
@@ -149,8 +159,11 @@ github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
149159
github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
150160
github.com/tidwall/gjson v1.7.2 h1:Mlc6J3RVIjBPiXounGdbdsk3WFwB195CLunMD/BtrOs=
151161
github.com/tidwall/gjson v1.7.2/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
162+
github.com/tidwall/gjson v1.7.5/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
152163
github.com/tidwall/gjson v1.8.0 h1:Qt+orfosKn0rbNTZqHYDqBrmm3UDA4KRkv70fDzG+PQ=
153164
github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
165+
github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
166+
github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
154167
github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
155168
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
156169
github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
@@ -167,12 +180,17 @@ github.com/twpayne/go-geom v1.0.5 h1:XZBfc3Wx0dj4p17ZfmzqxnU9fTTa3pY4YG5RngKsVNI
167180
github.com/twpayne/go-geom v1.0.5/go.mod h1:gO3i8BeAvZuihwwXcw8dIOWXebCzTmy3uvXj9dZG2RA=
168181
github.com/twpayne/go-geom v1.3.6 h1:O27mIXZnMYiZi0ZD8ewjs/IT/ZOFVbZHBzPjA9skdmg=
169182
github.com/twpayne/go-geom v1.3.6/go.mod h1:XTyWHR6+l9TUYONbbK4ImUTYbWDCu2ySSPrZmmiA0Pg=
183+
github.com/twpayne/go-geom v1.4.0 h1:gtI+ClrojsGDl0SXXNAwPUtPxanyodQzXg8mliV3d/w=
184+
github.com/twpayne/go-geom v1.4.0/go.mod h1:k/zktXdL+qnA6OgKsdEGUTA17jbQ2ZPTUa3CCySuGpE=
170185
github.com/twpayne/go-kml v1.0.0/go.mod h1:LlvLIQSfMqYk2O7Nx8vYAbSLv4K9rjMvLlEdUKWdjq0=
171186
github.com/twpayne/go-kml v1.5.1/go.mod h1:kz8jAiIz6FIdU2Zjce9qGlVtgFYES9vt7BTPBHf5jl4=
187+
github.com/twpayne/go-kml v1.5.2/go.mod h1:kz8jAiIz6FIdU2Zjce9qGlVtgFYES9vt7BTPBHf5jl4=
172188
github.com/twpayne/go-polyline v1.0.0/go.mod h1:ICh24bcLYBX8CknfvNPKqoTbe+eg+MX1NPyJmSBo7pU=
173189
github.com/twpayne/go-waypoint v0.0.0-20200706203930-b263a7f6e4e8/go.mod h1:qj5pHncxKhu9gxtZEYWypA/z097sxhFlbTyOyt9gcnU=
174190
github.com/whosonfirst/go-ioutil v0.0.1 h1:cCrEYen6NDvHfjzV2q4u/VB21u2kTOwDnUGRlMI8Z9o=
175191
github.com/whosonfirst/go-ioutil v0.0.1/go.mod h1:2dS1vWdAIkiHDvDF8fYyjv6k2NISmwaIjJJeEDBEdvg=
192+
github.com/whosonfirst/go-ioutil v1.0.0 h1:sYpgJx7Wsp76e7PFGa8KKQBvWQW3+HMCWSJbKdD5m14=
193+
github.com/whosonfirst/go-ioutil v1.0.0/go.mod h1:2dS1vWdAIkiHDvDF8fYyjv6k2NISmwaIjJJeEDBEdvg=
176194
github.com/whosonfirst/go-reader v0.0.2/go.mod h1:k/U2jXarXsFWC2yh63kYgKIJzTEmc60lN/ipyrdT3W4=
177195
github.com/whosonfirst/go-reader v0.1.1 h1:0fXoYQR/Yyh3PKk+9Huwoc6dCAt8l1tjg2dEShjqcFI=
178196
github.com/whosonfirst/go-reader v0.1.1/go.mod h1:w0AeU+Ojyfmxb7r+rcSYyxpCxrhxlHv+D9EgEwQsqcM=
@@ -182,6 +200,8 @@ github.com/whosonfirst/go-reader v0.2.1 h1:URhO7a2rDZizElGPy7lrWDpV1c4ceInYMGNQP
182200
github.com/whosonfirst/go-reader v0.2.1/go.mod h1:qUhz3OWefOUX/G1nzCEUzJskDjkF+l9oKPOM3K2fAJI=
183201
github.com/whosonfirst/go-reader v0.5.0 h1:nx+ai0F6JXouw+7Dln34dmYglw+3sQ6sG4JZGOJ/sqA=
184202
github.com/whosonfirst/go-reader v0.5.0/go.mod h1:4ou/wZUss2CDZp27QK5ySDc8p98GVWvUiqqmwEprjgk=
203+
github.com/whosonfirst/go-reader v0.7.0 h1:N1vovuS3mNCZUzoOYEyBh+4LoRN643zWndgUxPLrT2Q=
204+
github.com/whosonfirst/go-reader v0.7.0/go.mod h1:6byB+UfZFNLYFqgsC/EKxTnKY8ahNgGHhUJsTrv1Jig=
185205
github.com/whosonfirst/go-reader-http v0.0.2 h1:uaCFfNu5Hwr5PDicduLAB1g3y6pi6fUcLJHUKlbNdOw=
186206
github.com/whosonfirst/go-reader-http v0.0.2/go.mod h1:u34jMGXs4smJyVHqGudWoTTy8u954gHqlz9cuIr7eBk=
187207
github.com/whosonfirst/go-reader-http v0.1.0 h1:zgrfHAD5y/jWk2xdoJuGeJr6ISxO+E/GqjxQ8R+j8Do=
@@ -214,6 +234,8 @@ github.com/whosonfirst/go-whosonfirst-flags v0.4.0 h1:3qEz1v7rALk+TqVstW9DKQOWrM
214234
github.com/whosonfirst/go-whosonfirst-flags v0.4.0/go.mod h1:kewFjxBiE00SqjjIanm5DPI81SYvx93wVb3ogwV/PMk=
215235
github.com/whosonfirst/go-whosonfirst-flags v0.4.2 h1:HWjy/0MfAQMdCj4M9hi3LAITgK/D+cuDWGHP37mFeZo=
216236
github.com/whosonfirst/go-whosonfirst-flags v0.4.2/go.mod h1:kewFjxBiE00SqjjIanm5DPI81SYvx93wVb3ogwV/PMk=
237+
github.com/whosonfirst/go-whosonfirst-flags v0.4.3 h1:ef6IkgvYADL4kc750sl6i5hkReNq0Z6upLcqpK2CHLY=
238+
github.com/whosonfirst/go-whosonfirst-flags v0.4.3/go.mod h1:pL17Ryo60FH8RYaQRgfu5XnxhrNRK3x+rn03TYD6Gc8=
217239
github.com/whosonfirst/go-whosonfirst-geojson-v2 v0.11.0 h1:soP6ge/rJwv6mAWoC9sfb40bw2tjNrskd/Ry1k5LfiQ=
218240
github.com/whosonfirst/go-whosonfirst-geojson-v2 v0.11.0/go.mod h1:uriIqN/EQVo1QllqvpIcAyshnEOggPlraUYjjeyGTBg=
219241
github.com/whosonfirst/go-whosonfirst-geojson-v2 v0.11.1 h1:WKIZkzlOBgfE6AuVT8xyF+wY8kRuKkzLOULYai5EBiw=
@@ -265,6 +287,8 @@ github.com/whosonfirst/go-whosonfirst-iterate v1.1.0 h1:mirgJrwyMS7Qdle3DpHCt9go
265287
github.com/whosonfirst/go-whosonfirst-iterate v1.1.0/go.mod h1:ceLMHQ9s3naZLFcKeUvokP0Sw7/BmwuZJiaQt/mVO0I=
266288
github.com/whosonfirst/go-whosonfirst-iterate v1.1.1 h1:7J8kq86bZgO2uUEJcSW7ciWTaoMC9k5obFQ90lp7ZpQ=
267289
github.com/whosonfirst/go-whosonfirst-iterate v1.1.1/go.mod h1:ceLMHQ9s3naZLFcKeUvokP0Sw7/BmwuZJiaQt/mVO0I=
290+
github.com/whosonfirst/go-whosonfirst-iterate v1.2.0 h1:+wouZy6JPIrmLBZdFDqI1UJWthbpwGc1JRdnLbW6hIc=
291+
github.com/whosonfirst/go-whosonfirst-iterate v1.2.0/go.mod h1:MOA6QCBONVG98p8kA8HaoBEAmv83jW4SNTfNhHpP9+o=
268292
github.com/whosonfirst/go-whosonfirst-iterate-git v1.0.2 h1:UQLm7BLRy5CocgYVghdqaT/cqyLX+Z0F3uGGsZrIKhI=
269293
github.com/whosonfirst/go-whosonfirst-iterate-git v1.0.2/go.mod h1:kxsU3Q6WLRKI/UrJt13i3VZl4ucE4QaeTbDM/1j67oY=
270294
github.com/whosonfirst/go-whosonfirst-log v0.1.0 h1:mWYI5hn16uyeLxBmPsLSvYV4rQKK/cxGVhM+bC2ZoGc=
@@ -343,6 +367,8 @@ github.com/whosonfirst/go-whosonfirst-sqlite-features v0.7.0 h1:tPNRXNBKQTs4/D2x
343367
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.7.0/go.mod h1:8/vuryTxsLsPEpVgpy0n+phpIMLXFd1PiFOm395/BXg=
344368
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.8.0 h1:Vjf1DxHmJtXzCmV6qzhh8fa8pMM2Cxl3eH0Sq09MnjM=
345369
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.8.0/go.mod h1:UvQibPWuscAPqaltGOCsR6YaPwKKG/sREbOQ9+/xuuk=
370+
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.9.0 h1:d3vnD38NMsRsDlkQD0cX93k4B+EyUOJkdFcQiJC5nM4=
371+
github.com/whosonfirst/go-whosonfirst-sqlite-features v0.9.0/go.mod h1:kb7rFX9o+OlCD+iy0Jw30Rk7osOk6EIIuki0HFUFcrk=
346372
github.com/whosonfirst/go-whosonfirst-sqlite-index v0.0.1 h1:/GuAgxIHn5vZwAEDA4XUSWe7rYWZW30I4HLQRTpBeJY=
347373
github.com/whosonfirst/go-whosonfirst-sqlite-index v0.0.1/go.mod h1:5fY1ikCDhe1u0umawonTOICPzv/2CgfFT9hTAen5nsI=
348374
github.com/whosonfirst/go-whosonfirst-sqlite-index v0.1.0 h1:/tljUy2rchRC9XE4FDteNmYZYhYqxWX2uF4c61WlocU=
@@ -353,12 +379,16 @@ github.com/whosonfirst/go-whosonfirst-sqlite-index v0.2.0 h1:biGKWUogPLXmWVOn44J
353379
github.com/whosonfirst/go-whosonfirst-sqlite-index v0.2.0/go.mod h1:Z5lr3lHDAmMkexXXjFGPP4Cw356ULmsiyv0Tok6R86k=
354380
github.com/whosonfirst/go-whosonfirst-sqlite-index v1.0.0 h1:K3OtRgbp0V9QnkaRPuKoCdPSN0tucm8PVEM2tvGdRVk=
355381
github.com/whosonfirst/go-whosonfirst-sqlite-index v1.0.0/go.mod h1:00kULxxu7HUFbquvBQ3VD8VYBbEiCGMDPkFPVmSbPu8=
382+
github.com/whosonfirst/go-whosonfirst-sqlite-index v1.1.0 h1:j7OJef+FTk8pb5OnfKRZYR+HfFD6bGQzUvfTNWYz0+A=
383+
github.com/whosonfirst/go-whosonfirst-sqlite-index v1.1.0/go.mod h1:a0ratYLWlBo2MoHSfi+q+SPVB7W+EkSLpzNX+sp6FzM=
356384
github.com/whosonfirst/go-whosonfirst-uri v0.1.0 h1:JMlpam0x1hVrFBMTAPY3edIHz7azfMK8lLI2kM9BgbI=
357385
github.com/whosonfirst/go-whosonfirst-uri v0.1.0/go.mod h1:8eaDVcc4v+HHHEDaRbApdmhPwM4/JQllw2PktvZcPVs=
358386
github.com/whosonfirst/go-whosonfirst-uri v0.2.0 h1:iODHdyvW+8IXqHZTixZ/9GEZy1dVKGj6dMRg7fn0d2M=
359387
github.com/whosonfirst/go-whosonfirst-uri v0.2.0/go.mod h1:8eaDVcc4v+HHHEDaRbApdmhPwM4/JQllw2PktvZcPVs=
360388
github.com/whosonfirst/go-whosonfirst-uri v1.0.1 h1:hVEDRuW9WhqvTksDi092OO9UecX7PAMDrD47KPEqAg0=
361389
github.com/whosonfirst/go-whosonfirst-uri v1.0.1/go.mod h1:8eaDVcc4v+HHHEDaRbApdmhPwM4/JQllw2PktvZcPVs=
390+
github.com/whosonfirst/go-whosonfirst-uri v1.1.0 h1:kNYOmKSm3u2asUOeq7yXL1Q8gFKkPIl8A0qinKrGV/8=
391+
github.com/whosonfirst/go-whosonfirst-uri v1.1.0/go.mod h1:8eaDVcc4v+HHHEDaRbApdmhPwM4/JQllw2PktvZcPVs=
362392
github.com/whosonfirst/walk v0.0.0-20160802000000-c0a349674b73681a7272f5ce6ade8ea28055059f h1:hvKIIx2IuWmRtOdpDk29quD+t7GowpHZxz8bCfIGE58=
363393
github.com/whosonfirst/walk v0.0.0-20160802000000-c0a349674b73681a7272f5ce6ade8ea28055059f/go.mod h1:U/1VXxlMzNZbyylg18AzEeHkGi1RXiBCMKpaM2XR+tQ=
364394
github.com/whosonfirst/walk v0.0.0-20160803014805-c0a349674b73 h1:/43peH8y6Wg+dAgQ97swaPN8c3/M6hi8lawr1vDblzs=

‎index.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"context"
55
"errors"
66
"fmt"
7+
"github.com/aaronland/go-sqlite"
78
"github.com/tidwall/gjson"
89
"github.com/whosonfirst/go-reader"
910
"github.com/whosonfirst/go-whosonfirst-geojson-v2"
1011
"github.com/whosonfirst/go-whosonfirst-geojson-v2/feature"
1112
"github.com/whosonfirst/go-whosonfirst-iterate/emitter"
12-
"github.com/whosonfirst/go-whosonfirst-sqlite"
1313
wof_tables "github.com/whosonfirst/go-whosonfirst-sqlite-features/tables"
1414
sql_index "github.com/whosonfirst/go-whosonfirst-sqlite-index"
1515
"github.com/whosonfirst/go-whosonfirst-uri"
@@ -92,7 +92,7 @@ func SQLiteFeaturesIndexRelationsFuncWithOptions(opts *SQLiteFeaturesIndexRelati
9292

9393
cb := func(ctx context.Context, db sqlite.Database, tables []sqlite.Table, record interface{}) error {
9494

95-
geojson_t, err := wof_tables.NewGeoJSONTable()
95+
geojson_t, err := wof_tables.NewGeoJSONTable(ctx)
9696

9797
if err != nil {
9898
return err
@@ -211,7 +211,7 @@ func SQLiteFeaturesIndexRelationsFuncWithOptions(opts *SQLiteFeaturesIndexRelati
211211

212212
for _, t := range tables {
213213

214-
err = t.IndexRecord(db, record)
214+
err = t.IndexRecord(ctx, db, record)
215215

216216
if err != nil {
217217
return err

‎vendor/github.com/aaronland/go-json-query/.gitignore

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)