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

Fix bug in area features generation (from relations).

Browse source
This commit is contained in:
vng 2011-04-16 05:40:25 +03:00 • committed by Alex Zolotarev
parent 41418ec122
commit d744997f8e
4 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/osm_element.hpp
View file

@ -105,7 +105,7 @@ protected:
{
// process way points
shared_ptr<WayElement> e = i->second;
e->ForEachPoint(process);
e->ForEachPointOrdered(id, process);
m.erase(i);

23
indexer/feature.cpp
View file

@ -9,6 +9,7 @@
#include "../defines.hpp" // just for file extensions
#include "../geometry/rect2d.hpp"
#include "../geometry/region2d.hpp"
#include "../coding/byte_stream.hpp"
@ -47,20 +48,22 @@ void FeatureBuilder1::AddPoint(m2::PointD const & p)
m_LimitRect.Add(p);
}
void FeatureBuilder1::SetAreaAddHoles(list<vector<m2::PointD> > & holes)
void FeatureBuilder1::SetAreaAddHoles(list<points_t> const & holes)
{
m_bArea = true;
m_Holes.clear();
m_Holes.swap(holes);
if (holes.empty()) return;
// This is filtering during osm parsing.
//for (list<points_t>::iterator i = m_Holes.begin(); i != m_Holes.end();)
//{
// if (i->size() < 3)
// i = m_Holes.erase(i);
// else
// ++i;
//}
m2::Region<m2::PointD> rgn(m_Geometry.begin(), m_Geometry.end());
for (list<points_t>::const_iterator i = holes.begin(); i != holes.end(); ++i)
{
ASSERT ( !i->empty(), () );
if (rgn.Contains(i->front()))
m_Holes.push_back(*i);
}
}
void FeatureBuilder1::AddName(string const & name)

2
indexer/feature.hpp
View file

@ -36,7 +36,7 @@ public:
void SetLinear() { m_bLinear = true; }
/// Set that featue is area and get ownership of holes.
void SetAreaAddHoles(list<vector<m2::PointD> > & holes);
void SetAreaAddHoles(list<vector<m2::PointD> > const & holes);
//@}
void AddName(string const & name);

13
indexer/osm_decl.hpp
View file

@ -6,6 +6,8 @@
#include "../std/utility.hpp"
#include "../std/vector.hpp"
#include "../std/string.hpp"
#include "../std/algorithm.hpp"
#include "../std/bind.hpp"
/// Used to store all world nodes inside temporary index file.
@ -77,8 +79,15 @@ struct WayElement
template <class ToDo> void ForEachPoint(ToDo & toDo) const
{
for (size_t i = 0; i < nodes.size(); ++i)
toDo(nodes[i]);
for_each(nodes.begin(), nodes.end(), bind<void>(ref(toDo), _1));
}
template <class ToDo> void ForEachPointOrdered(uint64_t start, ToDo & toDo)
{
if (start == nodes.front())
for_each(nodes.begin(), nodes.end(), bind<void>(ref(toDo), _1));
else
for_each(nodes.rbegin(), nodes.rend(), bind<void>(ref(toDo), _1));
}
};