From b54c417754e89f62dbf6f53274b86ff209a4bad5 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Wed, 11 Nov 2015 17:17:18 +0100 Subject: [PATCH] Adding country, city function for namedplaces --- .../expected/50_namedplaces_test.out | 14 +++++++ server/extension/sql/0.0.1/50_namedplaces.sql | 39 ++++++++++++++++++- server/extension/sql/50_namedplaces_test.sql | 5 +++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/server/extension/expected/50_namedplaces_test.out b/server/extension/expected/50_namedplaces_test.out index 4178bd8..b3f4549 100644 --- a/server/extension/expected/50_namedplaces_test.out +++ b/server/extension/expected/50_namedplaces_test.out @@ -14,6 +14,8 @@ INSERT INTO global_cities_points_limited (geoname_id, name, iso2, admin1, admin2 INSERT INTO global_cities_alternates_limited (geoname_id, name, preferred, lowername, admin1_geonameid, iso2, admin1, the_geom) VALUES (3128760, 'Elx', true, 'elx', '000000', 'ES', 'VA', ST_GeomFromText( 'POINT(0.6983 39.26787)',4326) ); +-- Insert dummy data into country decoder table +INSERT INTO country_decoder (synonyms, iso2) VALUES (Array['spain'], 'ES'); -- This should return the point inserted above SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elx'); geocode_namedplace @@ -27,3 +29,15 @@ SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elc 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340 (1 row) +SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elx', 'Spain'); + geocode_namedplace +---------------------------------------------------- + 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340 +(1 row) + +SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elche', 'Spain'); + geocode_namedplace +---------------------------------------------------- + 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340 +(1 row) + diff --git a/server/extension/sql/0.0.1/50_namedplaces.sql b/server/extension/sql/0.0.1/50_namedplaces.sql index e1561e9..9d9a9fd 100644 --- a/server/extension/sql/0.0.1/50_namedplaces.sql +++ b/server/extension/sql/0.0.1/50_namedplaces.sql @@ -22,7 +22,27 @@ RETURNS Geometry AS $$ return rv[0]["mypoint"] $$ LANGUAGE plpythonu; ----- geocode_admin1_polygons(admin1_name text, country_name text) +---- geocode_namedplace(city_name text, country_name text) +CREATE OR REPLACE FUNCTION geocode_namedplace(user_id name, tx_id bigint, city_name text, country_name text) +RETURNS Geometry AS $$ + plpy.debug('Entering geocode_namedplace(city_name text, country_name text)') + plpy.debug('user_id = %s' % user_id) + + #-- Access control + #-- TODO: this should be part of cdb python library + if user_id == 'publicuser': + plpy.error('The api_key must be provided') + + #--TODO: rate limiting check + #--TODO: quota check + + #-- Copied from the doc, see http://www.postgresql.org/docs/9.4/static/plpython-database.html + plan = plpy.prepare("SELECT cdb_geocoder_server._geocode_namedplace($1, $2) AS mypoint", ["text", "text"]) + rv = plpy.execute(plan, [city_name, country_name], 1) + + plpy.debug('Returning from Returning from geocode_namedplace') + return rv[0]["mypoint"] +$$ LANGUAGE plpythonu; -------------------------------------------------------------------------------- @@ -49,5 +69,22 @@ RETURNS Geometry AS $$ $$ LANGUAGE plpgsql; ---- geocode_namedplace(city_name text, country_name text) +CREATE OR REPLACE FUNCTION _geocode_namedplace(city_name text, country_name text) +RETURNS Geometry AS $$ + DECLARE + ret Geometry; + BEGIN + SELECT geom INTO ret + FROM ( + WITH p AS (SELECT r.s, r.c, (SELECT iso2 FROM country_decoder WHERE lower(r.c) = ANY (synonyms)) i FROM (SELECT city_name AS s, country_name::text AS c) r), + best AS (SELECT p.s AS q, p.c AS c, (SELECT gp.the_geom AS geom FROM global_cities_points_limited gp WHERE gp.lowername = lower(p.s) AND gp.iso2 = p.i ORDER BY population DESC LIMIT 1) AS geom FROM p), + next AS (SELECT p.s AS q, p.c AS c, (SELECT gp.the_geom FROM global_cities_points_limited gp, global_cities_alternates_limited ga WHERE lower(p.s) = ga.lowername AND gp.iso2 = p.i AND ga.geoname_id = gp.geoname_id ORDER BY preferred DESC LIMIT 1) geom FROM p WHERE p.s NOT IN (SELECT q FROM best WHERE c = p.c AND geom IS NOT NULL)) + SELECT geom FROM best WHERE geom IS NOT NULL + UNION ALL + SELECT geom FROM next + ) v; + RETURN ret; + END +$$ LANGUAGE plpgsql; diff --git a/server/extension/sql/50_namedplaces_test.sql b/server/extension/sql/50_namedplaces_test.sql index 469603b..4485d60 100644 --- a/server/extension/sql/50_namedplaces_test.sql +++ b/server/extension/sql/50_namedplaces_test.sql @@ -12,6 +12,11 @@ INSERT INTO global_cities_alternates_limited (geoname_id, name, preferred, lower 'POINT(0.6983 39.26787)',4326) ); +-- Insert dummy data into country decoder table +INSERT INTO country_decoder (synonyms, iso2) VALUES (Array['spain'], 'ES'); + -- This should return the point inserted above SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elx'); SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elche'); +SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elx', 'Spain'); +SELECT cdb_geocoder_server.geocode_namedplace(session_user, txid_current(), 'Elche', 'Spain');