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

Rename variable s/user_geocoder_config/mapzen_geocoder_config

Browse Source
This commit is contained in:
Rafa de la Torre 2016-10-03 12:52:18 +02:00
parent fb812ee15e
commit b1f3405cd0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/extension/sql/20_geocode_street.sql
View File

@ -166,8 +166,7 @@ RETURNS Geometry AS $$
user_config_storage = UserConfigStorageFactory(redis_metadata_connection, username).get() user_config_storage = UserConfigStorageFactory(redis_metadata_connection, username).get()
org_config_storage = OrgConfigStorageFactory(redis_metadata_connection, orgname).get() org_config_storage = OrgConfigStorageFactory(redis_metadata_connection, orgname).get()
# TODO rename this variable mapzen_geocoder_config = MapzenGeocoderConfigBuilder(server_config_storage, user_config_storage, org_config_storage, username, orgname).get()
user_geocoder_config = MapzenGeocoderConfigBuilder(server_config_storage, user_config_storage, org_config_storage, username, orgname).get()
# TODO encapsulate the connection creation # TODO encapsulate the connection creation
if environment == 'onpremise': if environment == 'onpremise':
@ -176,12 +175,12 @@ RETURNS Geometry AS $$
redis_metrics_connection_config = RedisMetricsConnectionConfigBuilder(server_config_storage).get() redis_metrics_connection_config = RedisMetricsConnectionConfigBuilder(server_config_storage).get()
redis_metrics_connection = RedisConnectionBuilder(redis_metrics_connection_config).get() redis_metrics_connection = RedisConnectionBuilder(redis_metrics_connection_config).get()
quota_service = QuotaService(user_geocoder_config, redis_metrics_connection) quota_service = QuotaService(mapzen_geocoder_config, redis_metrics_connection)
if not quota_service.check_user_quota(): if not quota_service.check_user_quota():
raise Exception('You have reached the limit of your quota') raise Exception('You have reached the limit of your quota')
try: try:
geocoder = MapzenGeocoder(user_geocoder_config.mapzen_api_key, logger) geocoder = MapzenGeocoder(mapzen_geocoder_config.mapzen_api_key, logger)
country_iso3 = None country_iso3 = None
if country: if country:
country_iso3 = country_to_iso3(country) country_iso3 = country_to_iso3(country)