diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-10-19 07:40:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 07:40:20 +0200 |
| commit | 6976050e23683adf07c4688352d8d283a13e6b37 (patch) | |
| tree | 504becc4b6c240ec84d9b2e0eec6925da4da37a3 /src/iso19111 | |
| parent | f94f1ddeaa83bab4f6f3f9d5720a777e569c781b (diff) | |
| parent | 00bac075a1b626f87262ea5c64a805a104765cba (diff) | |
| download | PROJ-6976050e23683adf07c4688352d8d283a13e6b37.tar.gz PROJ-6976050e23683adf07c4688352d8d283a13e6b37.zip | |
Merge pull request #1685 from OSGeo/backport-1683-to-6.2
[Backport 6.2] createOperations(): fix double vertical unit conversion from CompoundCRS to other CRS when the horizontal part of the projected CRS uses non-metre unit
Diffstat (limited to 'src/iso19111')
| -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()) { |