Skip to content
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

Bugfix in CRS::alterCSLinearUnit for DerivedProjectedCRS #3499

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Bugfix in CRS::alterCSLinearUnit for DerivedProjectedCRS #3499

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
8 changes: 6 additions & 2 deletions src/iso19111/crs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,10 +378,14 @@ CRSNNPtr CRS::alterCSLinearUnit(const common::UnitOfMeasure &unit) const {
{
auto derivedProjCRS = dynamic_cast<const DerivedProjectedCRS *>(this);
if (derivedProjCRS) {
auto cs = derivedProjCRS->coordinateSystem();
auto cartCS = util::nn_dynamic_pointer_cast<cs::CartesianCS>(cs);
hernando marked this conversation as resolved.
Show resolved Hide resolved
if (cartCS) {
cs = cartCS->alterUnit(unit);
}
return DerivedProjectedCRS::create(
createPropertyMap(this), derivedProjCRS->baseCRS(),
derivedProjCRS->derivingConversion(),
derivedProjCRS->baseCRS()->coordinateSystem()->alterUnit(unit));
derivedProjCRS->derivingConversion(), cs);
}
}

Expand Down
18 changes: 18 additions & 0 deletions test/unit/test_crs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6542,6 +6542,24 @@ TEST(crs, crs_alterCSLinearUnit) {
EXPECT_EQ(cs->axisList()[1]->unit().conversionToSI(), 2);
}

{
auto crs = createDerivedProjectedCRSNorthingEasting();
auto alteredCRS = crs->alterCSLinearUnit(UnitOfMeasure("my unit", 2));

auto leftHandedDerivedCRS =
dynamic_cast<DerivedProjectedCRS *>(alteredCRS.get());
ASSERT_TRUE(leftHandedDerivedCRS != nullptr);
auto cs = dynamic_cast<CartesianCS *>(
leftHandedDerivedCRS->coordinateSystem().get());
ASSERT_EQ(cs->axisList().size(), 2U);
EXPECT_EQ(cs->axisList()[0]->unit().name(), "my unit");
EXPECT_EQ(cs->axisList()[0]->direction(), AxisDirection::NORTH);
EXPECT_EQ(cs->axisList()[0]->unit().conversionToSI(), 2);
EXPECT_EQ(cs->axisList()[1]->unit().name(), "my unit");
EXPECT_EQ(cs->axisList()[1]->direction(), AxisDirection::EAST);
EXPECT_EQ(cs->axisList()[1]->unit().conversionToSI(), 2);
}

{
auto crs = GeodeticCRS::EPSG_4978->alterCSLinearUnit(
UnitOfMeasure("my unit", 2));
Expand Down