diff options
| author | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-02-19 17:13:34 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-02-19 17:13:34 +0000 |
| commit | b33b2d8ac0fed47856b2962dece5a848c4a6caf2 (patch) | |
| tree | 008d780e1f013d6b3335be8cf8392a4a8528f263 | |
| parent | 078eb3e6010a2aa2eef025f615e87d1c90cf2431 (diff) | |
| download | PROJ-b33b2d8ac0fed47856b2962dece5a848c4a6caf2.tar.gz PROJ-b33b2d8ac0fed47856b2962dece5a848c4a6caf2.zip | |
validateParameters(): fix false-positive warning on Equidistant Cylindrical
| -rw-r--r-- | src/iso19111/coordinateoperation.cpp | 8 | ||||
| -rw-r--r-- | test/unit/test_operation.cpp | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index d6a75df9..4996001f 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -2126,6 +2126,14 @@ std::list<std::string> SingleOperation::validateParameters() const { } if (!opv) { + if ((methodEPSGCode == EPSG_CODE_METHOD_EQUIDISTANT_CYLINDRICAL || + methodEPSGCode == + EPSG_CODE_METHOD_EQUIDISTANT_CYLINDRICAL_SPHERICAL) && + paramMapping == ¶mLatitudeNatOrigin) { + // extension of EPSG used by GDAL/PROJ, so we should not + // warn on its absence. + continue; + } std::string msg("Cannot find expected parameter "); msg += paramMapping->wkt2_name; res.emplace_back(msg); diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index 96d2147f..fdf81ebb 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -2090,6 +2090,8 @@ TEST(operation, createEquidistantCylindrical) { "PARAMETER[\"central_meridian\",2],\n" "PARAMETER[\"false_easting\",3],\n" "PARAMETER[\"false_northing\",4]"); + + EXPECT_TRUE(conv->validateParameters().empty()); } // --------------------------------------------------------------------------- @@ -2127,6 +2129,8 @@ TEST(operation, createEquidistantCylindricalSpherical) { "PARAMETER[\"central_meridian\",2],\n" "PARAMETER[\"false_easting\",3],\n" "PARAMETER[\"false_northing\",4]"); + + EXPECT_TRUE(conv->validateParameters().empty()); } // --------------------------------------------------------------------------- |