JSON export: avoid non-significant decimal digits in version field (f…

…ixes #3863)
OSGeo · Aug 28, 2023 · 19cda6a · 19cda6a
1 parent 4f0376b
commit 19cda6a
Showing 1 changed file with 9 additions and 7 deletions.
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,17 @@ void Identifier::_exportToJSON(JSONFormatter *formatter) const {
 
         if (!l_version.empty()) {
             writer->AddObjKey("version");
-            try {
-                const double dblVersion = c_locale_stod(l_version);
+            bool isDouble = false;
+            const double dblVersion = c_locale_stod(l_version, isDouble);
+            if (isDouble) {
                 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);
+                    writer->Add(dblVersion, /*precision=*/15);
                 }
-            } catch (const std::exception &) {
+            } else {
                 writer->Add(l_version);
             }
         }