diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-12-17 11:34:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 11:34:27 +0100 |
| commit | b013d24bffe810cc5b3fb168c1abce5efabad807 (patch) | |
| tree | 2014bb128ee736184c46257d131c79aafa5d1ca0 /src/iso19111/operation/conversion.cpp | |
| parent | 0845df60254221e084cf76a894d9d87067ec29ed (diff) | |
| parent | 4608ef43d6cf41f7acc61d228caab3234e04b28b (diff) | |
| download | PROJ-b013d24bffe810cc5b3fb168c1abce5efabad807.tar.gz PROJ-b013d24bffe810cc5b3fb168c1abce5efabad807.zip | |
Merge pull request #2986 from OSGeo/backport-2985-to-8.2
[Backport 8.2] WKT1 import: correctly deal with missing rectified_grid_angle parameter
Diffstat (limited to 'src/iso19111/operation/conversion.cpp')
| -rw-r--r-- | src/iso19111/operation/conversion.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/iso19111/operation/conversion.cpp b/src/iso19111/operation/conversion.cpp index 9927892d..77e703f3 100644 --- a/src/iso19111/operation/conversion.cpp +++ b/src/iso19111/operation/conversion.cpp @@ -4005,6 +4005,16 @@ void Conversion::_exportToPROJString( EPSG_CODE_PARAMETER_SCALE_FACTOR_AT_NATURAL_ORIGIN) { valueConverted = 1.0; } + if ((mapping->epsg_code == + EPSG_CODE_METHOD_HOTINE_OBLIQUE_MERCATOR_VARIANT_A || + mapping->epsg_code == + EPSG_CODE_METHOD_HOTINE_OBLIQUE_MERCATOR_VARIANT_B) && + param->epsg_code == + EPSG_CODE_PARAMETER_ANGLE_RECTIFIED_TO_SKEW_GRID) { + // Do not use 0 as the default value for +gamma of + // proj=omerc + continue; + } } else if (param->unit_type == common::UnitOfMeasure::Type::ANGULAR) { valueConverted = |