kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #3644 from bykoianko/master-FeatureType-bugfix

Browse source 
FeatureType bugfix. Initialization of bool fiels of FeatureType class which was uninitialized before.
This commit is contained in:
mpimenov 2016-06-22 18:33:22 +03:00 • committed by GitHub
commit 84e9ec4715
3 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/feature_builder.cpp
View file

@ -189,7 +189,7 @@ FeatureBase FeatureBuilder1::GetFeatureBase() const
memcpy(f.m_types, &m_params.m_Types[0], sizeof(uint32_t) * m_params.m_Types.size());
f.m_limitRect = m_limitRect;
f.m_bTypesParsed = f.m_bCommonParsed = true;
f.m_typesParsed = f.m_commonParsed = true;
return f;
}

66
indexer/feature.cpp
View file

@ -30,7 +30,7 @@ void FeatureBase::Deserialize(feature::LoaderBase * pLoader, TBuffer buffer)
m_pLoader->Init(buffer);
m_limitRect = m2::RectD::GetEmptyRect();
m_bTypesParsed = m_bCommonParsed = false;
m_typesParsed = m_commonParsed = false;
m_header = m_pLoader->GetHeader();
}
@ -49,7 +49,7 @@ void FeatureType::ApplyPatch(editor::XMLFeature const & xml)
// m_params.ref =
// m_params.layer =
// m_params.rank =
m_bCommonParsed = true;
m_commonParsed = true;
xml.ForEachTag([this](string const & k, string const & v)
{
@ -59,12 +59,12 @@ void FeatureType::ApplyPatch(editor::XMLFeature const & xml)
else
LOG(LWARNING, ("Patching feature has unknown tags"));
});
m_bMetadataParsed = true;
m_metadataParsed = true;
// If types count are changed here, in ApplyPatch, new number of types should be passed
// instead of GetTypesCount().
m_header = CalculateHeader(GetTypesCount(), Header() & HEADER_GEOTYPE_MASK, m_params);
m_bHeader2Parsed = true;
m_header2Parsed = true;
}
void FeatureType::ReplaceBy(osm::EditableMapObject const & emo)
@ -76,7 +76,7 @@ void FeatureType::ReplaceBy(osm::EditableMapObject const & emo)
m_center = emo.GetMercator();
m_limitRect.MakeEmpty();
m_limitRect.Add(m_center);
m_bPointsParsed = m_bTrianglesParsed = true;
m_pointsParsed = m_trianglesParsed = true;
geoType = feature::GEOM_POINT;
}
else
@ -90,17 +90,17 @@ void FeatureType::ReplaceBy(osm::EditableMapObject const & emo)
m_params.house.Clear();
else
m_params.house.Set(house);
m_bCommonParsed = true;
m_commonParsed = true;
m_metadata = emo.GetMetadata();
m_bMetadataParsed = true;
m_metadataParsed = true;
uint32_t typesCount = 0;
for (uint32_t const type : emo.GetTypes())
m_types[typesCount++] = type;
m_bTypesParsed = true;
m_typesParsed = true;
m_header = CalculateHeader(typesCount, geoType, m_params);
m_bHeader2Parsed = true;
m_header2Parsed = true;
m_id = emo.GetID();
}
@ -195,7 +195,7 @@ bool FeatureType::FromXML(editor::XMLFeature const & xml)
("At the moment only new nodes (points) can can be created."));
m_center = xml.GetMercatorCenter();
m_limitRect.Add(m_center);
m_bPointsParsed = m_bTrianglesParsed = true;
m_pointsParsed = m_trianglesParsed = true;
xml.ForEachName([this](string const & lang, string const & name)
{
@ -210,7 +210,7 @@ bool FeatureType::FromXML(editor::XMLFeature const & xml)
// m_params.ref =
// m_params.layer =
// m_params.rank =
m_bCommonParsed = true;
m_commonParsed = true;
uint32_t typesCount = 0;
xml.ForEachTag([this, &typesCount](string const & k, string const & v)
@ -237,33 +237,33 @@ bool FeatureType::FromXML(editor::XMLFeature const & xml)
LOG(LWARNING, ("Can't load/parse type:", k, v));
}
});
m_bMetadataParsed = true;
m_bTypesParsed = true;
m_metadataParsed = true;
m_typesParsed = true;
EHeaderTypeMask const geomType = house.empty() && !m_params.ref.empty() ? HEADER_GEOM_POINT : HEADER_GEOM_POINT_EX;
m_header = CalculateHeader(typesCount, geomType, m_params);
m_bHeader2Parsed = true;
m_header2Parsed = true;
return typesCount > 0;
}
void FeatureBase::ParseTypes() const
{
if (!m_bTypesParsed)
if (!m_typesParsed)
{
m_pLoader->ParseTypes();
m_bTypesParsed = true;
m_typesParsed = true;
}
}
void FeatureBase::ParseCommon() const
{
if (!m_bCommonParsed)
if (!m_commonParsed)
{
ParseTypes();
m_pLoader->ParseCommon();
m_bCommonParsed = true;
m_commonParsed = true;
}
}
@ -302,7 +302,7 @@ void FeatureType::Deserialize(feature::LoaderBase * pLoader, TBuffer buffer)
m_pLoader->InitFeature(this);
m_bHeader2Parsed = m_bPointsParsed = m_bTrianglesParsed = m_bMetadataParsed = false;
m_header2Parsed = m_pointsParsed = m_trianglesParsed = m_metadataParsed = false;
m_innerStats.MakeZero();
}
@ -318,12 +318,12 @@ void FeatureType::ParseEverything() const
void FeatureType::ParseHeader2() const
{
if (!m_bHeader2Parsed)
if (!m_header2Parsed)
{
ParseCommon();
m_pLoader->ParseHeader2();
m_bHeader2Parsed = true;
m_header2Parsed = true;
}
}
@ -335,7 +335,7 @@ void FeatureType::ResetGeometry() const
if (GetFeatureType() != GEOM_POINT)
m_limitRect = m2::RectD();
m_bHeader2Parsed = m_bPointsParsed = m_bTrianglesParsed = false;
m_header2Parsed = m_pointsParsed = m_trianglesParsed = false;
m_pLoader->ResetGeometry();
}
@ -343,12 +343,12 @@ void FeatureType::ResetGeometry() const
uint32_t FeatureType::ParseGeometry(int scale) const
{
uint32_t sz = 0;
if (!m_bPointsParsed)
if (!m_pointsParsed)
{
ParseHeader2();
sz = m_pLoader->ParseGeometry(scale);
m_bPointsParsed = true;
m_pointsParsed = true;
}
return sz;
}
@ -356,23 +356,23 @@ uint32_t FeatureType::ParseGeometry(int scale) const
uint32_t FeatureType::ParseTriangles(int scale) const
{
uint32_t sz = 0;
if (!m_bTrianglesParsed)
if (!m_trianglesParsed)
{
ParseHeader2();
sz = m_pLoader->ParseTriangles(scale);
m_bTrianglesParsed = true;
m_trianglesParsed = true;
}
return sz;
}
void FeatureType::ParseMetadata() const
{
if (m_bMetadataParsed) return;
if (m_metadataParsed) return;
m_pLoader->ParseMetadata();
m_bMetadataParsed = true;
m_metadataParsed = true;
}
StringUtf8Multilang const & FeatureType::GetNames() const
@ -399,7 +399,7 @@ void FeatureType::SetNames(StringUtf8Multilang const & newNames)
void FeatureType::SetMetadata(feature::Metadata const & newMetadata)
{
m_bMetadataParsed = true;
m_metadataParsed = true;
m_metadata = newMetadata;
}
@ -616,12 +616,12 @@ string FeatureType::GetRoadNumber() const
void FeatureType::SwapGeometry(FeatureType & r)
{
ASSERT_EQUAL(m_bPointsParsed, r.m_bPointsParsed, ());
ASSERT_EQUAL(m_bTrianglesParsed, r.m_bTrianglesParsed, ());
ASSERT_EQUAL(m_pointsParsed, r.m_pointsParsed, ());
ASSERT_EQUAL(m_trianglesParsed, r.m_trianglesParsed, ());
if (m_bPointsParsed)
if (m_pointsParsed)
m_points.swap(r.m_points);
if (m_bTrianglesParsed)
if (m_trianglesParsed)
m_triangles.swap(r.m_triangles);
}

