cartodb4/data-services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleans country inputs and fixes some trailing spaces

Browse Source
This commit is contained in:
Carla Iriberri
2015-11-30 15:39:25 +01:00
parent 89cc5840b9
commit 352916d247
3 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
geocoder/extension/sql/0.0.1/20_admin1.sql
View File

@@ -13,9 +13,9 @@ CREATE OR REPLACE FUNCTION geocode_admin1_polygons(name text[]) RETURNS SETOF ge
FROM (
SELECT
q, (
SELECT the_geom
SELECT the_geom
FROM global_province_polygons
WHERE d.c = ANY (synonyms)
WHERE d.c = ANY (synonyms)
ORDER BY frequency DESC LIMIT 1
) geom
FROM (SELECT trim(replace(lower(unnest(name)),'.',' ')) c, unnest(name) q) d
@@ -31,23 +31,23 @@ $$;
CREATE OR REPLACE FUNCTION geocode_admin1_polygons(name text[], inputcountry text) RETURNS SETOF geocode_admin_v1
LANGUAGE plpgsql SECURITY DEFINER
AS $$
DECLARE
DECLARE
ret geocode_admin_v1%rowtype;
BEGIN
FOR ret IN WITH
FOR ret IN WITH
p AS (SELECT r.c, r.q, (SELECT iso3 FROM country_decoder WHERE lower(inputcountry) = ANY (synonyms)) i FROM (SELECT trim(replace(lower(unnest(name)),'.',' ')) c, unnest(name) q) r)
SELECT
q, geom, CASE WHEN geom IS NULL THEN FALSE ELSE TRUE END AS success
FROM (
SELECT
q, (
SELECT the_geom
SELECT the_geom
FROM global_province_polygons
WHERE p.c = ANY (synonyms)
WHERE p.c = ANY (synonyms)
AND iso3 = p.i
-- To calculate frequency, I simply counted the number of users
-- we had signed up in each country. Countries with more users,
-- we had signed up in each country. Countries with more users,
-- we favor higher in the geocoder :)
ORDER BY frequency DESC LIMIT 1
) geom
@@ -63,7 +63,7 @@ $$;
CREATE OR REPLACE FUNCTION geocode_admin1_polygons(names text[], country text[]) RETURNS SETOF geocode_admin_country_v1
LANGUAGE plpgsql SECURITY DEFINER
AS $$
DECLARE
DECLARE
ret geocode_admin_country_v1%rowtype;
nans TEXT[];
BEGIN
@@ -86,12 +86,12 @@ CREATE OR REPLACE FUNCTION geocode_admin1_polygons(names text[], country text[])
FROM (
SELECT
q, c, (
SELECT the_geom
SELECT the_geom
FROM global_province_polygons
WHERE p.p = ANY (synonyms)
WHERE p.p = ANY (synonyms)
AND iso3 = p.i
-- To calculate frequency, I simply counted the number of users
-- we had signed up in each country. Countries with more users,
-- we had signed up in each country. Countries with more users,
-- we favor higher in the geocoder :)
ORDER BY frequency DESC LIMIT 1
) geom