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

Merge branch 'development' into 346-user-rate-limits

Browse Source 
# Conflicts:
#	README.md
#	server/extension/sql/20_geocode_street.sql
#	server/lib/python/cartodb_services/cartodb_services/metrics/config.py
This commit is contained in:
Javier Goizueta
2017-03-14 19:00:53 +01:00
parent 6c5ca97468 a64557b50e
commit 05b29967c7
30 changed files with 3916 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ RETURNS Geometry AS $$
service_manager.check()
try:
geocoder = HereMapsGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, logger)
geocoder = HereMapsGeocoder(user_geocoder_config.heremaps_app_id, user_geocoder_config.heremaps_app_code, logger, user_geocoder_config.heremaps_service_params)
coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country)
if coordinates:
quota_service.increment_success_service_use()
@@ -162,7 +162,7 @@ RETURNS Geometry AS $$
service_manager.check()
try:
geocoder = MapzenGeocoder(service_manager.config.mapzen_api_key, logger)
geocoder = MapzenGeocoder(mapzen_geocoder_config.mapzen_api_key, logger, mapzen_geocoder_config.service_params)
country_iso3 = None
if country:
untry_iso3 = country_to_iso3(country)