snapshot: wire in pip code, compiles but untested

app/pip/app.go

@@ -0,0 +1,168 @@
+package pip
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"log"
+
+	"github.com/aws/aws-lambda-go/lambda"
+	"github.com/sfomuseum/go-flags/flagset"
+	"github.com/sfomuseum/go-flags/lookup"
+	"github.com/whosonfirst/go-whosonfirst-spatial"
+	"github.com/whosonfirst/go-whosonfirst-spatial/pip"
+	"github.com/whosonfirst/go-whosonfirst-spatial/app"
+	spatial_flags "github.com/whosonfirst/go-whosonfirst-spatial/flags"	
+)
+
+type RunOptions struct {
+	Logger  *log.Logger
+	FlagSet *flag.FlagSet
+}
+
+func Run(ctx context.Context, logger *log.Logger) error {
+
+	fs, err := DefaultFlagSet(ctx)
+
+	if err != nil {
+		return fmt.Errorf("Failed to create application flag set, %v", err)
+	}
+
+	return RunWithFlagSet(ctx, fs, logger)
+}
+
+func RunWithFlagSet(ctx context.Context, fs *flag.FlagSet, logger *log.Logger) error {
+
+	opts := &RunOptions{
+		Logger:  logger,
+		FlagSet: fs,
+	}
+
+	return RunWithOptions(ctx, opts)
+}
+
+func RunWithOptions(ctx context.Context, opts *RunOptions) error {
+
+	fs := opts.FlagSet
+	logger := opts.Logger
+
+	flagset.Parse(fs)
+
+	err := flagset.SetFlagsFromEnvVars(fs, "WHOSONFIRST")
+
+	if err != nil {
+		return err
+	}
+
+	err = spatial_flags.ValidateCommonFlags(fs)
+
+	if err != nil {
+		return err
+	}
+
+	err = spatial_flags.ValidateQueryFlags(fs)
+
+	if err != nil {
+		return err
+	}
+
+	err = spatial_flags.ValidateIndexingFlags(fs)
+
+	if err != nil {
+		return err
+	}
+
+	spatial_app, err := app.NewSpatialApplicationWithFlagSet(ctx, fs)
+
+	if err != nil {
+		return fmt.Errorf("Failed to create new spatial application, %v", err)
+	}
+
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	uris := fs.Args()
+
+	done_ch := make(chan bool)
+
+	go func() {
+
+		err := spatial_app.Iterator.IterateURIs(ctx, uris...)
+
+		if err != nil {
+			logger.Printf("Failed to iterate URIs, %v", err)
+		}
+
+		done_ch <- true
+	}()
+
+	switch mode {
+
+	case "cli":
+
+		props, err := lookup.MultiStringVar(fs, spatial_flags.PROPERTIES)
+
+		if err != nil {
+			return err
+		}
+
+		<-done_ch
+
+		req, err := pip.NewPointInPolygonRequestFromFlagSet(fs)
+
+		if err != nil {
+			return fmt.Errorf("Failed to create SPR filter, %v", err)
+		}
+
+		var rsp interface{}
+
+		pip_rsp, err := pip.QueryPointInPolygon(ctx, spatial_app, req)
+
+		if err != nil {
+			return fmt.Errorf("Failed to query, %v", err)
+		}
+
+		rsp = pip_rsp
+
+		if len(props) > 0 {
+
+			props_opts := &spatial.PropertiesResponseOptions{
+				Reader:       spatial_app.PropertiesReader,
+				Keys:         props,
+				SourcePrefix: "properties",
+			}
+
+			props_rsp, err := spatial.PropertiesResponseResultsWithStandardPlacesResults(ctx, props_opts, pip_rsp)
+
+			if err != nil {
+				return fmt.Errorf("Failed to generate properties response, %v", err)
+			}
+
+			rsp = props_rsp
+		}
+
+		enc, err := json.Marshal(rsp)
+
+		if err != nil {
+			return fmt.Errorf("Failed to marshal results, %v", err)
+		}
+
+		fmt.Println(string(enc))
+
+	case "lambda":
+
+		<-done_ch
+
+		handler := func(ctx context.Context, req *pip.PointInPolygonRequest) (interface{}, error) {
+			return pip.QueryPointInPolygon(ctx, spatial_app, req)
+		}
+
+		lambda.Start(handler)
+
+	default:
+		return fmt.Errorf("Invalid or unsupported mode '%s'", mode)
+	}
+
+	return nil
+}

app/pip/flags.go

@@ -0,0 +1,45 @@
+package pip
+
+import (
+	"context"
+	"flag"
+
+	"github.com/sfomuseum/go-flags/multi"
+	"github.com/whosonfirst/go-whosonfirst-spatial/flags"
+)
+
+const ENABLE_GEOJSON string = "enable-geojson"
+const SERVER_URI string = "server-uri"
+const MODE string = "mode"
+
+var mode string
+var server_uri string
+var enable_geojson bool
+
+var sort_uris multi.MultiString
+
+func DefaultFlagSet(ctx context.Context) (*flag.FlagSet, error) {
+
+	fs, err := flags.CommonFlags()
+
+	if err != nil {
+		return nil, err
+	}
+
+	err = flags.AppendQueryFlags(fs)
+
+	if err != nil {
+		return nil, err
+	}
+
+	err = flags.AppendIndexingFlags(fs)
+
+	if err != nil {
+		return nil, err
+	}
+
+	fs.StringVar(&mode, "mode", "cli", "Valid options are: cli")
+	fs.StringVar(&server_uri, "server-uri", "http://localhost:8080", "A valid aaronland/go-http-server URI.")
+
+	return fs, nil
+}

go.mod

@@ -4,6 +4,7 @@ go 1.22.1
 
 require (
 	github.com/aaronland/go-roster v1.0.0
+	github.com/aws/aws-lambda-go v1.46.0
 	github.com/paulmach/orb v0.11.1
 	github.com/sfomuseum/go-flags v0.10.0
 	github.com/sfomuseum/go-timings v1.2.1

go.sum

@@ -2,6 +2,8 @@ github.com/aaronland/go-json-query v0.1.4 h1:iM5GkF0VDsOeVgp0/WrDaFUB64ubJvmm+TZ
 github.com/aaronland/go-json-query v0.1.4/go.mod h1:S7V5eQko+XDPq+dfdSYub5mZI0VapVgUH2NLG0buZr4=
 github.com/aaronland/go-roster v1.0.0 h1:FRDGrTqsYySKjWnAhbBGXyeGlI/o5/t9FZYCbUmyQtI=
 github.com/aaronland/go-roster v1.0.0/go.mod h1:KIsYZgrJlAsyb9LsXSCvlqvbcCBVjCSqcQiZx42i9ro=
+github.com/aws/aws-lambda-go v1.46.0 h1:UWVnvh2h2gecOlFhHQfIPQcD8pL/f7pVCutmFl+oXU8=
+github.com/aws/aws-lambda-go v1.46.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=