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

Added grouping of shapes by feature id in messaging on BR

Browse source
This commit is contained in:
r.kuznetsov 2015-04-21 16:06:47 +03:00
parent 51cca09664
commit e41f5df9c4
7 changed files with 70 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drape_frontend/apply_feature_functors.cpp
View file

@ -171,7 +171,7 @@ void ApplyPointFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
TextViewParams params;
ExtractCaptionParams(capRule, pRule->GetCaption(1), depth, params);
if(!params.m_primaryText.empty() || !params.m_secondaryText.empty())
m_context.InsertShape(dp::MovePointer<MapShape>(new TextShape(m_centerPoint, params)));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(new TextShape(m_centerPoint, params)));
}
SymbolRuleProto const * symRule = pRule->GetSymbol();
@ -203,7 +203,7 @@ void ApplyPointFeature::Finish()
params.m_radius = m_circleRule->radius();
CircleShape * shape = new CircleShape(m_centerPoint, params);
m_context.InsertShape(dp::MovePointer<MapShape>(shape));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(shape));
}
else if (m_symbolRule)
{
@ -212,7 +212,7 @@ void ApplyPointFeature::Finish()
params.m_symbolName = m_symbolRule->name();
PoiSymbolShape * shape = new PoiSymbolShape(m_centerPoint, params);
m_context.InsertShape(dp::MovePointer<MapShape>(shape));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(shape));
}
}
@ -252,7 +252,7 @@ void ApplyAreaFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
params.m_color = ToDrapeColor(areaRule->color());
AreaShape * shape = new AreaShape(move(m_triangles), params);
m_context.InsertShape(dp::MovePointer<MapShape>(shape));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(shape));
}
else
TBase::ProcessRule(rule);
@ -306,7 +306,7 @@ void ApplyLineFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
params.m_textFont = fontDecl;
params.m_baseGtoPScale = m_currentScaleGtoP;
m_context.InsertShape(dp::MovePointer<MapShape>(new PathTextShape(m_spline, params)));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(new PathTextShape(m_spline, params)));
}
if (pLineRule != NULL)
@ -322,7 +322,7 @@ void ApplyLineFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
params.m_step = symRule.step() * mainScale;
params.m_baseGtoPScale = m_currentScaleGtoP;
m_context.InsertShape(dp::MovePointer<MapShape>(new PathSymbolShape(m_spline, params)));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(new PathSymbolShape(m_spline, params)));
}
else
{
@ -330,7 +330,7 @@ void ApplyLineFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
Extract(pLineRule, params);
params.m_depth = depth;
params.m_baseGtoPScale = m_currentScaleGtoP;
m_context.InsertShape(dp::MovePointer<MapShape>(new LineShape(m_spline, params)));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(new LineShape(m_spline, params)));
}
}
}
@ -362,7 +362,7 @@ void ApplyLineFeature::Finish()
m2::Spline::iterator it = m_spline.CreateIterator();
while (!it.BeginAgain())
{
m_context.InsertShape(dp::MovePointer<MapShape>(new TextShape(it.m_pos, viewParams)));
m_context.InsertShape(m_id, dp::MovePointer<MapShape>(new TextShape(it.m_pos, viewParams)));
it.Advance(splineStep);
}
}

6
drape_frontend/backend_renderer.cpp
View file

@ -122,10 +122,8 @@ void BackendRenderer::AcceptMessage(dp::RefPointer<Message> message)
{
MapShapeReadedMessage * msg = df::CastMessage<MapShapeReadedMessage>(message);
dp::RefPointer<dp::Batcher> batcher = m_batchersPool->GetTileBatcher(msg->GetKey());
dp::MasterPointer<MapShape> shape(msg->GetShape());
shape->Draw(batcher, m_texturesManager);
shape.Destroy();
for (dp::MasterPointer<MapShape> const & shape : msg->GetShapes())
shape->Draw(batcher, m_texturesManager);
break;
}
case Message::UpdateUserMarkLayer:

20
drape_frontend/engine_context.cpp
View file

@ -11,6 +11,8 @@
#include "base/string_utils.hpp"
#endif
#include "base/logging.hpp"
namespace df
{
@ -25,9 +27,23 @@ void EngineContext::BeginReadTile()
PostMessage(dp::MovePointer<Message>(new TileReadStartMessage(m_tileKey)));
}
void EngineContext::InsertShape(dp::TransferPointer<MapShape> shape)
void EngineContext::BeginReadFeature(FeatureID const & featureId)
{
PostMessage(dp::MovePointer<Message>(new MapShapeReadedMessage(m_tileKey, shape)));
ASSERT(m_mapShapeStorage.find(featureId) == m_mapShapeStorage.end(), ());
m_mapShapeStorage.insert(make_pair(featureId, list<dp::MasterPointer<MapShape>>()));
}
void EngineContext::InsertShape(FeatureID const & featureId, dp::TransferPointer<MapShape> shape)
{
ASSERT(m_mapShapeStorage.find(featureId) != m_mapShapeStorage.end(), ());
m_mapShapeStorage[featureId].push_back(dp::MasterPointer<MapShape>(shape));
}
void EngineContext::EndReadFeature(FeatureID const & featureId)
{
MapShapeStorage::iterator it = m_mapShapeStorage.find(featureId);
ASSERT(it != m_mapShapeStorage.end(), ());
PostMessage(dp::MovePointer<Message>(new MapShapeReadedMessage(m_tileKey, move(it->second))));
}
void EngineContext::EndReadTile()

