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:
authortatiana-yan <tatiana.kondakova@gmail.com>2018-12-25 18:08:31 +0300
committermpimenov <mpimenov@users.noreply.github.com>2019-02-14 17:47:56 +0300
commite1b64a39dba576d9272acb3e6743d8c4432fc215 (patch)
treee147739b2c0a09bbf470e20990d8f8fe0fb2a24e /indexer
parent94a1bb578eb01e460663ffccee848d9ee7dbe8f1 (diff)
[indexer] Fix sponsored types displacement.
Diffstat (limited to 'indexer')
-rw-r--r--indexer/feature_visibility.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index 7bb414167a..a71329769d 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -229,13 +229,12 @@ namespace
return false;
static uint32_t const internet = classif().GetTypeByPath({"internet_access"});
- static uint32_t const sponsored = classif().GetTypeByPath({"sponsored"});
if ((g == GEOM_LINE || g == GEOM_UNDEFINED) && HasRoutingExceptionType(type))
return true;
ftype::TruncValue(type, 1);
- if (g != GEOM_LINE && (sponsored == type || internet == type))
+ if (g != GEOM_LINE && type == internet)
return true;
return false;
@@ -256,6 +255,7 @@ namespace
static uint32_t const psurface = classif().GetTypeByPath({"psurface"});
static uint32_t const wheelchair = classif().GetTypeByPath({"wheelchair"});
static uint32_t const cuisine = classif().GetTypeByPath({"cuisine"});
+ static uint32_t const sponsored = classif().GetTypeByPath({"sponsored"});
// Reserved for custom event processing, e.g. fc2018.
// static uint32_t const event = classif().GetTypeByPath({"event" });
@@ -268,17 +268,20 @@ namespace
ftype::TruncValue(type, 1);
if (g == GEOM_LINE || g == GEOM_UNDEFINED)
{
- if (hwtag == type || psurface == type)
+ if (type == hwtag || type == psurface)
return true;
}
- if (wheelchair == type && typeLength == 2)
+ if (type == wheelchair && typeLength == 2)
return true;
- if (cuisine == type)
+ if (type == cuisine)
return true;
- // Reserved for custom event processing, i.e. fc2018.
+ if (g != GEOM_LINE && type == sponsored)
+ return true;
+
+ // Reserved for custom event processing, e.g. fc2018.
// if (event == type)
// return true;