aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111/io.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/iso19111/io.cpp')
-rw-r--r--src/iso19111/io.cpp128
1 files changed, 65 insertions, 63 deletions
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index 6ea6316c..51162365 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -916,9 +916,9 @@ struct WKTNode::Private {
// ---------------------------------------------------------------------------
-const WKTNodeNNPtr &WKTNode::Private::lookForChild(const std::string &childName,
- int occurrence) const
- noexcept {
+const WKTNodeNNPtr &
+WKTNode::Private::lookForChild(const std::string &childName,
+ int occurrence) const noexcept {
int occCount = 0;
for (const auto &child : children_) {
if (ci_equal(child->GP()->value(), childName)) {
@@ -3408,8 +3408,8 @@ ConversionNNPtr WKTParser::Private::buildProjectionFromESRI(
}
struct ci_less_struct {
- bool operator()(const std::string &lhs, const std::string &rhs) const
- noexcept {
+ bool operator()(const std::string &lhs,
+ const std::string &rhs) const noexcept {
return ci_less(lhs, rhs);
}
};
@@ -3750,14 +3750,12 @@ ConversionNNPtr WKTParser::Private::buildProjectionStandard(
// Krovak East-North Oriented methods
if (ci_equal(projectionName, "Krovak") &&
projCRSNode->countChildrenOfName(WKTConstants::AXIS) == 2 &&
- &buildAxis(
- projCRSNode->GP()->lookForChild(WKTConstants::AXIS, 0),
- defaultLinearUnit, UnitOfMeasure::Type::LINEAR, false,
- 1)->direction() == &AxisDirection::SOUTH &&
- &buildAxis(
- projCRSNode->GP()->lookForChild(WKTConstants::AXIS, 1),
- defaultLinearUnit, UnitOfMeasure::Type::LINEAR, false,
- 2)->direction() == &AxisDirection::WEST) {
+ &buildAxis(projCRSNode->GP()->lookForChild(WKTConstants::AXIS, 0),
+ defaultLinearUnit, UnitOfMeasure::Type::LINEAR, false, 1)
+ ->direction() == &AxisDirection::SOUTH &&
+ &buildAxis(projCRSNode->GP()->lookForChild(WKTConstants::AXIS, 1),
+ defaultLinearUnit, UnitOfMeasure::Type::LINEAR, false, 2)
+ ->direction() == &AxisDirection::WEST) {
mapping = getMapping(EPSG_CODE_METHOD_KROVAK);
}
@@ -6442,50 +6440,52 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text,
auto factory =
AuthorityFactory::create(NN_NO_CHECK(dbContext), std::string());
- const auto searchObject = [&factory](
- const std::string &objectName, bool approximateMatch,
- const std::vector<AuthorityFactory::ObjectType> &objectTypes,
- bool &goOn) {
- constexpr size_t limitResultCount = 10;
- auto res = factory->createObjectsFromName(
- objectName, objectTypes, approximateMatch, limitResultCount);
- if (res.size() == 1) {
- return res.front();
- }
- if (res.size() > 1) {
- if (objectTypes.size() == 1 &&
- objectTypes[0] == AuthorityFactory::ObjectType::CRS) {
- for (size_t ndim = 2; ndim <= 3; ndim++) {
- for (const auto &obj : res) {
- auto crs =
- dynamic_cast<crs::GeographicCRS *>(obj.get());
- if (crs &&
- crs->coordinateSystem()->axisList().size() ==
- ndim) {
- return obj;
+ const auto searchObject =
+ [&factory](
+ const std::string &objectName, bool approximateMatch,
+ const std::vector<AuthorityFactory::ObjectType> &objectTypes,
+ bool &goOn) {
+ constexpr size_t limitResultCount = 10;
+ auto res = factory->createObjectsFromName(
+ objectName, objectTypes, approximateMatch,
+ limitResultCount);
+ if (res.size() == 1) {
+ return res.front();
+ }
+ if (res.size() > 1) {
+ if (objectTypes.size() == 1 &&
+ objectTypes[0] == AuthorityFactory::ObjectType::CRS) {
+ for (size_t ndim = 2; ndim <= 3; ndim++) {
+ for (const auto &obj : res) {
+ auto crs = dynamic_cast<crs::GeographicCRS *>(
+ obj.get());
+ if (crs && crs->coordinateSystem()
+ ->axisList()
+ .size() == ndim) {
+ return obj;
+ }
}
}
}
- }
- std::string msg("several objects matching this name: ");
- bool first = true;
- for (const auto &obj : res) {
- if (msg.size() > 200) {
- msg += ", ...";
- break;
- }
- if (!first) {
- msg += ", ";
+ std::string msg("several objects matching this name: ");
+ bool first = true;
+ for (const auto &obj : res) {
+ if (msg.size() > 200) {
+ msg += ", ...";
+ break;
+ }
+ if (!first) {
+ msg += ", ";
+ }
+ first = false;
+ msg += obj->nameStr();
}
- first = false;
- msg += obj->nameStr();
+ throw ParsingException(msg);
}
- throw ParsingException(msg);
- }
- goOn = true;
- throw ParsingException("dummy");
- };
+ goOn = true;
+ throw ParsingException("dummy");
+ };
const auto searchCRS = [&searchObject](const std::string &objectName) {
bool goOn = false;
@@ -6808,7 +6808,9 @@ WKTParser::guessDialect(const std::string &wkt) noexcept {
}
}
static const char *const wkt2_2019_only_substrings[] = {
- "CS[TemporalDateTime,", "CS[TemporalCount,", "CS[TemporalMeasure,",
+ "CS[TemporalDateTime,",
+ "CS[TemporalCount,",
+ "CS[TemporalMeasure,",
};
for (const auto &substrings : wkt2_2019_only_substrings) {
if (ci_find(wkt, substrings) != std::string::npos) {
@@ -9086,7 +9088,7 @@ static double getNumericValue(const std::string &paramValue,
// ---------------------------------------------------------------------------
namespace {
template <class T> inline void ignoreRetVal(T) {}
-}
+} // namespace
GeographicCRSNNPtr PROJStringParser::Private::buildGeographicCRS(
int iStep, int iUnitConvert, int iAxisSwap, bool ignorePROJAxis) {
@@ -10097,9 +10099,8 @@ PROJStringParser::createFromPROJString(const std::string &projString) {
} else {
for (auto cur = pj->params; cur; cur = cur->next) {
const char *equal = strchr(cur->param, '=');
- if (equal &&
- static_cast<size_t>(equal - cur->param) ==
- kv.key.size()) {
+ if (equal && static_cast<size_t>(equal - cur->param) ==
+ kv.key.size()) {
if (memcmp(cur->param, kv.key.c_str(), kv.key.size()) ==
0) {
recognizedByPROJ = (cur->used == 1);
@@ -10197,13 +10198,14 @@ PROJStringParser::createFromPROJString(const std::string &projString) {
iProjStep,
d->buildProjectedCRS(
iProjStep,
- d->buildGeographicCRS(
- iFirstGeogStep, iFirstUnitConvert < iFirstGeogStep
- ? iFirstUnitConvert
- : -1,
- iFirstAxisSwap < iFirstGeogStep ? iFirstAxisSwap
- : -1,
- true),
+ d->buildGeographicCRS(iFirstGeogStep,
+ iFirstUnitConvert < iFirstGeogStep
+ ? iFirstUnitConvert
+ : -1,
+ iFirstAxisSwap < iFirstGeogStep
+ ? iFirstAxisSwap
+ : -1,
+ true),
iFirstUnitConvert < iFirstGeogStep ? iSecondUnitConvert
: iFirstUnitConvert,
iFirstAxisSwap < iFirstGeogStep ? iSecondAxisSwap
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 19:05:32 +0000