Skip to content

Commit a1474c5

Browse files
committed
Merge branch 'master' of ssh://github.com/googlemaps/google-maps-services-python
Change-Id: If33eb29c8c9422d17105f4d78d71df9cee3eea3e
2 parents 86cfa45 + c1c6aff commit a1474c5

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

‎googlemaps/places.py‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222

2323
def places(client, query, location=None, radius=None, language=None,
24-
min_price=None, max_price=None, open_now=False, type=None,
24+
min_price=None, max_price=None, open_now=False, type=None, region=None,
2525
page_token=None):
2626
"""
2727
Places search.
@@ -57,6 +57,10 @@ def places(client, query, location=None, radius=None, language=None,
5757
The full list of supported types is available here:
5858
https://developers.google.com/places/supported_types
5959
:type type: string
60+
61+
:param region: The region code, optional parameter.
62+
See more @ https://developers.google.com/places/web-service/search
63+
:type region: string
6064
6165
:param page_token: Token from a previous search that when provided will
6266
returns the next page of results for the same search.
@@ -69,7 +73,7 @@ def places(client, query, location=None, radius=None, language=None,
6973
"""
7074
return _places(client, "text", query=query, location=location,
7175
radius=radius, language=language, min_price=min_price,
72-
max_price=max_price, open_now=open_now, type=type,
76+
max_price=max_price, open_now=open_now, type=type, region=region,
7377
page_token=page_token)
7478

7579

@@ -85,6 +89,10 @@ def places_nearby(client, location=None, radius=None, keyword=None,
8589
8690
:param radius: Distance in meters within which to bias results.
8791
:type radius: int
92+
93+
:param region: The region code, optional parameter.
94+
See more @ https://developers.google.com/places/web-service/search
95+
:type region: string
8896
8997
:param keyword: A term to be matched against all content that Google has
9098
indexed for this place.
@@ -204,7 +212,7 @@ def places_radar(client, location, radius, keyword=None, min_price=None,
204212

205213
def _places(client, url_part, query=None, location=None, radius=None,
206214
keyword=None, language=None, min_price=0, max_price=4, name=None,
207-
open_now=False, rank_by=None, type=None, page_token=None):
215+
open_now=False, rank_by=None, type=None, region=None, page_token=None):
208216
"""
209217
Internal handler for ``places``, ``places_nearby``, and ``places_radar``.
210218
See each method's docs for arg details.
@@ -230,6 +238,8 @@ def _places(client, url_part, query=None, location=None, radius=None,
230238
params["rankby"] = rank_by
231239
if type:
232240
params["type"] = type
241+
if region:
242+
params["region"] = region
233243
if page_token:
234244
params["pagetoken"] = page_token
235245

‎test/test_places.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def setUp(self):
3434
self.location = (-33.86746, 151.207090)
3535
self.type = 'liquor_store'
3636
self.language = 'en-AU'
37+
self.region = 'AU'
3738
self.radius = 100
3839

3940
@responses.activate
@@ -44,14 +45,14 @@ def test_places_text_search(self):
4445
status=200, content_type='application/json')
4546

4647
self.client.places('restaurant', location=self.location,
47-
radius=self.radius, language=self.language,
48+
radius=self.radius, region=self.region, language=self.language,
4849
min_price=1, max_price=4, open_now=True,
4950
type=self.type)
5051

5152
self.assertEqual(1, len(responses.calls))
5253
self.assertURLEqual('%s?language=en-AU&location=-33.86746%%2C151.20709&'
5354
'maxprice=4&minprice=1&opennow=true&query=restaurant&'
54-
'radius=100&type=liquor_store&key=%s'
55+
'radius=100&region=AU&type=liquor_store&key=%s'
5556
% (url, self.key), responses.calls[0].request.url)
5657

5758
@responses.activate

0 commit comments

Comments
 (0)