Skip to content
This repository was archived by the owner on Jun 29, 2023. It is now read-only.

Commit 9108e22

Browse files
committed
Merge branch 'master' of github.com:leftshift/python_mvg_api
2 parents ed211fb + e544376 commit 9108e22

File tree

1 file changed

+45
-43
lines changed

1 file changed

+45
-43
lines changed

mvg_api/__init__.py

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,27 @@ def get_nearby_stations(lat, lon):
5757
5858
[
5959
{
60-
'lines':
61-
{
62-
'nachtbus': [],
63-
'ubahn': ['2', '5', '7'],
64-
'tram': [],
65-
'sbahn': [],
66-
'otherlines': [],
67-
'nachttram': [],
68-
'bus': []
69-
},
70-
'hasLiveData': True,
71-
'place': 'München',
72-
'products': ['BUS', 'TRAM', 'UBAHN', 'SBAHN'],
60+
'type': 'station',
61+
'latitude': 48.12046,
62+
'longitude': 11.61869,
7363
'id': 1060,
74-
'type': 'nearbystation',
64+
'place': 'München',
7565
'name': 'Innsbrucker Ring',
66+
'hasLiveData': True,
7667
'hasZoomData': True,
77-
'distance': 59,
78-
'longitude': 11.619138,
79-
'latitude': 48.120408
80-
},
68+
'products': ['UBAHN'],
69+
'aliases': 'Muenchen Munchen',
70+
'link': 'IR',
71+
'lines': {
72+
'tram': [],
73+
'nachttram': [],
74+
'sbahn': [],
75+
'ubahn': [],
76+
'bus': [],
77+
'nachtbus': [],
78+
'otherlines': []
79+
}
80+
},
8181
]
8282
8383
"""
@@ -115,26 +115,26 @@ def get_locations(query):
115115
116116
[
117117
{
118-
'lines':
119-
{
120-
'nachtbus': [],
121-
'ubahn': ['2', '5', '7'],
122-
'tram': [],
123-
'sbahn': [],
124-
'otherlines': [],
125-
'nachttram': [],
126-
'bus': []
127-
},
128-
'hasLiveData': True,
129-
'place': 'München',
130-
'products': ['u'],
118+
'type': 'station',
119+
'latitude': 48.12046,
120+
'longitude': 11.61869,
131121
'id': 1060,
132-
'type': 'nearbystation',
122+
'place': 'München',
133123
'name': 'Innsbrucker Ring',
124+
'hasLiveData': True,
134125
'hasZoomData': True,
135-
'distance': 59,
136-
'longitude': 11.619138,
137-
'latitude': 48.120408
126+
'products': ['UBAHN'],
127+
'aliases': 'Muenchen Munchen',
128+
'link': 'IR',
129+
'lines': {
130+
'tram': [],
131+
'nachttram': [],
132+
'sbahn': [],
133+
'ubahn': [],
134+
'bus': [],
135+
'nachtbus': [],
136+
'otherlines': []
137+
}
138138
},
139139
]
140140
@@ -180,6 +180,8 @@ def get_route(start, dest,
180180
the desired time of arrival.
181181
max_walk_time_to_start, max_walk_time_to_dest : int, optional
182182
Maximum time of walking in minutes required to reach the start/dest.
183+
changeLimit : int, optional
184+
Specifies the maximum amount of changes.
183185
"""
184186
url = routing_url
185187
options = []
@@ -239,15 +241,15 @@ def get_departures(station_id):
239241
240242
[
241243
{
242-
'departureTimeMinutes': 0,
243-
'destination': 'Laimer Platz',
244-
'sev': False,
245-
'departureId': 1188266868,
244+
'departureTime': 1571923180000,
245+
'product': 'UBAHN',
246+
'label': 'U2',
247+
'destination': 'Messestadt Ost',
246248
'live': True,
247-
'departureTime': 1478644495000,
248-
'lineBackgroundColor': '#b78730',
249-
'label': '5',
250-
'product': 'u'
249+
'lineBackgroundColor': '#dd3d4d',
250+
'departureId': 1152101303,
251+
'sev': False,
252+
'departureTimeMinutes': 0
251253
},
252254
]
253255

0 commit comments

Comments
 (0)