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

[generator] Fix type constructor

Browse source
This commit is contained in:
Ilya Zverev 2018-04-09 18:28:32 +03:00 • committed by Sergey Yershov
parent 50974e5434
commit b333719087
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/osm_source.cpp
View file

@ -45,8 +45,8 @@ SourceReader::SourceReader()
}
SourceReader::SourceReader(string const & filename)
: m_file(unique_ptr<istream, Deleter>(new ifstream(filename), Deleter()))
{
m_file = unique_ptr<istream, Deleter>(new ifstream(filename), Deleter());
CHECK(static_cast<ifstream *>(m_file.get())->is_open() , ("Can't open file:", filename));
LOG_SHORT(LINFO, ("Reading OSM data from", filename));
}

3
indexer/feature_visibility.cpp
View file

@ -222,6 +222,9 @@ namespace
/// See also ftypes_matcher.cpp, IsInvisibleIndexedChecker.
bool TypeAlwaysExists(uint32_t type, EGeomType g = GEOM_UNDEFINED)
{
if (!classif().IsTypeValid(type))
return false;
static const uint32_t roundabout = classif().GetTypeByPath({ "junction", "roundabout" });
static const uint32_t hwtag = classif().GetTypeByPath({ "hwtag" });
static const uint32_t psurface = classif().GetTypeByPath({ "psurface" });