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

Review fixes.

Browse source
This commit is contained in:
Lev Dragunov 2016-02-12 15:32:08 +03:00 • committed by Sergey Yershov
parent 03848c5199
commit 54a2c65d09
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generator/tag_admixer.hpp
View file

@ -62,10 +62,11 @@ public:
uint64_t nodeId;
// Third ';'.
auto endPos = oneLine.find(";", pos + 1);
if (endPos == string::npos)
endPos = oneLine.length() - 1;
if (strings::to_uint64(oneLine.substr(pos + 1, endPos - pos - 1), nodeId))
m_capitals.insert(nodeId);
if (endPos != string::npos)
{
if (strings::to_uint64(oneLine.substr(pos + 1, endPos - pos - 1), nodeId))
m_capitals.insert(nodeId);
}
}
}
}

2
indexer/displacement_manager.hpp
View file

@ -117,7 +117,7 @@ public:
{
uint32_t scale = node.m_minScale;
// Do not filter high level objects.
if (scale < 10)
if (scale <= scales::GetUpperWorldScale())
{
AddNodeToSorter(node,scale);
acceptedNodes.Add(node);