diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-03-04 11:39:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 11:39:22 +0100 |
| commit | da406335b35b3751eed6c0a8dea6fd820c50dccf (patch) | |
| tree | f87b70f0394460ab605b541265b62fdd539c5d14 /test/unit/test_defmodel.cpp | |
| parent | d7d5e48de5d6775f72fcfec67a077a47618da313 (diff) | |
| parent | d5e07c53993d73cdc85c6cbe48694aa9cc3872f4 (diff) | |
| download | PROJ-da406335b35b3751eed6c0a8dea6fd820c50dccf.tar.gz PROJ-da406335b35b3751eed6c0a8dea6fd820c50dccf.zip | |
Merge pull request #2553 from rouault/backport_8.0_clang_format
[Backport 8.0] 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.cpp | 31 |
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"}, |