PyTransportNSWv2 0.5.4__tar.gz → 0.5.6__tar.gz

{PyTransportNSWv2-0.5.4 → PyTransportNSWv2-0.5.6}/PKG-INFO

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

{PyTransportNSWv2-0.5.4 → PyTransportNSWv2-0.5.6}/PyTransportNSWv2.egg-info/PKG-INFO

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

{PyTransportNSWv2-0.5.4 → PyTransportNSWv2-0.5.6}/TransportNSWv2/TransportNSWv2.py

@@ -134,7 +134,6 @@ class TransportNSWv2(object):
             exit
 
         retrieved_journeys = len(result['journeys'])
-        print ("retrieved_journeys = " + str(retrieved_journeys))
 
         # Loop through the results applying filters where required, and generate the appropriate JSON output including an array of in-scope trips
         json_output=''
@@ -142,26 +141,22 @@ class TransportNSWv2(object):
         no_valid_journeys = False
 
         for current_journey_index in range (0, retrieved_journeys, 1):
-            print(current_journey_index)
             if transport_type == 0:
                 # Just grab the next trip
                 journey = result['journeys'][current_journey_index]
                 next_journey_index = current_journey_index + 1
             else:
                 # Look for a trip with a matching class filter in at least one of its legs.  Either ANY, or the first leg, depending on how strict we're being
-                print ("transport_type = " + str(transport_type))
                 journey, next_journey_index = self.find_next_journey(result['journeys'], current_journey_index, transport_type, strict_transport_type)
-                if (journey is None):
-                    print ("Just called find_next_journey")
-                    print ("journey is None")
 
             if ((journey is None) or (journey['legs']) is None):
-                print ("This journey isn't valid, moving to the next one")
-
+                pass
             else:
                 legs = journey['legs']
                 first_leg = self.find_first_leg(legs, transport_type, strict_transport_type)
-                last_leg = self.find_last_leg(legs, transport_type, strict_transport_type)
+
+                #Executive decision - don't be strict on the last leg, there's often some walking (transport type 100) involved.
+                last_leg = self.find_last_leg(legs, transport_type, False)
                 changes = self.find_changes(legs, transport_type)
 
                 origin = first_leg['origin']
@@ -231,7 +226,6 @@ class TransportNSWv2(object):
 
                         # Unfortunately we need to do some mucking about for train-based trip_ids
                         # Define the appropriate regular expression to search for - usually just the full text
-                        print ( feed.entity[0] )
                         bFindLocation = True
 
                         if origin_mode == 'Train':
@@ -308,21 +302,16 @@ class TransportNSWv2(object):
     def find_next_journey(self, journeys, start_journey_index, journeytype, strict):
         # Fnd the next journey that has a leg of the requested type
         journey_count = len(journeys)
-        print ("(find_next_journey): start_journey_index = " + str(start_journey_index))
-        print ("(find_next_journey): journey_count = " + str(journey_count))
 
         # Some basic error checking
         if start_journey_index > journey_count:
-            print ("None, None")
             return None, None
 
         for journey_index in range (start_journey_index, journey_count, 1):
             leg = self.find_first_leg(journeys[journey_index]['legs'], journeytype, strict)
             if leg is not None:
-                print ("leg is not None")
                 return journeys[journey_index], journey_index + 1
             else:
-                print ("leg is None, None")
                 return None, None
 
         # Hmm, we didn't find one
@@ -332,10 +321,8 @@ class TransportNSWv2(object):
     def find_first_leg(self, legs, legtype, strict):
         # Find the first leg of the requested type
         leg_count = len(legs)
-        print ("leg_count = " + str(leg_count))
         for leg_index in range (0, leg_count, 1):
             leg_class = legs[leg_index]['transportation']['product']['class']
-            print("leg_class = " + str(leg_class))
             # We've got a filter, and the leg type matches it, so return that leg
             if legtype != 0 and leg_class == legtype:
                 return legs[leg_index]
@@ -349,7 +336,6 @@ class TransportNSWv2(object):
                 return None
 
         # Hmm, we didn't find one
-        print ("Fell through to None")
         return None
 
 

{PyTransportNSWv2-0.5.4 → PyTransportNSWv2-0.5.6}/setup.py

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