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

createOperations(): tune name and remarks of some vertical transformations #3334

Merged
merged 6 commits into from
Sep 22, 2022
Merged

createOperations(): tune name and remarks of some vertical transformations #3334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28f4486
Database: create a undeprecated copy of EPSG:9123 grid transformation…
rouault Sep 20, 2022
4444957
Database: alias HT2_1997.byn to ca_nrc_HT2_2010v70.tif (refs #3328)
rouault Sep 20, 2022
67017db
createOperations: add missing +proj=push +v_1 +v_2 / +proj=pop +v_1 +…
rouault Sep 20, 2022
435a78e
PROJ string pipeline optimizer: add optimization for EPSG:4326+5773 t…
rouault Sep 20, 2022
966ea2b
Tests: test EPSG:4326+5773 to EPSG:4326+5713 (refs #3328)
rouault Sep 20, 2022
ecc13ab
createOperations(): tune name and remarks of some vertical transforma…
rouault Sep 20, 2022
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
4 changes: 2 additions & 2 deletions data/sql/commit.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ FOR EACH ROW BEGIN
AND g1.source_crs_code = g2.source_crs_code
AND g1.target_crs_auth_name = g2.target_crs_auth_name
AND g1.target_crs_code = g2.target_crs_code
WHERE g1.auth_name = 'PROJ' AND g1.code NOT LIKE '%_RESTRICTED_TO_VERTCRS%' AND g2.auth_name = 'EPSG')
WHERE g1.auth_name = 'PROJ' AND g1.code NOT LIKE '%_RESTRICTED_TO_VERTCRS%' AND g2.auth_name = 'EPSG' AND g2.deprecated = 0)
OR EXISTS (SELECT 1 FROM grid_transformation g1
JOIN grid_transformation g2
ON g1.source_crs_auth_name = g2.target_crs_auth_name
AND g1.source_crs_code = g2.target_crs_code
AND g1.target_crs_auth_name = g1.source_crs_auth_name
AND g1.target_crs_code = g1.source_crs_code
WHERE g1.auth_name = 'PROJ' AND g1.code NOT LIKE '%_RESTRICTED_TO_VERTCRS%' AND g2.auth_name = 'EPSG');
WHERE g1.auth_name = 'PROJ' AND g1.code NOT LIKE '%_RESTRICTED_TO_VERTCRS%' AND g2.auth_name = 'EPSG' AND g2.deprecated = 0);

SELECT RAISE(ABORT, 'Arg! there is now a EPSG:102100 object. Hack in createFromUserInput() will no longer work')
WHERE EXISTS(SELECT 1 FROM crs_view WHERE auth_name = 'EPSG' AND code = '102100');
Expand Down
44 changes: 44 additions & 0 deletions data/sql/customizations.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,50 @@ UPDATE grid_transformation SET accuracy = 2.0 WHERE auth_name = 'EPSG' AND code

UPDATE grid_transformation SET accuracy = 2.0 WHERE auth_name = 'EPSG' AND code = '1462';


-- Create a PROJ copy of EPSG:9123 "NAD83(CSRS) to CGVD28 height (1)" by
-- removing the deprecation flag.
-- Having a transformation from/to CGVD28 using the "generic" NAD83(CSRS) is much
-- more convenient for low accuracy cases like /~https://github.com/OSGeo/PROJ/issues/3328
INSERT INTO grid_transformation SELECT
'PROJ' AS auth_name,
'EPSG_9123' AS code,
name,
description || ' Imported from EPSG:9123 with deprecation flag removed by PROJ' AS description,
method_auth_name,
method_code,
method_name,
source_crs_auth_name,
source_crs_code,
target_crs_auth_name,
target_crs_code,
accuracy,
grid_param_auth_name,
grid_param_code,
grid_param_name,
grid_name,
grid2_param_auth_name,
grid2_param_code,
grid2_param_name,
grid2_name,
interpolation_crs_auth_name,
interpolation_crs_code,
operation_version,
0 AS deprecated
FROM grid_transformation WHERE auth_name = 'EPSG' AND code = '9123';

INSERT INTO usage SELECT
'PROJ' AS auth_name,
'USAGE_PROJ_EPSG_9123' AS code,
object_table_name,
'PROJ' AS object_auth_name,
'EPSG_9123' AS object_code,
extent_auth_name,
extent_code,
scope_auth_name,
scope_code
FROM usage WHERE object_table_name = 'grid_transformation' AND object_auth_name = 'EPSG' AND object_code = '9123';

-- Define the allowed authorities, and their precedence, when researching a
-- coordinate operation

