From fb576455955cdeda8e83c15da8a6598ba91d7c2b Mon Sep 17 00:00:00 2001 From: Mmoncadaisla Date: Mon, 17 May 2021 15:11:04 +0200 Subject: [PATCH] Update bulk geocoder SQL function for GS7 support (serial) and 6.2 apikey support --- server/extension/sql/21_bulk_geocode_street.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/extension/sql/21_bulk_geocode_street.sql b/server/extension/sql/21_bulk_geocode_street.sql index e41e67e..39f7dac 100644 --- a/server/extension/sql/21_bulk_geocode_street.sql +++ b/server/extension/sql/21_bulk_geocode_street.sql @@ -57,10 +57,10 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_bulk_heremaps_geocode_st RETURNS SETOF cdb_dataservices_server.geocoding AS $$ from cartodb_services import run_street_point_geocoder from cartodb_services.tools import LegacyServiceManager - from cartodb_services.here import HereMapsBulkGeocoder + from cartodb_services.here import get_bulk_geocoder service_manager = LegacyServiceManager('geocoder', username, orgname, GD) - geocoder = HereMapsBulkGeocoder(service_manager.config.heremaps_app_id, service_manager.config.heremaps_app_code, service_manager.logger, service_manager.config.heremaps_service_params) + 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) return run_street_point_geocoder(plpy, GD, geocoder, service_manager, username, orgname, searches) $$ LANGUAGE @@plpythonu@@ STABLE PARALLEL RESTRICTED;