Author: Adam Evyčędo <git@apiote.xyz>
rename traffic.Item to Queryable
api/api.go | 6 +++--- server/router.go | 10 +++++----- traffic/structs.go | 22 ++--------------------
diff --git a/api/api.go b/api/api.go index 55a8640c69154d8ae4e52831b53109050183c7eb..727a03ce1529eaedbed856a6281cff027269d4df 100644 --- a/api/api.go +++ b/api/api.go @@ -251,7 +251,7 @@ Vehicles: v, }, nil*/ } -func CreateSuccessQueryables(items []traffic.Item, context traffic.Context, t *traffic.Traffic, other QueryablesResponse, sortByDistance bool) (QueryablesResponse, error) { +func CreateSuccessQueryables(items []traffic.Queryable, context traffic.Context, t *traffic.Traffic, other QueryablesResponse, sortByDistance bool) (QueryablesResponse, error) { success := QueryablesResponseV1{ Queryables: []QueryableV1{}, } @@ -271,7 +271,7 @@ } return success, nil } -func CreateSuccessQueryablesV2(query string, items []traffic.Item, context traffic.Context, t *traffic.Traffic, other QueryablesResponse, sortByDistance bool) (QueryablesResponse, error) { +func CreateSuccessQueryablesV2(query string, items []traffic.Queryable, context traffic.Context, t *traffic.Traffic, other QueryablesResponse, sortByDistance bool) (QueryablesResponse, error) { success := QueryablesResponseV2{ Queryables: []QueryableV2{}, } @@ -299,7 +299,7 @@ } return success, nil } -func CreateSuccessQueryablesV3(query string, items []traffic.Item, context traffic.Context, t *traffic.Traffic, other QueryablesResponse, sortByDistance bool) (QueryablesResponse, error) { +func CreateSuccessQueryablesV3(query string, items []traffic.Queryable, context traffic.Context, t *traffic.Traffic, other QueryablesResponse, sortByDistance bool) (QueryablesResponse, error) { success := QueryablesResponseDev{ Queryables: []QueryableV3{}, } diff --git a/server/router.go b/server/router.go index 92af52952bf75359bda9d522c766d7ec73276352..e6f78b453103d9f1415688a01ec1ae673c52be00 100644 --- a/server/router.go +++ b/server/router.go @@ -228,7 +228,7 @@ stops, err := traffic.GetStopsNear(location, context, t) if err != nil { return fmt.Errorf("while getting near stops: %w", err) } - items := []traffic.Item{} + items := []traffic.Queryable{} for _, stop := range stops { items = append(items, stop) } @@ -254,11 +254,11 @@ return fmt.Errorf("while getting stop: %w", err) } switch accept { case 0: - queryablesSuccess, err = api.CreateSuccessQueryablesV3(query, []traffic.Item{stop}, context, t, queryablesSuccess, false) + queryablesSuccess, err = api.CreateSuccessQueryablesV3(query, []traffic.Queryable{stop}, context, t, queryablesSuccess, false) case 1: - queryablesSuccess, err = api.CreateSuccessQueryables([]traffic.Item{stop}, context, t, queryablesSuccess, false) + queryablesSuccess, err = api.CreateSuccessQueryables([]traffic.Queryable{stop}, context, t, queryablesSuccess, false) case 2: - queryablesSuccess, err = api.CreateSuccessQueryablesV2(query, []traffic.Item{stop}, context, t, queryablesSuccess, false) + queryablesSuccess, err = api.CreateSuccessQueryablesV2(query, []traffic.Queryable{stop}, context, t, queryablesSuccess, false) } if err != nil { return fmt.Errorf("while creating stopsSuccess from code: %w", err) @@ -273,7 +273,7 @@ stops, err2 := traffic.QueryStops(query, context, t) if err1 != nil && err2 != nil { return fmt.Errorf("while querying stops and lines: %w", errors.Join(err1, err2)) } - items := []traffic.Item{} + items := []traffic.Queryable{} for _, line := range lines { items = append(items, line) } diff --git a/traffic/structs.go b/traffic/structs.go index 6f33ff3997a3c1d24735c74695d31a7ad9db4b73..da47daf22b59f9e9932f8eaf29f366eab88938f7 100644 --- a/traffic/structs.go +++ b/traffic/structs.go @@ -141,28 +141,10 @@ func (l Line) IsItem() {} type Shape struct { // todo(BAF11) - Points []string // OLC + Points []Position } -/*type Schedule struct { - ScheduleID string - Weekdays uint8 - StartDate string - EndDate string -}*/ - -/*type StopOrder struct { - TripOffset uint - Order int - TripID string -}*/ - -/*type ChangeOption struct { - LineName string - Headsign string -}*/ - -type Item interface { // todo(BAF12) name: ‘query-able’ eg. +type Queryable interface { IsItem() DisplayName() string }