[android] revert for merge-commit dd75999 from goblinr:MAPSME-87-ext-fix-editor-restore-state

2 files changed, 8 insertions, 17 deletions

diff --git a/map/framework.cpp b/map/framework.cpp
index 661be55c00..0486be2394 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -771,11 +771,6 @@ void Framework::FillBookmarkInfo(Bookmark const & bmk, BookmarkAndCategory const
   info.m_bookmarkDescription = data.GetDescription();
 }
 
-void Framework::FillPoiInfo(m2::PointD const & pt, place_page::Info & info) const
-{
-  FillPointInfo(pt, string(), info);
-}
-
 void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info) const
 {
   if (!fid.IsValid())
@@ -2167,12 +2162,10 @@ void Framework::UpdateMinBuildingsTapZoom()
                               feature::GetDrawableScaleRange(classif().GetTypeByPath({"building"})).first);
 }
 
-FeatureID Framework::FindBuildingAtPoint(m2::PointD const & mercator, int drawScale /*= -1*/) const
+FeatureID Framework::FindBuildingAtPoint(m2::PointD const & mercator) const
 {
   FeatureID featureId;
-  bool matchZoom =
-      drawScale < 0 ? GetDrawScale() >= m_minBuildingsTapZoom : drawScale >= m_minBuildingsTapZoom;
-  if (matchZoom)
+  if (GetDrawScale() >= m_minBuildingsTapZoom)
   {
     constexpr int kScale = scales::GetUpperScale();
     constexpr double kSelectRectWidthInMeters = 1.1;
@@ -3017,8 +3010,7 @@ bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const feat
   return osm::Editor::Instance().CreatePoint(featureType, mercator, mwmId, emo);
 }
 
-bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObject & emo,
-                                     int drawScale /*= -1*/) const
+bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObject & emo) const
 {
   if (!fid.IsValid())
     return false;
@@ -3042,8 +3034,8 @@ bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObje
   if (!ftypes::IsBuildingChecker::Instance()(ft) &&
       (emo.GetHouseNumber().empty() || emo.GetStreet().m_defaultName.empty()))
   {
-    SetHostingBuildingAddress(FindBuildingAtPoint(feature::GetCenter(ft), drawScale), index, coder,
-                              emo);
+    SetHostingBuildingAddress(FindBuildingAtPoint(feature::GetCenter(ft)),
+                              index, coder, emo);
   }
 
   return true;
diff --git a/map/framework.hpp b/map/framework.hpp
index 34ad4aa94f..7e04607ff8 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -392,7 +392,7 @@ private:
                                                      place_page::Info & outInfo) const;
   unique_ptr<TapEvent> MakeTapEvent(m2::PointD const & center, FeatureID const & fid,
                                     TapEvent::Source source) const;
-  FeatureID FindBuildingAtPoint(m2::PointD const & mercator, int drawScale = -1) const;
+  FeatureID FindBuildingAtPoint(m2::PointD const & mercator) const;
   void UpdateMinBuildingsTapZoom();
 
   int m_minBuildingsTapZoom;
@@ -630,11 +630,10 @@ private:
   void FillInfoFromFeatureType(FeatureType const & ft, place_page::Info & info) const;
   void FillApiMarkInfo(ApiMarkPoint const & api, place_page::Info & info) const;
   void FillSearchResultInfo(SearchMarkPoint const & smp, place_page::Info & info) const;
+  void FillMyPositionInfo(place_page::Info & info) const;
 
 public:
   void FillBookmarkInfo(Bookmark const & bmk, BookmarkAndCategory const & bac, place_page::Info & info) const;
-  void FillPoiInfo(m2::PointD const & pt, place_page::Info & info) const;
-  void FillMyPositionInfo(place_page::Info & info) const;
 
   /// @returns address of nearby building with house number in approx 1km distance.
   search::AddressInfo GetAddressInfoAtPoint(m2::PointD const & pt) const;
@@ -815,7 +814,7 @@ public:
 
   bool CreateMapObject(m2::PointD const & mercator, uint32_t const featureType, osm::EditableMapObject & emo) const;
   /// @returns false if feature is invalid or can't be edited.
-  bool GetEditableMapObject(FeatureID const & fid, osm:: EditableMapObject & emo, int drawScale = -1) const;
+  bool GetEditableMapObject(FeatureID const & fid, osm:: EditableMapObject & emo) const;
   osm::Editor::SaveResult SaveEditedMapObject(osm::EditableMapObject emo);
   void DeleteFeature(FeatureID const & fid) const;
   osm::NewFeatureCategories GetEditorCategories() const;