Merge pull request #6258 from alexzatsepin/MAPSME-4691-remove-add-route-stop

Mapsme 4691 remove add route stop

android/res/values/strings.xml

@@ -663,6 +663,8 @@
 	<string name="p2p_to_here">Route to</string>
 	<string name="p2p_only_from_current">Navigation is available only from your current location.</string>
 	<string name="p2p_reroute_from_current">Do you want us to plan a route from your current location?</string>
+	<string name="p2p_add_stop">Add stop</string>
+	<string name="p2p_remove_stop">Remove stop</string>
 	<string name="whats_new_next_button">Next</string>
 	<string name="editor_time_add">Add Schedule</string>
 	<string name="editor_time_delete">Delete Schedule</string>

android/src/com/mapswithme/maps/MwmActivity.java

@@ -1866,6 +1866,18 @@ public class MwmActivity extends BaseMwmFragmentActivity
     ThemeSwitcher.restart(isMapRendererActive());
   }
 
+  @Override
+  public void onAddedStop()
+  {
+    closePlacePage();
+  }
+
+  @Override
+  public void onRemovedStop()
+  {
+    closePlacePage();
+  }
+
   private void updateSearchBar()
   {
     if (!TextUtils.isEmpty(SearchEngine.getQuery()))

android/src/com/mapswithme/maps/bookmarks/data/MapObject.java

@@ -317,6 +317,28 @@ public class MapObject implements Parcelable
     dest.writeTypedList(mBanners);
   }
 
+  @Override
+  public boolean equals(Object o)
+  {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    MapObject mapObject = (MapObject) o;
+
+    if (mMwmVersion != mapObject.mMwmVersion) return false;
+    if (mFeatureIndex != mapObject.mFeatureIndex) return false;
+    return mMwmName.equals(mapObject.mMwmName);
+  }
+
+  @Override
+  public int hashCode()
+  {
+    int result = mMwmName.hashCode();
+    result = 31 * result + (int) (mMwmVersion ^ (mMwmVersion >>> 32));
+    result = 31 * result + mFeatureIndex;
+    return result;
+  }
+
   public static final Creator<MapObject> CREATOR = new Creator<MapObject>()
   {
     @Override

android/src/com/mapswithme/maps/routing/RoutePointInfo.java

@@ -10,9 +10,24 @@ import java.lang.annotation.RetentionPolicy;
 
 public class RoutePointInfo implements Parcelable
 {
-  public static final int ROUTE_MARK_START = 0;
-  public static final int ROUTE_MARK_INTERMEDIATE = 1;
-  public static final int ROUTE_MARK_FINISH = 2;
+  public static final Creator<RoutePointInfo> CREATOR = new Creator<RoutePointInfo>()
+  {
+    @Override
+    public RoutePointInfo createFromParcel(Parcel in)
+    {
+      return new RoutePointInfo(in);
+    }
+
+    @Override
+    public RoutePointInfo[] newArray(int size)
+    {
+      return new RoutePointInfo[size];
+    }
+  };
+
+  static final int ROUTE_MARK_START = 0;
+  static final int ROUTE_MARK_INTERMEDIATE = 1;
+  static final int ROUTE_MARK_FINISH = 2;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({ ROUTE_MARK_START, ROUTE_MARK_INTERMEDIATE, ROUTE_MARK_FINISH })
@@ -35,20 +50,20 @@ public class RoutePointInfo implements Parcelable
     this(in.readInt() /* mMarkType */, in.readInt() /* mIntermediateIndex */);
   }
 
-  public static final Creator<RoutePointInfo> CREATOR = new Creator<RoutePointInfo>()
+  boolean isIntermediatePoint()
   {
-    @Override
-    public RoutePointInfo createFromParcel(Parcel in)
-    {
-      return new RoutePointInfo(in);
-    }
+    return mMarkType == ROUTE_MARK_INTERMEDIATE;
+  }
 
-    @Override
-    public RoutePointInfo[] newArray(int size)
-    {
-      return new RoutePointInfo[size];
-    }
-  };
+  boolean isFinishPoint()
+  {
+    return mMarkType == ROUTE_MARK_FINISH;
+  }
+
+  boolean isStartPoint()
+  {
+    return mMarkType == ROUTE_MARK_START;
+  }
 
   @Override
   public int describeContents()

