PyTransportNSWv2 0.8.6__tar.gz → 0.8.7__tar.gz

{PyTransportNSWv2-0.8.6 → PyTransportNSWv2-0.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.8.6
+Version: 0.8.7
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999
@@ -148,7 +148,7 @@ Description: # TransportNSWv2
         Also note that the 'transport_type' filter, if present, only makes sure that at least **one** leg of the journey includes that transport type unless ```strict_transport_type``` is True, in which case the **first** leg must be of the requested type to be returned.
         
         ### Rate limits ###
-        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
+        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  From version 0.8.7 I found a TransportNSW-maintained CSV that contains mappings of bus agency IDs to URLs so I'm using that, plus adding in a 0.75 second delay between API calls.
         
         ## Thank you
         Thank you Dav0815 for your TransportNSW library that the vast majority of this fork is based on.  I couldn't have done it without you!

{PyTransportNSWv2-0.8.6 → PyTransportNSWv2-0.8.7}/PyTransportNSWv2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.8.6
+Version: 0.8.7
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999
@@ -148,7 +148,7 @@ Description: # TransportNSWv2
         Also note that the 'transport_type' filter, if present, only makes sure that at least **one** leg of the journey includes that transport type unless ```strict_transport_type``` is True, in which case the **first** leg must be of the requested type to be returned.
         
         ### Rate limits ###
-        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
+        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  From version 0.8.7 I found a TransportNSW-maintained CSV that contains mappings of bus agency IDs to URLs so I'm using that, plus adding in a 0.75 second delay between API calls.
         
         ## Thank you
         Thank you Dav0815 for your TransportNSW library that the vast majority of this fork is based on.  I couldn't have done it without you!

{PyTransportNSWv2-0.8.6 → PyTransportNSWv2-0.8.7}/README.md

@@ -140,7 +140,7 @@ Note also that the origin and destination details are just that - information ab
 Also note that the 'transport_type' filter, if present, only makes sure that at least **one** leg of the journey includes that transport type unless ```strict_transport_type``` is True, in which case the **first** leg must be of the requested type to be returned.
 
 ### Rate limits ###
-By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
+By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  From version 0.8.7 I found a TransportNSW-maintained CSV that contains mappings of bus agency IDs to URLs so I'm using that, plus adding in a 0.75 second delay between API calls.
 
 ## Thank you
 Thank you Dav0815 for your TransportNSW library that the vast majority of this fork is based on.  I couldn't have done it without you!

{PyTransportNSWv2-0.8.6 → PyTransportNSWv2-0.8.7}/TransportNSWv2/TransportNSWv2.py

@@ -115,7 +115,7 @@ class TransportNSWv2(object):
 
             # Send the query and return an error if something goes wrong
             try:
-                response = requests.get(url, headers=header, timeout=20)
+                response = requests.get(url, headers=header, timeout=5)
             except Exception as ex:
                 logger.error("Network or Timeout error when calling /v1/tp/stop_finder API")
                 return None
@@ -157,7 +157,7 @@ class TransportNSWv2(object):
         # Send the query and return an error if something goes wrong
         # Otherwise store the response
         try:
-            response = requests.get(url, headers=header, timeout=20)
+            response = requests.get(url, headers=header, timeout=10)
         except:
             logger.error("Network or timeout error")
             return None
@@ -527,13 +527,14 @@ class TransportNSWv2(object):
         Map the journey mode to the proper modifier URL.  If the mode is Bus, Coach or School bus then use the agency ID to invoke the GTFS datastore search API
         which will give us the appropriate URL to call later - we still have to do light rail the old-fashioned, brute-force way though
         """
+
         if mode in ["Bus", "Coach", "School bus"]:
             # Use the API to determine the appropriate URL
             url = "https://opendata.transport.nsw.gov.au/data/api/action/datastore_search?resource_id=30b850b7-f439-4e30-8072-e07ef62a2a36&filters={%22For%20Realtime%20GTFS%20agency_id%22:%22" + agencyid + "%22}&limit=1"
 
             # Send the query and return an error if something goes wrong
             try:
-                response = requests.get(url, timeout=20)
+                response = requests.get(url, timeout=5)
             except Exception as ex:
                 logger.error("Error " + str(ex) + " querying GTFS URL datastore")
                 return None
@@ -555,17 +556,16 @@ class TransportNSWv2(object):
                 return None
 
             bus_list = ["/" + mode_path]
-
-        url_options = {
-            "Train"      : ["/sydneytrains"],
-            "Metro"      : ["/metro"],
-            "Light rail" : ["/lightrail/innerwest", "/lightrail/cbdandsoutheast", "/lightrail/newcastle"],
-            "Bus"        : bus_list,
-            "Coach"      : bus_list,
-            "Ferry"      : ["/ferries/sydneyferries"],
-            "School bus" : bus_list
-        }
-        return url_options.get(mode, None)
+            return bus_list
+        else:
+            # Handle the other modes
+            url_options = {
+                "Train"      : ["/sydneytrains"],
+                "Metro"      : ["/metro"],
+                "Light rail" : ["/lightrail/innerwest", "/lightrail/cbdandsoutheast", "/lightrail/newcastle"],
+                "Ferry"      : ["/ferries/sydneyferries"]
+            }
+            return url_options.get(mode, None)
 
 
     def get_due(self, estimated):

{PyTransportNSWv2-0.8.6 → PyTransportNSWv2-0.8.7}/setup.py

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