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

[drape] store geometry in global coordinates

Browse source
This commit is contained in:
ExMix 2014-01-29 19:58:53 +03:00 • committed by Alex Zolotarev
parent 16fe5cdc48
commit d6042a8e41
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drape_frontend/rule_drawer.cpp
View file

@ -67,29 +67,19 @@ namespace df
class TrianglesFunctor
{
public:
TrianglesFunctor(ScreenBase const & convertor, vector<m2::PointF> & triangles)
: m_convertor(convertor)
, m_triangles(triangles)
TrianglesFunctor(vector<m2::PointF> & triangles)
: m_triangles(triangles)
{
}
void operator()(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
{
m2::PointF points[3] = { m_convertor.GtoP(p1), m_convertor.GtoP(p2), m_convertor.GtoP(p3) };
m2::RectF r(points[0], points[1]);
r.Add(points[2]);
double const eps = 1.0;
if (r.SizeX() < eps && r.SizeY() < 1.0)
return;
m_triangles.push_back(points[0]);
m_triangles.push_back(points[1]);
m_triangles.push_back(points[2]);
m_triangles.push_back(p1);
m_triangles.push_back(p2);
m_triangles.push_back(p3);
}
private:
ScreenBase const & m_convertor;
vector<m2::PointF> & m_triangles;
};
@ -203,7 +193,7 @@ namespace df
{
vector<m2::PointF> triangles;
TrianglesFunctor fun(m_geometryConvertor, triangles);
TrianglesFunctor fun(triangles);
f.ForEachTriangleRef(fun, m_tileKey.m_zoomLevel);
ApplyAreaFeature apply(m_context, m_tileKey, triangles);

4
drape_frontend/tile_info.cpp
View file

@ -58,9 +58,7 @@ namespace df
vector<size_t> indexes;
RequestFeatures(memIndex, indexes);
// TODO remove m_key == TileKey(1, 0, 3) when tile position on
// display will be calculated in frontend_renderer
if (!indexes.empty() && m_key == TileKey(1,0,3))
if (!indexes.empty())
{
context.BeginReadTile(m_key);
vector<FeatureID> featuresToRead;