diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-10-18 21:54:55 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-10-18 21:55:22 +0200 |
| commit | 0af6db3af53160fcc94c9bb9c9198bed12e484cc (patch) | |
| tree | 66825b6fde00022f9ddca81ed4f006af96aa833b /src | |
| parent | 5fbcf98c9ac6184a066d66a39d55bd3084926b2f (diff) | |
| download | PROJ-0af6db3af53160fcc94c9bb9c9198bed12e484cc.tar.gz PROJ-0af6db3af53160fcc94c9bb9c9198bed12e484cc.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 24763f5e..5d3af369 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -3332,13 +3332,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()) { |