Refactor campus package (#2)

* add tree output to current-complex

* add Museum type to complex def

* break up as tree methods

* move all the FindTHING methods in to discrete packages

* snapshot: move code around, rename a bunch of things

* move more code around

* work through Walk method, not sure it works yet

* make recursive/tree stuff work

* refactor how SFOId is derived for galleries and public art, still a few dupes...

* add complex.DeriveAltLookup

* update complex.AsGeoJSONLayers to use Walk methods

* update vendor deps

---------

Co-authored-by: sfomuseumbot <sfomuseumbot@localhost>

.gitignore

@@ -1,2 +1,3 @@
 *~
-bin
+bin
+*.db

Makefile

@@ -1,14 +1,16 @@
-GOMOD=vendor
+GOMOD=$(shell test -f "go.work" && echo "readonly" || echo "vendor")
+LDFLAGS=-s -w
+
 
 cli:
 	@make cli-lookup
-	go build -mod $(GOMOD) -o bin/supersede-gallery cmd/supersede-gallery/main.go
+	go build -mod $(GOMOD) -ldflags="$(LDFLAGS)" -o bin/supersede-gallery cmd/supersede-gallery/main.go
 
 cli-lookup:
-	go build -mod $(GOMOD) -o bin/lookup cmd/lookup/main.go
+	go build -mod $(GOMOD) -ldflags="$(LDFLAGS)" -o bin/lookup cmd/lookup/main.go
 
 cli-complex:
-	go build -mod $(GOMOD) --tags json1 -o bin/current-complex cmd/current-complex/main.go
+	go build -mod $(GOMOD) -ldflags="$(LDFLAGS)" --tags json1 -o bin/current-complex cmd/current-complex/main.go
 
 compile:
 	@make compile-gates
@@ -17,10 +19,10 @@ compile:
 	@make cli-lookup
 
 compile-gates:
-	go run -mod $(GOMOD) cmd/compile-gates-data/main.go
+	go run -mod $(GOMOD) -ldflags="$(LDFLAGS)" cmd/compile-gates-data/main.go
 
 compile-terminals:
-	go run -mod $(GOMOD) cmd/compile-terminals-data/main.go
+	go run -mod $(GOMOD) -ldflags="$(LDFLAGS)" cmd/compile-terminals-data/main.go
 
 compile-galleries:
-	go run -mod $(GOMOD) cmd/compile-galleries-data/main.go
+	go run -mod $(GOMOD) -ldflags="$(LDFLAGS)" cmd/compile-galleries-data/main.go

campus/boardingarea.go

@@ -0,0 +1,283 @@
+package campus
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"io"
+	"log/slog"
+	"strings"
+
+	"github.com/tidwall/gjson"
+	"github.com/whosonfirst/go-reader"
+)
+
+// type BoardingArea is a lightweight data structure to represent boarding areas at SFO with pointers its descendants.
+type BoardingArea struct {
+	Element          `json:",omitempty"`
+	WhosOnFirstId    int64              `json:"id"`
+	SFOId            string             `json:"sfo:id"`
+	Gates            []*Gate            `json:"gates,omitempty"`
+	Checkpoints      []*Checkpoint      `json:"checkpoints,omitempty"`
+	Galleries        []*Gallery         `json:"galleries,omitempty"`
+	PublicArt        []*PublicArt       `json:"publicart,omitempty"`
+	ObservationDecks []*ObservationDeck `json:"observationdecks,omitempty"`
+	Museums          []*Museum          `json:"museums,omitempty"` // for example AML
+}
+
+func (b *BoardingArea) Id() int64 {
+	return b.WhosOnFirstId
+}
+
+func (b *BoardingArea) AltId() string {
+	return b.SFOId
+}
+
+func (b *BoardingArea) Placetype() string {
+	return "boardingarea"
+}
+
+func (b *BoardingArea) Walk(ctx context.Context, cb ElementCallbackFunc) error {
+
+	for _, g := range b.Gates {
+
+		err := cb(ctx, g)
+
+		if err != nil {
+			return nil
+		}
+	}
+
+	for _, cp := range b.Checkpoints {
+
+		err := cb(ctx, cp)
+
+		if err != nil {
+			return nil
+		}
+	}
+
+	for _, g := range b.Galleries {
+
+		err := cb(ctx, g)
+
+		if err != nil {
+			return nil
+		}
+	}
+
+	for _, pa := range b.PublicArt {
+
+		err := cb(ctx, pa)
+
+		if err != nil {
+			return nil
+		}
+	}
+
+	for _, od := range b.ObservationDecks {
+
+		err := cb(ctx, od)
+
+		if err != nil {
+			return nil
+		}
+	}
+
+	for _, m := range b.Museums {
+
+		err := cb(ctx, m)
+
+		if err != nil {
+			return nil
+		}
+	}
+
+	return nil
+}
+
+func (b *BoardingArea) AsTree(ctx context.Context, r reader.Reader, wr io.Writer, indent int) error {
+
+	return elementTree(ctx, b, r, wr, indent)
+
+	b_id := b.WhosOnFirstId
+	fmt.Fprintf(wr, "%s (boardingarea) %d %s\n", strings.Repeat("\t", indent), b_id, name(ctx, r, b_id))
+
+	for _, g := range b.Gates {
+
+		err := g.AsTree(ctx, r, wr, indent+1)
+
+		if err != nil {
+			return fmt.Errorf("Failed to encode gate as tree, %w", err)
+		}
+	}
+
+	for _, c := range b.Checkpoints {
+
+		err := c.AsTree(ctx, r, wr, indent+1)
+
+		if err != nil {
+			return fmt.Errorf("Failed to encode checkpoint as tree, %w", err)
+		}
+	}
+
+	for _, g := range b.Galleries {
+
+		err := g.AsTree(ctx, r, wr, indent+1)
+
+		if err != nil {
+			return fmt.Errorf("Failed to encode gallery as tree, %w", err)
+		}
+	}
+
+	for _, p := range b.PublicArt {
+
+		err := p.AsTree(ctx, r, wr, indent+1)
+
+		if err != nil {
+			return fmt.Errorf("Failed to encode public art as tree, %w", err)
+		}
+	}
+
+	for _, o := range b.ObservationDecks {
+
+		err := o.AsTree(ctx, r, wr, indent+1)
+
+		if err != nil {
+			return fmt.Errorf("Failed to encode observation deck as tree, %w", err)
+		}
+	}
+
+	for _, m := range b.Museums {
+
+		err := m.AsTree(ctx, r, wr, indent+1)
+
+		if err != nil {
+			return fmt.Errorf("Failed to encode museum as tree, %w", err)
+		}
+	}
+
+	return nil
+
+}
+
+func DeriveBoardingAreas(ctx context.Context, db *sql.DB, id int64) ([]*BoardingArea, error) {
+
+	slog.Debug("Derive boarding areas", "parent", id)
+
+	boardingarea_ids, err := findChildIDs(ctx, db, id, "boardingarea")
+
+	if err != nil {
+		return nil, fmt.Errorf("Failed to find any child records (boarding areas areas) for %d, %v", id, err)
+	}
+
+	boardingareas := make([]*BoardingArea, 0)
+
+	for _, b_id := range boardingarea_ids {
+
+		gates, err := DeriveGates(ctx, db, b_id)
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to derive gates for boarding area %d, %w", b_id, err)
+		}
+
+		checkpoints, err := DeriveCheckpoints(ctx, db, b_id)
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to derive check points for boarding area %d, %w", b_id, err)
+		}
+
+		galleries, err := DeriveGalleries(ctx, db, b_id)
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to derive galleries for boarding area %d, %w", b_id, err)
+		}
+
+		publicart, err := DerivePublicArt(ctx, db, b_id)
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to derive public art for boarding area %d, %w", b_id, err)
+		}
+
+		observation_decks, err := DeriveObservationDecks(ctx, db, b_id)
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to derive observation decks for boarding area %d, %w", b_id, err)
+		}
+
+		museums, err := DeriveMuseums(ctx, db, b_id)
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to derive museums for boarding area %d, %w", b_id, err)
+		}
+
+		b_body, err := loadFeatureWithDBAndChecks(ctx, db, b_id)
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to load feature for %d, %w", b_id, err)
+		}
+
+		if b_body == nil {
+			continue
+		}
+
+		var sfoid string
+
+		rsp := gjson.GetBytes(b_body, "properties.sfo:id")
+
+		if rsp.Exists() {
+
+			sfoid = rsp.String()
+
+		} else {
+
+			rsp := gjson.GetBytes(b_body, "properties.sfo:building_id")
+
+			if !rsp.Exists() {
+				return nil, fmt.Errorf("Missing sfo:building_id for boarding area %d", b_id)
+			}
+
+			sfoid = rsp.String()
+		}
+
+		name_rsp := gjson.GetBytes(b_body, "properties.wof:name")
+		inception_rsp := gjson.GetBytes(b_body, "properties.edtf:inception")
+		cessation_rsp := gjson.GetBytes(b_body, "properties.edtf:cessation")
+
+		slog.Debug("Add boardinarea", "sfo id", sfoid, "id", b_id, "name", name_rsp.String(), "inception", inception_rsp.String(), "cessation", cessation_rsp.String())
+
+		area := &BoardingArea{
+			WhosOnFirstId: b_id,
+			SFOId:         sfoid,
+		}
+
+		if len(gates) > 0 {
+			area.Gates = gates
+		}
+
+		if len(checkpoints) > 0 {
+			area.Checkpoints = checkpoints
+		}
+
+		if len(galleries) > 0 {
+			area.Galleries = galleries
+		}
+
+		if len(publicart) > 0 {
+			area.PublicArt = publicart
+		}
+
+		if len(observation_decks) > 0 {
+			area.ObservationDecks = observation_decks
+		}
+
+		if len(museums) > 0 {
+			area.Museums = museums
+		}
+
+		boardingareas = append(boardingareas, area)
+	}
+
+	return boardingareas, nil
+
+}