kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[map] remove unused code from the GpsTrackCollection

Browse source 
GpsTrackCollection has two methods to add: point and points.
The first one is used only once time in the unit test and removed to simplify the adding logic.
RemoveUntil is not used.

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-10-11 21:49:10 +04:00 • committed by Viktor Havaka
parent a8077eb6a0
commit 2d410d127b
3 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
map/gps_track_collection.cpp
View file

@ -36,20 +36,6 @@ GpsTrackCollection::GpsTrackCollection()
{
}
size_t GpsTrackCollection::Add(TItem const & item)
{
if (!m_items.empty() && m_items.back().m_timestamp > item.m_timestamp)
{
// Invalid timestamp order
return kInvalidId; // Nothing was added
}
m_items.emplace_back(item);
++m_lastId;
return m_lastId - 1;
}
std::pair<size_t, size_t> GpsTrackCollection::Add(std::vector<TItem> const & items)
{
size_t startId = m_lastId;
@ -113,11 +99,3 @@ bool GpsTrackCollection::IsEmpty() const
{
return m_items.empty();
}
std::pair<size_t, size_t> GpsTrackCollection::RemoveUntil(std::deque<TItem>::iterator i)
{
auto const res = std::make_pair(m_lastId - m_items.size(),
m_lastId - m_items.size() + distance(m_items.begin(), i) - 1);
m_items.erase(m_items.begin(), i);
return res;
}

12
map/gps_track_collection.hpp
View file

@ -17,11 +17,6 @@ public:
/// Constructor
GpsTrackCollection();
/// Adds new point in the collection.
/// @param item - item to be added.
/// @returns the item unique identifier or kInvalidId if point has incorrect time.
size_t Add(TItem const & item);
/// Adds set of new points in the collection.
/// @param items - set of items to be added.
/// @returns range of identifiers of added items or pair(kInvalidId,kInvalidId) if nothing was added
@ -62,13 +57,6 @@ public:
}
private:
// Removes items in range [m_items.begin(), i) and returnd
// range of identifiers of removed items
std::pair<size_t, size_t> RemoveUntil(std::deque<TItem>::iterator i);
// Removes items extra by timestamp
std::pair<size_t, size_t> RemoveExtraItems();
std::deque<TItem> m_items; // asc. sorted by timestamp
size_t m_lastId;

6
map/map_tests/gps_track_collection_test.cpp
View file

@ -38,9 +38,9 @@ UNIT_TEST(GpsTrackCollection_Simple)
for (size_t i = 0; i < 50; ++i)
{
auto info = MakeGpsTrackInfo(timestamp + i, ms::LatLon(-90 + i, -180 + i), i);
size_t addedId = collection.Add(info);
TEST_EQUAL(addedId, i, ());
data[addedId] = info;
std::pair<size_t, size_t> addedIds = collection.Add({info});
TEST_EQUAL(addedIds.second, i, ());
data[addedIds.second] = info;
}
TEST_EQUAL(50, collection.GetSize(), ());