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

[indexer] Do not force emit junction-roundabout feature type.

Browse source
This commit is contained in:
tatiana-yan 2019-01-21 13:56:25 +03:00 • committed by Vladimir Byko-Ianko
parent bcea52c397
commit 36ef7c0694
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
indexer/feature_visibility.cpp
View file

@ -228,31 +228,15 @@ namespace
if (!classif().IsTypeValid(type))
return false;
static uint32_t const roundabout = classif().GetTypeByPath({"junction", "roundabout"});
static uint32_t const internet = classif().GetTypeByPath({"internet_access"});
static uint32_t const sponsored = classif().GetTypeByPath({"sponsored"});
// Reserved for custom event processing, i.e. fc2018.
// static uint32_t const event = classif().GetTypeByPath({"event" });
if (g == GEOM_LINE || g == GEOM_UNDEFINED)
{
if (roundabout == type)
return true;
if (HasRoutingExceptionType(type))
return true;
}
if ((g == GEOM_LINE || g == GEOM_UNDEFINED) && HasRoutingExceptionType(type))
return true;
ftype::TruncValue(type, 1);
if (g != GEOM_LINE)
{
if (sponsored == type || internet == type)
return true;
// Reserved for custom event processing, i.e. fc2018.
//if (event == type)
// return true;
}
if (g != GEOM_LINE && (sponsored == type || internet == type))
return true;
return false;
}
@ -268,13 +252,19 @@ namespace
return true;
static uint32_t const hwtag = classif().GetTypeByPath({"hwtag"});
static uint32_t const roundabout = classif().GetTypeByPath({"junction", "roundabout"});
static uint32_t const psurface = classif().GetTypeByPath({"psurface"});
static uint32_t const wheelchair = classif().GetTypeByPath({"wheelchair"});
static uint32_t const cuisine = classif().GetTypeByPath({"cuisine"});
// Reserved for custom event processing, e.g. fc2018.
// static uint32_t const event = classif().GetTypeByPath({"event" });
// Caching type length to exclude generic [wheelchair].
uint8_t const typeLength = ftype::GetLevel(type);
if ((g == GEOM_LINE || g == GEOM_UNDEFINED) && type == roundabout)
return true;
ftype::TruncValue(type, 1);
if (g == GEOM_LINE || g == GEOM_UNDEFINED)
{
@ -288,6 +278,10 @@ namespace
if (cuisine == type)
return true;
// Reserved for custom event processing, i.e. fc2018.
// if (event == type)
// return true;
return false;
}
} // namespace