From 303697c6ba4d97d79aa32e724b3ae93f4f2adf4d Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@maps.me>
Date: Mon, 23 Mar 2015 20:53:42 +0300
Subject: [PATCH] Typed enum for usermark.

---
 android/jni/com/mapswithme/maps/Framework.cpp | 10 +++++-----
 iphone/Maps/Classes/PlacePageView.mm          | 10 +++++-----
 map/bookmark.hpp                              |  2 +-
 map/user_mark.hpp                             | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index c1a9f3723a..8640092ecd 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -926,7 +926,7 @@ extern "C"
 
     switch (mark->GetMarkType())
     {
-    case UserMark::API:
+    case UserMark::Type::API:
       {
         double lat, lon;
         mark->GetLatLon(lat, lon);
@@ -934,7 +934,7 @@ extern "C"
         break;
       }
 
-    case UserMark::BOOKMARK:
+    case UserMark::Type::BOOKMARK:
       {
         BookmarkAndCategory bmAndCat = fm->FindBookmark(mark);
         if (IsValid(bmAndCat))
@@ -942,14 +942,14 @@ extern "C"
         break;
       }
 
-    case UserMark::POI:
+    case UserMark::Type::POI:
       {
         PoiMarkPoint const * poiMark = CastMark<PoiMarkPoint>(mark);
         CallOnPoiActivatedListener(obj, mark->GetOrg(), poiMark->GetInfo(), poiMark->GetMetadata());
         break;
       }
 
-    case UserMark::SEARCH:
+    case UserMark::Type::SEARCH:
       {
         SearchMarkPoint const * searchMark = CastMark<SearchMarkPoint>(mark);
         feature::FeatureMetadata metadata;
@@ -958,7 +958,7 @@ extern "C"
         break;
       }
 
-    case UserMark::MY_POSITION:
+    case UserMark::Type::MY_POSITION:
       {
         double lat, lon;
         mark->GetLatLon(lat, lon);
diff --git a/iphone/Maps/Classes/PlacePageView.mm b/iphone/Maps/Classes/PlacePageView.mm
index 7de9666bdf..08108815b8 100644
--- a/iphone/Maps/Classes/PlacePageView.mm
+++ b/iphone/Maps/Classes/PlacePageView.mm
@@ -245,7 +245,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
       cell = [[PlacePageShareCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:[PlacePageShareCell className]];
 
     cell.delegate = self;
-    if ([self isMarkOfType:UserMark::API])
+    if ([self isMarkOfType:UserMark::Type::API])
       cell.apiAppTitle = [NSString stringWithUTF8String:GetFramework().GetApiDataHolder().GetAppTitle().c_str()];
     else
       cell.apiAppTitle = nil;
@@ -842,12 +842,12 @@ typedef NS_ENUM(NSUInteger, CellRow)
 
 - (BOOL)isMyPosition
 {
-  return [self isMarkOfType:UserMark::MY_POSITION];
+  return [self isMarkOfType:UserMark::Type::MY_POSITION];
 }
 
 - (BOOL)isBookmark
 {
-  return [self isMarkOfType:UserMark::BOOKMARK];
+  return [self isMarkOfType:UserMark::Type::BOOKMARK];
 }
 
 - (m2::PointD)pinPoint
@@ -893,7 +893,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
       Bookmark const * bookmark = static_cast<Bookmark const *>([self userMark]);
       _title = [self nonEmptyTitle:bookmark->GetName()];
     }
-    else if ([self isMarkOfType:UserMark::API])
+    else if ([self isMarkOfType:UserMark::Type::API])
     {
       ApiMarkPoint const * apiMark = static_cast<ApiMarkPoint const *>([self userMark]);
       _title = [self nonEmptyTitle:apiMark->GetName()];
@@ -1001,7 +1001,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
   if (needUpdateAddressInfo)
   {
     needUpdateAddressInfo = NO;
-    if ([self isMarkOfType:UserMark::POI] || [self isMarkOfType:UserMark::SEARCH] || [self isMyPosition])
+    if ([self isMarkOfType:UserMark::Type::POI] || [self isMarkOfType:UserMark::Type::SEARCH] || [self isMyPosition])
     {
       SearchMarkPoint const * mark = static_cast<SearchMarkPoint const *>([self userMark]);
       m_addressInfo = mark->GetInfo();
diff --git a/map/bookmark.hpp b/map/bookmark.hpp
index 2d3dd5d4e5..8ded89d2c7 100644
--- a/map/bookmark.hpp
+++ b/map/bookmark.hpp
@@ -89,7 +89,7 @@ public:
   void SetData(BookmarkData const & data) { m_data = data; }
   BookmarkData const & GetData() const { return m_data; }
 
-  virtual Type GetMarkType() const { return BOOKMARK; }
+  virtual Type GetMarkType() const { return UserMark::Type::BOOKMARK; }
 
   string const & GetName() const { return m_data.GetName(); }
   void SetName(string const & name) { m_data.SetName(name); }
diff --git a/map/user_mark.hpp b/map/user_mark.hpp
index 0218bcb019..caf7534448 100644
--- a/map/user_mark.hpp
+++ b/map/user_mark.hpp
@@ -24,7 +24,7 @@ class UserMarkCopy;
 class UserMark : private noncopyable
 {
 public:
-  enum Type
+  enum class Type
   {
     API,
     SEARCH,
@@ -88,7 +88,7 @@ public:
   {
   }
 
-  UserMark::Type GetMarkType() const { return API; }
+  UserMark::Type GetMarkType() const { return UserMark::Type::API; }
 
   string const & GetName() const { return m_name; }
   void SetName(string const & name) { m_name = name; }
@@ -123,7 +123,7 @@ public:
   {
   }
 
-  UserMark::Type GetMarkType() const { return SEARCH; }
+  UserMark::Type GetMarkType() const { return UserMark::Type::SEARCH; }
 
   search::AddressInfo const & GetInfo() const { return m_info; }
   void SetInfo(search::AddressInfo const & info) { m_info = info; }
@@ -148,7 +148,7 @@ public:
   PoiMarkPoint(UserMarkContainer * container)
     : SearchMarkPoint(m2::PointD(0.0, 0.0), container) {}
 
-  UserMark::Type GetMarkType() const { return POI; }
+  UserMark::Type GetMarkType() const { return UserMark::Type::POI; }
   unique_ptr<UserMarkCopy> Copy() const override
   {
     return unique_ptr<UserMarkCopy>(new UserMarkCopy(this, false));
@@ -165,7 +165,7 @@ public:
   MyPositionMarkPoint(UserMarkContainer * container)
     : base_t(container) {}
 
-  UserMark::Type GetMarkType() const { return MY_POSITION; }
+  UserMark::Type GetMarkType() const { return UserMark::Type::MY_POSITION; }
 };
 
 class ICustomDrawable : public UserMark