Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to EPSG 10.003 and make code base robust to dealing with WKT CRS with DatumEnsemble #2370

Merged
merged 19 commits into from
Oct 16, 2020
Merged

Update to EPSG 10.003 and make code base robust to dealing with WKT CRS with DatumEnsemble #2370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a9b6f39
Database: "minimal" update to EPSG v10.003
rouault Sep 24, 2020
4c99203
Database: add a reference_frame_epoch column to the geodetic_datum fo…
rouault Oct 5, 2020
2cfdd6f
Database: instanciate DynamicGeodeticReferenceFrame (things like ITRF…
rouault Oct 5, 2020
3ed9a61
Database: use extended description for extent/area of use, as done by…
rouault Oct 5, 2020
ecf9cf0
getCRSInfoList(): make it use area description
rouault Oct 8, 2020
ff9a386
Database: import datum ensemble accuracy and members (but do not use …
rouault Oct 6, 2020
e51a7db
Database: avoid importing duplicated alias names
rouault Oct 6, 2020
fece8a6
Database: add aliases for 'old' names of WGS84 and ETRS89 datums, and…
rouault Oct 6, 2020
b5369cc
Add a AuthorityFactory::createDatumEnsemble() method, and make it inh…
rouault Oct 6, 2020
9dc3bf5
Add DatumEnsemble::asDatum() and use it in exportToWkt()
rouault Oct 6, 2020
53672bd
Make CRS identification work with CRS with DatumEnsemble
rouault Oct 7, 2020
492c95c
Make createOperations() work with DatumEnsemble
rouault Oct 7, 2020
4049f4c
createGeodeticCRS(): more DatumEnsemble compatibility in the case whe…
rouault Oct 7, 2020
f147821
Add C API to work with datum ensemble
rouault Oct 8, 2020
67af1d5
Make proj_create_crs_to_crs() / cs2cs work with CRS with DatumEnsemble
rouault Oct 8, 2020
acd1cf3
Make GeographicCRS::is2DPartOf3D() work with DatumEnsemble
rouault Oct 8, 2020
ad80dc8
Database: add a frame_reference_epoch column in vertical_datum to be …
rouault Oct 11, 2020
d1a0d95
Database query: add AuthorityFactory::ObjectType::DYNAMIC_GEODETIC_RE…
rouault Oct 11, 2020
6867134
C API: add proj_dynamic_datum_get_frame_reference_epoch()
rouault Oct 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion data/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ SQL_ORDERED_LIST = sql/begin.sql \
sql/conversion_triggers.sql \
sql/metadata.sql \
sql/unit_of_measure.sql \
sql/area.sql \
sql/extent.sql \
sql/scope.sql \
sql/coordinate_system.sql \
sql/axis.sql \
sql/ellipsoid.sql \
sql/prime_meridian.sql \
sql/geodetic_datum.sql \
sql/geodetic_datum_ensemble_member.sql \
sql/vertical_datum.sql \
sql/vertical_datum_ensemble_member.sql \
sql/conversion.sql \
sql/geodetic_crs.sql \
sql/projected_crs.sql \
Expand All @@ -30,6 +33,7 @@ SQL_ORDERED_LIST = sql/begin.sql \
sql/other_transformation.sql \
sql/concatenated_operation.sql \
sql/concatenated_operation_step.sql \
sql/usage.sql \
sql/alias_name.sql \
sql/supersession.sql \
sql/deprecation.sql \
Expand Down
7 changes: 3 additions & 4 deletions data/sql/alias_name.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1131','JGD2011 (vertica
INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1130','JGD2000 (vertical)','EPSG');
INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1129','JSLD72','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_datum','EPSG','1132','RDN2008','EPSG');
INSERT INTO "alias_name" VALUES('vertical_datum','EPSG','1288','BI','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','21100','Genuk / NEIEZ','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2140','NAD83(CSRS98) / SCoPQ zone 3','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2141','NAD83(CSRS98) / SCoPQ zone 4','EPSG');
Expand Down Expand Up @@ -2791,7 +2792,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2058','ED50(ED77) / UTM
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2059','ED50(ED77) / UTM 39N','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2060','ED50(ED77) / UTM 40N','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2061','ED50(ED77) / UTM 41N','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2062','Madrid (Madrid) / Spain LCC','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2063','Dabola 1981 / UTM 28N','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2064','Dabola 1981 / UTM 29N','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2104','Lake / La Rosa Grid','EPSG');
Expand Down Expand Up @@ -4837,7 +4837,6 @@ INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2315','Campo Inchauspe /
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2316','Campo Inchauspe /UTM 20S','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','7992','Malongo 1987 / UTM 33S','EPSG');
INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','7976','Hong Kong Principal Datum depth','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2062','Madrid - LCC','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','8042','S-SC','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','8042','Stable Cadastre','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','8043','Stable cadastre','EPSG');
Expand Down Expand Up @@ -5073,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');
Expand Down Expand Up @@ -6087,7 +6085,6 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','5195','MK_TRIE / NOH','EP
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','4826','WGS 84 / Cape Verde New','EPSG');
INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','9390','EVRF2019mean_AMST / NH','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4479','732','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4479','CGCS 2000 - XYZ','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4480','733','EPSG');
INSERT INTO "alias_name" VALUES('compound_crs','EPSG','9450','ETRS89 + Belfast Lough height','EPSG');
INSERT INTO "alias_name" VALUES('geodetic_crs','EPSG','4480','CGCS 2000 - LatLonEht','EPSG');
Expand Down Expand Up @@ -7195,3 +7192,5 @@ INSERT INTO "alias_name" VALUES('vertical_crs','EPSG','6693','JSLD height','EPSG
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6707','RDN2008 / TM32','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6708','RDN2008 / TM33','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','6709','RDN2008 / TM34','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2062','Madrid (Madrid) / Spain LCC','EPSG');
INSERT INTO "alias_name" VALUES('projected_crs','EPSG','2062','Madrid - LCC','EPSG');
Loading