From 3a8283df93ca78d261f6b9bba2270e5f4a8c1174 Mon Sep 17 00:00:00 2001 From: Drew Dara-Abrams Date: Fri, 6 Oct 2023 17:01:54 -0700 Subject: [PATCH 1/2] when `agency_url` is missing, only issue a warning --- tl/gtfs_agency.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tl/gtfs_agency.go b/tl/gtfs_agency.go index b36ad61f..ba2936fb 100644 --- a/tl/gtfs_agency.go +++ b/tl/gtfs_agency.go @@ -1,12 +1,14 @@ package tl -import "github.com/interline-io/transitland-lib/tl/tt" +import ( + "github.com/interline-io/transitland-lib/tl/tt" +) // Agency agency.txt type Agency struct { AgencyID string AgencyName string `csv:",required"` - AgencyURL string `csv:",required"` + AgencyURL string AgencyTimezone string `csv:",required"` AgencyLang string AgencyPhone string @@ -29,7 +31,6 @@ func (ent *Agency) EntityKey() string { func (ent *Agency) Errors() (errs []error) { errs = append(errs, ent.BaseEntity.Errors()...) errs = append(errs, tt.CheckPresent("agency_name", ent.AgencyName)...) - errs = append(errs, tt.CheckPresent("agency_url", ent.AgencyURL)...) errs = append(errs, tt.CheckPresent("agency_timezone", ent.AgencyTimezone)...) errs = append(errs, tt.CheckTimezone("agency_timezone", ent.AgencyTimezone)...) errs = append(errs, tt.CheckURL("agency_url", ent.AgencyURL)...) @@ -39,6 +40,13 @@ func (ent *Agency) Errors() (errs []error) { return errs } +// Warnings for this entity +func (ent *Agency) Warnings() (warnings []error) { + warnings = append(warnings, ent.BaseEntity.Warnings()...) + warnings = append(warnings, tt.CheckPresent("agency_url", ent.AgencyURL)...) + return warnings +} + // Filename agency.txt func (ent *Agency) Filename() string { return "agency.txt" From 5983bec58d5785e4ea493f2f53163e06a9496b66 Mon Sep 17 00:00:00 2001 From: Drew Dara-Abrams Date: Fri, 17 Nov 2023 11:20:14 -0800 Subject: [PATCH 2/2] warning --- tl/gtfs_agency.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tl/gtfs_agency.go b/tl/gtfs_agency.go index ba2936fb..dfd20f3a 100644 --- a/tl/gtfs_agency.go +++ b/tl/gtfs_agency.go @@ -41,10 +41,10 @@ func (ent *Agency) Errors() (errs []error) { } // Warnings for this entity -func (ent *Agency) Warnings() (warnings []error) { - warnings = append(warnings, ent.BaseEntity.Warnings()...) - warnings = append(warnings, tt.CheckPresent("agency_url", ent.AgencyURL)...) - return warnings +func (ent *Agency) Warnings() (warns []error) { + warns = append(warns, ent.BaseEntity.Warnings()...) + warns = append(warns, tt.CheckPresent("agency_url", ent.AgencyURL)...) + return warns } // Filename agency.txt