From b9d50247190e7b9ecd849ab260eb45edca3236cb Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 22 Nov 2018 21:32:51 +0100
Subject: Fix transformation between geographic CRS that differ by axis order
 and units

---
 src/coordinateoperation.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'src/coordinateoperation.cpp')

diff --git a/src/coordinateoperation.cpp b/src/coordinateoperation.cpp
index 42cc806e..e0e02931 100644
--- a/src/coordinateoperation.cpp
+++ b/src/coordinateoperation.cpp
@@ -8220,6 +8220,32 @@ bool SingleOperation::exportToPROJStringGeneric(
     if (isAxisOrderReversal(methodEPSGCode)) {
         formatter->addStep("axisswap");
         formatter->addParam("order", "2,1");
+        auto sourceCRSGeog =
+            dynamic_cast<const crs::GeographicCRS *>(sourceCRS().get());
+        auto targetCRSGeog =
+            dynamic_cast<const crs::GeographicCRS *>(targetCRS().get());
+        if (sourceCRSGeog && targetCRSGeog) {
+            const auto &unitSrc =
+                sourceCRSGeog->coordinateSystem()->axisList()[0]->unit();
+            const auto &unitDst =
+                targetCRSGeog->coordinateSystem()->axisList()[0]->unit();
+            if (!unitSrc._isEquivalentTo(
+                    unitDst, util::IComparable::Criterion::EQUIVALENT)) {
+                formatter->addStep("unitconvert");
+                auto projUnit = unitSrc.exportToPROJString();
+                if (projUnit.empty()) {
+                    formatter->addParam("xy_in", unitSrc.conversionToSI());
+                } else {
+                    formatter->addParam("xy_in", projUnit);
+                }
+                projUnit = unitDst.exportToPROJString();
+                if (projUnit.empty()) {
+                    formatter->addParam("xy_out", unitDst.conversionToSI());
+                } else {
+                    formatter->addParam("xy_out", projUnit);
+                }
+            }
+        }
         return true;
     }
 
-- 
cgit v1.2.3