Merge branch 'matrix-v1' into deprecate-distance

mapbox · Jan 6, 2018 · a849083 · a849083
2 parents b7378b2 + 9fb0497
commit a849083
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/docs/matrix.md b/docs/matrix.md
@@ -58,7 +58,7 @@ The input waypoints to the `directions` method are
 
 ```
 
-The `distance` method can be called with a list of point features and the
+The `matrix` method can be called with a list of point features and the
 travel profile.
 
 ```python
@@ -81,4 +81,4 @@ zeros.
 
 ```
 
-See ``import mapbox; help(mapbox.Distance)`` for more detailed usage.
+See ``import mapbox; help(mapbox.DirectionsMatrix)`` for more detailed usage.
diff --git a/tests/test_matrix.py b/tests/test_matrix.py
@@ -57,6 +57,15 @@ def test_matrix(waypoints):
         status=200,
         content_type='application/json')
 
+    # We need a second response because of the difference in rounding between
+    # Python 2 (leaves a '.0') and 3 (no unnecessary '.0').
+    responses.add(
+        responses.GET,
+        'https://api.mapbox.com/directions-matrix/v1/mapbox/driving/-87.0,36.0;-86.0,36.0;-88.0,37.0?access_token=pk.test',
+        match_querystring=True,
+        body='{"durations":[[0,4977,5951],[4963,0,9349],[5881,9317,0]]}',
+        status=200,
+        content_type='application/json')
     res = mapbox.DirectionsMatrix(access_token='pk.test').matrix(waypoints)
     matrix = res.json()['durations']
     # 3x3 list