drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tracks] Fixed starting points.

Browse Source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2025-07-21 22:03:58 -03:00
committed by Konstantin Pastbin
parent 8477fff988
commit fda1da03c8
2 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libs/map/gps_track_filter.cpp
View File

@@ -6,8 +6,6 @@
#include "platform/settings.hpp" #include "platform/settings.hpp"
#include "base/assert.hpp" #include "base/assert.hpp"
#include "base/macros.hpp"
#include "base/math.hpp"
namespace namespace
{ {
@@ -80,35 +78,32 @@ void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
if (!currInfo.HasSpeed()) if (!currInfo.HasSpeed())
continue; continue;
if (m_countAcceptedInfo < 2 || currInfo.m_timestamp < GetLastAcceptedInfo().m_timestamp) if (m_countAcceptedInfo == 0 || (IsGoodPoint(currInfo) && (m_countLastInfo < 2 || IsGoodVector(currInfo))))
{ {
AddLastInfo(currInfo); outPoints.emplace_back(currInfo);
AddLastAcceptedInfo(currInfo); AddLastAcceptedInfo(currInfo);
continue;
} }
if (IsGoodPoint(currInfo)) AddLastInfo(currInfo);
}
}
bool GpsTrackFilter::IsGoodVector(location::GpsInfo const & info) const
{ {
ASSERT_GREATER(m_countLastInfo, 1, ());
double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]); // meters double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]); // meters
double const realDistance = GetDistance(m_lastInfo[0], currInfo); // meters double const realDistance = GetDistance(m_lastInfo[0], info); // meters
m2::PointD const predictionDirection = GetDirection(m_lastInfo[1], m_lastInfo[0]); m2::PointD const predictionDirection = GetDirection(m_lastInfo[1], m_lastInfo[0]);
m2::PointD const realDirection = GetDirection(m_lastInfo[0], currInfo); m2::PointD const realDirection = GetDirection(m_lastInfo[0], info);
// Cosine of angle between prediction direction and real direction is // Cosine of angle between prediction direction and real direction is
double const cosine = m2::DotProduct(predictionDirection, realDirection); double const cosine = m2::DotProduct(predictionDirection, realDirection);
// Acceptable angle must be from 0 to 45 or from 0 to -45. // Acceptable angle must be from 0 to 45 or from 0 to -45.
// Acceptable distance must be not great than 2x than predicted, otherwise it is jump. // Acceptable distance must be not great than 2x than predicted, otherwise it is jump.
if (cosine >= kCosine45degrees && realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance)) return (cosine >= kCosine45degrees && realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance));
{
outPoints.emplace_back(currInfo);
AddLastAcceptedInfo(currInfo);
}
}
AddLastInfo(currInfo);
}
} }
bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
@@ -120,6 +115,11 @@ bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
auto const & lastInfo = GetLastInfo(); auto const & lastInfo = GetLastInfo();
auto const & lastAcceptedInfo = GetLastAcceptedInfo(); auto const & lastAcceptedInfo = GetLastAcceptedInfo();
// Time spend to move from the last point to the current point, sec:
double const timeFromLast = info.m_timestamp - lastInfo.m_timestamp;
if (timeFromLast <= 0.0)
return false;
// Distance in meters between last accepted and current point is, meters: // Distance in meters between last accepted and current point is, meters:
double const distanceFromLastAccepted = GetDistance(lastAcceptedInfo, info); double const distanceFromLastAccepted = GetDistance(lastAcceptedInfo, info);
@@ -135,11 +135,6 @@ bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
// Distance in meters between last and current point is, meters: // Distance in meters between last and current point is, meters:
double const distanceFromLast = GetDistance(lastInfo, info); double const distanceFromLast = GetDistance(lastInfo, info);
// Time spend to move from the last point to the current point, sec:
double const timeFromLast = info.m_timestamp - lastInfo.m_timestamp;
if (timeFromLast <= 0.0)
return false;
// Speed to move from the last point to the current point // Speed to move from the last point to the current point
double const speedFromLast = distanceFromLast / timeFromLast; double const speedFromLast = distanceFromLast / timeFromLast;
@@ -167,12 +162,12 @@ void GpsTrackFilter::AddLastInfo(location::GpsInfo const & info)
{ {
m_lastInfo[1] = m_lastInfo[0]; m_lastInfo[1] = m_lastInfo[0];
m_lastInfo[0] = info; m_lastInfo[0] = info;
m_countLastInfo += 1; ++m_countLastInfo;
} }
void GpsTrackFilter::AddLastAcceptedInfo(location::GpsInfo const & info) void GpsTrackFilter::AddLastAcceptedInfo(location::GpsInfo const & info)
{ {
m_lastAcceptedInfo[1] = m_lastAcceptedInfo[0]; m_lastAcceptedInfo[1] = m_lastAcceptedInfo[0];
m_lastAcceptedInfo[0] = info; m_lastAcceptedInfo[0] = info;
m_countAcceptedInfo += 1; ++m_countAcceptedInfo;
} }

4
libs/map/gps_track_filter.hpp
View File

@@ -2,9 +2,6 @@
#include "platform/location.hpp" #include "platform/location.hpp"
#include "geometry/latlon.hpp"
#include <cstddef>
#include <vector> #include <vector>
class IGpsTrackFilter class IGpsTrackFilter
@@ -35,6 +32,7 @@ public:
private: private:
bool IsGoodPoint(location::GpsInfo const & info) const; bool IsGoodPoint(location::GpsInfo const & info) const;
bool IsGoodVector(location::GpsInfo const & info) const;
location::GpsInfo const & GetLastInfo() const; location::GpsInfo const & GetLastInfo() const;
location::GpsInfo const & GetLastAcceptedInfo() const; location::GpsInfo const & GetLastAcceptedInfo() const;