drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-05 20:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[tracks] Fixed ending points."

Browse Source 
This reverts commit 64f50d4e49.
This commit is contained in:
Konstantin Pastbin
2025-08-31 15:58:44 +07:00
parent de305e1a87
commit 2dce119370
11 changed files with 88 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
libs/map/gps_track.cpp
View File

@@ -3,7 +3,36 @@
#include "base/assert.hpp"
#include "base/logging.hpp"
#include <algorithm>
using namespace std;
using namespace std::chrono;
namespace gps_track
{
inline pair<size_t, size_t> UnionRanges(pair<size_t, size_t> const & a, pair<size_t, size_t> const & b)
{
if (a.first == GpsTrack::kInvalidId)
{
ASSERT_EQUAL(a.second, GpsTrack::kInvalidId, ());
return b;
}
if (b.first == GpsTrack::kInvalidId)
{
ASSERT_EQUAL(b.second, GpsTrack::kInvalidId, ());
return a;
}
ASSERT_LESS_OR_EQUAL(a.first, a.second, ());
ASSERT_LESS_OR_EQUAL(b.first, b.second, ());
return make_pair(min(a.first, b.first), max(a.second, b.second));
}
size_t constexpr kItemBlockSize = 1000;
} // namespace gps_track
size_t const GpsTrack::kInvalidId = GpsTrackCollection::kInvalidId;
GpsTrack::GpsTrack(string const & filePath, unique_ptr<IGpsTrackFilter> && filter)
: m_filePath(filePath)
@@ -70,6 +99,12 @@ void GpsTrack::Clear()
ScheduleTask();
}
size_t GpsTrack::GetSize() const
{
CHECK(m_collection != nullptr, ());
return m_collection->GetSize();
}
bool GpsTrack::IsEmpty() const
{
if (!m_collection)
@@ -91,7 +126,6 @@ void GpsTrack::ScheduleTask()
{
lock_guard<mutex> lg(m_threadGuard);
/// @todo Replace with !m_thread.joinable() ?
if (m_thread.get_id() == std::thread::id())
{
m_thread = threads::SimpleThread([this]()
@@ -99,16 +133,11 @@ void GpsTrack::ScheduleTask()
unique_lock<mutex> ul(m_threadGuard);
while (true)
{
m_cv.wait(ul, [this]() { return m_threadExit || m_threadWakeup; });
if (m_threadWakeup)
{
m_threadWakeup = false;
ProcessPoints();
}
m_cv.wait(ul, [this]() -> bool { return m_threadExit || m_threadWakeup; });
if (m_threadExit)
break;
m_threadWakeup = false;
ProcessPoints();
}
m_storage.reset();
@@ -150,7 +179,7 @@ void GpsTrack::InitCollection()
// and filtered points are inserted in the runtime collection.
vector<location::GpsInfo> originPoints;
originPoints.reserve(GpsTrackStorage::kItemBlockSize);
originPoints.reserve(gps_track::kItemBlockSize);
m_storage->ForEach([this, &originPoints](location::GpsInfo const & originPoint) -> bool
{
@@ -210,35 +239,13 @@ void GpsTrack::ProcessPoints()
vector<location::GpsInfo> points;
m_filter->Process(originPoints, points);
pair<size_t, size_t> addedIds, evictedIds;
pair<size_t, size_t> addedIds;
pair<size_t, size_t> evictedIds;
UpdateCollection(needClear, points, addedIds, evictedIds);
NotifyCallback(addedIds, evictedIds);
}
size_t GpsTrack::Finalize()
{
if (m_thread.joinable())
{
{
lock_guard<mutex> lg(m_threadGuard);
m_threadWakeup = true;
m_threadExit = true;
m_cv.notify_one();
}
m_thread.join();
m_thread = {};
}
vector<location::GpsInfo> points;
m_filter->Finalize(points);
if (!points.empty())
m_collection->Add(points);
return m_collection->GetSize();
}
bool GpsTrack::HasCallback()
{
lock_guard<mutex> lg(m_callbackGuard);