6d35cff9c7
Add config function in postgres explicitly to get MapzenGeocoderConfig. Bump versions for client and server APIs. New MapzenGeocoderConfig included to be able to use current QuotaServices with non-configured users.
101 lines
5.9 KiB
PL/PgSQL
101 lines
5.9 KiB
PL/PgSQL
--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES
|
|
-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
|
|
\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '0.11.0'" to load this file. \quit
|
|
|
|
CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_here_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
|
|
RETURNS Geometry AS $$
|
|
plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
|
|
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
|
|
plpy.execute("SELECT cdb_dataservices_server._get_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
|
|
user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]
|
|
|
|
if user_geocoder_config.heremaps_geocoder:
|
|
here_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_here_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
|
|
return plpy.execute(here_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
|
|
else:
|
|
plpy.error('Here geocoder is not available for your account.')
|
|
|
|
$$ LANGUAGE plpythonu;
|
|
|
|
CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_google_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
|
|
RETURNS Geometry AS $$
|
|
plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
|
|
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
|
|
plpy.execute("SELECT cdb_dataservices_server._get_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
|
|
user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]
|
|
|
|
if user_geocoder_config.google_geocoder:
|
|
google_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_google_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
|
|
return plpy.execute(google_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
|
|
else:
|
|
plpy.error('Google geocoder is not available for your account.')
|
|
|
|
$$ LANGUAGE plpythonu;
|
|
|
|
CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_mapzen_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
|
|
RETURNS Geometry AS $$
|
|
# The configuration is retrieved but no checks are performed on it
|
|
plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
|
|
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
|
|
plpy.execute("SELECT cdb_dataservices_server._get_mapzen_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
|
|
user_geocoder_config = GD["user_mapzen_geocoder_config_{0}".format(username)]
|
|
|
|
mapzen_plan = plpy.prepare("SELECT cdb_dataservices_server._cdb_mapzen_geocode_street_point($1, $2, $3, $4, $5, $6) as point; ", ["text", "text", "text", "text", "text", "text"])
|
|
return plpy.execute(mapzen_plan, [username, orgname, searchtext, city, state_province, country], 1)[0]['point']
|
|
|
|
$$ LANGUAGE plpythonu;
|
|
|
|
|
|
CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_mapzen_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
|
|
RETURNS Geometry AS $$
|
|
from cartodb_services.mapzen import MapzenGeocoder
|
|
from cartodb_services.mapzen.types import country_to_iso3
|
|
from cartodb_services.metrics import QuotaService
|
|
|
|
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
|
|
user_mapzen_geocoder_config = GD["user_mapzen_geocoder_config_{0}".format(username)]
|
|
quota_service = QuotaService(user_mapzen_geocoder_config, redis_conn)
|
|
if not quota_service.check_user_quota():
|
|
plpy.error('You have reached the limit of your quota')
|
|
|
|
try:
|
|
geocoder = MapzenGeocoder(user_mapzen_geocoder_config.mapzen_api_key)
|
|
country_iso3 = None
|
|
if country:
|
|
country_iso3 = country_to_iso3(country)
|
|
coordinates = geocoder.geocode(searchtext=searchtext, city=city,
|
|
state_province=state_province,
|
|
country=country_iso3)
|
|
if coordinates:
|
|
quota_service.increment_success_service_use()
|
|
plan = plpy.prepare("SELECT ST_SetSRID(ST_MakePoint($1, $2), 4326); ", ["double precision", "double precision"])
|
|
point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
|
|
return point['st_setsrid']
|
|
else:
|
|
quota_service.increment_empty_service_use()
|
|
return None
|
|
except BaseException as e:
|
|
import sys, traceback
|
|
type_, value_, traceback_ = sys.exc_info()
|
|
quota_service.increment_failed_service_use()
|
|
error_msg = 'There was an error trying to geocode using mapzen geocoder: {0}'.format(e)
|
|
plpy.notice(traceback.format_tb(traceback_))
|
|
plpy.error(error_msg)
|
|
finally:
|
|
quota_service.increment_total_service_use()
|
|
$$ LANGUAGE plpythonu;
|
|
|
|
|
|
CREATE OR REPLACE FUNCTION cdb_dataservices_server._get_mapzen_geocoder_config(username text, orgname text)
|
|
RETURNS boolean AS $$
|
|
cache_key = "user_mapzen_geocoder_config_{0}".format(username)
|
|
if cache_key in GD:
|
|
return False
|
|
else:
|
|
from cartodb_services.metrics import MapzenGeocoderConfig
|
|
plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
|
|
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection']
|
|
mapzen_geocoder_config = MapzenGeocoderConfig(redis_conn, plpy, username, orgname)
|
|
GD[cache_key] = mapzen_geocoder_config
|
|
return True
|
|
$$ LANGUAGE plpythonu SECURITY DEFINER; |