From cd6df95d69be865d6503b6397c3c7236da637eb3 Mon Sep 17 00:00:00 2001 From: David Bailey Date: Fri, 9 Oct 2015 10:30:40 -0700 Subject: [PATCH] swtiched back to amtrak from metro-la --- speeds.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/speeds.py b/speeds.py index 8557d46..fc32c91 100644 --- a/speeds.py +++ b/speeds.py @@ -41,20 +41,20 @@ def __getitem__(self, name): return getattr(self, name) # amtrak = gtfstk.feed.Feed(expanduser('~/Desktop/la-metro_20101211_0848.zip')) #http://www.gtfs-data-exchange.com/agency/la-metro/ -# amtrak = getFeed('http://gtfs.s3.amazonaws.com/amtrak_20140723_0354.zip') -amtrak = getFeed('http://gtfs.s3.amazonaws.com/la-metro_20101211_0848.zip') -amtrak.trips.set_index('route_id', inplace=True) -amtrak.trips.sort_index(inplace=True) -amtrak.stop_times.set_index('stop_headsign', inplace=True) -amtrak.stop_times.sort_index(inplace=True) +amtrak = getFeed('http://gtfs.s3.amazonaws.com/amtrak_20140723_0354.zip') amtrak.stops.set_index('stop_id', inplace=True) amtrak.stops.sort_index(inplace=True) +#amtrak = getFeed('http://gtfs.s3.amazonaws.com/la-metro_20101211_0848.zip') +#amtrak.stop_times.set_index('stop_headsign', inplace=True) +#amtrak.stop_times.sort_index(inplace=True) +#amtrak.trips.set_index('route_id', inplace=True) +#amtrak.trips.sort_index(inplace=True) def getJSONs(route,direction): -# trip_ids = amtrak.trips[(amtrak.trips['route_id'].astype(str) == str(route).replace('%20', ' ')) & (amtrak.trips['direction_id'] == int(direction))]['trip_id'] -# stops = pandas.merge(pandas.DataFrame(trip_ids),amtrak.stop_times) - trip_ids = amtrak.trips.loc[str(route).replace('%20', ' ')]['trip_id'] - stops = pandas.merge(pandas.DataFrame(trip_ids),amtrak.stop_times.loc[str(direction).replace('%20',' ')]) + trip_ids = amtrak.trips[(amtrak.trips['route_id'].astype(str) == str(route).replace('%20', ' ')) & (amtrak.trips['direction_id'] == int(direction))]['trip_id'] + stops = pandas.merge(pandas.DataFrame(trip_ids),amtrak.stop_times) +# trip_ids = amtrak.trips.loc[str(route).replace('%20', ' ')]['trip_id'] +# stops = pandas.merge(pandas.DataFrame(trip_ids),amtrak.stop_times.loc[str(direction).replace('%20',' ')]) trains = stops.groupby('trip_id') stop_ids = [] for index, train in trains: