diff options
author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2016-02-12 15:32:08 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:20:40 +0300 |
commit | 54a2c65d093886ab9eeb48d717316fd15d0b4047 (patch) | |
tree | c490608dcfe5dc1563fe315f5339eaa67c406baf | |
parent | 03848c51990c1f34d0808d54783437a6db85a34b (diff) |
Review fixes.
-rw-r--r-- | generator/tag_admixer.hpp | 9 | ||||
-rw-r--r-- | indexer/displacement_manager.hpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/generator/tag_admixer.hpp b/generator/tag_admixer.hpp index a94c1fe578..b19e96f5c0 100644 --- a/generator/tag_admixer.hpp +++ b/generator/tag_admixer.hpp @@ -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); + } } } } diff --git a/indexer/displacement_manager.hpp b/indexer/displacement_manager.hpp index f4974effbd..51bb961f2f 100644 --- a/indexer/displacement_manager.hpp +++ b/indexer/displacement_manager.hpp @@ -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); |