fix: multiple avoid problem #417

shaiguelman · 2021-09-06T04:06:15Z

Fixes #382

Modified distance_matrix so that the parameter "avoid" accepts multiple values, such as "tolls|highways".

google-cla · 2021-09-06T04:06:25Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

shaiguelman · 2021-09-07T18:41:42Z

I have now signed the CLA, so that tag can be removed.

kostyafarber · 2022-09-22T09:24:52Z

@shaiguelman do you need to add another label describing the pr to have it merged?

wangela

Thank you for offering this fix and for your patience. Let me know if you're willing to make these changes, or if you'd prefer me to submit a patch to your fork.

Please also add this parameter to the distance matrix test, which you can model off the test of the multi-argument parameter in test_directions.py

wangela · 2023-01-25T19:54:52Z

googlemaps/distance_matrix.py

@@ -51,7 +51,8 @@ def distance_matrix(client, origins, destinations,
    :type language: string

    :param avoid: Indicates that the calculated route(s) should avoid the
-        indicated features. Valid values are "tolls", "highways" or "ferries".
+        indicated features. Valid values are "tolls", "highways" or "ferries"


Add "indoor"

wangela · 2023-01-25T19:55:50Z

googlemaps/distance_matrix.py

@@ -51,7 +51,8 @@ def distance_matrix(client, origins, destinations,
    :type language: string

    :param avoid: Indicates that the calculated route(s) should avoid the
-        indicated features. Valid values are "tolls", "highways" or "ferries".
+        indicated features. Valid values are "tolls", "highways" or "ferries"
+        as well as any combination of them separated by "|".
    :type avoid: string


To mirror the implementation in directions.py, let's update this to list or string

wangela · 2023-01-25T19:56:02Z

googlemaps/distance_matrix.py

@@ -107,8 +108,12 @@ def distance_matrix(client, origins, destinations,
        params["language"] = language

    if avoid:
-        if avoid not in ["tolls", "highways", "ferries"]:
-            raise ValueError("Invalid route restriction.")
+        valid_avoids = ["tolls", "highways", "ferries"]


add "indoor"

wangela · 2023-01-25T19:56:39Z

googlemaps/distance_matrix.py

+        for token in avoid_tokens:
+            if token not in valid_avoids:
+                raise ValueError("Invalid route restriction.")
+            valid_avoids.remove(token)


I think you mean to remove from avoid_tokens

googlemaps/distance_matrix.py

wangela · 2023-01-25T19:59:18Z

googlemaps/distance_matrix.py

+        for token in avoid_tokens:
+            if token not in valid_avoids:
+                raise ValueError("Invalid route restriction.")
+            valid_avoids.remove(token)
        params["avoid"] = avoid


We want to set it to the value of avoid_tokens right?

Here's where we could do parallel implementation with directions.py.
How about:

params["avoid"] = convert.join_list("|", avoid_tokens)

shaiguelman added 2 commits September 5, 2021 20:49

Fixed avoid to allow multiple avoid parameters.

96039e5

Changed documentation to account for change.

a71dedb

blunderbuss-gcf bot assigned wangela Sep 6, 2021

google-cla bot added the cla: no This human has *not* signed the Contributor License Agreement. label Sep 6, 2021

Yakopoto mentioned this pull request Oct 4, 2021

fix: multiple avoid distance matrix #382 #420

Closed

4 tasks

google-cla bot added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Nov 4, 2021

shaiguelman changed the title ~~Fix multiple avoid problem~~ Fix: multiple avoid problem Jan 29, 2022

shaiguelman changed the title ~~Fix: multiple avoid problem~~ fix: multiple avoid problem Apr 10, 2022

wangela requested changes Jan 25, 2023

View reviewed changes

wangela mentioned this pull request Jan 25, 2023

Multiple avoid problems #382

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: multiple avoid problem #417

fix: multiple avoid problem #417

shaiguelman commented Sep 6, 2021

google-cla bot commented Sep 6, 2021

shaiguelman commented Sep 7, 2021

kostyafarber commented Sep 22, 2022

wangela left a comment •

edited

Loading

wangela Jan 25, 2023

wangela Jan 25, 2023

wangela Jan 25, 2023

wangela Jan 25, 2023

wangela Jan 25, 2023

wangela Jan 25, 2023

fix: multiple avoid problem #417

Are you sure you want to change the base?

fix: multiple avoid problem #417

Conversation

shaiguelman commented Sep 6, 2021

google-cla bot commented Sep 6, 2021

What to do if you already signed the CLA

Individual signers

Corporate signers

shaiguelman commented Sep 7, 2021

kostyafarber commented Sep 22, 2022

wangela left a comment • edited Loading

Choose a reason for hiding this comment

wangela Jan 25, 2023

Choose a reason for hiding this comment

wangela Jan 25, 2023

Choose a reason for hiding this comment

wangela Jan 25, 2023

Choose a reason for hiding this comment

wangela Jan 25, 2023

Choose a reason for hiding this comment

wangela Jan 25, 2023

Choose a reason for hiding this comment

wangela Jan 25, 2023

Choose a reason for hiding this comment

wangela left a comment •

edited

Loading