Skip to content

Commit

Permalink
update vendor deps; strip debugging from binary tools
Browse files Browse the repository at this point in the history
  • Loading branch information
sfomuseumbot committed Mar 17, 2023
1 parent 11d7dc1 commit e90b966
Show file tree
Hide file tree
Showing 116 changed files with 21,975 additions and 523 deletions.
35 changes: 19 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
.PHONY: cli

GOMOD=vendor

cli:
go build -mod vendor -o bin/wof-assign-geometry cmd/wof-assign-geometry/main.go
go build -mod vendor -o bin/wof-assign-parent cmd/wof-assign-parent/main.go
go build -mod vendor -o bin/wof-exportify cmd/wof-exportify/main.go
go build -mod vendor -o bin/wof-create cmd/wof-create/main.go
go build -mod vendor -o bin/wof-deprecate cmd/wof-deprecate/main.go
go build -mod vendor -o bin/wof-cessate cmd/wof-cessate/main.go
go build -mod vendor -o bin/wof-superseded-by cmd/wof-superseded-by/main.go
go build -mod vendor -o bin/wof-ensure-properties cmd/wof-ensure-properties/main.go
go build -mod vendor -o bin/wof-deprecate-and-supersede cmd/wof-deprecate-and-supersede/main.go
go build -mod vendor -o bin/wof-merge-featurecollection cmd/wof-merge-featurecollection/main.go
go build -mod vendor -o bin/wof-supersede-with-parent cmd/wof-supersede-with-parent/main.go
go build -mod vendor -o bin/wof-as-featurecollection cmd/wof-as-featurecollection/main.go
go build -mod vendor -o bin/wof-as-jsonl cmd/wof-as-jsonl/main.go
go build -mod vendor -o bin/wof-rename-property cmd/wof-rename-property/main.go
go build -mod vendor -o bin/wof-remove-properties cmd/wof-remove-properties/main.go
go build -mod vendor -o bin/wof-clone-feature cmd/wof-clone-feature/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-assign-geometry cmd/wof-assign-geometry/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-assign-parent cmd/wof-assign-parent/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-exportify cmd/wof-exportify/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-create cmd/wof-create/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-deprecate cmd/wof-deprecate/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-cessate cmd/wof-cessate/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-superseded-by cmd/wof-superseded-by/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-ensure-properties cmd/wof-ensure-properties/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-deprecate-and-supersede cmd/wof-deprecate-and-supersede/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-merge-featurecollection cmd/wof-merge-featurecollection/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-supersede-with-parent cmd/wof-supersede-with-parent/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-as-featurecollection cmd/wof-as-featurecollection/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-as-jsonl cmd/wof-as-jsonl/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-rename-property cmd/wof-rename-property/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-remove-properties cmd/wof-remove-properties/main.go
go build -mod $(GOMOD) -ldflags="-s -w" -o bin/wof-clone-feature cmd/wof-clone-feature/main.go
6 changes: 5 additions & 1 deletion cmd/wof-create/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ func main() {
log.Fatalf("Failed to create new spatial database for '%s', %v", *spatial_database_uri, err)
}

resolver, err := hierarchy.NewPointInPolygonHierarchyResolver(ctx, spatial_db, nil)
resolver_opts := &hierarchy.PointInPolygonHierarchyResolverOptions{
Database: spatial_db,
}

resolver, err := hierarchy.NewPointInPolygonHierarchyResolver(ctx, resolver_opts)

if err != nil {
log.Fatalf("Failed to create new hierarchy resolver, %v", err)
Expand Down
2 changes: 1 addition & 1 deletion cmd/wof-export-iterator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func main() {
if !has_changed {
return nil
}

buf_wr.Flush()
br := bytes.NewReader(buf.Bytes())

Expand Down
21 changes: 12 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/aaronland/go-json-query v0.1.3
github.com/paulmach/orb v0.8.0
github.com/paulmach/orb v0.9.0
github.com/sfomuseum/go-edtf v1.1.1
github.com/sfomuseum/go-flags v0.10.0
github.com/tidwall/gjson v1.14.4
Expand All @@ -14,11 +14,11 @@ require (
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.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-whosonfirst-spatial v0.5.6
github.com/whosonfirst/go-whosonfirst-spatial-hierarchy v0.6.0
github.com/whosonfirst/go-whosonfirst-spatial-sqlite v0.6.5
github.com/whosonfirst/go-whosonfirst-uri v1.3.0
github.com/whosonfirst/go-whosonfirst-writer/v3 v3.1.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 All @@ -27,6 +27,7 @@ require (
require (
github.com/aaronland/go-artisanal-integers v0.9.1 // indirect
github.com/aaronland/go-brooklynintegers-api v1.2.6 // indirect
github.com/aaronland/go-log/v2 v2.0.0 // indirect
github.com/aaronland/go-pagination v0.2.0 // indirect
github.com/aaronland/go-pagination-sql v0.2.0 // indirect
github.com/aaronland/go-pool/v2 v2.0.0 // indirect
Expand All @@ -40,6 +41,7 @@ require (
github.com/aaronland/go-uid-whosonfirst v0.0.2 // indirect
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/dominikbraun/graph v0.16.1 // indirect
github.com/g8rswimmer/error-chain v1.0.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
Expand All @@ -58,16 +60,17 @@ require (
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.26 // indirect
github.com/whosonfirst/go-whosonfirst-flags v0.4.4 // indirect
github.com/whosonfirst/go-whosonfirst-flags v0.5.1 // indirect
github.com/whosonfirst/go-whosonfirst-format v0.4.1 // indirect
github.com/whosonfirst/go-whosonfirst-id v1.2.0 // indirect
github.com/whosonfirst/go-whosonfirst-names v0.1.0 // indirect
github.com/whosonfirst/go-whosonfirst-placetypes v0.4.2 // indirect
github.com/whosonfirst/go-whosonfirst-placetypes v0.7.0 // indirect
github.com/whosonfirst/go-whosonfirst-sources v0.1.0 // indirect
github.com/whosonfirst/go-whosonfirst-spr/v2 v2.3.3 // indirect
github.com/whosonfirst/go-whosonfirst-spr/v2 v2.3.6 // indirect
github.com/whosonfirst/go-whosonfirst-sqlite-features/v2 v2.0.0 // indirect
github.com/whosonfirst/go-whosonfirst-sqlite-spr/v2 v2.0.0 // indirect
github.com/whosonfirst/walk v0.0.1 // indirect
go.mongodb.org/mongo-driver v1.11.1 // indirect
go.uber.org/ratelimit v0.2.0 // indirect
golang.org/x/mod v0.3.0 // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
Expand Down
Loading

0 comments on commit e90b966

Please sign in to comment.