From d870b33803c184feb97e4abd67e1896b89c8e8c1 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 10 Apr 2021 22:09:29 +0200 Subject: CRS::normalizeForVisualization(): propagate domains/extent of original CRS (fixes #2603) --- src/iso19111/crs.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index d7058a56..2d589ad1 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -824,21 +824,58 @@ bool CRS::mustAxisOrderBeSwitchedForVisualization() const { //! @cond Doxygen_Suppress CRSNNPtr CRS::normalizeForVisualization() const { - auto props = util::PropertyMap().set( - common::IdentifiedObject::NAME_KEY, - nameStr() + " (with axis order normalized for visualization)"); + + const auto createProperties = [this](const std::string &newName = + std::string()) { + auto props = util::PropertyMap().set( + common::IdentifiedObject::NAME_KEY, + !newName.empty() + ? newName + : nameStr() + + " (with axis order normalized for visualization)"); + const auto &l_domains = domains(); + if (!l_domains.empty()) { + auto array = util::ArrayOfBaseObject::create(); + for (const auto &domain : l_domains) { + array->add(domain); + } + if (!array->empty()) { + props.set(common::ObjectUsage::OBJECT_DOMAIN_KEY, array); + } + } + const auto &l_identifiers = identifiers(); + const auto &l_remarks = remarks(); + if (l_identifiers.size() == 1) { + std::string remarks("Axis order reversed compared to "); + remarks += *(l_identifiers[0]->codeSpace()); + remarks += ':'; + remarks += l_identifiers[0]->code(); + if (!l_remarks.empty()) { + remarks += ". "; + remarks += l_remarks; + } + props.set(common::IdentifiedObject::REMARKS_KEY, remarks); + } else if (!l_remarks.empty()) { + props.set(common::IdentifiedObject::REMARKS_KEY, l_remarks); + } + return props; + }; const CompoundCRS *compoundCRS = dynamic_cast(this); if (compoundCRS) { const auto &comps = compoundCRS->componentReferenceSystems(); - if (!comps.empty()) { + if (!comps.empty() && + comps[0]->mustAxisOrderBeSwitchedForVisualization()) { std::vector newComps; newComps.emplace_back(comps[0]->normalizeForVisualization()); + std::string l_name = newComps.back()->nameStr(); for (size_t i = 1; i < comps.size(); i++) { newComps.emplace_back(comps[i]); + l_name += " + "; + l_name += newComps.back()->nameStr(); } return util::nn_static_pointer_cast( - CompoundCRS::create(props, newComps)); + CompoundCRS::create(createProperties(l_name), newComps)); } } @@ -852,8 +889,9 @@ CRSNNPtr CRS::normalizeForVisualization() const { : cs::EllipsoidalCS::create(util::PropertyMap(), axisList[1], axisList[0], axisList[2]); - return util::nn_static_pointer_cast(GeographicCRS::create( - props, geogCRS->datum(), geogCRS->datumEnsemble(), cs)); + return util::nn_static_pointer_cast( + GeographicCRS::create(createProperties(), geogCRS->datum(), + geogCRS->datumEnsemble(), cs)); } } @@ -867,8 +905,9 @@ CRSNNPtr CRS::normalizeForVisualization() const { axisList[0]) : cs::CartesianCS::create(util::PropertyMap(), axisList[1], axisList[0], axisList[2]); - return util::nn_static_pointer_cast(ProjectedCRS::create( - props, projCRS->baseCRS(), projCRS->derivingConversion(), cs)); + return util::nn_static_pointer_cast( + ProjectedCRS::create(createProperties(), projCRS->baseCRS(), + projCRS->derivingConversion(), cs)); } } @@ -1021,12 +1060,19 @@ CRSNNPtr CRS::promoteTo3D(const std::string &newName, } } const auto &l_identifiers = identifiers(); + const auto &l_remarks = remarks(); if (l_identifiers.size() == 1) { std::string remarks("Promoted to 3D from "); remarks += *(l_identifiers[0]->codeSpace()); remarks += ':'; remarks += l_identifiers[0]->code(); + if (!l_remarks.empty()) { + remarks += ". "; + remarks += l_remarks; + } props.set(common::IdentifiedObject::REMARKS_KEY, remarks); + } else if (!l_remarks.empty()) { + props.set(common::IdentifiedObject::REMARKS_KEY, l_remarks); } return props; }; -- cgit v1.2.3 From 88426c18e43538edc6075d47b3b6829ada7e9a76 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 10 Apr 2021 22:09:48 +0200 Subject: projinfo: add a --normalize-axis-order undocument switch --- src/apps/projinfo.cpp | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp index dd94b652..d2fb6911 100644 --- a/src/apps/projinfo.cpp +++ b/src/apps/projinfo.cpp @@ -162,7 +162,7 @@ static BaseObjectNNPtr buildObject( const std::string &kind, const std::string &context, bool buildBoundCRSToWGS84, CoordinateOperationContext::IntermediateCRSUse allowUseIntermediateCRS, - bool promoteTo3D, bool quiet) { + bool promoteTo3D, bool normalizeAxisOrder, bool quiet) { BaseObjectPtr obj; std::string l_user_string(user_string); @@ -310,6 +310,13 @@ static BaseObjectNNPtr buildObject( } } + if (normalizeAxisOrder) { + auto crs = std::dynamic_pointer_cast(obj); + if (crs) { + obj = crs->normalizeForVisualization().as_nullable(); + } + } + return NN_NO_CHECK(obj); } @@ -712,12 +719,12 @@ static void outputOperations( CoordinateOperationContext::IntermediateCRSUse allowUseIntermediateCRS, const std::vector> &pivots, const std::string &authority, bool usePROJGridAlternatives, - bool showSuperseded, bool promoteTo3D, double minimumAccuracy, - const OutputOptions &outputOpt, bool summary) { + bool showSuperseded, bool promoteTo3D, bool normalizeAxisOrder, + double minimumAccuracy, const OutputOptions &outputOpt, bool summary) { auto sourceObj = buildObject(dbContext, sourceCRSStr, "crs", "source CRS", false, CoordinateOperationContext::IntermediateCRSUse::NEVER, - promoteTo3D, outputOpt.quiet); + promoteTo3D, normalizeAxisOrder, outputOpt.quiet); auto sourceCRS = nn_dynamic_pointer_cast(sourceObj); if (!sourceCRS) { std::cerr << "source CRS string is not a CRS" << std::endl; @@ -728,7 +735,7 @@ static void outputOperations( auto targetObj = buildObject(dbContext, targetCRSStr, "crs", "target CRS", false, CoordinateOperationContext::IntermediateCRSUse::NEVER, - promoteTo3D, outputOpt.quiet); + promoteTo3D, normalizeAxisOrder, outputOpt.quiet); auto targetCRS = nn_dynamic_pointer_cast(targetObj); if (!targetCRS) { std::cerr << "target CRS string is not a CRS" << std::endl; @@ -862,6 +869,7 @@ int main(int argc, char **argv) { bool identify = false; bool showSuperseded = false; bool promoteTo3D = false; + bool normalizeAxisOrder = false; double minimumAccuracy = -1; bool outputAll = false; bool dumpDbStructure = false; @@ -1143,6 +1151,9 @@ int main(int argc, char **argv) { outputOpt.ballparkAllowed = false; } else if (ci_equal(arg, "--3d")) { promoteTo3D = true; + } else if (ci_equal(arg, "--normalize-axis-order")) { + // Undocumented for now + normalizeAxisOrder = true; } else if (arg == "--output-id" && i + 1 < argc) { i++; const auto tokens = split(argv[i], ':'); @@ -1288,7 +1299,7 @@ int main(int argc, char **argv) { auto obj(buildObject(dbContext, user_string, objectKind, "input string", buildBoundCRSToWGS84, allowUseIntermediateCRS, promoteTo3D, - outputOpt.quiet)); + normalizeAxisOrder, outputOpt.quiet)); if (guessDialect) { auto dialect = WKTParser().guessDialect(user_string); std::cout << "Guessed WKT dialect: "; @@ -1443,12 +1454,13 @@ int main(int argc, char **argv) { } try { - outputOperations( - dbContext, sourceCRSStr, targetCRSStr, bboxFilter, - spatialCriterion, spatialCriterionExplicitlySpecified, - crsExtentUse, gridAvailabilityUse, allowUseIntermediateCRS, - pivots, authority, usePROJGridAlternatives, showSuperseded, - promoteTo3D, minimumAccuracy, outputOpt, summary); + outputOperations(dbContext, sourceCRSStr, targetCRSStr, bboxFilter, + spatialCriterion, + spatialCriterionExplicitlySpecified, crsExtentUse, + gridAvailabilityUse, allowUseIntermediateCRS, + pivots, authority, usePROJGridAlternatives, + showSuperseded, promoteTo3D, normalizeAxisOrder, + minimumAccuracy, outputOpt, summary); } catch (const std::exception &e) { std::cerr << "outputOperations() failed with: " << e.what() << std::endl; -- cgit v1.2.3