Merge branch 'master' of github.com:paultag/python-charlie

paultag · Mar 17, 2012 · df1baac · df1baac
2 parents 9c57251 + 8a70bef
commit df1baac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/charlie/__init__.py b/charlie/__init__.py
@@ -33,7 +33,7 @@ def get_station_by_stop( platform ):
 _apiurl     = "http://developer.mbta.com/Data/"
 # _apiurl     = "http://tag.pault.ag/charlie-fake/"
 # _apiurl      = "http://localhost/"
-_datadir    = "/home/tag/dev/local/python-charlie/data"
+_datadir    = "/usr/share/charlie/data"
 _csvfile    = _datadir + "/station.data.csv"
 
 def refresh():

diff --git a/examples/events b/examples/events
@@ -16,7 +16,8 @@ while True:
         event = t.getMostCloseEvent()
         try:
             if lkloc[train] != event["PlatformKey"]:
-                print "Train event: %s" % train
+                print "Train event: %s at %s" % ( train, 
+                    charlie.get_station_by_stop( event["PlatformKey"] ).name )
         except KeyError:
             print "New Train: %s" % train
         lkloc[train] = event["PlatformKey"]