aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111/operation/transformation.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-03-03 17:45:53 +0100
committerEven Rouault <even.rouault@spatialys.com>2021-03-03 17:45:53 +0100
commit095731d53405309c38bebe31af51d141f6319f1a (patch)
treeefa9f1e916c1c1373298900ac4e66702beec8f35 /src/iso19111/operation/transformation.cpp
parent9e2eb067585b9a61b2b5e636547ac80dd4d01d06 (diff)
downloadPROJ-095731d53405309c38bebe31af51d141f6319f1a.tar.gz
PROJ-095731d53405309c38bebe31af51d141f6319f1a.zip
Reformat code with clang-format-10 from ubuntu 20.04
Diffstat (limited to 'src/iso19111/operation/transformation.cpp')
-rw-r--r--src/iso19111/operation/transformation.cpp66
1 files changed, 32 insertions, 34 deletions
diff --git a/src/iso19111/operation/transformation.cpp b/src/iso19111/operation/transformation.cpp
index 932b9e4e..984f2756 100644
--- a/src/iso19111/operation/transformation.cpp
+++ b/src/iso19111/operation/transformation.cpp
@@ -268,23 +268,20 @@ Transformation::getTOWGS84Parameters() const // throw(io::FormattingException)
} else if (epsg_code ==
EPSG_CODE_PARAMETER_X_AXIS_ROTATION) {
params[3] = fixNegativeZero(
- rotSign *
- measure.convertToUnit(
- common::UnitOfMeasure::ARC_SECOND));
+ rotSign * measure.convertToUnit(
+ common::UnitOfMeasure::ARC_SECOND));
foundRotX = true;
} else if (epsg_code ==
EPSG_CODE_PARAMETER_Y_AXIS_ROTATION) {
params[4] = fixNegativeZero(
- rotSign *
- measure.convertToUnit(
- common::UnitOfMeasure::ARC_SECOND));
+ rotSign * measure.convertToUnit(
+ common::UnitOfMeasure::ARC_SECOND));
foundRotY = true;
} else if (epsg_code ==
EPSG_CODE_PARAMETER_Z_AXIS_ROTATION) {
params[5] = fixNegativeZero(
- rotSign *
- measure.convertToUnit(
- common::UnitOfMeasure::ARC_SECOND));
+ rotSign * measure.convertToUnit(
+ common::UnitOfMeasure::ARC_SECOND));
foundRotZ = true;
} else if (epsg_code ==
EPSG_CODE_PARAMETER_SCALE_DIFFERENCE) {
@@ -2178,14 +2175,13 @@ TransformationNNPtr Transformation::substitutePROJAlternativeGridNames(
}
}
const auto &horizontalGridName =
- !NTv1Filename.empty() ? NTv1Filename : !NTv2Filename.empty()
- ? NTv2Filename
- : lasFilename;
+ !NTv1Filename.empty()
+ ? NTv1Filename
+ : !NTv2Filename.empty() ? NTv2Filename : lasFilename;
- if (!horizontalGridName.empty() &&
- databaseContext->lookForGridAlternative(horizontalGridName,
- projFilename, projGridFormat,
- inverseDirection)) {
+ if (!horizontalGridName.empty() && databaseContext->lookForGridAlternative(
+ horizontalGridName, projFilename,
+ projGridFormat, inverseDirection)) {
if (horizontalGridName == projFilename) {
if (inverseDirection) {
@@ -2296,13 +2292,14 @@ TransformationNNPtr Transformation::substitutePROJAlternativeGridNames(
EPSG_CODE_PARAMETER_GEOID_CORRECTION_FILENAME)};
#ifdef disabled_for_now
if (inverseDirection) {
- return create(createPropertiesForInverse(
- self.as_nullable().get(), true, false),
- targetCRS(), sourceCRS(), nullptr,
- createSimilarPropertiesMethod(method()),
- parameters, {ParameterValue::createFilename(
- projFilename)},
- coordinateOperationAccuracies())
+ return create(
+ createPropertiesForInverse(
+ self.as_nullable().get(), true, false),
+ targetCRS(), sourceCRS(), nullptr,
+ createSimilarPropertiesMethod(method()),
+ parameters,
+ {ParameterValue::createFilename(projFilename)},
+ coordinateOperationAccuracies())
->inverseAsTransformation();
} else
#endif
@@ -2373,13 +2370,14 @@ TransformationNNPtr Transformation::substitutePROJAlternativeGridNames(
createOpParamNameEPSGCode(
EPSG_CODE_PARAMETER_VERTICAL_OFFSET_FILE)};
if (inverseDirection) {
- return create(createPropertiesForInverse(
- self.as_nullable().get(), true, false),
- targetCRS(), sourceCRS(), nullptr,
- createSimilarPropertiesMethod(method()),
- parameters, {ParameterValue::createFilename(
- projFilename)},
- coordinateOperationAccuracies())
+ return create(
+ createPropertiesForInverse(
+ self.as_nullable().get(), true, false),
+ targetCRS(), sourceCRS(), nullptr,
+ createSimilarPropertiesMethod(method()),
+ parameters,
+ {ParameterValue::createFilename(projFilename)},
+ coordinateOperationAccuracies())
->inverseAsTransformation();
} else {
return create(
@@ -2985,9 +2983,9 @@ void Transformation::_exportToPROJString(
const auto &hGridShiftFilename =
!HorizontalShiftGTIFFFilename.empty()
? HorizontalShiftGTIFFFilename
- : !NTv1Filename.empty() ? NTv1Filename : !NTv2Filename.empty()
- ? NTv2Filename
- : CTABLE2Filename;
+ : !NTv1Filename.empty()
+ ? NTv1Filename
+ : !NTv2Filename.empty() ? NTv2Filename : CTABLE2Filename;
if (!hGridShiftFilename.empty()) {
auto sourceCRSGeog =
extractGeographicCRSIfGeographicCRSOrEquivalent(sourceCRS());
@@ -3282,5 +3280,5 @@ void Transformation::_exportToPROJString(
throw io::FormattingException("Unimplemented");
}
-} // namespace crs
+} // namespace operation
NS_PROJ_END