From 9d00b21198f84cc4ce7d61bffc059da8aebafa97 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Wed, 5 Feb 2020 14:46:09 +0300
Subject: [PATCH] Review fixes.

---
 .../maps/bookmarks/data/MapObject.java        | 39 +++++++------------
 .../maps/editor/EditorFragment.java           | 14 +++----
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
index c8ae2d2a77..d8127dcc7c 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
@@ -31,31 +31,20 @@ public class MapObject implements Parcelable, PopularityProvider, ShareableInfoP
   // Order must correspond indexer/map_object.hpp
   public enum OsmProps
   {
-    OpeningHours(0),
-    Phone(1),
-    Fax(2),
-    Website(3),
-    Email(4),
-    Cuisine(5),
-    Stars(6),
-    Operator(7),
-    Elevation(8),
-    Internet(9),
-    Wikipedia(10),
-    Flats(11),
-    BuildingLevels(12),
-    Level(13);
-    private final int mType;
-
-    OsmProps(int type)
-    {
-      mType = type;
-    }
-
-    public int toInt()
-    {
-      return mType;
-    }
+    OpeningHours,
+    Phone,
+    Fax,
+    Website,
+    Email,
+    Cuisine,
+    Stars,
+    Operator,
+    Elevation,
+    Internet,
+    Wikipedia,
+    Flats,
+    BuildingLevels,
+    Level;
   }
 
   @Retention(RetentionPolicy.SOURCE)
diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java
index 1a4a98aaee..8f78c0f360 100644
--- a/android/src/com/mapswithme/maps/editor/EditorFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java
@@ -463,13 +463,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     mReset = (TextView) view.findViewById(R.id.reset);
     mReset.setOnClickListener(this);
 
-    mDetailsBlocks.append(OsmProps.OpeningHours.toInt(), blockOpeningHours);
-    mDetailsBlocks.append(OsmProps.Phone.toInt(), blockPhone);
-    mDetailsBlocks.append(OsmProps.Website.toInt(), blockWeb);
-    mDetailsBlocks.append(OsmProps.Email.toInt(), blockEmail);
-    mDetailsBlocks.append(OsmProps.Cuisine.toInt(), blockCuisine);
-    mDetailsBlocks.append(OsmProps.Operator.toInt(), blockOperator);
-    mDetailsBlocks.append(OsmProps.Internet.toInt(), blockWifi);
+    mDetailsBlocks.append(OsmProps.OpeningHours.ordinal(), blockOpeningHours);
+    mDetailsBlocks.append(OsmProps.Phone.ordinal(), blockPhone);
+    mDetailsBlocks.append(OsmProps.Website.ordinal(), blockWeb);
+    mDetailsBlocks.append(OsmProps.Email.ordinal(), blockEmail);
+    mDetailsBlocks.append(OsmProps.Cuisine.ordinal(), blockCuisine);
+    mDetailsBlocks.append(OsmProps.Operator.ordinal(), blockOperator);
+    mDetailsBlocks.append(OsmProps.Internet.ordinal(), blockWifi);
   }
 
   private static EditText findInput(View blockWithInput)