Skip to content

Commit 55b1fcb

Browse files
authoredNov 22, 2024
Merge pull request #208 from gjohansson-ST/gj-20241122-7
Add OfficialLocationName to station search
2 parents a1711bb + 1bcb78e commit 55b1fcb

File tree

1 file changed

+27
-4
lines changed

1 file changed

+27
-4
lines changed
 

‎pytrafikverket/trafikverket_train.py

+27-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ async def async_get_train_station_from_signature(
3737
"TrainStation",
3838
"1.5",
3939
"rail.infrastructure",
40-
["AdvertisedLocationName", "LocationSignature", "Advertised", "Deleted"],
40+
[
41+
"AdvertisedLocationName",
42+
"LocationSignature",
43+
"Advertised",
44+
"Deleted",
45+
"OfficialLocationName",
46+
],
4147
[
4248
FieldFilter(FilterOperation.EQUAL, "LocationSignature", signature),
4349
],
@@ -71,10 +77,27 @@ async def async_search_train_stations(
7177
"TrainStation",
7278
"1.5",
7379
"rail.infrastructure",
74-
["AdvertisedLocationName", "LocationSignature", "Advertised", "Deleted"],
7580
[
76-
FieldFilter(
77-
FilterOperation.LIKE, "AdvertisedLocationName", location_name
81+
"AdvertisedLocationName",
82+
"LocationSignature",
83+
"Advertised",
84+
"Deleted",
85+
"OfficialLocationName",
86+
],
87+
[
88+
OrFilter(
89+
[
90+
FieldFilter(
91+
FilterOperation.LIKE,
92+
"AdvertisedLocationName",
93+
location_name,
94+
),
95+
FieldFilter(
96+
FilterOperation.LIKE,
97+
"OfficialLocationName",
98+
location_name,
99+
),
100+
]
78101
),
79102
FieldFilter(FilterOperation.EQUAL, "Advertised", "true"),
80103
],

0 commit comments

Comments
 (0)