Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--generator/tag_admixer.hpp9
-rw-r--r--indexer/displacement_manager.hpp2
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);