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

Revert "[test] Don't simplify line feature geometry for the last scale. Needed to test routing."

Browse source 
This reverts commit 886be33a4f1e6355d3a78a9934e63f5d5741a91a.
This commit is contained in:
Denis Koronchik 2014-07-29 18:22:21 +03:00 • committed by Alex Zolotarev
parent 5caabc6062
commit 7193810679
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
generator/feature_sorter.cpp
View file

@ -427,8 +427,7 @@ namespace feature
}
*/
int const scalesStart = m_header.GetScalesCount() - 1;
for (int i = scalesStart; i >= 0; --i)
for (int i = m_header.GetScalesCount()-1; i >= 0; --i)
{
int const level = m_header.GetScale(i);
if (fb.IsDrawableInRange(i > 0 ? m_header.GetScale(i-1) + 1 : 0, level))
@ -437,14 +436,9 @@ namespace feature
bool const isCoast = fb.GetCoastCell(dummy);
m2::RectD const rect = fb.GetLimitRect();
// Simplify and serialize geometry.
// simplify and serialize geometry
points_t points;
// Do not change linear geometry for the upper scale.
if (isLine && i == scalesStart)
points = holder.GetSourcePoints();
else
SimplifyPoints(holder.GetSourcePoints(), points, level, isCoast, rect);
SimplifyPoints(holder.GetSourcePoints(), points, level, isCoast, rect);
if (isLine)
holder.AddPoints(points, i);