diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-10-18 23:25:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 23:25:47 +0200 |
| commit | 20b8604f3fef503015010a1c4fe37771d679e42c (patch) | |
| tree | 8337cf581c703917565f8cf86a1a091040a3f5b6 /src | |
| parent | 00666ee8352ea188f89c53bc38823ab711dacde5 (diff) | |
| parent | 0af6db3af53160fcc94c9bb9c9198bed12e484cc (diff) | |
| download | PROJ-20b8604f3fef503015010a1c4fe37771d679e42c.tar.gz PROJ-20b8604f3fef503015010a1c4fe37771d679e42c.zip | |
Merge pull request #1683 from rouault/fix_double_vertical_unit_conversion
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')
| -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()) { |