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

Refactor of the google geocoder keys in the config object

Browse Source
This commit is contained in:
Mario de Frutos
2016-01-21 18:05:08 +01:00
parent af051e2ed5
commit 111804dafc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/lib/python/cartodb_geocoder/cartodb_geocoder/config_helper.py
View File

@@ -76,11 +76,12 @@ class GeocoderConfig:
self._orgname = None self._orgname = None
self._geocoder_type = filtered_config[self.GEOCODER_TYPE].lower() self._geocoder_type = filtered_config[self.GEOCODER_TYPE].lower()
self._period_end_date = date_parse(filtered_config[self.PERIOD_END_DATE]) self._period_end_date = date_parse(filtered_config[self.PERIOD_END_DATE])
self._google_maps_private_key = None self._google_maps_api_key = None
self._google_maps_client_id = None
self._geocoding_quota = 0 self._geocoding_quota = 0
self._soft_geocoding_limit = False self._soft_geocoding_limit = False
if self.GOOGLE_GEOCODER == self._geocoder_type: if self.GOOGLE_GEOCODER == self._geocoder_type:
self._google_maps_private_key = filtered_config[self.GOOGLE_GEOCODER_API_KEY] self._google_maps_api_key = filtered_config[self.GOOGLE_GEOCODER_API_KEY]
self._google_maps_client_id = filtered_config[self.GOOGLE_GEOCODER_CLIENT_ID] self._google_maps_client_id = filtered_config[self.GOOGLE_GEOCODER_CLIENT_ID]
elif self.NOKIA_GEOCODER == self._geocoder_type: elif self.NOKIA_GEOCODER == self._geocoder_type:
self._geocoding_quota = float(filtered_config[self.QUOTA_KEY]) self._geocoding_quota = float(filtered_config[self.QUOTA_KEY])
@@ -113,7 +114,7 @@ class GeocoderConfig:
@property @property
def google_api_key(self): def google_api_key(self):
return self._google_maps_private_key return self._google_maps_api_key
@property @property
def geocoding_quota(self): def geocoding_quota(self):