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

[generator] Shorter error message for unmerged coastline

Browse source
This commit is contained in:
Ilya Zverev 2016-02-24 20:15:16 +03:00
parent 7b095b2cc6
commit 4eea7cdbb5
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
generator/coastlines_generator.cpp
View file

@ -109,7 +109,12 @@ namespace
m_rMain.AddRegionToTree(fb);
else
{
LOG(LINFO, ("Not merged coastline", fb.GetOsmIdsString()));
osm::Id const firstWay = fb.GetFirstOsmId();
osm::Id const lastWay = fb.GetLastOsmId();
if (firstWay == lastWay)
LOG(LINFO, ("Not merged coastline, way", firstWay.OsmId(), "(", fb.GetPointsCount(), "points)"));
else
LOG(LINFO, ("Not merged coastline, ways", firstWay.OsmId(), "to", lastWay.OsmId(), "(", fb.GetPointsCount(), "points)"));
++m_notMergedCoastsCount;
m_totalNotMergedCoastsPoints += fb.GetPointsCount();
}

6
generator/feature_builder.cpp
View file

@ -432,6 +432,12 @@ void FeatureBuilder1::SetOsmId(osm::Id id)
m_osmIds.assign(1, id);
}
osm::Id FeatureBuilder1::GetFirstOsmId() const
{
ASSERT(!m_osmIds.empty(), ());
return m_osmIds.front();
}
osm::Id FeatureBuilder1::GetLastOsmId() const
{
ASSERT(!m_osmIds.empty(), ());

1
generator/feature_builder.hpp
View file

@ -155,6 +155,7 @@ public:
//@{
void AddOsmId(osm::Id id);
void SetOsmId(osm::Id id);
osm::Id GetFirstOsmId() const;
osm::Id GetLastOsmId() const;
bool HasOsmId(osm::Id const & id) const;
string GetOsmIdsString() const;