Skip to content

Commit c0fc1fa

Browse files
committed
Database: add copy of 'BD72 to ETRS89-BEL [BEREF2011] (3)' to also apply to BEREF2002, and copy of 'ED50 to ETRS89-ESP [REGENTE] (14)' to also apply to ETRS89
1 parent a818559 commit c0fc1fa

4 files changed

Lines changed: 44 additions & 4 deletions

File tree

data/sql/final_consistency_checks.sql

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,12 @@ FOR EACH ROW BEGIN
6666
AND g1.source_crs_code = g2.source_crs_code
6767
AND g1.target_crs_auth_name = g2.target_crs_auth_name
6868
AND g1.target_crs_code = g2.target_crs_code
69-
WHERE g1.auth_name = 'PROJ' AND g1.code NOT LIKE '%_RESTRICTED_TO_VERTCRS%' AND g2.auth_name = 'EPSG' AND g2.deprecated = 0 AND (
70-
(g1.interpolation_crs_auth_name IS NULL AND g2.interpolation_crs_auth_name IS NULL) OR
69+
WHERE g1.auth_name = 'PROJ'
70+
AND g1.code NOT LIKE '%_RESTRICTED_TO_VERTCRS%'
71+
AND g1.code != 'ED50_TO_ETRS89_CATALONIA'
72+
AND g2.auth_name = 'EPSG'
73+
AND g2.deprecated = 0 AND
74+
((g1.interpolation_crs_auth_name IS NULL AND g2.interpolation_crs_auth_name IS NULL) OR
7175
(g1.interpolation_crs_auth_name IS NOT NULL AND g2.interpolation_crs_auth_name IS NOT NULL AND
7276
g1.interpolation_crs_auth_name = g2.interpolation_crs_auth_name AND
7377
g1.interpolation_crs_code = g2.interpolation_crs_code)))

data/sql/grid_transformation_custom.sql

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
-- This file is hand generated.
22

3+
-- Belgium
4+
5+
-- FIXME: remove this record when EPSG has fixed that issue
6+
INSERT INTO "grid_transformation" VALUES('PROJ','BD72_TO_BEREF2002','BD72 to ETRS89-BEL [BEREF2002] (3)','Copy of BD72 to ETRS89-BEL [BEREF2011] (3) EPSG:8369','EPSG','9615','NTv2','EPSG','4313','EPSG','11063',0.01,'EPSG','8656','Latitude and longitude difference file','bd72lb72_etrs89lb08.gsb',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'IGN-Bel 0.01m',0);
7+
INSERT INTO "usage" VALUES('PROJ','BD72_TO_BEREF2002_USAGE','grid_transformation','PROJ','BD72_TO_BEREF2002','EPSG','1347','EPSG','1150');
8+
9+
-- Catalonia
10+
11+
-- FIXME: remove this record when EPSG has fixed that issue
12+
INSERT INTO "grid_transformation" VALUES('PROJ','ED50_TO_ETRS89_CATALONIA','ED50 to ETRS89 (14)','Copy of ED50 to ETRS89-ESP [REGENTE] (14) EPSG:5661','EPSG','9615','NTv2','EPSG','4230','EPSG','4258',0.05,'EPSG','8656','Latitude and longitude difference file','100800401.gsb',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ICC-Esp Cat',0);
13+
INSERT INTO "usage" VALUES('PROJ','ED50_TO_ETRS89_CATALONIA_USAGE','grid_transformation','PROJ','ED50_TO_ETRS89_CATALONIA','EPSG','3732','EPSG','1079');
14+
315
-- Denmark
416

517
INSERT INTO "grid_transformation" VALUES(

data/sql/proj.db.sql.expected.md5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e8ed9d4f446a6ee5d805490b6f915751
1+
d6ab76428b888374927b8fdaa2e335ab

test/gie/epsg_grid.gie

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,31 @@ accept 55.0 12.0 10.0
1818
expect 55.0 12.0 -27.8257
1919

2020
################
21-
#### FRANCE ####
21+
#### Belgium ####
22+
#################
23+
24+
crs_src EPSG:31370 # BD72 / Belgian Lambert 72
25+
crs_dst EPSG:3812 # ETRS89-BEL [BEREF2002] / Belgian Lambert 2008
26+
tolerance 0.1 mm
27+
require_grid be_ign_bd72lb72_etrs89lb08.tif
28+
29+
accept 149186.41 170810.74
30+
expect 649186.03701863 670811.16949360
31+
32+
###################
33+
#### Catalonia ####
34+
###################
35+
36+
crs_src EPSG:4230 # ED50
37+
crs_dst EPSG:4258 # ETRS89
38+
tolerance 0.1 mm
39+
require_grid es_cat_icgc_100800401.tif
40+
41+
accept 41.4 2.17
42+
expect 41.398875399 2.168850772
43+
44+
################
45+
#### France ####
2246
################
2347

2448
crs_src EPSG:9785 # RGF93 v2b + NGF-IGN69 height

0 commit comments

Comments
 (0)