16
indexer/feature.hpp
View file

@ -135,7 +135,7 @@ protected:
protected:
feature::LoaderBase * m_pLoader;
uint8_t m_header;
uint8_t m_header = 0;
mutable uint32_t m_types[feature::kMaxTypesCount];
@ -145,7 +145,8 @@ protected:
mutable m2::RectD m_limitRect;
mutable bool m_bTypesParsed, m_bCommonParsed;
mutable bool m_typesParsed = false;
mutable bool m_commonParsed = false;
friend class feature::LoaderCurrent;
friend class old_101::feature::LoaderImpl;
@ -231,14 +232,14 @@ public:
inline size_t GetPointsCount() const
{
ASSERT(m_bPointsParsed, ());
ASSERT(m_pointsParsed, ());
return m_points.size();
}
inline m2::PointD const & GetPoint(size_t i) const
{
ASSERT_LESS(i, m_points.size(), ());
ASSERT(m_bPointsParsed, ());
ASSERT(m_pointsParsed, ());
return m_points[i];
}
@ -345,7 +346,7 @@ public:
inline void SwapPoints(buffer_vector<m2::PointD, 32> & points) const
{
ASSERT(m_bPointsParsed, ());
ASSERT(m_pointsParsed, ());
return m_points.swap(points);
}
@ -360,7 +361,10 @@ private:
mutable points_t m_points, m_triangles;
mutable feature::Metadata m_metadata;
mutable bool m_bHeader2Parsed, m_bPointsParsed, m_bTrianglesParsed, m_bMetadataParsed;
mutable bool m_header2Parsed = false;
mutable bool m_pointsParsed = false;
mutable bool m_trianglesParsed = false;
mutable bool m_metadataParsed = false;
mutable inner_geom_stat_t m_innerStats;