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

Fixed user marks generation assignment.

Browse source
This commit is contained in:
Daria Volvenkova 2018-03-01 18:06:14 +03:00 • committed by Aleksandr Zatsepin
parent 0dba9c6c0d
commit 455527be5f
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape_frontend/backend_renderer.cpp
View file

@ -174,7 +174,6 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
{
ref_ptr<TileReadEndMessage> msg = message;
m_batchersPool->ReleaseBatcher(msg->GetKey());
m_userMarkGenerator->GenerateUserMarksGeometry(msg->GetKey(), m_texMng);
break;
}

28
drape_frontend/read_manager.cpp
View file

@ -105,13 +105,19 @@ void ReadManager::OnTaskFinished(threads::IRoutine * task)
if (!task->IsCancelled())
{
m_activeTiles.erase(t->GetTileKey());
auto const it = m_activeTiles.find(t->GetTileKey());
ASSERT(it != m_activeTiles.end(), ());
// Use the tile key from active tiles with the actual user marks generation.
auto const tileKey = *it;
TTilesCollection tiles;
tiles.emplace(t->GetTileKey());
tiles.emplace(tileKey);
m_activeTiles.erase(it);
m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
make_unique_dp<FinishTileReadMessage>(std::move(tiles),
false /* forceUpdateUserMarks */),
true /* forceUpdateUserMarks */),
MessagePriority::Normal);
}
}
@ -237,7 +243,7 @@ void ReadManager::PushTaskBackForTileKey(TileKey const & tileKey,
task->Init(tileInfo);
{
std::lock_guard<std::mutex> lock(m_finishedTilesMutex);
m_activeTiles.insert(tileKey);
m_activeTiles.insert(TileKey(tileKey, m_generationCounter, m_userMarksGenerationCounter));
}
m_pool->PushBack(task);
}
@ -253,8 +259,20 @@ void ReadManager::CheckFinishedTiles(TTileInfoCollection const & requestedTiles,
for (auto const & tile : requestedTiles)
{
if (m_activeTiles.find(tile->GetTileKey()) == m_activeTiles.end())
auto const it = m_activeTiles.find(tile->GetTileKey());
if (it == m_activeTiles.end())
{
finishedTiles.emplace(tile->GetTileKey(), m_generationCounter, m_userMarksGenerationCounter);
}
else if (forceUpdateUserMarks)
{
// In case of active tile reading update its user marks generation.
// User marks will be generated after finishing of tile reading with correct tile key.
auto tileKey = *it;
tileKey.m_userMarksGeneration = m_userMarksGenerationCounter;
m_activeTiles.erase(it);
m_activeTiles.insert(tileKey);
}
}
if (!finishedTiles.empty())