Skip to content

Commit 9ecb3a4

Browse files
committed
fixStepsDirection(): pass database context
1 parent 8b562af commit 9ecb3a4

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

include/proj/coordinateoperation.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,8 @@ class PROJ_GCC_DLL ConcatenatedOperation final : public CoordinateOperation {
18301830
PROJ_INTERNAL static void
18311831
fixStepsDirection(const crs::CRSNNPtr &concatOpSourceCRS,
18321832
const crs::CRSNNPtr &concatOpTargetCRS,
1833-
std::vector<CoordinateOperationNNPtr> &operationsInOut);
1833+
std::vector<CoordinateOperationNNPtr> &operationsInOut,
1834+
const io::DatabaseContextPtr &dbContext);
18341835
//! @endcond
18351836

18361837
protected:

src/iso19111/factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6257,7 +6257,7 @@ operation::CoordinateOperationNNPtr AuthorityFactory::createCoordinateOperation(
62576257
->createCoordinateReferenceSystem(source_crs_code),
62586258
d->createFactory(target_crs_auth_name)
62596259
->createCoordinateReferenceSystem(target_crs_code),
6260-
operations);
6260+
operations, d->context());
62616261

62626262
auto props = d->createPropertiesSearchUsages(
62636263
type, code, name, deprecated, description);

src/iso19111/io.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3641,7 +3641,7 @@ WKTParser::Private::buildConcatenatedOperation(const WKTNodeNNPtr &node) {
36413641
}
36423642

36433643
ConcatenatedOperation::fixStepsDirection(
3644-
NN_NO_CHECK(sourceCRS), NN_NO_CHECK(targetCRS), operations);
3644+
NN_NO_CHECK(sourceCRS), NN_NO_CHECK(targetCRS), operations, dbContext_);
36453645

36463646
std::vector<PositionalAccuracyNNPtr> accuracies;
36473647
auto &accuracyNode = nodeP->lookForChild(WKTConstants::OPERATIONACCURACY);
@@ -6580,7 +6580,8 @@ JSONParser::buildConcatenatedOperation(const json &j) {
65806580
operations.emplace_back(NN_NO_CHECK(op));
65816581
}
65826582

6583-
ConcatenatedOperation::fixStepsDirection(sourceCRS, targetCRS, operations);
6583+
ConcatenatedOperation::fixStepsDirection(sourceCRS, targetCRS, operations,
6584+
dbContext_);
65846585

65856586
std::vector<PositionalAccuracyNNPtr> accuracies;
65866587
if (j.contains("accuracy")) {

src/iso19111/operation/concatenatedoperation.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ ConcatenatedOperationNNPtr ConcatenatedOperation::create(
265265
void ConcatenatedOperation::fixStepsDirection(
266266
const crs::CRSNNPtr &concatOpSourceCRS,
267267
const crs::CRSNNPtr &concatOpTargetCRS,
268-
std::vector<CoordinateOperationNNPtr> &operationsInOut) {
268+
std::vector<CoordinateOperationNNPtr> &operationsInOut,
269+
const io::DatabaseContextPtr & /*dbContext*/) {
269270

270271
// Set of heuristics to assign CRS to steps, and possibly reverse them.
271272

0 commit comments

Comments
 (0)