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

Jump to bottom

proj_normalize_for_visualization(): take into account FORCE_OVER property from source operation (fixes #3347) #3350

Merged
merged 1 commit into from
Sep 27, 2022
Merged

proj_normalize_for_visualization(): take into account FORCE_OVER property from source operation (fixes #3347) #3350

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
12 changes: 9 additions & 3 deletions src/iso19111/c_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8825,6 +8825,7 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) {
pjNew->descr = "Set of coordinate operations";
pjNew->left = obj->left;
pjNew->right = obj->right;
pjNew->over = obj->over;

for (const auto &alt : obj->alternativeCoordinateOperations) {
auto co = dynamic_cast<const CoordinateOperation *>(
Expand Down Expand Up @@ -8857,11 +8858,14 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) {
std::swap(maxxDst, maxyDst);
}
}
auto pjNormalized =
pj_obj_create(ctx, co->normalizeForVisualization());
pjNormalized->over = alt.pj->over;
pjNew->alternativeCoordinateOperations.emplace_back(
alt.idxInOriginalList, minxSrc, minySrc, maxxSrc,
maxySrc, minxDst, minyDst, maxxDst, maxyDst,
pj_obj_create(ctx, co->normalizeForVisualization()),
co->nameStr(), alt.accuracy, alt.isOffshore);
pjNormalized, co->nameStr(), alt.accuracy,
alt.isOffshore);
}
}
return pjNew.release();
Expand Down Expand Up @@ -8890,7 +8894,9 @@ PJ *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ *obj) {
return nullptr;
}
try {
return pj_obj_create(ctx, co->normalizeForVisualization());
auto pjNormalized = pj_obj_create(ctx, co->normalizeForVisualization());
pjNormalized->over = obj->over;
return pjNormalized;
} catch (const std::exception &e) {
proj_log_debug(ctx, __FUNCTION__, e.what());
return nullptr;
Expand Down
11 changes: 11 additions & 0 deletions test/unit/gie_self_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,10 @@ TEST(gie, proj_create_crs_to_crs_from_pj_force_over) {
EXPECT_NEAR(input_over.xyz.x, input_over_inv.xyz.x, 1e-8);
EXPECT_NEAR(input_over.xyz.y, input_over_inv.xyz.y, 1e-8);

auto Pnormalized = proj_normalize_for_visualization(ctx, P);
ASSERT_TRUE(Pnormalized->over);
proj_destroy(Pnormalized);

proj_destroy(P);
}

Expand Down Expand Up @@ -1196,6 +1200,13 @@ TEST(gie, proj_create_crs_to_crs_from_pj_force_over) {
EXPECT_NEAR(output_over.xyz.x, 4980122.749364435, 1e-8);
EXPECT_NEAR(output_over.xyz.y, 14467212.882603768, 1e-8);

auto Pnormalized = proj_normalize_for_visualization(ctx, P);
ASSERT_TRUE(Pnormalized->over);
for (const auto &op : Pnormalized->alternativeCoordinateOperations) {
ASSERT_TRUE(op.pj->over);
}
proj_destroy(Pnormalized);

proj_destroy(P);
}

Expand Down