From 89cc5840b9d73b7121d7198393a5b78d15fdb1e9 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Mon, 30 Nov 2015 13:01:37 +0100 Subject: [PATCH] Removes test functions --- geocoder/admin1/sql/geocoder.sql | 108 ------------------------- geocoder/postal-codes/sql/geocoder.sql | 67 --------------- 2 files changed, 175 deletions(-) diff --git a/geocoder/admin1/sql/geocoder.sql b/geocoder/admin1/sql/geocoder.sql index 076a6fc..c6ff759 100644 --- a/geocoder/admin1/sql/geocoder.sql +++ b/geocoder/admin1/sql/geocoder.sql @@ -1,111 +1,3 @@ ---Text array, country text - ---- Usage - ---- SELECT (geocode_admin1_polygons(Array['az', 'Texas'], 'Ecuador')).* - - ---- Function -CREATE OR REPLACE FUNCTION test_geocode_admin1_polygons(name text[], inputcountry text) - RETURNS SETOF geocode_admin_country_v1 AS $$ - DECLARE - ret geocode_admin_country_v1%rowtype; - adm0 TEXT; - adm0_check BOOLEAN := TRUE; - BEGIN - - IF inputcountry IS NULL THEN - adm0_check = FALSE; - END IF; - IF trim(inputcountry)='' THEN - adm0_check = FALSE; - END IF; - - IF adm0_check IS TRUE THEN - SELECT INTO adm0 adm0_a3 FROM admin0_synonyms WHERE name_ = lower(regexp_replace(inputcountry, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text LIMIT 1; - - FOR ret IN - SELECT - q, inputcountry, geom, CASE WHEN geom IS NULL THEN FALSE ELSE TRUE END AS success - FROM ( - SELECT - q, ( - SELECT the_geom FROM adm1 WHERE global_id = ( - SELECT global_id - FROM admin1_synonyms - WHERE name_ = lower(regexp_replace(d.q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text - AND adm0_a3 = adm0 - LIMIT 1 - ) - ) geom - FROM (SELECT unnest(name) q) d - ) v - LOOP - RETURN NEXT ret; - END LOOP; - - --Handle cases where country couldn't be found - ELSE - FOR ret IN - SELECT - q, inputcountry, geom, CASE WHEN geom IS NULL THEN FALSE ELSE TRUE END AS success - FROM ( - SELECT - q, ( - SELECT the_geom FROM adm1 WHERE global_id = ( - SELECT global_id - FROM admin1_synonyms - WHERE name_ = lower(regexp_replace(d.q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text - LIMIT 1 - ) - ) geom - FROM (SELECT unnest(name) q) d - ) v - LOOP - RETURN NEXT ret; - END LOOP; - END IF; - RETURN; -END -$$ LANGUAGE 'plpgsql'; - - ---Text array, country array - ---- Usage - ---- SELECT (geocode_admin1_polygons(Array['az', 'az'], Array['Ecuador', 'USA'])).* - ---- Function - -CREATE OR REPLACE FUNCTION test_geocode_admin1_polygons(names text[], country text[]) - RETURNS SETOF geocode_admin_country_v1 AS $$ - DECLARE - ret geocode_admin_country_v1%rowtype; - BEGIN - - FOR ret IN SELECT (test_geocode_admin1_polygons(array_agg(n), c)).* FROM (SELECT unnest(names) n, unnest(country) c) a GROUP BY c LOOP - RETURN NEXT ret; - END LOOP; - RETURN; -END -$$ LANGUAGE 'plpgsql'; - ---Text text - - ---- Function - -CREATE OR REPLACE FUNCTION test_geocode_admin1_polygons(name text[]) -RETURNS SETOF geocode_admin_country_v1 AS $$ -DECLARE - ret geocode_admin_v1%rowtype; - BEGIN RETURN QUERY - SELECT d.q, n.the_geom as geom, CASE WHEN s.adm1_code IS NULL then FALSE ELSE TRUE END AS success FROM (SELECT q, lower(regexp_replace(q, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text x FROM (SELECT unnest(name) q) g) d LEFT OUTER JOIN admin1_synonyms s ON name_ = d.x LEFT OUTER JOIN ne_admin1_v3 n ON s.adm1_code = n.adm1_code; -END -$$ LANGUAGE 'plpgsql'; - - --Text array, country array -- diff --git a/geocoder/postal-codes/sql/geocoder.sql b/geocoder/postal-codes/sql/geocoder.sql index 5bce401..c812634 100644 --- a/geocoder/postal-codes/sql/geocoder.sql +++ b/geocoder/postal-codes/sql/geocoder.sql @@ -251,70 +251,3 @@ CREATE OR REPLACE FUNCTION geocode_postalcode_polygons(code text[], inputcountry END $$ LANGUAGE 'plpgsql' SECURITY DEFINER; - --- Test functions for polygons -- - --- code array, countries array - -CREATE OR REPLACE FUNCTION test_geocode_postalcode_polygons(code text[], inputcountries text[]) - RETURNS SETOF geocode_namedplace_country_v1 AS $$ - DECLARE - ret geocode_namedplace_country_v1%rowtype; - adm text[]; - BEGIN - - SELECT INTO adm array_agg((SELECT adm0_a3 FROM admin0_synonyms WHERE name_ = lower(regexp_replace(b.c, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text LIMIT 1)) FROM (SELECT UNNEST(inputcountries) c) b; - - FOR ret IN - SELECT - q, c, geom, CASE WHEN geom IS NULL THEN FALSE ELSE TRUE END AS success - FROM ( - SELECT - q, c, ( - SELECT the_geom - FROM postal_code_polygons - WHERE postal_code = CASE WHEN a = 'CAN' THEN substring(upper(d.q) from 1 for 3) ELSE upper(d.q) END - AND adm0_a3 = a - ) geom - FROM (SELECT unnest(code) q, unnest(inputcountries) c, unnest(adm) a) d - ) v - LOOP - RETURN NEXT ret; - END LOOP; - RETURN; -END -$$ LANGUAGE 'plpgsql' SECURITY DEFINER; - - --- codes array, country text - -CREATE OR REPLACE FUNCTION test_geocode_postalcode_polygons(code text[], inputcountry text) - RETURNS SETOF geocode_namedplace_v1 AS $$ - DECLARE - c text; - c_iso3 text; - ret geocode_namedplace_v1%rowtype; - BEGIN - c := inputcountry; - - SELECT INTO c_iso3 adm0_a3 FROM admin0_synonyms WHERE name_ = lower(regexp_replace(c, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g'))::text LIMIT 1; - - FOR ret IN - SELECT - q, geom, CASE WHEN geom IS NULL THEN FALSE ELSE TRUE END AS success - FROM ( - SELECT - q, ( - SELECT the_geom - FROM postal_code_polygons - WHERE postal_code = upper(d.q) - AND adm0_a3 = c_iso3 - ) geom - FROM (SELECT unnest(code) q) d - ) v - LOOP - RETURN NEXT ret; - END LOOP; - RETURN; -END -$$ LANGUAGE 'plpgsql' SECURITY DEFINER;