PyTransportNSWv2 2.0.2__tar.gz → 2.0.4__tar.gz

{PyTransportNSWv2-2.0.2 → PyTransportNSWv2-2.0.4}/PKG-INFO

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

{PyTransportNSWv2-2.0.2 → PyTransportNSWv2-2.0.4}/PyTransportNSWv2.egg-info/PKG-INFO

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

{PyTransportNSWv2-2.0.2 → PyTransportNSWv2-2.0.4}/TransportNSWv2/TransportNSWv2.py

@@ -198,6 +198,7 @@ class TransportNSWv2(object):
 
         """Get the latest data from Transport NSW."""
         fmt = '%Y-%m-%dT%H:%M:%SZ'
+        api_calls = 0
 
         route_filter = route_filter.lower()
         include_alerts = include_alerts.lower()
@@ -269,7 +270,7 @@ class TransportNSWv2(object):
                 raise APIRateLimitExceeded("Error 'API rate limit exceeded' calling trip API for journey {name_origin} to {name_destination}")
 
             else:
-                raise TripError(f"Error '{str(response.status_cude)}' calling trip API for journey {name_origin} to {name_destination}")
+                raise TripError(f"Error '{str(response.status_code)}' calling trip API for journey {name_origin} to {name_destination}")
 
         result = response.json()
 
@@ -452,14 +453,16 @@ class TransportNSWv2(object):
             return None, None, None, None, None
 
         for journey_index in range (start_journey_index, journey_count, 1):
-            origin_leg = self._find_first_leg(journeys[journey_index]['legs'], origin_transport_type, strict, route_filter)
+            journey = journeys[journey_index]
+
+            origin_leg = self._find_first_leg(journey['legs'], origin_transport_type, strict, route_filter)
 
             if origin_leg is not None:
-                destination_leg = self._find_last_leg(journeys[journey_index]['legs'], destination_transport_type, strict)
+                destination_leg = self._find_last_leg(journey['legs'], destination_transport_type, strict)
 
             if origin_leg is not None and destination_leg is not None:
-                changes = self._find_changes(journeys[journey_index]['legs'], origin_leg, destination_leg)
-                return journeys[journey_index]['legs'], journey_index + 1, origin_leg, destination_leg, changes
+                changes = self._find_changes(journey['legs'], origin_leg, destination_leg)
+                return journey['legs'], journey_index + 1, origin_leg, destination_leg, changes
             else:
                 return None, None, None, None, None
 
@@ -523,24 +526,28 @@ class TransportNSWv2(object):
 
 
     def _find_changes(self, legs, origin_leg, destination_leg):
-        # Find out how often we have to change
+        # Find out how often we have to change.  Immediately return 0 if the origin and destination legs are the same
+        if origin_leg == destination_leg:
+            return 0
+
+        # Count the changes, each time we hit new non-walking leg is considered to be a change
         changes = 0
         bInJourney = False
 
         for leg in legs:
-            if leg == destination_leg:
-                # We've found the last leg (which oould be the same as the first leg), stop counting
-                return changes
-
             if leg == origin_leg:
-                # We've found the first leg, start counting
+                # We're in the journey so start capturing changes
                 bInJourney = True
-            else:
-                if bInJourney:
-                    leg_class = leg['transportation']['product']['class']
-                    if leg_class < 99:
+
+            elif bInJourney:
+                leg_class = leg['transportation']['product']['class']
+                if leg_class < 99:
+                    if leg != destination_leg:
                         changes += 1
 
+            if leg == destination_leg:
+                return changes
+
         # We should never get here!
         return 999
 

{PyTransportNSWv2-2.0.2 → PyTransportNSWv2-2.0.4}/setup.py

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