android/src/com/mapswithme/maps/routing/RoutingController.java

@@ -73,6 +73,8 @@ public class RoutingController
     void onUberError(@NonNull Uber.ErrorCode code);
     void onNavigationCancelled();
     void onNavigationStarted();
+    void onAddedStop();
+    void onRemovedStop();
 
     /**
      * @param progress progress to be displayed.
@@ -277,7 +279,10 @@ public class RoutingController
 
     RoutePoint[] routePoints = Framework.nativeGetRoutePoints();
     if (routePoints.length < 2)
+    {
+      setBuildState(BuildState.NONE);
       return;
+    }
 
     mLogger.d(TAG, "build");
     mUberRequestHandled = false;
@@ -433,8 +438,47 @@ public class RoutingController
     LocationHelper.INSTANCE.restart();
   }
 
+  public void addStop(@NonNull MapObject mapObject)
+  {
+    RoutePointInfo info = new RoutePointInfo(RoutePointInfo.ROUTE_MARK_INTERMEDIATE, 0);
+    Framework.nativeAddRoutePoint(mapObject.getLat(), mapObject.getLon(),
+                                  MapObject.isOfType(MapObject.MY_POSITION, mapObject), info);
+    build();
+    if (mContainer != null)
+      mContainer.onAddedStop();
+  }
+
+  public void removeStop(@NonNull MapObject mapObject)
+  {
+    RoutePointInfo info = mapObject.getRoutePointInfo();
+    if (info == null)
+      throw new AssertionError("A stop point must have the route point info!");
+
+    Framework.nativeRemoveRoutePoint(info);
+    if (info.isFinishPoint())
+      mEndPoint = null;
+    if (info.isStartPoint())
+      mStartPoint = null;
+    build();
+    if (mContainer != null)
+      mContainer.onRemovedStop();
+  }
+
+  public boolean isStopPointAllowed()
+  {
+    return Framework.nativeCouldAddIntermediatePoint();
+  }
+
+  public boolean isRoutePoint(@NonNull MapObject mapObject)
+  {
+    return mapObject.getRoutePointInfo() != null;
+  }
+
   private void suggestRebuildRoute()
   {
+    if (mContainer == null)
+      return;
+
     final AlertDialog.Builder builder = new AlertDialog.Builder(mContainer.getActivity())
                                                        .setMessage(R.string.p2p_reroute_from_current)
                                                        .setCancelable(false)

android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java

@@ -138,6 +138,36 @@ final class PlacePageButtons
       }
     },
 
+    ROUTE_ADD
+    {
+      @Override
+      int getTitle()
+      {
+        return R.string.p2p_add_stop;
+      }
+
+      @Override
+      int getIcon()
+      {
+        return R.drawable.ic_route_via;
+      }
+    },
+
+    ROUTE_REMOVE
+    {
+      @Override
+      int getTitle()
+      {
+        return R.string.p2p_remove_stop;
+      }
+
+      @Override
+      int getIcon()
+      {
+        return R.drawable.ic_route_remove;
+      }
+    },
+
     SHARE
     {
       @Override
@@ -179,7 +209,7 @@ final class PlacePageButtons
       @Override
       int getIcon()
       {
-        return R.drawable.ic_phone;
+        return R.drawable.ic_place_page_phone;
       }
     };
 
@@ -212,10 +242,18 @@ final class PlacePageButtons
     int from = res.indexOf(Item.ROUTE_FROM);
     if (from > -1)
     {
+      int addStop = res.indexOf(Item.ROUTE_ADD);
       int to = res.indexOf(Item.ROUTE_TO);
-      if (to > from && to >= MAX_BUTTONS)
+      if ((to > from && to >= MAX_BUTTONS) || (to > from && addStop >= MAX_BUTTONS))
         Collections.swap(res, from, to);
 
+      if (addStop >= MAX_BUTTONS)
+      {
+        from = res.indexOf(Item.ROUTE_FROM);
+        if (addStop > from)
+          Collections.swap(res, from, addStop);
+      }
+
       preserveRoutingButtons(res, Item.CALL);
       preserveRoutingButtons(res, Item.BOOKING);
       preserveRoutingButtons(res, Item.BOOKING_SEARCH);
@@ -235,8 +273,18 @@ final class PlacePageButtons
       items.remove(pos);
       items.add(MAX_BUTTONS, itemToShift);
       int to = items.indexOf(Item.ROUTE_TO);
-      items.remove(Item.ROUTE_FROM);
-      items.add(to + 1, Item.ROUTE_FROM);
+      if (items.indexOf(Item.ROUTE_ADD) > -1)
+      {
+        items.remove(Item.ROUTE_ADD);
+        items.remove(Item.ROUTE_FROM);
+        items.add(to + 1, Item.ROUTE_ADD);
+        items.add(MAX_BUTTONS, Item.ROUTE_FROM);
+      }
+      else
+      {
+        items.remove(Item.ROUTE_FROM);
+        items.add(to + 1, Item.ROUTE_FROM);
+      }
     }
   }
 

android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java

@@ -522,6 +522,16 @@ public class PlacePageView extends RelativeLayout
           }
           break;
 
+        case ROUTE_ADD:
+          if (mMapObject != null)
+            RoutingController.get().addStop(mMapObject);
+          break;
+
+        case ROUTE_REMOVE:
+          if (mMapObject != null)
+            RoutingController.get().removeStop(mMapObject);
+          break;
+
         case BOOKING:
         case OPENTABLE:
           onSponsoredClick(true /* book */, false);
