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

[formulas] Fix warning (variable hiding member) in sjoberg_intersection #1365

Merged
merged 1 commit into from
Jan 13, 2025
Merged

[formulas] Fix warning (variable hiding member) in sjoberg_intersection #1365

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
7 changes: 3 additions & 4 deletions include/boost/geometry/formulas/sjoberg_intersection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Boost.Geometry

// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2023-2025 Adam Wulkiewicz, Lodz, Poland.

// Copyright (c) 2016-2019 Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
Expand Down Expand Up @@ -566,7 +566,6 @@ class sjoberg_geodesic
{
CT const c0 = 0;
CT const dLj = d_lambda(c0);
CT const asin_tj_t0j = asin(Cj * tan_betaj / sqrt_1_Cj_sqr);
awulkiew marked this conversation as resolved.
Show resolved Hide resolved
return lonj - asin_tj_t0j + dLj;
}

Expand Down Expand Up @@ -676,8 +675,8 @@ class sjoberg_intersection
CT const f = formula::flattening<CT>(spheroid);
CT const one_minus_f = c1 - f;

geodesic_type geod1(lon_a1, lat_a1, alpha_a1, f);
geodesic_type geod2(lon_b1, lat_b1, alpha_b1, f);
geodesic_type const geod1(lon_a1, lat_a1, alpha_a1, f);
geodesic_type const geod2(lon_b1, lat_b1, alpha_b1, f);

// Cj = 1 if on equator <=> sqrt_1_Cj_sqr = 0
// Cj = 0 if vertical <=> sqrt_1_Cj_sqr = 1
Expand Down
16 changes: 16 additions & 0 deletions test/formulas/intersection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Boost.Geometry
// Unit Test

// Copyright (c) 2025 Adam Wulkiewicz, Lodz, Poland.

// Copyright (c) 2016-2019 Oracle and/or its affiliates.

// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
Expand Down Expand Up @@ -185,6 +187,19 @@ void test_bugs()
}
}

void test_special_cases()
{
{
double lon, lat;
bg::formula::sjoberg_intersection<double, bg::formula::andoyer_inverse, 1>
::apply(-0.01, 0.0, 0.01, 0.0,
0.0, -0.01, 0.0, 0.01,
lon, lat, bg::srs::spheroid<double>());
check_one("geodesic on equator", lon, 0.0);
check_one("geodesic on equator", lat, 0.0);
}
}

int test_main(int, char*[])
{
for (size_t i = 0; i < expected_size; ++i)
Expand All @@ -193,6 +208,7 @@ int test_main(int, char*[])
}

test_bugs();
test_special_cases();

return 0;
}
Loading