From cb921614c3391241d88e182d545eae075db93aa9 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Thu, 14 Apr 2016 07:46:28 +0200 Subject: [PATCH] Version 0.6.1 sql files --- server/extension/Makefile | 4 +- .../cdb_dataservices_server--0.6.0--0.6.1.sql | 39 +++++++++++++++++++ .../cdb_dataservices_server--0.6.1--0.6.0.sql | 33 ++++++++++++++++ ...sql => cdb_dataservices_server--0.6.1.sql} | 37 ++++++++++++++++++ .../extension/cdb_dataservices_server.control | 2 +- .../cdb_dataservices_server--0.5.2--0.6.0.sql | 0 .../cdb_dataservices_server--0.6.0--0.5.2.sql | 0 .../cdb_dataservices_server--0.6.0.sql | 0 8 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 server/extension/cdb_dataservices_server--0.6.0--0.6.1.sql create mode 100644 server/extension/cdb_dataservices_server--0.6.1--0.6.0.sql rename server/extension/{cdb_dataservices_server--0.5.2.sql => cdb_dataservices_server--0.6.1.sql} (95%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.5.2--0.6.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.6.0--0.5.2.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.6.0.sql (100%) diff --git a/server/extension/Makefile b/server/extension/Makefile index 6dd6db0..d764817 100644 --- a/server/extension/Makefile +++ b/server/extension/Makefile @@ -13,8 +13,8 @@ OLD_VERSIONS = $(wildcard old_versions/*.sql) # @see http://www.postgresql.org/docs/current/static/extend-pgxs.html DATA = $(NEW_EXTENSION_ARTIFACT) \ $(OLD_VERSIONS) \ - cdb_dataservices_server--0.6.0--0.5.2.sql \ - cdb_dataservices_server--0.5.2--0.6.0.sql + cdb_dataservices_server--0.6.1--0.6.0.sql \ + cdb_dataservices_server--0.6.0--0.6.1.sql REGRESS = $(notdir $(basename $(wildcard test/sql/*test.sql))) TEST_DIR = test/ diff --git a/server/extension/cdb_dataservices_server--0.6.0--0.6.1.sql b/server/extension/cdb_dataservices_server--0.6.0--0.6.1.sql new file mode 100644 index 0000000..7f3b5c2 --- /dev/null +++ b/server/extension/cdb_dataservices_server--0.6.0--0.6.1.sql @@ -0,0 +1,39 @@ +--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.6.1'" to load this file. \quit +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_geocoder_config = GD["user_geocoder_config_{0}".format(username)] + quota_service = QuotaService(user_geocoder_config, redis_conn) + + try: + geocoder = MapzenGeocoder(user_geocoder_config.mapzen_app_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; \ No newline at end of file diff --git a/server/extension/cdb_dataservices_server--0.6.1--0.6.0.sql b/server/extension/cdb_dataservices_server--0.6.1--0.6.0.sql new file mode 100644 index 0000000..5ac3380 --- /dev/null +++ b/server/extension/cdb_dataservices_server--0.6.1--0.6.0.sql @@ -0,0 +1,33 @@ +--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.6.0'" to load this file. \quit +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.metrics import QuotaService + + redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] + user_geocoder_config = GD["user_geocoder_config_{0}".format(username)] + quota_service = QuotaService(user_geocoder_config, redis_conn) + + try: + geocoder = MapzenGeocoder(user_geocoder_config.mapzen_app_key) + coordinates = geocoder.geocode(searchtext=searchtext, country=country) + 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; \ No newline at end of file diff --git a/server/extension/cdb_dataservices_server--0.5.2.sql b/server/extension/cdb_dataservices_server--0.6.1.sql similarity index 95% rename from server/extension/cdb_dataservices_server--0.5.2.sql rename to server/extension/cdb_dataservices_server--0.6.1.sql index d2906fb..8c8989a 100644 --- a/server/extension/cdb_dataservices_server--0.5.2.sql +++ b/server/extension/cdb_dataservices_server--0.6.1.sql @@ -175,6 +175,9 @@ RETURNS Geometry AS $$ elif 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'] + elif user_geocoder_config.mapzen_geocoder: + 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'] else: plpy.error('Requested geocoder is not available') @@ -245,6 +248,40 @@ RETURNS Geometry AS $$ finally: quota_service.increment_total_service_use() $$ 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.metrics import QuotaService + + redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] + user_geocoder_config = GD["user_geocoder_config_{0}".format(username)] + quota_service = QuotaService(user_geocoder_config, redis_conn) + + try: + geocoder = MapzenGeocoder(user_geocoder_config.mapzen_app_key) + country_iso3 = None + if country: + country_iso3 = country_to_iso3(country) + coordinates = geocoder.geocode(searchtext=searchtext, 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.cdb_geocode_admin0_polygon(username text, orgname text, country_name text) RETURNS Geometry AS $$ from cartodb_services.metrics import QuotaService diff --git a/server/extension/cdb_dataservices_server.control b/server/extension/cdb_dataservices_server.control index f0182bc..682ea2a 100644 --- a/server/extension/cdb_dataservices_server.control +++ b/server/extension/cdb_dataservices_server.control @@ -1,5 +1,5 @@ comment = 'CartoDB dataservices server extension' -default_version = '0.6.0' +default_version = '0.6.1' requires = 'plpythonu, postgis, cdb_geocoder' superuser = true schema = cdb_dataservices_server diff --git a/server/extension/cdb_dataservices_server--0.5.2--0.6.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.5.2--0.6.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.5.2--0.6.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.5.2--0.6.0.sql diff --git a/server/extension/cdb_dataservices_server--0.6.0--0.5.2.sql b/server/extension/old_versions/cdb_dataservices_server--0.6.0--0.5.2.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.6.0--0.5.2.sql rename to server/extension/old_versions/cdb_dataservices_server--0.6.0--0.5.2.sql diff --git a/server/extension/cdb_dataservices_server--0.6.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.6.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.6.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.6.0.sql