From 53b83f447b82b59d944d63b336839676d8265b88 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 29 Nov 2018 16:04:49 +0100
Subject: importFromWKT v1: properly handle latitude_of_origin=0 for
 Mercator_1SP

---
 src/io.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/io.cpp')

diff --git a/src/io.cpp b/src/io.cpp
index 90732a32..3a980993 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -1199,8 +1199,8 @@ struct WKTParser::Private {
     static bool hasWebMercPROJ4String(const WKTNodeNNPtr &projCRSNode,
                                       const WKTNodeNNPtr &projectionNode);
 
-    static bool projectionHasParameter(const WKTNodeNNPtr &projCRSNode,
-                                       const char *paramName);
+    static std::string projectionGetParameter(const WKTNodeNNPtr &projCRSNode,
+                                              const char *paramName);
 
     ConversionNNPtr buildProjection(const WKTNodeNNPtr &projCRSNode,
                                     const WKTNodeNNPtr &projectionNode,
@@ -3044,19 +3044,20 @@ WKTParser::Private::buildProjection(const WKTNodeNNPtr &projCRSNode,
 
 // ---------------------------------------------------------------------------
 
-bool WKTParser::Private::projectionHasParameter(const WKTNodeNNPtr &projCRSNode,
-                                                const char *paramName) {
+std::string
+WKTParser::Private::projectionGetParameter(const WKTNodeNNPtr &projCRSNode,
+                                           const char *paramName) {
     for (const auto &childNode : projCRSNode->GP()->children()) {
         if (ci_equal(childNode->GP()->value(), WKTConstants::PARAMETER)) {
             const auto &childNodeChildren = childNode->GP()->children();
             if (childNodeChildren.size() == 2 &&
                 metadata::Identifier::isEquivalentName(
                     stripQuotes(childNodeChildren[0]).c_str(), paramName)) {
-                return true;
+                return childNodeChildren[1]->GP()->value();
             }
         }
     }
-    return false;
+    return std::string();
 }
 
 // ---------------------------------------------------------------------------
@@ -3078,10 +3079,12 @@ ConversionNNPtr WKTParser::Private::buildProjectionStandard(
     bool gdal_3026_hack = false;
     if (metadata::Identifier::isEquivalentName(wkt1ProjectionName.c_str(),
                                                "Mercator_1SP") &&
-        !projectionHasParameter(projCRSNode, "center_latitude")) {
+        projectionGetParameter(projCRSNode, "center_latitude").empty()) {
 
         // Hack for https://trac.osgeo.org/gdal/ticket/3026
-        if (projectionHasParameter(projCRSNode, "latitude_of_origin")) {
+        std::string lat0(
+            projectionGetParameter(projCRSNode, "latitude_of_origin"));
+        if (!lat0.empty() && lat0 != "0" && lat0 != "0.0") {
             wkt1ProjectionName = "Mercator_2SP";
             gdal_3026_hack = true;
         } else {
-- 
cgit v1.2.3