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

Removed debug logging for features merging

Browse source
This commit is contained in:
Alex Zolotarev 2011-02-06 19:53:02 +02:00 • committed by Alex Zolotarev
parent a48d4d5575
commit 9b164728dc
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/feature_merger.cpp
View file

@ -1,6 +1,6 @@
#include "feature_merger.hpp"
#include "../base/logging.hpp"
//#include "../base/logging.hpp"
FeatureBuilder1Merger::FeatureBuilder1Merger(FeatureBuilder1 const & fb)
: FeatureBuilder1(fb)
@ -41,9 +41,9 @@ bool FeatureBuilder1Merger::MergeWith(FeatureBuilder1 const & fb)
return false; // no common points were found...
static int counter = 0;
//static int counter = 0;
// @TODO check if we got AREA feature after merging, this can be useful for coastlines
LOG(LINFO, (++counter, "features were merged!"));
//LOG(LINFO, (++counter, "features were merged!"));
return true;
}

12
indexer/indexer_tool/world_map_generator.hpp
View file

@ -1,5 +1,7 @@
#pragma once
#include "../../base/logging.hpp"
#include "../../defines.hpp"
#include "../../indexer/feature.hpp"
@ -68,6 +70,10 @@ public:
~WorldMapGenerator()
{
if (m_mergeCoastlines)
{
LOG(LINFO, ("Final merging of coastlines started"));
}
// try to merge all merged features with each other
while (ReMergeFeatures())
{
@ -76,6 +82,12 @@ public:
// emit all merged features
for (FeaturesContainerT::iterator it = m_features.begin(); it != m_features.end(); ++it)
(*m_worldBucket)(*it);
if (m_mergeCoastlines)
{
LOG(LINFO, ("Final merging of coastlines ended"));
}
}
bool operator()(FeatureBuilder1 const & fb)