Expand Down
3 changes: 2 additions & 1 deletion data/sql/grid_alternatives.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ VALUES
('CGG2013an83.byn','ca_nrc_CGG2013an83.tif','CGG2013an83.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_CGG2013an83.tif',1,1,NULL),
('CGG2013i83.byn','ca_nrc_CGG2013i08.tif','CGG2013i08.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_CGG2013i08.tif',1,1,NULL),
('CGG2013n83.byn','ca_nrc_CGG2013n83.tif','CGG2013n83.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_CGG2013n83.tif',1,1,NULL),
('HT2_0.byn','ca_nrc_HT2_2010v70.tif','HT2_2010v70.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70.tif',1,1,NULL), -- deprecated name
('HT2_0.byn','ca_nrc_HT2_2010v70.tif','HT2_2010v70.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70.tif',1,1,NULL), -- deprecated name. dubious mapping !!!
('HT2_1997.byn','ca_nrc_HT2_2010v70.tif',NULL,'GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70.tif',1,1,NULL), -- dubious mapping !!!
('HT2_2010v70.byn','ca_nrc_HT2_2010v70.tif','HT2_2010v70.gtx','GTiff','geoid_like',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70.tif',1,1,NULL),
('HT2_2010v70_CGG2013a.byn','ca_nrc_HT2_2010v70_CGG2013a.tif',NULL,'GTiff','vgridshift',0,NULL,'https://cdn.proj.org/ca_nrc_HT2_2010v70_CGG2013a.tif',1,1,NULL),
-- the PROJ grid is the reverse way of the EPSG one
Expand Down
120 changes: 114 additions & 6 deletions src/iso19111/io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8618,7 +8618,8 @@ const std::string &PROJStringFormatter::toString() const {
iterNext = std::next(iterNext);
}
}
if (ok && iterNext != steps.end()) {
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "axisswap" &&
Expand All @@ -8628,7 +8629,8 @@ const std::string &PROJStringFormatter::toString() const {
iterNext = std::next(iterNext);
}
}
if (ok && iterNext != steps.end()) {
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "unitconvert" &&
Expand All @@ -8640,15 +8642,17 @@ const std::string &PROJStringFormatter::toString() const {
}
}
auto iterVgridshift = iterNext;
if (ok && iterNext != steps.end()) {
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "vgridshift") {
ok = true;
iterNext = std::next(iterNext);
}
}
if (ok && iterNext != steps.end()) {
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "unitconvert" &&
Expand All @@ -8659,7 +8663,8 @@ const std::string &PROJStringFormatter::toString() const {
iterNext = std::next(iterNext);
}
}
if (ok && iterNext != steps.end()) {
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "axisswap" &&
Expand All @@ -8669,14 +8674,16 @@ const std::string &PROJStringFormatter::toString() const {
iterNext = std::next(iterNext);
}
}
if (ok && iterNext != steps.end()) {
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "pop" &&
nextStep.paramValues.size() == 2 &&
nextStep.paramValues[0].keyEquals("v_1") &&
nextStep.paramValues[1].keyEquals("v_2")) {
ok = true;
// iterNext = std::next(iterNext);
}
}
if (ok) {
Expand All @@ -8688,6 +8695,107 @@ const std::string &PROJStringFormatter::toString() const {
}
}

// +step +proj=axisswap +order=2,1
// +step +proj=unitconvert +xy_in=deg +xy_out=rad
// +step +proj=vgridshift ...
// +step +proj=unitconvert +xy_in=rad +xy_out=deg
// +step +proj=axisswap +order=2,1
// +step +proj=push +v_1 +v_2
// +step +proj=axisswap +order=2,1
// +step +proj=unitconvert +xy_in=deg +xy_out=rad
// ==>
// +step +proj=push +v_1 +v_2
// +step +proj=axisswap +order=2,1
// +step +proj=unitconvert +xy_in=deg +xy_out=rad
// +step +proj=vgridshift ...

if (prevStep.name == "axisswap" && prevStepParamCount == 1 &&
prevStep.paramValues[0].equals("order", "2,1") &&
curStep.name == "unitconvert" && curStepParamCount == 2 &&
!curStep.inverted &&
curStep.paramValues[0].equals("xy_in", "deg") &&
curStep.paramValues[1].equals("xy_out", "rad")) {
auto iterNext = std::next(iterCur);
bool ok = false;
auto iterVgridshift = iterNext;
if (iterNext != steps.end()) {
auto &nextStep = *iterNext;
if (nextStep.name == "vgridshift") {
ok = true;
iterNext = std::next(iterNext);
}
}
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "unitconvert" && !nextStep.inverted &&
nextStep.paramValues.size() == 2 &&
nextStep.paramValues[0].equals("xy_in", "rad") &&
nextStep.paramValues[1].equals("xy_out", "deg")) {
ok = true;
iterNext = std::next(iterNext);
}
}
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "axisswap" &&
nextStep.paramValues.size() == 1 &&
nextStep.paramValues[0].equals("order", "2,1")) {
ok = true;
iterNext = std::next(iterNext);
}
}
auto iterPush = iterNext;
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "push" &&
nextStep.paramValues.size() == 2 &&
nextStep.paramValues[0].keyEquals("v_1") &&
nextStep.paramValues[1].keyEquals("v_2")) {
ok = true;
iterNext = std::next(iterNext);
}
}
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "axisswap" &&
nextStep.paramValues.size() == 1 &&
nextStep.paramValues[0].equals("order", "2,1")) {
ok = true;
iterNext = std::next(iterNext);
}
}
ok &= iterNext != steps.end();
if (ok) {
ok = false;
auto &nextStep = *iterNext;
if (nextStep.name == "unitconvert" &&
nextStep.paramValues.size() == 2 &&
!nextStep.inverted &&
nextStep.paramValues[0].equals("xy_in", "deg") &&
nextStep.paramValues[1].equals("xy_out", "rad")) {
ok = true;
// iterNext = std::next(iterNext);
}
}

if (ok) {
auto stepVgridshift = *iterVgridshift;
steps.erase(iterPrev, iterPush);
steps.insert(std::next(iterNext), stepVgridshift);
iterPrev = iterPush;
iterCur = std::next(iterPush);
continue;
}
}

++iterCur;
}
}
Expand Down
Loading