aboutsummaryrefslogtreecommitdiff
path: root/test/unit/test_defmodel.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-03-04 11:39:14 +0100
committerGitHub <noreply@github.com>2021-03-04 11:39:14 +0100
commitf278b5bee641dd94245ed54f4eb75e29c3d4d993 (patch)
treeec5700b9a252f27670e821da9f821c8bed867052 /test/unit/test_defmodel.cpp
parent948f39a4da835d9e770ece735d58ac488591bd76 (diff)
parent095731d53405309c38bebe31af51d141f6319f1a (diff)
downloadPROJ-f278b5bee641dd94245ed54f4eb75e29c3d4d993.tar.gz
PROJ-f278b5bee641dd94245ed54f4eb75e29c3d4d993.zip
Merge pull request #2551 from rouault/clang_format
Reformat code with clang-format-10 from ubuntu 20.04
Diffstat (limited to 'test/unit/test_defmodel.cpp')
-rw-r--r--test/unit/test_defmodel.cpp31
1 files changed, 14 insertions, 17 deletions
diff --git a/test/unit/test_defmodel.cpp b/test/unit/test_defmodel.cpp
index ac9da818..16bffcf3 100644
--- a/test/unit/test_defmodel.cpp
+++ b/test/unit/test_defmodel.cpp
@@ -63,8 +63,8 @@ static json getMinValidContent() {
j["target_crs"] = "EPSG:7907";
j["definition_crs"] = "EPSG:4959";
j["extent"]["type"] = "bbox";
- j["extent"]
- ["parameters"] = {{"bbox", {modelMinX, modelMinY, modelMaxX, modelMaxY}}};
+ j["extent"]["parameters"] = {
+ {"bbox", {modelMinX, modelMinY, modelMaxX, modelMaxY}}};
j["time_extent"]["first"] = "1900-01-01T00:00:00Z";
j["time_extent"]["last"] = "2050-01-01T00:00:00Z";
j["components"] = json::array();
@@ -124,7 +124,8 @@ static json getFullValidContent() {
}},
{"time_function",
{
- {"type", "constant"}, {"parameters", json::object()},
+ {"type", "constant"},
+ {"parameters", json::object()},
}},
}};
@@ -848,15 +849,13 @@ TEST(defmodel, evaluator_horizontal_unit_degree) {
tValid, newLon, newLat, newZ));
EXPECT_NEAR(
RadToDeg(newLon),
- lon +
- tFactor * (lonOffsetQueriedX +
- alphaX * (lonOffsetQueriedXp1 - lonOffsetQueriedX)),
+ lon + tFactor * (lonOffsetQueriedX + alphaX * (lonOffsetQueriedXp1 -
+ lonOffsetQueriedX)),
EPS);
EXPECT_NEAR(
RadToDeg(newLat),
- lat +
- tFactor * (latOffsetQueriedY +
- alphaY * (latOffsetQueriedYp1 - latOffsetQueriedY)),
+ lat + tFactor * (latOffsetQueriedY + alphaY * (latOffsetQueriedYp1 -
+ latOffsetQueriedY)),
EPS);
EXPECT_EQ(newZ, zVal);
}
@@ -1002,15 +1001,13 @@ TEST(defmodel, evaluator_horizontal_unit_degree) {
tValid, newLon, newLat, newZ));
EXPECT_NEAR(
RadToDeg(newLon),
- lon +
- tFactor * (lonOffsetQueriedX +
- alphaX * (lonOffsetQueriedXp1 - lonOffsetQueriedX)),
+ lon + tFactor * (lonOffsetQueriedX + alphaX * (lonOffsetQueriedXp1 -
+ lonOffsetQueriedX)),
EPS);
EXPECT_NEAR(
RadToDeg(newLat),
- lat +
- tFactor * (latOffsetQueriedY +
- alphaY * (latOffsetQueriedYp1 - latOffsetQueriedY)),
+ lat + tFactor * (latOffsetQueriedY + alphaY * (latOffsetQueriedYp1 -
+ latOffsetQueriedY)),
EPS);
const double zBottom =
@@ -1391,8 +1388,8 @@ TEST(defmodel, evaluator_projected_crs) {
constexpr double gridResX = gridMaxX - gridMinX;
constexpr double gridResY = gridMaxY - gridMinY;
- j["extent"]
- ["parameters"] = {{"bbox", {gridMinX, gridMinY, gridMaxX, gridMaxY}}};
+ j["extent"]["parameters"] = {
+ {"bbox", {gridMinX, gridMinY, gridMaxX, gridMaxY}}};
j["components"] = {
{{"displacement_type", "horizontal"},
{"uncertainty_type", "none"},