Skip to content

Reduce symbol count when zooming out #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vshcherb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reduce symbol count when zooming out #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 79 additions & 19 deletions src/Map/AtlasMapRendererSymbolsStage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,22 @@ bool OsmAnd::AtlasMapRendererSymbolsStage::obtainRenderableSymbols(

if (result)
{
_symbolCounts.clear();
for (const auto& mapSymbols : constOf(_lastAcceptedMapSymbolsByOrder))
{
const auto& citSymbolsEnd = mapSymbols.cend();
for (auto citSymbols = mapSymbols.cbegin(); citSymbols != citSymbolsEnd; citSymbols++) {
const auto& mapSymbolsGroup = citSymbols->first;
if (mapSymbolsGroup->symbols.isEmpty()
|| std::dynamic_pointer_cast<const VectorLine::SymbolsGroup>(mapSymbolsGroup))
continue;
int subsection = (std::dynamic_pointer_cast<const MapMarker::SymbolsGroup>(mapSymbolsGroup) ||
std::dynamic_pointer_cast<const AmenitySymbolsProvider::AmenitySymbolsGroup>(mapSymbolsGroup))
? mapSymbolsGroup->symbols.first()->subsection : 0;
_symbolCounts.insert(subsection, _symbolCounts.value(subsection) + 1);
}
}
_symbolZoomScale = static_cast<double>(1u << currentState.zoomLevel) * currentState.visualZoom;
if (needUpdatedSymbols)
renderer->setUpdateSymbols(false);

Expand All @@ -285,6 +301,23 @@ bool OsmAnd::AtlasMapRendererSymbolsStage::obtainRenderableSymbols(

// Do not suspend all VectorLine objects and MapMarker objects of updated subsections
const auto subsections = renderer->getSubsectionsToUpdate();
const auto symbolZoomScale = static_cast<double>(1u << currentState.zoomLevel);
auto symbolZoomFactor = static_cast<float>(symbolZoomScale / _symbolZoomScale);
symbolZoomFactor *= symbolZoomFactor;
const bool shrinkSymbolSections = symbolZoomFactor < 1.0f;
if (shrinkSymbolSections)
symbolZoomFactor = 1.0f - symbolZoomFactor;
QHash<int, int> removeSymbolsCounts;
if (shrinkSymbolSections)
{
for (const auto& lastAcceptedSymbolsCount : rangeOf(constOf(_symbolCounts)))
{
const auto key = lastAcceptedSymbolsCount.key();
const auto count = lastAcceptedSymbolsCount.value();
const auto removeCount = static_cast<int>(static_cast<float>(count) * symbolZoomFactor);
removeSymbolsCounts.insert(key, removeCount);
}
}

// Acquire selected objects from publishedMapSymbolsByOrder
MapRenderer::PublishedMapSymbolsByOrder filteredPublishedMapSymbols;
Expand All @@ -297,40 +330,67 @@ bool OsmAnd::AtlasMapRendererSymbolsStage::obtainRenderableSymbols(
{
const auto& mapSymbolsGroup = mapSymbolsEntry.first;
const auto& mapSymbolsFromGroup = mapSymbolsEntry.second;

if (std::dynamic_pointer_cast<const VectorLine::SymbolsGroup>(mapSymbolsGroup)
|| ((std::dynamic_pointer_cast<const MapMarker::SymbolsGroup>(mapSymbolsGroup)
|| std::dynamic_pointer_cast<const AmenitySymbolsProvider::AmenitySymbolsGroup>(mapSymbolsGroup))
&& !mapSymbolsGroup->symbols.isEmpty()
&& subsections.contains(mapSymbolsGroup->symbols.first()->subsection)))
{
if (std::dynamic_pointer_cast<const VectorLine::SymbolsGroup>(mapSymbolsGroup))
acceptedMapSymbols[mapSymbolsGroup] = mapSymbolsFromGroup;
else if ((std::dynamic_pointer_cast<const MapMarker::SymbolsGroup>(mapSymbolsGroup)
|| std::dynamic_pointer_cast<const AmenitySymbolsProvider::AmenitySymbolsGroup>(mapSymbolsGroup))
&& !mapSymbolsGroup->symbols.isEmpty())
{
int subsection = mapSymbolsGroup->symbols.first()->subsection;
if (subsections.contains(subsection))
{
acceptedMapSymbols[mapSymbolsGroup] = mapSymbolsFromGroup;
_symbolCounts.insert(subsection, _symbolCounts.value(subsection) + 1);
}
}
}
if (!acceptedMapSymbols.empty())
filteredPublishedMapSymbols[order] = acceptedMapSymbols;
}

// Filter out selected objects from _lastAcceptedMapSymbolsByOrder
for (auto& mapSymbols : _lastAcceptedMapSymbolsByOrder)
auto itMapSymbolsByOrder = _lastAcceptedMapSymbolsByOrder.end();
auto itMapSymbolsByOrderBegin = _lastAcceptedMapSymbolsByOrder.begin();
while (itMapSymbolsByOrder != itMapSymbolsByOrderBegin)
{
auto itSymbols = mapSymbols.begin();
while (itSymbols != mapSymbols.end()) {
itMapSymbolsByOrder--;
auto itSymbols = itMapSymbolsByOrder->begin();
while (itSymbols != itMapSymbolsByOrder->end()) {
const auto& mapSymbolsGroup = itSymbols->first;

if (std::dynamic_pointer_cast<const VectorLine::SymbolsGroup>(mapSymbolsGroup)
|| ((std::dynamic_pointer_cast<const MapMarker::SymbolsGroup>(mapSymbolsGroup)
|| std::dynamic_pointer_cast<const AmenitySymbolsProvider::AmenitySymbolsGroup>(mapSymbolsGroup))
&& !mapSymbolsGroup->symbols.isEmpty()
&& subsections.contains(mapSymbolsGroup->symbols.first()->subsection)))
if (std::dynamic_pointer_cast<const VectorLine::SymbolsGroup>(mapSymbolsGroup))
itSymbols = itMapSymbolsByOrder->erase(itSymbols);
else
{
itSymbols = mapSymbols.erase(itSymbols);
bool quickSymbols = (std::dynamic_pointer_cast<const MapMarker::SymbolsGroup>(mapSymbolsGroup)
|| std::dynamic_pointer_cast<const AmenitySymbolsProvider::AmenitySymbolsGroup>(mapSymbolsGroup))
&& !mapSymbolsGroup->symbols.isEmpty();
int subsection = quickSymbols ? mapSymbolsGroup->symbols.first()->subsection : 0;
if (quickSymbols && subsections.contains(subsection))
{
itSymbols = itMapSymbolsByOrder->erase(itSymbols);
_symbolCounts.insert(subsection, _symbolCounts.value(subsection) - 1);
}
else if (shrinkSymbolSections)
{
int symbolCount = removeSymbolsCounts.value(subsection);
if (symbolCount > 0)
{
itSymbols = itMapSymbolsByOrder->erase(itSymbols);
_symbolCounts.insert(subsection, _symbolCounts.value(subsection) - 1);
removeSymbolsCounts.insert(subsection, symbolCount - 1);
}
else
itSymbols++;
}
else
itSymbols++;
}
else
itSymbols++;
}
}

if (shrinkSymbolSections)
_symbolZoomScale = symbolZoomScale;

// Append selected objects to _lastAcceptedMapSymbolsByOrder
for (const auto& mapSymbolsByOrderEntry : rangeOf(constOf(filteredPublishedMapSymbols)))
{
Expand Down
2 changes: 2 additions & 0 deletions src/Map/AtlasMapRendererSymbolsStage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ namespace OsmAnd
MapRenderer::PublishedMapSymbolsByOrder* pOutAcceptedMapSymbolsByOrder,
AtlasMapRenderer_Metrics::Metric_renderFrame* metric);
mutable MapRenderer::PublishedMapSymbolsByOrder _lastAcceptedMapSymbolsByOrder;
QHash<int, int> _symbolCounts;
double _symbolZoomScale;
std::chrono::high_resolution_clock::time_point _lastResumeSymbolsUpdateTime;
bool _previouslyInvalidated;

Expand Down