Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:CxAalto/gtfspy into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jweckstr committed Sep 4, 2017
2 parents 4dcaa58 + d574c31 commit 1802b8e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion gtfspy/mapviz.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ def plot_routes_as_stop_to_stop_network(from_lats, from_lons, to_lats, to_lons,
assert c is not None
if zorders is None:
zorders = len(list(from_lats))*[1]

if line_labels is None:
line_labels = len(list(from_lats))*[None]

Expand Down Expand Up @@ -178,6 +177,7 @@ def plot_routes_as_stop_to_stop_network(from_lats, from_lons, to_lats, to_lons,
line_labels):



if color_attribute is None:
color = c
else:
Expand Down Expand Up @@ -207,6 +207,7 @@ def plot_routes_as_stop_to_stop_network(from_lats, from_lons, to_lats, to_lons,
for i in unique_types:
line = mlines.Line2D([], [], color=ROUTE_TYPE_TO_COLOR[i], markersize=15,
label=ROUTE_TYPE_TO_SHORT_DESCRIPTION[i])

lines.append(line)
handles = lines
labels = [h.get_label() for h in handles]
Expand Down
2 changes: 1 addition & 1 deletion gtfspy/stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ def departure_stops(gtfs, st, et):
df = gtfs.add_coordinates_to_df(df)
return df


def get_vehicle_hours_by_type(gtfs, route_type):
"""
Return the sum of vehicle hours in a particular day by route type.
Expand Down

0 comments on commit 1802b8e

Please sign in to comment.