From e51a7db2bd5322463f8a7d345fb972bfd91ad921 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 6 Oct 2020 17:23:45 +0200 Subject: Database: avoid importing duplicated alias names --- data/sql/alias_name.sql | 1 - scripts/build_db.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/data/sql/alias_name.sql b/data/sql/alias_name.sql index 4f6b5927..88826f25 100644 --- a/data/sql/alias_name.sql +++ b/data/sql/alias_name.sql @@ -5072,7 +5072,6 @@ INSERT INTO "alias_name" VALUES('compound_crs','EPSG','8360','ETRS89 [ETRF2000] INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4417','Pulkovo 42(83) / 3GK zn7','EPSG'); INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','8357','Bpv','EPSG'); INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4434','Pulkovo 42(83) / 3GK zn8','EPSG'); -INSERT INTO "alias_name" VALUES('compound_crs','EPSG','8360','ETRS89 [ETRF2000] + Bpv','EPSG'); INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','8351','S-JTSK (JTSK03)','EPSG'); INSERT INTO "alias_name" VALUES('projected_crs','EPSG','8352','S-JTSK (JTSK03) / Krovak','EPSG'); INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','8357','SK_KRON / NH','EPSG'); diff --git a/scripts/build_db.py b/scripts/build_db.py index 47a275f1..113ee3fd 100755 --- a/scripts/build_db.py +++ b/scripts/build_db.py @@ -671,7 +671,7 @@ def fill_concatenated_operation(proj_db_cursor): def fill_alias(proj_db_cursor): - proj_db_cursor.execute("SELECT object_code, alias FROM epsg.epsg_alias WHERE object_table_name = 'epsg_datum'") + proj_db_cursor.execute("SELECT DISTINCT object_code, alias FROM epsg.epsg_alias WHERE object_table_name = 'epsg_datum'") for row in proj_db_cursor.fetchall(): code, alt_name = row proj_db_cursor.execute('SELECT 1 FROM geodetic_datum WHERE code = ?', (code,)) @@ -684,7 +684,7 @@ def fill_alias(proj_db_cursor): else: print('Cannot find datum %s in geodetic_datum or vertical_datum' % (code)) - proj_db_cursor.execute("SELECT object_code, alias FROM epsg.epsg_alias WHERE object_table_name = 'epsg_coordinatereferencesystem'") + proj_db_cursor.execute("SELECT DISTINCT object_code, alias FROM epsg.epsg_alias WHERE object_table_name = 'epsg_coordinatereferencesystem'") for row in proj_db_cursor.fetchall(): code, alt_name = row if int(code) > 60000000: -- cgit v1.2.3