Author: Adam Evyčędo <git@apiote.xyz>
unify feed names
CHANGELOG.adoc | 1 + traffic/berlin_vbb.go | 2 +- traffic/brussels_stib_mivb.go | 2 +- traffic/convert.go | 5 +---- traffic/poznan_ztm.go | 2 +-
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 84a7cef0e6662da9f0553b57d17ee84206045ae0..7bda7e63a9bd6d5ae0c711b83de175dad6c01f9a 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -46,6 +46,7 @@ * show only stops type:platform on map but if stop type:platform has a parent that has any Portals (stop type:door) -> show portals on map; button with departures leads to Activity with list of Stops in Node (parent stop type:station) * RT: trip_update.stop_time_update.schedule_relationship * request to gtfs-rt feed not if 30s passed, but if feed changed +* translate feed name == v0.3 diff --git a/traffic/berlin_vbb.go b/traffic/berlin_vbb.go index 5729110453f2ccb39f57b4bc6166d00701a21a13..3484d5479b452aadec3ab865031f360b718d7076 100644 --- a/traffic/berlin_vbb.go +++ b/traffic/berlin_vbb.go @@ -60,7 +60,7 @@ return transform.Chain(transformers.TransformerDE, transformers.TransformerPL, transformers.TransformerFR) } func (z VbbBerlin) Name() string { - return "VBB Berlin" + return "Berlin/Brandenburg VBB" } func (z VbbBerlin) Attribution() map[language.Tag]string { diff --git a/traffic/brussels_stib_mivb.go b/traffic/brussels_stib_mivb.go index 7356eec5d7b9f45bddb202724381d693859633c6..3deab2208cfeef53274e7f7c55710af5eb49249b 100644 --- a/traffic/brussels_stib_mivb.go +++ b/traffic/brussels_stib_mivb.go @@ -70,7 +70,7 @@ return transform.Chain(transformers.TransformerFR, transformers.TransformerNL) } func (z StibMivbBrussels) Name() string { - return "STIB-MIVB Brussels" + return "Brussels STIB-MIVB" } func (z StibMivbBrussels) Attribution() map[language.Tag]string { diff --git a/traffic/convert.go b/traffic/convert.go index 0de29d1336bbc86724c3dcdc4257fb8b5c623442..b5510c836411f1f36ee1b8c4d4f56ca5f6223a24 100644 --- a/traffic/convert.go +++ b/traffic/convert.go @@ -1311,7 +1311,6 @@ record, err := r.Read() if err != nil { return c, fmt.Errorf("while reading a record: %w", err) } - feedInfo.Name = record[fields["feed_publisher_name"]] feedInfo.Website = record[fields["feed_publisher_url"]] feedInfo.Language = record[fields["feed_lang"]] if defaultLanguageIndex, ok := fields["default_lang"]; ok { @@ -1345,9 +1344,7 @@ for lng, attr := range c.Feed.Description() { feedInfo.Descriptions[lng.String()] = attr } - if feedInfo.Name == "" { - feedInfo.Name = c.Feed.Name() - } + feedInfo.Name = c.Feed.Name() c.feedInfo = feedInfo diff --git a/traffic/poznan_ztm.go b/traffic/poznan_ztm.go index 3ddd8cb1787ea0a61cc5827f4825bd87e891ce40..23c4370386c52023728edae73af1622b05ca7810 100644 --- a/traffic/poznan_ztm.go +++ b/traffic/poznan_ztm.go @@ -159,7 +159,7 @@ return transformers.TransformerPL } func (z ZtmPoznan) Name() string { - return "ZTM Poznań" + return "Poznań ZTM" } func (z ZtmPoznan) Attribution() map[language.Tag]string {