PyTransportNSWv2 2.0.3__tar.gz → 2.0.5__tar.gz

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

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

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

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

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

@@ -42,6 +42,7 @@ ATTR_DESTINATION_LINE_NAME = 'destination_line_name'
 ATTR_DESTINATION_LINE_NAME_SHORT = 'destination_line_name_short'
 
 ATTR_CHANGES = 'changes'
+ATTR_CHANGES_LIST = 'changes_list'
 
 ATTR_ORIGIN_OCCUPANCY = 'origin_occupancy'
 ATTR_DESTINATION_OCCUPANCY = 'destination_occupancy'
@@ -84,6 +85,7 @@ class TransportNSWv2(object):
             ATTR_DESTINATION_LINE_NAME : 'n/a',
             ATTR_DESTINATION_LINE_NAME_SHORT : 'n/a',
             ATTR_CHANGES : 'n/a',
+            ATTR_CHANGES_LIST: [],
             ATTR_ORIGIN_OCCUPANCY: 'n/a',
             ATTR_DESTINATION_OCCUPANCY: 'n/a',
             ATTR_ORIGIN_REAL_TIME_TRIP_ID : 'n/a',
@@ -198,6 +200,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()
@@ -297,7 +300,7 @@ class TransportNSWv2(object):
 
         for current_journey_index in range (0, retrieved_journeys, 1):
             # Look for a trip with a matching transport type filter in at least one of its legs.  Either ANY, or the first leg, depending on how strict we're being
-            legs, next_journey_index, first_leg, last_leg, changes = self._find_next_journey(result['journeys'], current_journey_index, origin_transport_type, destination_transport_type, strict_transport_type, route_filter)
+            legs, next_journey_index, first_leg, last_leg, changes, changes_list = self._find_next_journey(result['journeys'], current_journey_index, origin_transport_type, destination_transport_type, strict_transport_type, route_filter)
 
             if legs is None:
                 # An empty journey that didn't meet the criteria - which means all the valid journeys have been found already
@@ -412,6 +415,7 @@ class TransportNSWv2(object):
                     ATTR_DESTINATION_LINE_NAME : destination_line_name,
                     ATTR_DESTINATION_LINE_NAME_SHORT : destination_line_name_short,
                     ATTR_CHANGES: changes,
+                    ATTR_CHANGES_LIST: changes_list,
                     ATTR_ORIGIN_OCCUPANCY: origin_occupancy,
                     ATTR_DESTINATION_OCCUPANCY: destination_occupancy,
                     ATTR_ORIGIN_REAL_TIME_TRIP_ID: origin_realtimetripid,
@@ -460,13 +464,13 @@ class TransportNSWv2(object):
                 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(journey['legs'], origin_leg, destination_leg)
-                return journey['legs'], journey_index + 1, origin_leg, destination_leg, changes
+                changes, changes_list = self._find_changes(journey['legs'], origin_leg, destination_leg)
+                return journey['legs'], journey_index + 1, origin_leg, destination_leg, changes, changes_list
             else:
-                return None, None, None, None, None
+                return None, None, None, None, None, None
 
         # Hmm, we didn't find one
-        return None, None, None, None, None
+        return None, None, None, None, None, None
 
 
     def _find_first_leg(self, legs, transport_type, strict, route_filter):
@@ -526,11 +530,13 @@ class TransportNSWv2(object):
 
     def _find_changes(self, legs, origin_leg, destination_leg):
         # 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
+            return 0, changes_dict
 
         # Count the changes, each time we hit new non-walking leg is considered to be a change
         changes = 0
+        last_change =''
         bInJourney = False
 
         for leg in legs:
@@ -538,17 +544,36 @@ class TransportNSWv2(object):
                 # We're in the journey so start capturing changes
                 bInJourney = True
 
+                # Capture the destination, it's the first change.  From now on we capture both the origin and the destination until we hit the final leg, in which we only capture the origin
+                last_change = leg['destination']['disassembledName']
+                changes_list.append(last_change)
+
             elif bInJourney:
                 leg_class = leg['transportation']['product']['class']
                 if leg_class < 99:
                     if leg != destination_leg:
                         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']
+
+                        if new_change_origin != last_change:
+                            changes_list.append(new_change_origin)
+                            changes_list.append(new_change_destination)
+
+                            last_change = new_change_destination
+
             if leg == destination_leg:
-                return changes
+                # 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)
+
+                return changes, changes_list
 
         # We should never get here!
-        return 999
+        return 999, {}
 
 
     def _find_alerts(self, legs, priority_filter, alert_type):

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

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