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

Draw mwm files in better priority (countries, worldcoasts, world).

Browse source
This commit is contained in:
vng 2011-10-12 22:15:29 +03:00 • committed by Alex Zolotarev
parent 60d8435e93
commit bfb6f6e003
1 changed files with 56 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
indexer/index.hpp
View file

@ -5,6 +5,7 @@
#include "features_vector.hpp"
#include "scale_index.hpp"
#include "mwm_set.hpp"
#include "scales.hpp"
#include "../coding/file_container.hpp"
@ -89,6 +90,39 @@ private:
}
};
template <typename F>
void ProcessMwm(F & f, MwmId id, covering::CoveringGetter & cov, uint32_t scale) const
{
MwmLock lock(*this, id);
MwmValue * pValue = lock.GetValue();
if (pValue)
{
feature::DataHeader const & header = pValue->GetHeader();
// Prepare needed covering.
int const lastScale = header.GetLastScale();
// In case of WorldCoasts we should pass correct scale in ForEachInIntervalAndScale.
if (scale > lastScale) scale = lastScale;
// Use last coding scale for covering (see index_builder.cpp).
covering::IntervalsT const & interval = cov.Get(lastScale);
// prepare features reading
FeaturesVector fv(pValue->m_cont, header);
ScaleIndex<ModelReaderPtr> index(pValue->m_cont.GetReader(INDEX_FILE_TAG),
pValue->m_factory);
// iterate through intervals
unordered_set<uint32_t> offsets;
ReadFeatureFunctor<F> f1(fv, f, offsets);
for (size_t i = 0; i < interval.size(); ++i)
{
index.ForEachInIntervalAndScale(f1, interval[i].first, interval[i].second, scale);
}
}
}
template <typename F>
void ForEachInIntervals(F & f, int mode, m2::RectD const & rect, uint32_t scale) const
{
@ -97,40 +131,35 @@ private:
covering::CoveringGetter cov(rect, mode);
for (MwmId id = 0; id < mwm.size(); ++id)
size_t const count = mwm.size();
MwmId worldID[2] = { count, count };
for (MwmId id = 0; id < count; ++id)
{
if ((mwm[id].m_minScale <= scale && scale <= mwm[id].m_maxScale) &&
rect.IsIntersect(mwm[id].m_limitRect))
{
MwmLock lock(*this, id);
MwmValue * pValue = lock.GetValue();
if (pValue)
/// @todo It's better to avoid hacks with scale comparison.
if (mwm[id].m_minScale > 0)
{
feature::DataHeader const & header = pValue->GetHeader();
// Prepare needed covering.
// In case of WorldCoasts we should pass correct scale in ForEachInIntervalAndScale.
int const lastScale = header.GetLastScale();
if (scale > lastScale) scale = lastScale;
// Use last coding scale for covering (see index_builder.cpp).
covering::IntervalsT const & interval = cov.Get(lastScale);
// prepare features reading
FeaturesVector fv(pValue->m_cont, header);
ScaleIndex<ModelReaderPtr> index(pValue->m_cont.GetReader(INDEX_FILE_TAG),
pValue->m_factory);
// iterate through intervals
unordered_set<uint32_t> offsets;
ReadFeatureFunctor<F> f1(fv, f, offsets);
for (size_t i = 0; i < interval.size(); ++i)
{
index.ForEachInIntervalAndScale(f1, interval[i].first, interval[i].second, scale);
}
// process countries first
ProcessMwm(f, id, cov, scale);
}
else
{
if (mwm[id].m_maxScale == scales::GetUpperScale())
worldID[0] = id; // store WorldCoasts to process
else
worldID[1] = id; // store World to process
}
}
}
if (worldID[0] < count)
ProcessMwm(f, worldID[0], cov, scale);
if (worldID[1] < count)
ProcessMwm(f, worldID[1], cov, scale);
}
};