gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[map] [geometry] fix track length calculation

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-12-17 19:32:32 +04:00
parent ea01aeb994
commit 35f7b90ae6
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
geometry/point_with_altitude.cpp
View file

@ -1,4 +1,7 @@
#include "geometry/point_with_altitude.hpp"
#include "geometry/mercator.hpp"
#include "base/math.hpp"
#include "std/boost_container_hash.hpp"
@ -46,6 +49,13 @@ bool AlmostEqualAbs(PointWithAltitude const & lhs, PointWithAltitude const & rhs
{
return AlmostEqualAbs(lhs.GetPoint(), rhs.GetPoint(), eps) && lhs.GetAltitude() == rhs.GetAltitude();
}
double Distance(PointWithAltitude const & p1, PointWithAltitude const & p2)
{
auto const projection = mercator::DistanceOnEarth(p1.GetPoint(), p2.GetPoint());
auto const altitudeDifference = p2.GetAltitude() - p1.GetAltitude();
return std::sqrt(base::Pow2(projection) + base::Pow2(altitudeDifference));
}
} // namespace geometry
namespace std

1
geometry/point_with_altitude.hpp
View file

@ -47,6 +47,7 @@ inline m2::PointD GetPoint(PointWithAltitude const & pwa) { return pwa.GetPoint(
PointWithAltitude MakePointWithAltitudeForTesting(m2::PointD const & point);
bool AlmostEqualAbs(PointWithAltitude const & lhs, PointWithAltitude const & rhs, double eps);
double Distance(PointWithAltitude const & p1, PointWithAltitude const & p2);
} // namespace geometry
namespace std

4
map/map_tests/bookmarks_test.cpp
View file

@ -1149,7 +1149,7 @@ UNIT_CLASS_TEST(Runner, TrackParsingTest_1)
dp::Color(171, 230, 0, 255),
dp::Color(0, 230, 117, 255),
dp::Color(0, 59, 230, 255)}};
array<double, 4> constexpr length = {{3525.46839061, 27172.44338132, 27046.0456586, 23967.35765800}};
array<double, 4> constexpr length = {{3525.77, 27193.9, 27048.7, 23971.1}};
array<geometry::Altitude, 4> constexpr altitudes = {{0, 27, -3, -2}};
size_t i = 0;
for (auto const trackId : bmManager.GetTrackIds(catId))
@ -1159,7 +1159,7 @@ UNIT_CLASS_TEST(Runner, TrackParsingTest_1)
TEST_EQUAL(geom[0].GetAltitude(), altitudes[i], ());
TEST_EQUAL(names[i], track->GetName(), ());
TEST_ALMOST_EQUAL_ABS(track->GetLengthMeters(), length[i], 1.0E-6, ());
TEST_ALMOST_EQUAL_ABS(track->GetLengthMeters(), length[i], 1.0E-1, ());
TEST_GREATER(track->GetLayerCount(), 0, ());
TEST_EQUAL(col[i], track->GetColor(0), ());
++i;

12
map/track.cpp
View file

@ -17,9 +17,9 @@ double GetLengthInMeters(kml::MultiGeometry::LineT const & points, size_t pointI
double length = 0.0;
for (size_t i = 1; i <= pointIndex; ++i)
{
auto const & pt1 = points[i - 1].GetPoint();
auto const & pt2 = points[i].GetPoint();
auto const segmentLength = mercator::DistanceOnEarth(pt1, pt2);
auto const & pt1 = points[i - 1];
auto const & pt2 = points[i];
auto const segmentLength = geometry::Distance(pt1, pt2);
length += segmentLength;
}
return length;
@ -51,9 +51,9 @@ std::vector<Track::Lengths> Track::GetLengthsImpl() const
lineLengths.emplace_back(distance);
for (size_t j = 1; j < line.size(); ++j)
{
auto const & pt1 = line[j - 1].GetPoint();
auto const & pt2 = line[j].GetPoint();
distance += mercator::DistanceOnEarth(pt1, pt2);
auto const & pt1 = line[j - 1];
auto const & pt2 = line[j];
distance += geometry::Distance(pt1, pt2);
lineLengths.emplace_back(distance);
}
lengths.emplace_back(std::move(lineLengths));