@@ -1388,6 +1398,12 @@ public class PlacePageView extends RelativeLayout
   private void setButtons(@NonNull MapObject mapObject, boolean showBackButton, boolean showRoutingButton)
   {
     List<PlacePageButtons.Item> buttons = new ArrayList<>();
+    if (RoutingController.get().isRoutePoint(mapObject))
+    {
+      buttons.add(PlacePageButtons.Item.ROUTE_REMOVE);
+      mButtons.setItems(buttons);
+      return;
+    }
 
     if (showBackButton || ParsedMwmRequest.isPickPointMode())
       buttons.add(PlacePageButtons.Item.BACK);
@@ -1421,6 +1437,8 @@ public class PlacePageView extends RelativeLayout
     {
       buttons.add(PlacePageButtons.Item.ROUTE_FROM);
       buttons.add(PlacePageButtons.Item.ROUTE_TO);
+      if (RoutingController.get().isStopPointAllowed())
+        buttons.add(PlacePageButtons.Item.ROUTE_ADD);
     }
 
     buttons.add(PlacePageButtons.Item.SHARE);

iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "هل ترغب في أن نرسم مسار لك من موقعك الحالي؟";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "التالي";
 
 "editor_time_add" = "إضافة جدول";

iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Chcete, abychom naplánovali trasu z vašeho současného umístění?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Další";
 
 "editor_time_add" = "Přidat rozvrh";

iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Ønsker du, at vi planlægger en rute fra din nuværende placering?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Næste";
 
 "editor_time_add" = "Tilføj tidsplan";

iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Weiter";
 
 "editor_time_add" = "Zeitplan hinzufügen";

iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Θέλετε να σχεδιάσουμε μια διαδρομή από την τρέχουσα θέση σας;";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Επόμενη";
 
 "editor_time_add" = "Προσθέσετε χρονοδιάγραμμα";

iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Do you want us to plan a route from your current location?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Next";
 
 "editor_time_add" = "Add Schedule";

iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Do you want us to plan a route from your current location?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Next";
 
 "editor_time_add" = "Add Schedule";

iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "¿Quieres que planeemos un ruta desde tu ubicación actual?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Siguiente";
 
 "editor_time_add" = "Añadir horario";

iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Haluatko valita vaihtoehtoisen reitin?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Seuraava";
 
 "editor_time_add" = "Lisää aikataulu";

iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Suivant";
 
 "editor_time_add" = "Ajouter au planning";

iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Szeretne útvonaltervet készíttetni a jelenlegi pozíciójától?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Következő";
 
 "editor_time_add" = "Időrend felvitele";

iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Apakah Anda ingin kami merencanakan sebuah rute dari lokasi Anda saat ini?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Berikut";
 
 "editor_time_add" = "Tambah Jadwal";

iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Vuoi che impostiamo il percorso dalla tua posizione corrente?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Avanti";
 
 "editor_time_add" = "Aggiungi orari";

iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "現在位置からのルートを作成しますか？";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "次へ";
 
 "editor_time_add" = "スケジュール追加";

iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "현재 위치에서 경로를 계획하시겠습니까?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "다음";
 
 "editor_time_add" = "스케줄 추가";

iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Vil du vi skal planlegge en rute fra din nåværende posisjon?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Neste";
 
 "editor_time_add" = "Legg til tidsrom";

iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Wilt u dat wij een route plannen vanaf uw huidige locatie?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Volgende";
 
 "editor_time_add" = "Schema toevoegen";

iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Czy chcesz, byśmy zaplanowali trasę z Twojej bieżącej lokalizacji?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Dalej";
 
 "editor_time_add" = "Dodaj harmonogram";

iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Deseja planejar uma rota a partir da sua localização atual?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Próxima";
 
 "editor_time_add" = "Adicionar Horário";

iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Doriți să vă planificăm o rută având ca punct de pornire locația actuală?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Următoarea";
 
 "editor_time_add" = "Adăugare planificare";

iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Хотите перестроить маршрут от вашего местоположения?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Далее";
 
 "editor_time_add" = "Добавить расписание";

iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Doriți să vă planificăm o rută având ca punct de pornire locația actuală?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Nasledujúca";
 
 "editor_time_add" = "Pridať rozvrh";

iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Vill du att vi planerar en färdväg från din nuvarande plats?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Nästa";
 
 "editor_time_add" = "Lägg till schema";

iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "คุณต้องการให้เราาวงแผนเส้นทางจากสถานที่ตั้งปัจจุบันของคุณหรือไม่?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "ถัดไป";
 
 "editor_time_add" = "เพิ่มวัน";

iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Mevcut konumunuzdan bir rota planlamamızı ister misiniz?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Sonraki";
 
 "editor_time_add" = "Plan Ekle";

iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Хочете спланувати маршрут із поточного місцезнаходження?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Далі";
 
 "editor_time_add" = "Додати розклад";

iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "Bạn có muốn chúng tôi vạch đường từ vị trí hiện tại của bạn không?";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "Tiếp theo";
 
 "editor_time_add" = "Thêm lịch biểu";

iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "你是否想要规划当前位置的路线？";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "下一页";
 
 "editor_time_add" = "添加计划";

iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings

@@ -1053,6 +1053,10 @@
 
 "p2p_reroute_from_current" = "你是否想要規劃目前位置的路線？";
 
+"p2p_add_stop" = "Add stop";
+
+"p2p_remove_stop" = "Remove stop";
+
 "whats_new_next_button" = "下一頁";
 
 "editor_time_add" = "新增排程";

strings.txt

@@ -12527,6 +12527,14 @@
     el = Θέλετε να σχεδιάσουμε μια διαδρομή από την τρέχουσα θέση σας;
     sk = Doriți să vă planificăm o rută având ca punct de pornire locația actuală?
 
+  [p2p_add_stop]
+    tags = ios, android
+    en = Add stop
+
+  [p2p_remove_stop]
+    tags = ios, android
+    en = Remove stop
+
   [whats_new_next_button]
     tags = ios
     en = Next