Merge pull request #2814 from rouault/fix_2813

BoundCRS: accept importing/exporting in WKT2 and PROJJSON the scope/area/extent/id attributes (fixes #2813)

1 files changed, 46 insertions, 7 deletions

diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp
index 942e2d43..3e825ff0 100644
--- a/src/iso19111/crs.cpp
+++ b/src/iso19111/crs.cpp
@@ -1217,7 +1217,7 @@ CRSNNPtr CRS::promoteTo3D(const std::string &newName,
         try {
             transf->getTOWGS84Parameters();
             return BoundCRS::create(
-                base3DCRS,
+                createProperties(), base3DCRS,
                 boundCRS->hubCRS()->promoteTo3D(std::string(), dbContext),
                 transf->promoteTo3D(std::string(), dbContext));
         } catch (const io::FormattingException &) {
@@ -5294,27 +5294,50 @@ BoundCRS::transformation() PROJ_PURE_DEFN {
 /** \brief Instantiate a BoundCRS from a base CRS, a hub CRS and a
  * transformation.
  *
+ * @param properties See \ref general_properties.
  * @param baseCRSIn base CRS.
  * @param hubCRSIn hub CRS.
  * @param transformationIn transformation from base CRS to hub CRS.
  * @return new BoundCRS.
+ * @since PROJ 8.2
  */
 BoundCRSNNPtr
-BoundCRS::create(const CRSNNPtr &baseCRSIn, const CRSNNPtr &hubCRSIn,
+BoundCRS::create(const util::PropertyMap &properties, const CRSNNPtr &baseCRSIn,
+                 const CRSNNPtr &hubCRSIn,
                  const operation::TransformationNNPtr &transformationIn) {
     auto crs = BoundCRS::nn_make_shared<BoundCRS>(baseCRSIn, hubCRSIn,
                                                   transformationIn);
     crs->assignSelf(crs);
     const auto &l_name = baseCRSIn->nameStr();
-    if (!l_name.empty()) {
-        crs->setProperties(util::PropertyMap().set(
-            common::IdentifiedObject::NAME_KEY, l_name));
+    if (properties.get(common::IdentifiedObject::NAME_KEY) == nullptr &&
+        !l_name.empty()) {
+        auto newProperties(properties);
+        newProperties.set(common::IdentifiedObject::NAME_KEY, l_name);
+        crs->setProperties(newProperties);
+    } else {
+        crs->setProperties(properties);
     }
     return crs;
 }
 
 // ---------------------------------------------------------------------------
 
+/** \brief Instantiate a BoundCRS from a base CRS, a hub CRS and a
+ * transformation.
+ *
+ * @param baseCRSIn base CRS.
+ * @param hubCRSIn hub CRS.
+ * @param transformationIn transformation from base CRS to hub CRS.
+ * @return new BoundCRS.
+ */
+BoundCRSNNPtr
+BoundCRS::create(const CRSNNPtr &baseCRSIn, const CRSNNPtr &hubCRSIn,
+                 const operation::TransformationNNPtr &transformationIn) {
+    return create(util::PropertyMap(), baseCRSIn, hubCRSIn, transformationIn);
+}
+
+// ---------------------------------------------------------------------------
+
 /** \brief Instantiate a BoundCRS from a base CRS and TOWGS84 parameters
  *
  * @param baseCRSIn base CRS.
@@ -5415,6 +5438,7 @@ void BoundCRS::_exportToWKT(io::WKTFormatter *formatter) const {
         formatter->setAbridgedTransformation(true);
         d->transformation()->_exportToWKT(formatter);
         formatter->setAbridgedTransformation(false);
+        ObjectUsage::baseExportToWKT(formatter);
         formatter->endNode();
     } else {
 
@@ -5455,8 +5479,21 @@ void BoundCRS::_exportToJSON(
     io::JSONFormatter *formatter) const // throw(io::FormattingException)
 {
     auto writer = formatter->writer();
-    auto objectContext(
-        formatter->MakeObjectContext("BoundCRS", !identifiers().empty()));
+    const auto &l_name = nameStr();
+    if ((formatter->outputUsage(true) && !domains().empty()) ||
+        (formatter->outputId() && !identifiers().empty()) ||
+        !remarks().empty() ||
+        (!l_name.empty() && l_name != d->baseCRS()->nameStr())) {
+        // Only upgrades to v0.3 schema if needed
+        formatter->setSchema(io::JSONFormatter::PROJJSON_v0_3);
+    }
+
+    auto objectContext(formatter->MakeObjectContext("BoundCRS", false));
+
+    if (!l_name.empty() && l_name != d->baseCRS()->nameStr()) {
+        writer->AddObjKey("name");
+        writer->Add(l_name);
+    }
 
     writer->AddObjKey("source_crs");
     d->baseCRS()->_exportToJSON(formatter);
@@ -5469,6 +5506,8 @@ void BoundCRS::_exportToJSON(
     formatter->setAbridgedTransformation(true);
     d->transformation()->_exportToJSON(formatter);
     formatter->setAbridgedTransformation(false);
+
+    ObjectUsage::baseExportToJSON(formatter);
 }
 //! @endcond