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

Full logging of FeatureBuilder1.

Browse source
This commit is contained in:
vng 2012-10-04 22:14:53 +03:00 • committed by Alex Zolotarev
parent 24846326eb
commit 3c802db64e
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/coastlines_generator.cpp
View file

@ -105,7 +105,7 @@ namespace
if (fb.IsGeometryClosed())
m_rMain.AddRegionToTree(fb);
else
LOG(LINFO, ("Not merged coastline", fb));
LOG(LINFO, ("Not merged coastline", fb.GetOsmIdsString()));
}
};
}

14
generator/feature_builder.cpp
View file

@ -332,6 +332,14 @@ void FeatureBuilder1::AddOsmId(string const & type, uint64_t osmId)
m_osmIds.push_back(osm::OsmId(type, osmId));
}
string FeatureBuilder1::GetOsmIdsString() const
{
ostringstream out;
for (size_t i = 0; i < m_osmIds.size(); ++i)
out << m_osmIds[i].Type() << " id=" << m_osmIds[i].Id() << " ";
return out.str();
}
int FeatureBuilder1::GetMinFeatureDrawScale() const
{
int const minScale = feature::GetMinDrawableScale(GetFeatureBase());
@ -351,8 +359,6 @@ void FeatureBuilder1::SetCoastCell(int64_t iCell, string const & strCell)
string DebugPrint(FeatureBuilder1 const & f)
{
ostringstream out;
for (size_t i = 0; i < f.m_osmIds.size(); ++i)
out << f.m_osmIds[i].Type() << " id=" << f.m_osmIds[i].Id() << " ";
switch (f.GetGeomType())
{
@ -365,8 +371,8 @@ string DebugPrint(FeatureBuilder1 const & f)
return (out.str() + " " +
DebugPrint(f.m_LimitRect) + " " +
DebugPrint(f.m_Params)
//+ " " + DebugPrint(f.m_Polygons)
DebugPrint(f.m_Params) + " " +
DebugPrint(f.m_Polygons)
);
}

1
generator/feature_builder.hpp
View file

@ -121,6 +121,7 @@ public:
/// For OSM debugging, store original OSM id
void AddOsmId(string const & type, uint64_t osmId);
string GetOsmIdsString() const;
int GetMinFeatureDrawScale() const;

2
indexer/feature_data.cpp
View file

@ -204,5 +204,5 @@ string DebugPrint(FeatureParams const & p)
for (size_t i = 0; i < p.m_Types.size(); ++i)
out << p.m_Types[i] << "; ";
return out.str();
return (p.DebugString() + out.str());
}

5
indexer/feature_data.hpp
View file

@ -186,11 +186,6 @@ public:
typedef vector<uint32_t> types_t;
types_t m_Types;
FeatureParams(FeatureParamsBase const & rhs)
: FeatureParamsBase(rhs)
{
m_geomTypes[0] = m_geomTypes[1] = m_geomTypes[2] = false;
}
FeatureParams()
{
m_geomTypes[0] = m_geomTypes[1] = m_geomTypes[2] = false;