Database: add aliases for 'old' names of WGS84 and ETRS89 datums, and remove one hack

2 files changed, 15 insertions, 0 deletions

diff --git a/data/sql/commit.sql b/data/sql/commit.sql
index 53c571b6..5e1d69ff 100644
--- a/data/sql/commit.sql
+++ b/data/sql/commit.sql
@@ -58,6 +58,15 @@ FOR EACH ROW BEGIN
                 d.auth_name = ensemble_auth_name AND d.code = ensemble_code)
         );
 
+    SELECT RAISE(ABORT, 'PROJ defines an alias that exists in EPSG')
+        WHERE EXISTS (
+         SELECT * FROM (
+            SELECT count(*) AS count, table_name, auth_name, code, alt_name FROM alias_name
+            WHERE source in ('EPSG', 'PROJ')
+            AND NOT (source = 'PROJ' AND alt_name IN ('GGRS87', 'NAD27', 'NAD83'))
+            GROUP BY table_name, auth_name, code, alt_name) x WHERE count > 1
+        );
+
     -- test to check that our custom grid transformation overrides are really needed
     SELECT RAISE(ABORT, 'PROJ grid_transformation defined whereas EPSG has one')
         WHERE EXISTS (SELECT 1 FROM grid_transformation g1
diff --git a/data/sql/customizations.sql b/data/sql/customizations.sql
index e7e7b47e..32b3b163 100644
--- a/data/sql/customizations.sql
+++ b/data/sql/customizations.sql
@@ -374,6 +374,12 @@ INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6277','OSGB36','PROJ');
 -- to the EPSG:4326 CRS, as this is a common use case (https://github.com/OSGeo/PROJ/issues/2216)
 INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4326','WGS84','PROJ');
 
+---- Aliases from old datum names to new datum ensemble names -----
+
+-- Those have been reported to IOGP and will hopefully be integrated in a later EPSG release
+INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6326','World Geodetic System 1984','PROJ');
+INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','6258','European Terrestrial Reference System 1989','PROJ');
+
 ---- PROJ unit short names -----
 
 -- Linear units