From fae27e918b5f8b0090138f7345438ecb7fb1c49b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Thu, 14 Feb 2019 15:29:28 +0300
Subject: [PATCH] [android] Made more accurate map object comparing

[android] Added resetting pp scroll and webview for case when new pp opened once after the previos was scrolled or web loaded, i.e. without hidding of previos
---
 .../maps/bookmarks/data/MapObject.java        | 11 ++++++-----
 .../BottomSheetPlacePageController.java       |  5 ++++-
 .../maps/widget/placepage/PlacePageView.java  | 19 ++++++++++++-------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
index 9ee1b7c246..3216b82ac4 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
@@ -213,7 +213,7 @@ public class MapObject implements Parcelable, PopularityProvider
    * MapObject does not participate in any sets or other collections that need {@code hashCode()}.
    * So {@code sameAs()} serves as {@code equals()} but does not break the equals+hashCode contract.
    */
-  public boolean sameAs(MapObject other)
+  public boolean sameAs(@Nullable MapObject other)
   {
     if (other == null)
       return false;
@@ -225,13 +225,14 @@ public class MapObject implements Parcelable, PopularityProvider
     if (getClass() != other.getClass())
       return false;
 
+    if (mFeatureId != FeatureId.EMPTY && other.getFeatureId() != FeatureId.EMPTY)
+      return mFeatureId.equals(other.getFeatureId());
+
     return Double.doubleToLongBits(mLon) == Double.doubleToLongBits(other.mLon) &&
-           Double.doubleToLongBits(mLat) == Double.doubleToLongBits(other.mLat) &&
-           TextUtils.equals(mTitle, other.mTitle) &&
-           TextUtils.equals(mSubtitle, other.mSubtitle);
+           Double.doubleToLongBits(mLat) == Double.doubleToLongBits(other.mLat);
   }
 
-  public static boolean same(MapObject one, MapObject another)
+  public static boolean same(@Nullable MapObject one, @Nullable MapObject another)
   {
     //noinspection SimplifiableIfStatement
     if (one == null && another == null)
diff --git a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
index 30288dc4cf..75e2f213f4 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java
@@ -235,9 +235,12 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
         return;
       }
 
+      mPlacePage.resetScroll();
+      mPlacePage.resetWebView();
+
       if (object.isExtendedView())
       {
-        mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_EXPANDED);
+        mPlacePageBehavior.setState(AnchorBottomSheetBehavior.STATE_ANCHORED);
         return;
       }
 
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 297f2aa918..8aba9a5289 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -982,11 +982,6 @@ public class PlacePageView extends NestedScrollView
     return mIsFloating;
   }
 
-  private void clearBookmarkWebView()
-  {
-    mWvBookmarkNote.loadUrl("about:blank");
-  }
-
   @Nullable
   public MapObject getMapObject()
   {
@@ -1821,11 +1816,21 @@ public class PlacePageView extends NestedScrollView
 
   void reset()
   {
-    scrollTo(0, 0);
-    clearBookmarkWebView();
+    resetScroll();
+    resetWebView();
     detachCountry();
   }
 
+  void resetScroll()
+  {
+    scrollTo(0, 0);
+  }
+
+  void resetWebView()
+  {
+    mWvBookmarkNote.loadUrl("about:blank");
+  }
+
   private static boolean isInvalidDownloaderStatus(int status)
   {
     return (status != CountryItem.STATUS_DOWNLOADABLE &&