PyTransportNSWv2 0.7.1__tar.gz → 0.8.0__tar.gz

{PyTransportNSWv2-0.7.1 → PyTransportNSWv2-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.7.1
+Version: 0.8.0
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-0.7.1 → PyTransportNSWv2-0.8.0}/PyTransportNSWv2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.7.1
+Version: 0.8.0
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-0.7.1 → PyTransportNSWv2-0.8.0}/TransportNSWv2/TransportNSWv2.py

@@ -15,6 +15,7 @@ ATTR_DUE_IN = 'due'
 ATTR_ORIGIN_STOP_ID = 'origin_stop_id'
 ATTR_ORIGIN_NAME = 'origin_name'
 ATTR_DEPARTURE_TIME = 'departure_time'
+ATTR_DELAY = 'delay'
 
 ATTR_DESTINATION_STOP_ID = 'destination_stop_id'
 ATTR_DESTINATION_NAME = 'destination_name'
@@ -58,6 +59,7 @@ class TransportNSWv2(object):
             ATTR_ORIGIN_STOP_ID : 'n/a',
             ATTR_ORIGIN_NAME : 'n/a',
             ATTR_DEPARTURE_TIME : 'n/a',
+            ATTR_DELAY : 'n/a',
             ATTR_DESTINATION_STOP_ID : 'n/a',
             ATTR_DESTINATION_NAME : 'n/a',
             ATTR_ARRIVAL_TIME : 'n/a',
@@ -97,6 +99,37 @@ class TransportNSWv2(object):
         itdDate = now_plus_wait.strftime('%Y%m%d')
         itdTime = now_plus_wait.strftime('%H%M')
 
+        # First, check if the source and dest stops are valid
+        stop_list = [name_origin, name_destination]
+        auth = 'apikey ' + self.api_key
+        header = {'Accept': 'application/json', 'Authorization': auth}
+
+        for stop in stop_list:
+            url = \
+                'https://api.transport.nsw.gov.au/v1/tp/stop_finder?' \
+                'outputFormat=rapidJSON&coordOutputFormat=EPSG%3A4326' \
+                '&type_sf=stop&name_sf=' + stop + \
+                '&TfNSWSF=true'
+
+            # Send the query and return an error if something goes wrong
+            try:
+                response = requests.get(url, headers=header, timeout=20)
+            except:
+                logger.error("Network or Timeout error when calling /v1/tp/stop_finder API")
+                return None
+
+            # If we get bad status code, log error and return with n/a or an empty string
+            if response.status_code != 200:
+                logger.error("Error calling /v1/tp/stop_finder API; check api key")
+                return None
+
+            # Parse the result as a JSON object
+            result = response.json()
+
+            # Just a quick check - the presence of systemMessages signifies an error
+            if 'systemMessages' in result:
+                logger.error("Stop ID " + stop + " does not exist")
+
         # We don't control how many journeys are returned any more, so need to be careful of running out of valid journeys if there is a filter in place, particularly a strict filter
         # It would be more efficient to return one journey, check if the filter is met and then retrieve the next one via a new query if not, but for now we'll only be making use of the journeys we've been given
 
@@ -111,20 +144,17 @@ class TransportNSWv2(object):
             # '&calcNumberOfTrips=' + str(journeys_to_retrieve) + \
 
 
-        auth = 'apikey ' + self.api_key
-        header = {'Accept': 'application/json', 'Authorization': auth}
-
         # Send the query and return an error if something goes wrong
         # Otherwise store the response
         try:
             response = requests.get(url, headers=header, timeout=20)
         except:
-            logger.warning("Network or Timeout error")
+            logger.error("Network or Timeout error")
             return None
 
         # If we get bad status code, log error and return with n/a or an empty string
         if response.status_code != 200:
-            logger.warning("Error with the request sent; check api key")
+            logger.error("Error with the request sent; check api key")
             return None
 
         # Parse the result as a JSON object
@@ -171,6 +201,13 @@ class TransportNSWv2(object):
                 origin_stop_id = origin['id']
                 origin_name = origin['name']
                 origin_departure_time = origin['departureTimeEstimated']
+                origin_departure_time_planned = origin['departureTimePlanned']
+
+                t1 = datetime.strptime(origin_departure_time, fmt).timestamp()
+                t2 = datetime.strptime(origin_departure_time_planned, fmt).timestamp()
+                delay = int((t1-t2) / 60)
+
+                #print (origin_departure_time - origin_departure_time_planned)
 
                 # How long until it leaves?
                 due = self.get_due(datetime.strptime(origin_departure_time, fmt))
@@ -254,6 +291,7 @@ class TransportNSWv2(object):
 
                 self.info = {
                     ATTR_DUE_IN: due,
+                    ATTR_DELAY: delay,
                     ATTR_ORIGIN_STOP_ID : origin_stop_id,
                     ATTR_ORIGIN_NAME : origin_name,
                     ATTR_DEPARTURE_TIME : origin_departure_time,
@@ -416,13 +454,13 @@ class TransportNSWv2(object):
             current_leg = legs[leg_index]
             leg_class = current_leg['transportation']['product']['class']
             if 'hints' in current_leg:
-                print ("")
-                print ("Found hint(s) for leg " + str(leg_index) )
+                #print ("")
+                #print ("Found hint(s) for leg " + str(leg_index) )
                 hints = current_leg['hints']
-                for hint in hints:
-                    print ("Hint:")
-                    print (hint)
-                    print (" ")
+                #for hint in hints:
+                    #print ("Hint:")
+                    #print (hint)
+                    #print (" ")
 
 
 

{PyTransportNSWv2-0.7.1 → PyTransportNSWv2-0.8.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="PyTransportNSWv2",
-    version="0.7.1",
+    version="0.8.0",
     author="andystewart999",
     description="Get detailed per-trip transport information from TransportNSW",
     long_description=long_description,