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

Move style rendering up into StyledPoint.

Browse source
This commit is contained in:
Keith Wansbrough 2015-10-19 22:54:24 +01:00
parent 23ac0a8cf7
commit 94df024da8
4 changed files with 60 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
map/bookmark.cpp
View file

@ -31,22 +31,6 @@ unique_ptr<UserMarkCopy> Bookmark::Copy() const
return unique_ptr<UserMarkCopy>(new UserMarkCopy(this, false));
}
graphics::DisplayList * Bookmark::GetDisplayList(UserMarkDLCache * cache) const
{
return cache->FindUserMark(UserMarkDLCache::Key(GetType(), graphics::EPosAbove, GetContainer()->GetDepth()));
}
double Bookmark::GetAnimScaleFactor() const
{
return m_animScaleFactor;
}
m2::PointD const & Bookmark::GetPixelOffset() const
{
static m2::PointD s_offset(0.0, 3.0);
return s_offset;
}
shared_ptr<anim::Task> Bookmark::CreateAnimTask(Framework & fm)
{
m_animScaleFactor = 0.0;
@ -211,12 +195,6 @@ namespace
LINE
};
static char const * s_arrSupportedColors[] =
{
"placemark-red", "placemark-blue", "placemark-purple", "placemark-yellow",
"placemark-pink", "placemark-brown", "placemark-green", "placemark-orange"
};
class KMLParser
{
// Fixes icons which are not supported by MapsWithMe
@ -224,13 +202,7 @@ namespace
{
// Remove leading '#' symbol
string const result = s.substr(1);
for (size_t i = 0; i < ARRAY_SIZE(s_arrSupportedColors); ++i)
if (result == s_arrSupportedColors[i])
return result;
// Not recognized symbols are replaced with default one
LOG(LWARNING, ("Icon", result, "for bookmark", m_name, "is not supported"));
return s_arrSupportedColors[0];
return style::GetSupportedStyle(result, m_name);
}
BookmarkCategory & m_category;
@ -565,7 +537,7 @@ namespace
string BookmarkCategory::GetDefaultType()
{
return s_arrSupportedColors[0];
return style::GetDefaultStyle();
}
namespace

3
map/bookmark.hpp
View file

@ -112,9 +112,6 @@ public:
unique_ptr<UserMarkCopy> Copy() const override;
virtual graphics::DisplayList * GetDisplayList(UserMarkDLCache * cache) const override;
virtual double GetAnimScaleFactor() const override;
virtual m2::PointD const & GetPixelOffset() const override;
shared_ptr<anim::Task> CreateAnimTask(Framework & fm);
};

45
map/styled_point.cpp
View file

@ -7,3 +7,48 @@
#include "std/algorithm.hpp"
#include "std/auto_ptr.hpp"
graphics::DisplayList * StyledPoint::GetDisplayList(UserMarkDLCache * cache) const
{
return cache->FindUserMark(UserMarkDLCache::Key(GetStyle(), graphics::EPosAbove, GetContainer()->GetDepth()));
}
double StyledPoint::GetAnimScaleFactor() const
{
return 1.0;
}
m2::PointD const & StyledPoint::GetPixelOffset() const
{
static m2::PointD s_offset(0.0, 3.0);
return s_offset;
}
static char const * s_arrSupportedColors[] =
{
"placemark-red", "placemark-blue", "placemark-purple", "placemark-yellow",
"placemark-pink", "placemark-brown", "placemark-green", "placemark-orange"
};
namespace style
{
string GetSupportedStyle(string const & s, string const & context)
{
if (s.empty())
return s_arrSupportedColors[0];
for (size_t i = 0; i < ARRAY_SIZE(s_arrSupportedColors); ++i)
if (s == s_arrSupportedColors[i])
return s;
// Not recognized symbols are replaced with default one
LOG(LWARNING, ("Icon", s, "for point", context, "is not supported"));
return s_arrSupportedColors[0];
}
string GetDefaultStyle()
{
return s_arrSupportedColors[0];
}
} // namespace style

16
map/styled_point.hpp
View file

@ -14,11 +14,20 @@
#include "std/utility.hpp"
namespace style
{
// Fixes icons which are not supported by MapsWithMe
string GetSupportedStyle(string const & s, string const & context);
string GetDefaultStyle();
} // namespace style
class StyledPoint : public ICustomDrawable
{
public:
StyledPoint(m2::PointD const & ptOrg, UserMarkContainer * container)
: ICustomDrawable(ptOrg, container)
, m_style(style::GetDefaultStyle())
{
}
@ -28,9 +37,9 @@ public:
{
}
virtual graphics::DisplayList * GetDisplayList(UserMarkDLCache * cache) const = 0;
virtual double GetAnimScaleFactor() const = 0;
virtual m2::PointD const & GetPixelOffset() const = 0;
virtual graphics::DisplayList * GetDisplayList(UserMarkDLCache * cache) const override;
virtual double GetAnimScaleFactor() const override;
virtual m2::PointD const & GetPixelOffset() const override;
string const & GetStyle() const { return m_style; }
void SetStyle(const string & style) { m_style = style; }
@ -38,3 +47,4 @@ public:
private:
string m_style; ///< Point style (name of icon).
};