From 7360a9d2e11b7ed59becf26f3ca54a442f914a27 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Mon, 23 Mar 2026 15:47:48 -0700 Subject: [PATCH] Don't crash if the signal hos no address --- platform/signal.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/platform/signal.go b/platform/signal.go index ffeff2c9..3665f8d3 100644 --- a/platform/signal.go +++ b/platform/signal.go @@ -162,13 +162,13 @@ func SignalList(ctx context.Context, user User, limit int) ([]*Signal, error) { "COALESCE(signal.report_id, 0) AS \"report.id\"", "signal.species AS species", "signal.type_ AS type", - "address.country AS \"address.country\"", - "address.locality AS \"address.locality\"", - "address.number_ AS \"address.number\"", - "address.postal_code AS \"address.postal_code\"", - "address.region AS \"address.region\"", - "address.street AS \"address.street\"", - "address.unit AS \"address.unit\"", + "COALESCE(address.country, '') AS \"address.country\"", + "COALESCE(address.locality, '') AS \"address.locality\"", + "COALESCE(address.number_, '') AS \"address.number\"", + "COALESCE(address.postal_code, '') AS \"address.postal_code\"", + "COALESCE(address.region, '') AS \"address.region\"", + "COALESCE(address.street, '') AS \"address.street\"", + "COALESCE(address.unit, '') AS \"address.unit\"", // This will work great, up until we add polygons to signal "ST_Y(signal.location) AS \"location.latitude\"", "ST_X(signal.location) AS \"location.longitude\"", @@ -231,6 +231,9 @@ func SignalList(ctx context.Context, user User, limit int) ([]*Signal, error) { row.Pool = nil row.Report = report_map[row.Report.ID] } + if row.Address.Street == "" { + row.Address = nil + } } return rows, nil }