cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract parsing and return fix

Browse Source
This commit is contained in:
Juan Ignacio Sánchez Lara
2017-11-14 13:15:11 +01:00
parent f540a3d6b3
commit da8e5f6e36
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/lib/python/cartodb_services/cartodb_services/google/geocoder.py
View File

@@ -15,10 +15,8 @@ class GoogleMapsGeocoder:
def __init__(self, client_id, client_secret, logger): def __init__(self, client_id, client_secret, logger):
if client_id is None: if client_id is None:
raise InvalidGoogleCredentials raise InvalidGoogleCredentials
arguments = parse_qs(client_id) self.client_id, self.channel = self.parse_client_id(client_id)
self.client_id = arguments['client'] if arguments.has_key('client') else client_id
self.client_secret = client_secret self.client_secret = client_secret
self.channel = arguments['channel'] if arguments.has_key('channel') else None
self.geocoder = GoogleMapsClientFactory.get(self.client_id, self.client_secret, self.channel) self.geocoder = GoogleMapsClientFactory.get(self.client_id, self.client_secret, self.channel)
self._logger = logger self._logger = logger
@@ -51,3 +49,9 @@ class GoogleMapsGeocoder:
if country: if country:
optional_params['country'] = country optional_params['country'] = country
return optional_params return optional_params
def parse_client_id(self, client_id):
arguments = parse_qs(client_id)
client = arguments['client'][0] if arguments.has_key('client') else client_id
channel = arguments['channel'][0] if arguments.has_key('channel') else None
return client, channel