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

Fixed to keep the provider order in the results

Browse Source 
Also now is compatible with PG10
This commit is contained in:
Mario de Frutos
2018-02-14 14:23:19 +01:00
parent ff1f6125e8
commit 5df9e5b850
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geocoder/extension/expected/20_admin0_test.out
+2 -2
View File
@@ -10,9 +10,9 @@ SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*;
SELECT (geocode_admin0_polygons(Array['Spain', 'USA', ''])).*; SELECT (geocode_admin0_polygons(Array['Spain', 'USA', ''])).*;
q | geom | success q | geom | success
-------+------+--------- -------+------+---------
| | f
Spain | | f Spain | | f
USA | | f USA | | f
| | f
(3 rows) (3 rows)
-- Add a few synonyms -- Add a few synonyms
@@ -21,7 +21,7 @@ COPY admin0_synonyms (name, rank, created_at, updated_at, the_geom, the_geom_web
SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*; SELECT (admin0_synonym_lookup(Array['United States', 'ESP'])).*;
q | adm0_a3 q | adm0_a3
---------------+--------- ---------------+---------
ESP | ESP
United States | USA United States | USA
ESP | ESP
(2 rows) (2 rows)
geocoder/extension/sql/0.0.1/20_admin0.sql
+11 -9
View File
@@ -8,11 +8,12 @@ CREATE OR REPLACE FUNCTION geocode_admin0_polygons(name text[])
BEGIN BEGIN
-- FOR ret IN -- FOR ret IN
RETURN QUERY RETURN QUERY
SELECT d.q, n.the_geom as geom, CASE WHEN s.adm0_a3 IS NULL then FALSE ELSE TRUE END AS success SELECT q, n.the_geom as geom, CASE WHEN s.adm0_a3 IS NULL then FALSE ELSE TRUE END AS success
FROM (SELECT q, lower(geocode_clean_name(q))::text x FROM unnest(name) WITH ORDINALITY q
FROM (SELECT unnest(name) q) g) d LEFT OUTER JOIN admin0_synonyms s ON name_ = lower(geocode_clean_name(q))::text
LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x LEFT OUTER JOIN ne_admin0_v3 n ON s.adm0_a3 = n.adm0_a3
LEFT OUTER JOIN ne_admin0_v3 n ON s.adm0_a3 = n.adm0_a3 GROUP BY d.q, n.the_geom, s.adm0_a3; GROUP BY q, n.the_geom, s.adm0_a3, q.ordinality
ORDER BY q.ordinality;
END END
$$ LANGUAGE 'plpgsql' SECURITY DEFINER; $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
@@ -23,10 +24,11 @@ CREATE OR REPLACE FUNCTION admin0_synonym_lookup(name text[])
DECLARE DECLARE
ret synonym_lookup_v1%rowtype; ret synonym_lookup_v1%rowtype;
BEGIN RETURN QUERY BEGIN RETURN QUERY
SELECT d.q, s.adm0_a3 SELECT q, s.adm0_a3
FROM (SELECT q, lower(geocode_clean_name(q))::text x FROM unnest(name) WITH ORDINALITY q
FROM (SELECT unnest(name) q) g) d LEFT OUTER JOIN admin0_synonyms s ON name_ = lower(geocode_clean_name(q))::text
LEFT OUTER JOIN admin0_synonyms s ON name_ = d.x GROUP BY d.q, s.adm0_a3; GROUP BY q, s.adm0_a3, q.ordinality
ORDER BY q.ordinality;
END END
$$ LANGUAGE 'plpgsql' SECURITY DEFINER; $$ LANGUAGE 'plpgsql' SECURITY DEFINER;