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

Fixed notes

Browse source
This commit is contained in:
Constantin Shalnev 2015-12-07 12:51:01 +03:00
parent ea36c255dc
commit b6a793cc7e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map/gps_track_collection.cpp
View file

@ -116,13 +116,13 @@ pair<size_t, size_t> GpsTrackCollection::Clear(bool resetIds)
return make_pair(kInvalidId, kInvalidId);
}
ASSERT(m_lastId >= m_items.size(), ());
ASSERT_GREATER_OR_EQUAL(m_lastId, m_items.size(), ());
// Range of evicted items
auto const res = make_pair(m_lastId - m_items.size(), m_lastId - 1);
// Use move from an empty deque to free memory.
m_items = deque<TItem>();
m_items.clear();
m_items.shrink_to_fit();
if (resetIds)
m_lastId = 0;
@ -150,7 +150,7 @@ pair<double, double> GpsTrackCollection::GetTimestampRange() const
if (m_items.empty())
return make_pair(0, 0);
ASSERT(m_items.front().m_timestamp <= m_items.back().m_timestamp, ());
ASSERT_LESS_OR_EQUAL(m_items.front().m_timestamp, m_items.back().m_timestamp, ());
return make_pair(m_items.front().m_timestamp, m_items.back().m_timestamp);
}
@ -170,7 +170,7 @@ pair<size_t, size_t> GpsTrackCollection::RemoveExtraItems()
double const lowerBound = m_items.back().m_timestamp - m_duration.count() * kSecondsPerHour;
ASSERT(m_lastId >= m_items.size(), ());
ASSERT_GREATER_OR_EQUAL(m_lastId, m_items.size(), ());
if (m_items.front().m_timestamp >= lowerBound)
{