PyTransportNSWv2 2.0.5__tar.gz → 2.0.7__tar.gz

{PyTransportNSWv2-2.0.5 → PyTransportNSWv2-2.0.7}/PKG-INFO

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

{PyTransportNSWv2-2.0.5 → PyTransportNSWv2-2.0.7}/PyTransportNSWv2.egg-info/PKG-INFO

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

{PyTransportNSWv2-2.0.5 → PyTransportNSWv2-2.0.7}/TransportNSWv2/TransportNSWv2.py

@@ -15,6 +15,10 @@ import time
 # Global API variable
 api_calls = 0
 
+def reset_api_counter():
+    global api_calls
+    api_calls = 0
+
 def increment_api_counter(source):
     global api_calls
     api_calls += 1
@@ -115,6 +119,7 @@ class TransportNSWv2(object):
         stop_list = []
         skip_api_calls = False
 
+
         try:
             for stop in stops:
                 url = \
@@ -200,7 +205,7 @@ class TransportNSWv2(object):
 
         """Get the latest data from Transport NSW."""
         fmt = '%Y-%m-%dT%H:%M:%SZ'
-        api_calls = 0
+        reset_api_counter()
 
         route_filter = route_filter.lower()
         include_alerts = include_alerts.lower()
@@ -532,7 +537,7 @@ class TransportNSWv2(object):
         # Find out how often we have to change.  Immediately return 0 if the origin and destination legs are the same
         changes_list = []
         if origin_leg == destination_leg:
-            return 0, changes_dict
+            return 0, changes_list
 
         # Count the changes, each time we hit new non-walking leg is considered to be a change
         changes = 0
@@ -551,25 +556,21 @@ class TransportNSWv2(object):
             elif bInJourney:
                 leg_class = leg['transportation']['product']['class']
                 if leg_class < 99:
-                    if leg != destination_leg:
-                        changes += 1
+                    changes += 1
 
-                        # Also capture the origin and destination as a change, unless it's the same platform or stop as the last one
-                        new_change_origin = leg['origin']['disassembledName']
-                        new_change_destination = leg['destination']['disassembledName']
+                    # Also capture the origin and destination as a change, unless it's the same platform or stop as the last one
+                    new_change_origin = leg['origin']['disassembledName']
+                    new_change_destination = leg['destination']['disassembledName']
 
-                        if new_change_origin != last_change:
-                            changes_list.append(new_change_origin)
-                            changes_list.append(new_change_destination)
+                    if new_change_origin != last_change:
+                        changes_list.append(new_change_origin)
 
+                        if leg != destination_leg:
+                            changes_list.append(new_change_destination)
                             last_change = new_change_destination
 
             if leg == destination_leg:
-                # Capture the last change int he dictionary, again as long as it isn't the same as the previous change location
-                new_change_origin = leg['origin']['disassembledName']
-                if new_change_origin != last_change:
-                    changes_list.append(new_change_origin)
-
+                # We've finished looking for changes
                 return changes, changes_list
 
         # We should never get here!

{PyTransportNSWv2-2.0.5 → PyTransportNSWv2-2.0.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="PyTransportNSWv2",
-    version="2.0.5",
+    version="2.0.7",
     author="andystewart999",
     author_email="andy.stewart@live.com",
     description="Get detailed per-trip transport information from TransportNSW",