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:
authorDarafei Praliaskouski <komzpa@gmail.com>2013-01-21 17:53:19 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:49:00 +0300
commitafd954e47fd96984431a91961f591131b102c7a6 (patch)
treebc5b70263993c0dc2719c691d35c11189e28c483 /indexer
parentde0a0947acca91525243cabe3ac0fc7cebee1dda (diff)
classificator cleanup
Diffstat (limited to 'indexer')
-rw-r--r--indexer/classificator.cpp21
1 files changed, 3 insertions, 18 deletions
diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index 2a2070bdeb..19fa0cd5ec 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -298,9 +298,6 @@ namespace
vec_t const & m_rules;
vec_t & m_keys;
- iter_t m_iters[2];
- int m_scales[2];
-
bool m_added;
void add_rule(int ft, iter_t i)
@@ -326,22 +323,10 @@ namespace
void find(int ft, int scale)
{
- // find greater or equal scale
- m_iters[0] = lower_bound(m_rules.begin(), m_rules.end(), scale, less_scales());
- if (m_iters[0] != m_rules.end())
- m_scales[0] = m_iters[0]->m_scale;
- else
- m_scales[0] = -1000;
-
- // if drawing rules exist for 'scale', then process and exit
- if (scale == m_scales[0])
+ iter_t i = lower_bound(m_rules.begin(), m_rules.end(), scale, less_scales());
+ while (i != m_rules.end() && i->m_scale == scale)
{
- if (m_scales[0] < 0) return;
- iter_t i = m_iters[0];
- do
- {
- add_rule(ft, i++);
- } while (i != m_rules.end() && i->m_scale == m_scales[0]);
+ add_rule(ft, i++);
}
}
};