diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp index 7bf0ea00ef..03fae05902 100644 --- a/generator/coastlines_generator.cpp +++ b/generator/coastlines_generator.cpp @@ -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())); } }; } diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index 607300990b..01924b23ff 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -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) ); } diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp index c0b24b6fe0..27f2efb07c 100644 --- a/generator/feature_builder.hpp +++ b/generator/feature_builder.hpp @@ -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; diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp index dc8908e20b..12af305b66 100644 --- a/indexer/feature_data.cpp +++ b/indexer/feature_data.cpp @@ -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()); } diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp index ffbe1fec9d..35b70c2a8c 100644 --- a/indexer/feature_data.hpp +++ b/indexer/feature_data.hpp @@ -186,11 +186,6 @@ public: typedef vector 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;