From a1192f7addaccd58f47354e17e3cab10143ed5ca Mon Sep 17 00:00:00 2001 From: Carla Date: Wed, 3 Feb 2016 18:13:01 +0100 Subject: [PATCH 1/3] Update build_synonym_table.sql --- geocoder/admin0/sql/build_synonym_table.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/geocoder/admin0/sql/build_synonym_table.sql b/geocoder/admin0/sql/build_synonym_table.sql index a3d315e..27ec932 100644 --- a/geocoder/admin0/sql/build_synonym_table.sql +++ b/geocoder/admin0/sql/build_synonym_table.sql @@ -81,7 +81,9 @@ INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT abbrev, 8, adm0_a3 FROM - ne_admin0_v3; + ne_admin0_v3 +WHERE + char_length(regexp_replace(abbrev, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; -- insert subunit as name with a rank = 9 INSERT INTO admin0_synonyms (name, rank, adm0_a3) From ec0bd5d2cc16056129aa24361c70d0b4da380568 Mon Sep 17 00:00:00 2001 From: Carla Date: Wed, 3 Feb 2016 18:21:28 +0100 Subject: [PATCH 2/3] Update build_synonym_table.sql --- geocoder/admin0/sql/build_synonym_table.sql | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/geocoder/admin0/sql/build_synonym_table.sql b/geocoder/admin0/sql/build_synonym_table.sql index 27ec932..df7d5dd 100644 --- a/geocoder/admin0/sql/build_synonym_table.sql +++ b/geocoder/admin0/sql/build_synonym_table.sql @@ -60,21 +60,27 @@ INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT formal_en, 5, adm0_a3 FROM - ne_admin0_v3; + ne_admin0_v3 +WHERE + char_length(regexp_replace(formal_en, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; -- insert brk_name as name with a rank = 6 INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT brk_name, 6, adm0_a3 FROM - ne_admin0_v3; + ne_admin0_v3 +WHERE + char_length(regexp_replace(brk_name, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; -- insert formal_fr as name with a rank = 7 INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT formal_fr, 7, adm0_a3 FROM - ne_admin0_v3; + ne_admin0_v3 +WHERE + char_length(regexp_replace(formal_fr, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; -- insert abbrv as name with a rank = 8 INSERT INTO admin0_synonyms (name, rank, adm0_a3) @@ -83,14 +89,16 @@ SELECT FROM ne_admin0_v3 WHERE - char_length(regexp_replace(abbrev, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; + char_length(regexp_replace(abbrev, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; -- insert subunit as name with a rank = 9 INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT subunit, 9, adm0_a3 FROM - ne_admin0_v3; + ne_admin0_v3 +WHERE + char_length(regexp_replace(subunit, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; -- insert manual additions with a rank = 10 INSERT INTO admin0_synonyms (name, rank, adm0_a3) From fa47ab92cc2070b9c74616a0cdd2222c747c6f95 Mon Sep 17 00:00:00 2001 From: Carla Date: Wed, 3 Feb 2016 18:24:38 +0100 Subject: [PATCH 3/3] Update build_synonym_table.sql --- geocoder/admin0/sql/build_synonym_table.sql | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/geocoder/admin0/sql/build_synonym_table.sql b/geocoder/admin0/sql/build_synonym_table.sql index df7d5dd..df9c4e1 100644 --- a/geocoder/admin0/sql/build_synonym_table.sql +++ b/geocoder/admin0/sql/build_synonym_table.sql @@ -60,27 +60,21 @@ INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT formal_en, 5, adm0_a3 FROM - ne_admin0_v3 -WHERE - char_length(regexp_replace(formal_en, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; + ne_admin0_v3; -- insert brk_name as name with a rank = 6 INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT brk_name, 6, adm0_a3 FROM - ne_admin0_v3 -WHERE - char_length(regexp_replace(brk_name, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; + ne_admin0_v3; -- insert formal_fr as name with a rank = 7 INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT formal_fr, 7, adm0_a3 FROM - ne_admin0_v3 -WHERE - char_length(regexp_replace(formal_fr, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; + ne_admin0_v3; -- insert abbrv as name with a rank = 8 INSERT INTO admin0_synonyms (name, rank, adm0_a3) @@ -96,9 +90,7 @@ INSERT INTO admin0_synonyms (name, rank, adm0_a3) SELECT subunit, 9, adm0_a3 FROM - ne_admin0_v3 -WHERE - char_length(regexp_replace(subunit, '[^a-zA-Z\u00C0-\u00ff]+', '', 'g')) > 3; + ne_admin0_v3; -- insert manual additions with a rank = 10 INSERT INTO admin0_synonyms (name, rank, adm0_a3)