8000 [Backport 9.3] createOperations(): fix GeogCRS 3D with TOWGS84 to geocentric CRS (fixes #3909) by rouault · Pull Request #3915 · OSGeo/PROJ · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[Backport 9.3] createOperations(): fix GeogCRS 3D with TOWGS84 to geocentric CRS (fixes #3909) #3915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2023
Merged

[Backport 9.3] createOperations(): fix GeogCRS 3D with TOWGS84 to geocentric CRS (fixes #3909) #3915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/iso19111/operation/singleoperation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3498,15 +3498,31 @@ bool SingleOperation::exportToPROJStringGeneric(
auto sourceCRSGeog =
dynamic_cast<const crs::GeographicCRS *>(sourceCRS().get());
if (!sourceCRSGeog) {
throw io::FormattingException(
"Can apply Geographic 3D offsets only to GeographicCRS");
auto boundCRS =
dynamic_cast<const crs::BoundCRS *>(sourceCRS().get());
if (boundCRS) {
sourceCRSGeog = dynamic_cast<crs::GeographicCRS *>(
boundCRS->baseCRS().get());
}
if (!sourceCRSGeog) {
throw io::FormattingException(
"Can apply Geographic 3D offsets only to GeographicCRS");
}
}

auto targetCRSGeog =
dynamic_cast<const crs::GeographicCRS *>(targetCRS().get());
if (!targetCRSGeog) {
throw io::FormattingException(
"Can apply Geographic 3D offsets only to GeographicCRS");
auto boundCRS =
dynamic_cast<const crs::BoundCRS *>(targetCRS().get());
if (boundCRS) {
targetCRSGeog = dynamic_cast<const crs::GeographicCRS *>(
boundCRS->baseCRS().get());
}
if (!targetCRSGeog) {
throw io::FormattingException(
"Can apply Geographic 3D offsets only to GeographicCRS");
}
}

formatter->startInversion();
Expand Down
57 changes: 57 additions & 0 deletions test/unit/test_operationfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2116,6 +2116,63 @@ TEST(operation, geogCRS_different_from_baseCRS_to_projCRS) {

// ---------------------------------------------------------------------------

TEST(operation, geogCRS_with_towgs84_to_geocentric) {

auto dbContext = DatabaseContext::create();
auto authFactory = AuthorityFactory::create(dbContext, std::string());
auto ctxt = CoordinateOperationContext::create(authFactory, nullptr, 0.0);

auto objSrc = WKTParser().createFromWKT(
"GEOGCS[\"WGS84 Coordinate System\",DATUM[\"WGS_1984\","
"SPHEROID[\"WGS 1984\",6378137,298.257223563],"
"TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",\"6326\"]],"
"PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433],"
"AXIS[\"Latitude\",NORTH],AXIS[\"Longitude\",EAST],"
"AUTHORITY[\"EPSG\",\"4326\"]]");
auto src = nn_dynamic_pointer_cast<CRS>(objSrc);
ASSERT_TRUE(src != nullptr);
auto src3D = src->promoteTo3D(std::string(), dbContext);

auto objDst = WKTParser().createFromWKT(
"GEOCCS[\"WGS 84\",DATUM[\"WGS_1984\","
"SPHEROID[\"WGS 84\",6378137,298.257223563,"
"AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],"
"PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],"
"UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],"
"AXIS[\"Geocentric X\",OTHER],AXIS[\"Geocentric Y\",OTHER],"
"AXIS[\"Geocentric Z\",NORTH],AUTHORITY[\"EPSG\",\"4978\"]]");
auto dst = nn_dynamic_pointer_cast<CRS>(objDst);
ASSERT_TRUE(dst != nullptr);

{
auto list = CoordinateOperationFactory::create()->createOperations(
src3D, NN_NO_CHECK(dst), ctxt);
ASSERT_EQ(list.size(), 1U);
EXPECT_EQ(
list[0]->exportToPROJString(PROJStringFormatter::create().get()),
"+proj=pipeline "
"+step +proj=axisswap +order=2,1 "
"+step +proj=unitconvert +xy_in=deg +z_in=m "
"+xy_out=rad +z_out=m "
"+step +proj=cart +ellps=WGS84");
}

{
auto list = CoordinateOperationFactory::create()->createOperations(
NN_NO_CHECK(dst), src3D, ctxt);
ASSERT_EQ(list.size(), 1U);
EXPECT_EQ(
list[0]->exportToPROJString(PROJStringFormatter::create().get()),
"+proj=pipeline "
"+step +inv +proj=cart +ellps=WGS84 "
"+step +proj=unitconvert +xy_in=rad +z_in=m "
"+xy_out=deg +z_out=m "
"+step +proj=axisswap +order=2,1");
}
}

// ---------------------------------------------------------------------------

TEST(operation,
geogCRS_different_from_baseCRS_to_projCRS_context_compatible_area) {
auto authFactory =
Expand Down
0