28
drape_frontend/engine_context.hpp
View file

@ -5,6 +5,8 @@
#include "drape/pointers.hpp"
#include "indexer/feature_decl.hpp"
namespace df
{
@ -19,9 +21,11 @@ public:
TileKey const & GetTileKey() const { return m_tileKey; }
void BeginReadTile();
void BeginReadFeature(FeatureID const & featureId);
/// If you call this method, you may forget about shape.
/// It will be proccessed and delete later
void InsertShape(dp::TransferPointer<MapShape> shape);
void InsertShape(FeatureID const & featureId, dp::TransferPointer<MapShape> shape);
void EndReadFeature(FeatureID const & featureId);
void EndReadTile();
private:
@ -30,6 +34,28 @@ private:
private:
TileKey m_tileKey;
dp::RefPointer<ThreadsCommutator> m_commutator;
using MapShapeStorage = map<FeatureID, list<dp::MasterPointer<MapShape>>>;
MapShapeStorage m_mapShapeStorage;
};
class EngineContextReadFeatureGuard
{
public:
EngineContextReadFeatureGuard(EngineContext & context, FeatureID const & featureId)
: m_context(context), m_id(featureId)
{
m_context.BeginReadFeature(m_id);
}
~EngineContextReadFeatureGuard()
{
m_context.EndReadFeature(m_id);
}
private:
EngineContext & m_context;
FeatureID m_id;
};
} // namespace df

17
drape_frontend/map_shape.hpp
View file

@ -24,24 +24,29 @@ public:
class MapShapeReadedMessage : public Message
{
public:
MapShapeReadedMessage(TileKey const & key, dp::TransferPointer<MapShape> shape)
: m_key(key), m_shape(shape)
using MapShapes = list<dp::MasterPointer<MapShape>>;
MapShapeReadedMessage(TileKey const & key, MapShapes && shapes)
: m_key(key), m_shapes(move(shapes))
{}
Type GetType() const override { return Message::MapShapeReaded; }
~MapShapeReadedMessage()
{
m_shape.Destroy();
for (dp::MasterPointer<MapShape> & shape : m_shapes)
shape.Destroy();
m_shapes.clear();
}
TileKey const & GetKey() const { return m_key; }
/// return non const reference for correct construct MasterPointer
dp::TransferPointer<MapShape> & GetShape() { return m_shape; }
MapShapes const & GetShapes() { return m_shapes; }
private:
TileKey m_key;
dp::TransferPointer<MapShape> m_shape;
MapShapes m_shapes;
};
} // namespace df

1
drape_frontend/rule_drawer.cpp
View file

@ -48,6 +48,7 @@ void RuleDrawer::operator()(FeatureType const & f)
int zoomLevel = m_context.GetTileKey().m_zoomLevel;
EngineContextReadFeatureGuard guard(m_context, f.GetID());
if (s.AreaStyleExists())
{
ApplyAreaFeature apply(m_context, f.GetID(), s.GetCaptionDescription());

6
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -169,7 +169,7 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi
cell.detailTextLabel.text = [NSString stringWithFormat:@"%@ %@", L(@"length"), [NSString stringWithUTF8String:dist.c_str()]];
else
cell.detailTextLabel.text = nil;
const dp::Color c = tr->GetMainColor();
const dp::Color c = tr->GetColor(0);
cell.imageView.image = [CircleView createCircleImageWith:PINDIAMETER andColor:[UIColor colorWithRed:c.GetRed()/255.f green:c.GetGreen()/255.f
blue:c.GetBlue()/255.f alpha:1.f]];
}
@ -195,7 +195,7 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi
[m_locationManager getNorthRad:north];
string distance;
fr.GetDistanceAndAzimut(bm->GetOrg(), lat, lon, north, distance, azimut);
fr.GetDistanceAndAzimut(bm->GetPivot(), lat, lon, north, distance, azimut);
bmCell.bmDistance.text = @(distance.c_str());
}
@ -366,7 +366,7 @@ extern NSString * const kBookmarksChangedNotification = @"BookmarksChangedNotifi
Bookmark const * bm = static_cast<Bookmark const *>(cat->GetUserMark(indexPath.row));
if (bm)
{
m2::PointD const center = bm->GetOrg();
m2::PointD const center = bm->GetPivot();
double const metres = ms::DistanceOnEarth(info.m_latitude, info.m_longitude,
MercatorBounds::YToLat(center.y), MercatorBounds::XToLon(center.x));
cell.bmDistance.text = [LocationManager formattedDistance:metres];