From 192c81a832c566c2b7f9f02a80f9a38a47cb9825 Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Thu, 12 May 2016 14:43:06 +0300
Subject: [PATCH 1/2] [ios] Changed accuracy for not in position mode.

---
 iphone/Maps/Platform/LocationManager.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/Platform/LocationManager.mm b/iphone/Maps/Platform/LocationManager.mm
index 237ff53431..92a5482ee8 100644
--- a/iphone/Maps/Platform/LocationManager.mm
+++ b/iphone/Maps/Platform/LocationManager.mm
@@ -51,8 +51,8 @@ map<GeoMode, GeoModeSettings> const kGeoSettings{
                    .battery = kCLLocationAccuracyBest}}},
     {GeoMode::NotInPosition,
      {.distanceFilter = 15,
-      .accuracy = {.charging = kCLLocationAccuracyNearestTenMeters,
-                   .battery = kCLLocationAccuracyNearestTenMeters}}},
+      .accuracy = {.charging = kCLLocationAccuracyBestForNavigation,
+                   .battery = kCLLocationAccuracyBest}}},
     {GeoMode::FollowAndRotate,
      {.distanceFilter = 5,
       .accuracy = {.charging = kCLLocationAccuracyBestForNavigation,

From a12bc1a527376fa70b15c9bd63ec7d6bc26699d9 Mon Sep 17 00:00:00 2001
From: VladiMihaylenko <vxmihaylenko@gmail.com>
Date: Thu, 12 May 2016 15:11:51 +0300
Subject: [PATCH 2/2] [omim] Fixed Framework::RollBackChanges.

---
 map/framework.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index d3dca24409..0d553ff336 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -2824,9 +2824,14 @@ bool Framework::RollBackChanges(FeatureID const & fid)
   if (m_selectedFeature == fid) // reset selected feature since it becomes invalid after rollback
     m_selectedFeature = FeatureID();
   auto & editor = osm::Editor::Instance();
-  if (editor.GetFeatureStatus(fid) == osm::Editor::FeatureStatus::Created)
-    DeactivateMapSelection(true);
-  else
-    UpdatePlacePageInfoForCurrentSelection();
-  return editor.RollBackChanges(fid);
+  auto const status = editor.GetFeatureStatus(fid);
+  auto const rolledBack = editor.RollBackChanges(fid);
+  if (rolledBack)
+  {
+    if (status == osm::Editor::FeatureStatus::Created)
+      DeactivateMapSelection(true);
+    else
+      UpdatePlacePageInfoForCurrentSelection();
+  }
+  return rolledBack;
 }