PyTransportNSWv2 0.3.2__tar.gz → 0.3.4__tar.gz

{pytransportnswv2-0.3.2 → pytransportnswv2-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.3.2
+Version: 0.3.4
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999
@@ -12,6 +12,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: gtfs-realtime-bindings
+Requires-Dist: requests
 
 # TransportNSW
 Python lib to access Transport NSW information.
@@ -34,9 +35,21 @@ The source API details can be found here: https://opendata.transport.nsw.gov.au/
 ```python
 .get_trip(origin_stop_id, destination_stop_id, api_key, [trip_wait_time = 0], [transport_type = 0])
 ```
-
 TransportNSW's trip planner can work better if you use the general location IDs (eg Central Station) rather than a specific Stop ID (eg Central Station, Platform 19) for the destination, depending on the transport type.  Forcing a specific end destination sometimes results in much more complicated trips.  Also note that the API expects (and returns) the Stop IDs as strings, although so far they all appear to be numeric.
 
+### transport_type filters
+```
+1: Train
+4: Light rail
+5: Bus
+7: Coach
+9: Ferry
+11: School bus
+99: Walk
+100: Walk
+107: Cycle
+```
+
 ### Sample Code
 
 The following example will return the next trip that starts from a bus stop in St. Ives (207537) five minutes from now, to Central Station's general stop ID (10101100):

{pytransportnswv2-0.3.2 → pytransportnswv2-0.3.4}/PyTransportNSWv2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.3.2
+Version: 0.3.4
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999
@@ -12,6 +12,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: gtfs-realtime-bindings
+Requires-Dist: requests
 
 # TransportNSW
 Python lib to access Transport NSW information.
@@ -34,9 +35,21 @@ The source API details can be found here: https://opendata.transport.nsw.gov.au/
 ```python
 .get_trip(origin_stop_id, destination_stop_id, api_key, [trip_wait_time = 0], [transport_type = 0])
 ```
-
 TransportNSW's trip planner can work better if you use the general location IDs (eg Central Station) rather than a specific Stop ID (eg Central Station, Platform 19) for the destination, depending on the transport type.  Forcing a specific end destination sometimes results in much more complicated trips.  Also note that the API expects (and returns) the Stop IDs as strings, although so far they all appear to be numeric.
 
+### transport_type filters
+```
+1: Train
+4: Light rail
+5: Bus
+7: Coach
+9: Ferry
+11: School bus
+99: Walk
+100: Walk
+107: Cycle
+```
+
 ### Sample Code
 
 The following example will return the next trip that starts from a bus stop in St. Ives (207537) five minutes from now, to Central Station's general stop ID (10101100):

{pytransportnswv2-0.3.2 → pytransportnswv2-0.3.4}/PyTransportNSWv2.egg-info/requires.txt

@@ -1 +1,2 @@
 gtfs-realtime-bindings
+requests

{pytransportnswv2-0.3.2 → pytransportnswv2-0.3.4}/README.md

@@ -19,9 +19,21 @@ The source API details can be found here: https://opendata.transport.nsw.gov.au/
 ```python
 .get_trip(origin_stop_id, destination_stop_id, api_key, [trip_wait_time = 0], [transport_type = 0])
 ```
-
 TransportNSW's trip planner can work better if you use the general location IDs (eg Central Station) rather than a specific Stop ID (eg Central Station, Platform 19) for the destination, depending on the transport type.  Forcing a specific end destination sometimes results in much more complicated trips.  Also note that the API expects (and returns) the Stop IDs as strings, although so far they all appear to be numeric.
 
+### transport_type filters
+```
+1: Train
+4: Light rail
+5: Bus
+7: Coach
+9: Ferry
+11: School bus
+99: Walk
+100: Walk
+107: Cycle
+```
+
 ### Sample Code
 
 The following example will return the next trip that starts from a bus stop in St. Ives (207537) five minutes from now, to Central Station's general stop ID (10101100):

{pytransportnswv2-0.3.2 → pytransportnswv2-0.3.4}/TransportNSW/TransportNSW.py

@@ -157,7 +157,7 @@ class TransportNSW(object):
         origin_name = origin['name']
         origin_departure_time = origin['departureTimeEstimated']
 
-	# How long until it leaves?
+        # How long until it leaves?
         due = self.get_due(datetime.strptime(origin_departure_time, fmt))
 
         # Destination info
@@ -276,7 +276,12 @@ class TransportNSW(object):
         for leg in range (0, leg_count, 1):
             leg_class = legs[leg]['transportation']['product']['class']
 
-            if leg_class == legtype or legtype == 0:
+            # We've got a filter, and the leg type matches it, so return it
+            if legtype != 0 and leg_class == legtype:
+                return leg
+                
+            # We don't have a filter, and this is the first non-walk/cycle leg so return it
+            if  legtype == 0 and leg_class < 99:
                 return leg
 
         # Hmm, we didn't find one
@@ -289,7 +294,12 @@ class TransportNSW(object):
         for leg in range (leg_count - 1, -1, -1):
             leg_class = legs[leg]['transportation']['product']['class']
 
-            if leg_class == legtype or legtype == 0:
+            # We've got a filter, and the leg type matches it, so return it
+            if legtype != 0 and leg_class == legtype:
+                return leg
+                
+            # We don't have a filter, and this is the first non-walk/cycle leg so return it
+            if  legtype == 0 and leg_class < 99:
                 return leg
 
         # Hmm, we didn't find one

{pytransportnswv2-0.3.2 → pytransportnswv2-0.3.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="PyTransportNSWv2",
-    version="0.3.2",
+    version="0.3.4",
     author="andystewart999",
     description="Get detailed per-trip transport information from TransportNSW",
     long_description=long_description,
@@ -14,6 +14,7 @@ setuptools.setup(
     packages=setuptools.find_packages(),
     install_requires=[
         'gtfs-realtime-bindings',
+        'requests'
     ],
     classifiers=[
         "Programming Language :: Python :: 3",