Merge pull request #3866 from OSGeo/backport-3864-to-9.3

[Backport 9.3] JSON export: avoid non-significant decimal digits in version field (fixes #3863)
OSGeo · Aug 29, 2023 · 08f394e · 08f394e
2 parents 4f0376b + 847423f
commit 08f394e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
@@ -5981,7 +5981,7 @@ IdentifierNNPtr JSONParser::buildId(const json &j, bool removeInverseOf) {
                 static_cast<int>(dblVersion) == dblVersion) {
                 version = internal::toString(static_cast<int>(dblVersion));
             } else {
-                version = internal::toString(dblVersion);
+                version = internal::toString(dblVersion, /*precision=*/15);
             }
         } else {
             throw ParsingException("Unexpected type for value of \"version\"");

diff --git a/src/iso19111/metadata.cpp b/src/iso19111/metadata.cpp
@@ -1088,10 +1088,11 @@ void Identifier::_exportToWKT(WKTFormatter *formatter) const {
                 formatter->addQuotedString(l_code);
             }
             if (!l_version.empty()) {
-                try {
-                    (void)c_locale_stod(l_version);
+                bool isDouble = false;
+                (void)c_locale_stod(l_version, isDouble);
+                if (isDouble) {
                     formatter->add(l_version);
-                } catch (const std::exception &) {
+                } else {
                     formatter->addQuotedString(l_version);
                 }
             }
@@ -1140,16 +1141,11 @@ void Identifier::_exportToJSON(JSONFormatter *formatter) const {
 
         if (!l_version.empty()) {
             writer->AddObjKey("version");
-            try {
-                const double dblVersion = c_locale_stod(l_version);
-                if (dblVersion >= std::numeric_limits<int>::min() &&
-                    dblVersion <= std::numeric_limits<int>::max() &&
-                    static_cast<int>(dblVersion) == dblVersion) {
-                    writer->Add(static_cast<int>(dblVersion));
-                } else {
-                    writer->Add(dblVersion);
-                }
-            } catch (const std::exception &) {
+            bool isDouble = false;
+            (void)c_locale_stod(l_version, isDouble);
+            if (isDouble) {
+                writer->AddUnquoted(l_version.c_str());
+            } else {
                 writer->Add(l_version);
             }
         }

diff --git a/src/proj_json_streaming_writer.cpp b/src/proj_json_streaming_writer.cpp
@@ -219,6 +219,11 @@ void CPLJSonStreamingWriter::Add(const char *pszStr) {
     Print(FormatString(pszStr));
 }
 
+void CPLJSonStreamingWriter::AddUnquoted(const char *pszStr) {
+    EmitCommaIfNeeded();
+    Print(pszStr);
+}
+
 void CPLJSonStreamingWriter::Add(GIntBig nVal) {
     EmitCommaIfNeeded();
     Print(CPLSPrintf(CPL_FRMT_GIB, nVal));

diff --git a/src/proj_json_streaming_writer.hpp b/src/proj_json_streaming_writer.hpp
@@ -86,6 +86,7 @@ class CPL_DLL CPLJSonStreamingWriter {
 
     void Add(const std::string &str);
     void Add(const char *pszStr);
+    void AddUnquoted(const char *pszStr);
     void Add(bool bVal);
     void Add(int nVal) { Add(static_cast<GIntBig>(nVal)); }
     void Add(unsigned int nVal) { Add(static_cast<GIntBig>(nVal)); }