diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-01-09 23:27:39 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-01-09 23:27:39 +0100 |
| commit | 6d5924842035ae6b5af8a6685f5c531e667c7f18 (patch) | |
| tree | d259e2dcb48cf991f24945525e1a88574d53cc4b | |
| parent | 5b75e5fdccc531f7b0e3dcd636fa1ff3500bb071 (diff) | |
| download | PROJ-6d5924842035ae6b5af8a6685f5c531e667c7f18.tar.gz PROJ-6d5924842035ae6b5af8a6685f5c531e667c7f18.zip | |
createOperations(): fix a particular case of boundcrs to boundcrs transformation (fixes #1220)
| -rw-r--r-- | src/iso19111/crs.cpp | 4 | ||||
| -rw-r--r-- | test/unit/test_io.cpp | 2 | ||||
| -rw-r--r-- | test/unit/test_operation.cpp | 23 |
3 files changed, 26 insertions, 3 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index 6776093a..81c70b7a 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -3673,8 +3673,8 @@ BoundCRSNNPtr BoundCRS::createFromNadgrids(const CRSNNPtr &baseCRSIn, operation::Transformation::createNTv2( util::PropertyMap().set(common::IdentifiedObject::NAME_KEY, transformationName), - baseCRSIn, GeographicCRS::EPSG_4326, filename, - std::vector<metadata::PositionalAccuracyNNPtr>())); + NN_NO_CHECK(transformationSourceCRS), GeographicCRS::EPSG_4326, + filename, std::vector<metadata::PositionalAccuracyNNPtr>())); } // --------------------------------------------------------------------------- diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 3eabfc03..2b5eeffc 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -3094,7 +3094,7 @@ TEST(wkt_parse, WKT1_DATUM_EXTENSION) { ASSERT_TRUE(crs->transformation()->sourceCRS() != nullptr); EXPECT_EQ(crs->transformation()->sourceCRS()->nameStr(), - crs->baseCRS()->nameStr()); + "International 1909 (Hayford)"); ASSERT_TRUE(crs->transformation()->targetCRS() != nullptr); EXPECT_EQ(crs->transformation()->targetCRS()->nameStr(), diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index 379ef31a..d3f05548 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -5552,6 +5552,29 @@ TEST(operation, boundCRS_to_boundCRS_unralated_hub) { // --------------------------------------------------------------------------- +TEST(operation, boundCRS_of_projCRS_towgs84_to_boundCRS_of_projCRS_nadgrids) { + auto objSrc = PROJStringParser().createFromPROJString( + "+proj=utm +zone=15 +datum=NAD83 +units=m +no_defs +ellps=GRS80 " + "+towgs84=0,0,0"); + auto src = nn_dynamic_pointer_cast<CRS>(objSrc); + ASSERT_TRUE(src != nullptr); + auto objDst = PROJStringParser().createFromPROJString( + "+proj=utm +zone=15 +datum=NAD27 +units=m +no_defs +ellps=clrk66 " + "+nadgrids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat"); + auto dst = nn_dynamic_pointer_cast<CRS>(objDst); + ASSERT_TRUE(dst != nullptr); + auto op = CoordinateOperationFactory::create()->createOperation( + NN_CHECK_ASSERT(src), NN_CHECK_ASSERT(dst)); + ASSERT_TRUE(op != nullptr); + EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), + "+proj=pipeline +step +inv +proj=utm +zone=15 +ellps=GRS80 +step " + "+inv +proj=hgridshift " + "+grids=@conus,@alaska,@ntv2_0.gsb,@ntv1_can.dat +step +proj=utm " + "+zone=15 +ellps=clrk66"); +} + +// --------------------------------------------------------------------------- + TEST(operation, boundCRS_with_basecrs_with_extent_to_geogCRS) { auto wkt = |