Small refactoring of API-mark

1 files changed, 23 insertions, 18 deletions

diff --git a/map/api_mark_point.hpp b/map/api_mark_point.hpp
index cfd687c1e3..666f398288 100644
--- a/map/api_mark_point.hpp
+++ b/map/api_mark_point.hpp
@@ -1,37 +1,42 @@
 #pragma once
 
-#include "map/styled_point.hpp"
+#include "map/user_mark.hpp"
+#include "map/user_mark_container.hpp"
 
-class ApiMarkPoint : public style::StyledPoint
+#include "geometry/point2d.hpp"
+
+#include "std/string.hpp"
+
+namespace style
+{
+
+// Fixes icons which are not supported by MapsWithMe.
+string GetSupportedStyle(string const & s, string const & context, string const & fallback);
+// Default icon.
+string GetDefaultStyle();
+
+} // style
+
+class ApiMarkPoint : public UserMark
 {
 public:
-  ApiMarkPoint(m2::PointD const & ptOrg, UserMarkContainer * container)
-    : StyledPoint(ptOrg, container)
-  {
-  }
+  ApiMarkPoint(m2::PointD const & ptOrg, UserMarkContainer * container);
 
   ApiMarkPoint(string const & name, string const & id, string const & style,
-               m2::PointD const & ptOrg, UserMarkContainer * container)
-    : StyledPoint(ptOrg, container), m_name(name), m_id(id), m_style(style)
-  {
-  }
-
-  string GetSymbolName() const override { return "api-result"; }
+               m2::PointD const & ptOrg, UserMarkContainer * container);
 
-  UserMark::Type GetMarkType() const override { return UserMark::Type::API; }
+  string GetSymbolName() const override;
+  UserMark::Type GetMarkType() const override;
+  m2::PointD const & GetPixelOffset() const override;
 
   string const & GetName() const { return m_name; }
-
   void SetName(string const & name) { m_name = name; }
 
   string const & GetID() const { return m_id; }
-
   void SetID(string const & id) { m_id = id; }
 
   void SetStyle(string const & style) { m_style = style; }
-
-  // StyledPoint overrides:
-  string const & GetStyle() const override { return m_style; }
+  string const & GetStyle() const { return m_style; }
 
 private:
   string m_name;