lib/postgres/geo.sql

diff --git a/lib/postgres/geo.sql b/lib/postgres/geo.sql
index 655caf0b69d16f0c45088aaa8684b5bd39f0da65..96100c7840d9b1ca62c98921f6bebb13d8b0b808 100644 (file)
--- a/lib/postgres/geo.sql
+++ b/lib/postgres/geo.sql
@@ -18,7 +18,7 @@
 -- timezone          : the iana timezone id (see file timeZone.txt) varchar(40)
 -- modification date : date of last modification in yyyy-MM-dd format
 DROP TABLE IF EXISTS geo;
-CREATE TABLE IF NOT EXISTS geo (
+CREATE TABLE geo (
   id bigint PRIMARY KEY,
   name varchar(200),
   asciiname varchar(200),
@@ -29,10 +29,10 @@ CREATE TABLE IF NOT EXISTS geo (
   feature_code varchar(10),
   country char(2),
   cc2 varchar(200),
-  admin1 varchar(20),
-  admin2 varchar(80),
-  admin3 varchar(20),
-  admin4 varchar(20),
+-- NB 06.01.18   admin1 varchar(20),
+-- NB 06.01.18   admin2 varchar(80),
+-- NB 06.01.18   admin3 varchar(20),
+-- NB 06.01.18   admin4 varchar(20),
   population bigint,
   elevation integer,
   dem integer,
@@ -45,5 +45,6 @@ GRANT ALL ON ALL TABLES IN SCHEMA public TO root;
 CREATE INDEX IF NOT EXISTS geo_country_idx ON geo (country);
 BEGIN TRANSACTION;
 DELETE FROM geo;
-COPY geo FROM PROGRAM 'curl -s http://download.geonames.org/export/dump/allCountries.zip | zcat' WITH (format 'text', NULL '');
+-- NB 06.01.18 COPY geo FROM PROGRAM 'curl -s http://download.geonames.org/export/dump/allCountries.zip | zcat' WITH (format 'text', NULL '');
+COPY geo FROM PROGRAM 'curl -s http://download.geonames.org/export/dump/allCountries.zip | zcat | cut -f -10,15-' WITH (format 'text', NULL '');
 COMMIT;