aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111/coordinateoperation.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-04-22 19:25:07 +0200
committerGitHub <noreply@github.com>2020-04-22 19:25:07 +0200
commit529a5c098cad1d93e1bad5ca5cdf83d92e87cc77 (patch)
treed3233e48366f3aac8e67e1d3fad834d1c4499972 /src/iso19111/coordinateoperation.cpp
parent94aa1fc5ea1660be3f4fd10d069c44772df165d3 (diff)
downloadPROJ-529a5c098cad1d93e1bad5ca5cdf83d92e87cc77.tar.gz
PROJ-529a5c098cad1d93e1bad5ca5cdf83d92e87cc77.zip
PROJ4 string import: take into correctly non-metre unit when the string looks like the one for WGS 84 / Pseudo Mercator (fixes https://github.com/OSGeo/gdal/issues/2433) (#2174)
Diffstat (limited to 'src/iso19111/coordinateoperation.cpp')
-rw-r--r--src/iso19111/coordinateoperation.cpp20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp
index 4b174636..ab954ee2 100644
--- a/src/iso19111/coordinateoperation.cpp
+++ b/src/iso19111/coordinateoperation.cpp
@@ -5825,6 +5825,24 @@ static bool createPROJ4WebMercator(const Conversion *conv,
return false;
}
+ std::string units("m");
+ auto targetCRS = conv->targetCRS();
+ auto targetProjCRS =
+ dynamic_cast<const crs::ProjectedCRS *>(targetCRS.get());
+ if (targetProjCRS) {
+ const auto &axisList = targetProjCRS->coordinateSystem()->axisList();
+ const auto &unit = axisList[0]->unit();
+ if (!unit._isEquivalentTo(common::UnitOfMeasure::METRE,
+ util::IComparable::Criterion::EQUIVALENT)) {
+ auto projUnit = unit.exportToPROJString();
+ if (!projUnit.empty()) {
+ units = projUnit;
+ } else {
+ return false;
+ }
+ }
+ }
+
formatter->addStep("merc");
const double a = geogCRS->ellipsoid()->semiMajorAxis().getSIValue();
formatter->addParam("a", a);
@@ -5834,7 +5852,7 @@ static bool createPROJ4WebMercator(const Conversion *conv,
formatter->addParam("x_0", falseEasting);
formatter->addParam("y_0", falseNorthing);
formatter->addParam("k", 1.0);
- formatter->addParam("units", "m");
+ formatter->addParam("units", units);
formatter->addParam("nadgrids", "@null");
formatter->addParam("wktext");
formatter->addParam("no_defs");