[bugfix] #30 boundary.country Pelias & change isochrone defaults (#31)

* [bugfix] #29 boundary.country Pelias + change isochrone default params

Author: nilsnolde

CHANGELOG

@@ -1,3 +1,8 @@
+### v1.1.7
+
+- fix boundary.country for pelias_search (#30)
+- change isochrone defaults (#31)
+
 ### v1.1.6
 
 - fix boolean parameters (#28)

openrouteservice/__init__.py

@@ -17,7 +17,7 @@
 # the License.
 #
 
-__version__ = "1.1.6"
+__version__ = "1.1.7"
 
 # Make sure QGIS plugin can import openrouteservice-py
 

openrouteservice/client.py

@@ -47,7 +47,7 @@ class Client(object):
 
     def __init__(self, key=None,
                  base_url=_DEFAULT_BASE_URL, 
-                 timeout=None, 
+                 timeout=60,
                  retry_timeout=60, 
                  requests_kwargs=None,
                  queries_per_minute=40,

openrouteservice/geocode.py

@@ -75,9 +75,9 @@ def pelias_search(client, text,
         for details.
     :type layers: list of strings
 
-    :param country: Constrain query by country. Accepts alpha-2 or alpha-3
-        digit ISO-3166 country codes.
-    :type country: list of strings
+    :param country: Constrain query by country. Accepts a alpha-2 or alpha-3
+        digit ISO-3166 country code.
+    :type country: str
 
     :param size: The amount of results returned. Default 10.
     :type size: integer
@@ -125,7 +125,7 @@ def pelias_search(client, text,
         params['layers'] = convert._comma_list(layers)
 
     if country:
-        params['country'] = country
+        params['boundary.country'] = country
 
     if size:
         params['size'] = size
@@ -170,9 +170,9 @@ def pelias_autocomplete(client, text,
     :param rect_max_y: Max latitude by which to constrain request geographically.
     :type rect_max_y: float
 
-    :param country: Constrain query by country. Accepts alpha-2 or alpha-3
+    :param country: Constrain query by country. Accepts a alpha-2 or alpha-3
         digit ISO-3166 country codes.
-    :type country: list of strings
+    :type country: str
 
     :param sources: The originating source of the data. One or more of
         ['osm', 'oa', 'wof', 'gn']. Currently only 'osm', 'wof' and 'gn' are
@@ -345,9 +345,9 @@ def pelias_reverse(client, point,
         for details.
     :type layers: list of strings
 
-    :param country: Constrain query by country. Accepts alpha-2 or alpha-3
+    :param country: Constrain query by country. Accepts a alpha-2 or alpha-3
         digit ISO-3166 country codes.
-    :type country: list of strings
+    :type country: str
 
     :param size: The amount of results returned. Default 10.
     :type size: integer
@@ -377,7 +377,7 @@ def pelias_reverse(client, point,
         params['layers'] = convert._comma_list(layers)
 
     if country:
-        params['country'] = country
+        params['boundary.country'] = country
 
     if size:
         params['size'] = size

openrouteservice/isochrones.py

@@ -22,9 +22,9 @@
 
 def isochrones(client, locations,
                profile='driving-car',
-               range_type=None,
-               intervals=[60],
-               segments=30,
+               range_type='time',
+               intervals=None,
+               segments=None,
                units=None,
                location_type=None,
                smoothing=None,

setup.py

@@ -20,7 +20,7 @@ def readme():
         return f.read()
 
 setup(name='openrouteservice',
-      version='1.1.6',
+      version='1.1.7',
       description='Python client for requests to openrouteservice API services',
       long_description=readme(),
       classifiers=[

test/test_geocode.py

@@ -83,7 +83,7 @@ def test_full_search(self):
 
         self.assertEqual(1, len(responses.calls))
         self.assertURLEqual(
-            'https://api.openrouteservice.org/geocode/search?boundary.circle.lat=49.418431&boundary.circle.lon=8.675786&boundary.circle.radius=50&boundary.rect.max_lon=8.79405&boundary.rect.max_lat=49.459693&boundary.rect.min_lat=49.351764&boundary.rect.min_lon=8.573179&country=de&focus.point.lat=49.418431&focus.point.lon=8.675786&layers=locality%2Ccounty%2Cregion&size=5&sources=osm%2Cwof%2Cgn&text=Heidelberg&api_key=sample_key'.format(
+            'https://api.openrouteservice.org/geocode/search?boundary.circle.lat=49.418431&boundary.circle.lon=8.675786&boundary.circle.radius=50&boundary.rect.max_lon=8.79405&boundary.rect.max_lat=49.459693&boundary.rect.min_lat=49.351764&boundary.rect.min_lon=8.573179&boundary.country=de&focus.point.lat=49.418431&focus.point.lon=8.675786&layers=locality%2Ccounty%2Cregion&size=5&sources=osm%2Cwof%2Cgn&text=Heidelberg&api_key=sample_key'.format(
                 self.key),
             responses.calls[0].request.url)
 
@@ -131,6 +131,6 @@ def test_full_reverse(self):
 
         self.assertEqual(1, len(responses.calls))
         self.assertURLEqual(
-            'https://api.openrouteservice.org/geocode/reverse?boundary.circle.radius=50&country=de&layers=locality%2Ccounty%2Cregion&point.lat=49.418431&point.lon=8.675786&size=5&sources=osm%2Cwof%2Cgn&api_key=sample_key'.format(
+            'https://api.openrouteservice.org/geocode/reverse?boundary.circle.radius=50&boundary.country=de&layers=locality%2Ccounty%2Cregion&point.lat=49.418431&point.lon=8.675786&size=5&sources=osm%2Cwof%2Cgn&api_key=sample_key'.format(
                 self.key),
             responses.calls[0].request.url)

test/test_isochrones.py

@@ -22,7 +22,7 @@
 import openrouteservice
 
 
-class DistanceMatrixTest(_test.TestCase):
+class IsochronesTest(_test.TestCase):
 
     def setUp(self):
         self.key = 'sample_key'
@@ -41,12 +41,13 @@ def test_basic_params(self):
                       status=200,
                       content_type='application/json')
 
-        isochrone = self.client.isochrones(self.coords_valid[0])
+        isochrone = self.client.isochrones(self.coords_valid[0],
+                                           intervals=[60])
 
         self.assertEqual(1, len(responses.calls))
         self.assertURLEqual('https://api.openrouteservice.org/isochrones?api_key={}&'
                             'locations=9.970093%2C48.477473&'
-                            'profile=driving-car&range=60&interval=30'.format(self.key),
+                            'profile=driving-car&range=60&range_type=time'.format(self.key),
                             responses.calls[0].request.url)
 
     @responses.activate
@@ -67,16 +68,6 @@ def test_all_params(self):
                                            attributes=['area', 'reachfactor']
                                            )
 
-        iso_parameter = {'locations': [[9.970093, 48.477473], [9.207916, 49.153868]],
-                         'profile': 'cycling-regular',
-                         'range_type': 'distance',
-                         'range': [1000, 2000],
-                         'units': 'm',
-                         'location_type': 'destination',
-                         'attributes': ['area', 'reachfactor'],
-                         'interval': [30]
-                         }
-
         self.assertEqual(1, len(responses.calls))
         self.assertURLEqual('https://api.openrouteservice.org/isochrones?api_key={}&'
                             'locations=9.970093%2C48.477473%7C9.207916'
@@ -85,5 +76,5 @@ def test_all_params(self):
                             'range_type=distance&range=1000%2C2000&'
                             'units=m&location_type=destination&'
                             'smoothing=0.5&'
-                            'attributes=area|reachfactor&interval=30'.format(self.key),
+                            'attributes=area|reachfactor'.format(self.key),
                             responses.calls[0].request.url)