diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-10-18 19:54:55 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-10-18 19:55:22 +0000 |
| commit | 00bac075a1b626f87262ea5c64a805a104765cba (patch) | |
| tree | 504becc4b6c240ec84d9b2e0eec6925da4da37a3 /src | |
| parent | f94f1ddeaa83bab4f6f3f9d5720a777e569c781b (diff) | |
| download | PROJ-00bac075a1b626f87262ea5c64a805a104765cba.tar.gz PROJ-00bac075a1b626f87262ea5c64a805a104765cba.zip | |
createOperations(): fix double vertical unit conversion from CompoundCRS to other CRS when the horizontal part of the projected CRS uses non-metre unit
Fix issue reported on https://lists.osgeo.org/pipermail/proj/2019-October/008939.html
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/crs.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index eea7cce8..a13662cd 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -3239,13 +3239,16 @@ void ProjectedCRS::addUnitConvertAndAxisSwap(io::PROJStringFormatter *formatter, if (!formatter->getCRSExport()) { formatter->addStep("unitconvert"); formatter->addParam("xy_in", "m"); - formatter->addParam("z_in", "m"); + if (!formatter->omitZUnitConversion()) + formatter->addParam("z_in", "m"); if (projUnit.empty()) { formatter->addParam("xy_out", toSI); - formatter->addParam("z_out", toSI); + if (!formatter->omitZUnitConversion()) + formatter->addParam("z_out", toSI); } else { formatter->addParam("xy_out", projUnit); - formatter->addParam("z_out", projUnit); + if (!formatter->omitZUnitConversion()) + formatter->addParam("z_out", projUnit); } } else { if (projUnit.empty()) { |
