From b037bc139c10b4a63cd7bb7a565404dde8b6d083 Mon Sep 17 00:00:00 2001 From: Mmoncadaisla Date: Mon, 17 May 2021 16:43:27 +0200 Subject: [PATCH] Update heremaps conf parameter names in SQL function calls (geocoder) --- server/extension/sql/20_geocode_street.sql | 2 +- server/extension/sql/21_bulk_geocode_street.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/extension/sql/20_geocode_street.sql b/server/extension/sql/20_geocode_street.sql index 97843f4..8844d0e 100644 --- a/server/extension/sql/20_geocode_street.sql +++ b/server/extension/sql/20_geocode_street.sql @@ -132,7 +132,7 @@ RETURNS Geometry AS $$ try: service_manager.assert_within_limits() - geocoder = get_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.apikey or None, use_apikey=service_manager.config.use_apikey or False) + geocoder = get_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.heremaps_apikey or None, use_apikey=service_manager.config.heremaps_use_apikey or False) coordinates = geocoder.geocode(searchtext=searchtext, city=city, state=state_province, country=country) if coordinates: service_manager.quota_service.increment_success_service_use() diff --git a/server/extension/sql/21_bulk_geocode_street.sql b/server/extension/sql/21_bulk_geocode_street.sql index 39f7dac..dd88bd6 100644 --- a/server/extension/sql/21_bulk_geocode_street.sql +++ b/server/extension/sql/21_bulk_geocode_street.sql @@ -60,7 +60,7 @@ RETURNS SETOF cdb_dataservices_server.geocoding AS $$ from cartodb_services.here import get_bulk_geocoder service_manager = LegacyServiceManager('geocoder', username, orgname, GD) - geocoder = get_bulk_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.apikey or None, use_apikey=service_manager.config.use_apikey or False) + geocoder = get_bulk_geocoder(app_id=service_manager.config.heremaps_app_id or None, app_code=service_manager.config.heremaps_app_code or None, logger=service_manager.logger, service_params=service_manager.config.heremaps_service_params, apikey=service_manager.config.heremaps_apikey or None, use_apikey=service_manager.config.heremaps_use_apikey or False) return run_street_point_geocoder(plpy, GD, geocoder, service_manager, username, orgname, searches) $$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;