From 4b02cb552cf2396e7916896d7b9cd5e1ca77bbe8 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Fri, 9 Jun 2017 10:00:57 +0400
Subject: [PATCH 1/4] [strings] Remove/add stop strings

---
 strings.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/strings.txt b/strings.txt
index 97b9227273..56661446ae 100644
--- a/strings.txt
+++ b/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

From 91a19eb164546ab518b4e0235fa01d4c0886d6c9 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Fri, 9 Jun 2017 10:03:05 +0400
Subject: [PATCH 2/4] [strings] Generated strings

---
 android/res/values/strings.xml                                | 2 ++
 iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings  | 4 ++++
 iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings     | 4 ++++
 iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings     | 4 ++++
 .../Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings   | 4 ++++
 .../Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings   | 4 ++++
 30 files changed, 118 insertions(+)

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 2c1c66d2dc..a6dbcfefaf 100644
--- a/android/res/values/strings.xml
+++ b/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>
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index be7d98a4bc..6206edd0fa 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/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" = "إضافة جدول";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 262855d0d1..16f0511957 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 6951f3f3a4..99d80f4409 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 609712ffca..0e5512804c 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 47f8bdd21e..c907268d9c 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/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" = "Προσθέσετε χρονοδιάγραμμα";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 73c2995663..96b6434836 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 4eb296e4f7..38c130064f 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 92c05c09b2..6d3f9de2de 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 5e5bfc37ac..819d0b8f2c 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index eedd689b8e..871a2519ef 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index c31dee67d9..d7f5a54657 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index aa49e225e1..9837380e52 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 5dcd23a896..7b98ba870e 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 54e4f19cd1..21357e4160 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/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" = "スケジュール追加";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 657bb5ba6c..3701f3187d 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/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" = "스케줄 추가";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 9b45fb71fe..5a2c5f5cfb 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 2d32072503..8702769754 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index a68789cf6b..af6cce9e5c 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index a7902c828c..f85654942d 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 5a1af98080..2d9797e781 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 70173f5ac8..777b0874f6 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/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" = "Добавить расписание";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 5a27e6480b..ec1721591a 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index d8ecda3546..e634ada139 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 199acefd4b..728a9694f9 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/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" = "เพิ่มวัน";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index c7924e5680..20686a6640 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 53d53bfc64..88ca67b4f9 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/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" = "Додати розклад";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 77e146bb34..c80c6a34ae 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/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";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index dc6eb2d527..47069d1c69 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/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" = "添加计划";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 9435f7c43a..d0fc269228 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/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" = "新增排程";

From cec685c635e59218df4e9c1988dc904602f66aad Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Fri, 9 Jun 2017 12:22:33 +0400
Subject: [PATCH 3/4] [android] Added remove/add stop point buttons.

---
 android/res/drawable-hdpi/ic_opentable.png    | Bin 720 -> 389 bytes
 .../res/drawable-hdpi/ic_place_page_phone.png | Bin 0 -> 577 bytes
 android/res/drawable-hdpi/ic_route_remove.png | Bin 0 -> 161 bytes
 android/res/drawable-hdpi/ic_route_via.png    | Bin 0 -> 304 bytes
 android/res/drawable-mdpi/ic_opentable.png    | Bin 477 -> 266 bytes
 .../res/drawable-mdpi/ic_place_page_phone.png | Bin 0 -> 398 bytes
 android/res/drawable-mdpi/ic_route_remove.png | Bin 0 -> 125 bytes
 android/res/drawable-mdpi/ic_route_via.png    | Bin 0 -> 189 bytes
 android/res/drawable-xhdpi/ic_opentable.png   | Bin 1080 -> 508 bytes
 .../drawable-xhdpi/ic_place_page_phone.png    | Bin 0 -> 732 bytes
 .../res/drawable-xhdpi/ic_route_remove.png    | Bin 0 -> 175 bytes
 android/res/drawable-xhdpi/ic_route_via.png   | Bin 0 -> 289 bytes
 android/res/drawable-xxhdpi/ic_opentable.png  | Bin 1832 -> 793 bytes
 .../drawable-xxhdpi/ic_place_page_phone.png   | Bin 0 -> 1217 bytes
 .../res/drawable-xxhdpi/ic_route_remove.png   | Bin 0 -> 245 bytes
 android/res/drawable-xxhdpi/ic_route_via.png  | Bin 0 -> 514 bytes
 android/res/drawable-xxxhdpi/ic_opentable.png | Bin 2695 -> 1077 bytes
 .../drawable-xxxhdpi/ic_place_page_phone.png  | Bin 0 -> 1604 bytes
 .../res/drawable-xxxhdpi/ic_route_remove.png  | Bin 0 -> 289 bytes
 android/res/drawable-xxxhdpi/ic_route_via.png | Bin 0 -> 644 bytes
 .../maps/bookmarks/data/MapObject.java        |  22 +++++++
 .../maps/routing/RoutingController.java       |  25 ++++++++
 .../widget/placepage/PlacePageButtons.java    |  56 ++++++++++++++++--
 .../maps/widget/placepage/PlacePageView.java  |  22 +++++++
 24 files changed, 121 insertions(+), 4 deletions(-)
 create mode 100644 android/res/drawable-hdpi/ic_place_page_phone.png
 create mode 100644 android/res/drawable-hdpi/ic_route_remove.png
 create mode 100644 android/res/drawable-hdpi/ic_route_via.png
 create mode 100644 android/res/drawable-mdpi/ic_place_page_phone.png
 create mode 100644 android/res/drawable-mdpi/ic_route_remove.png
 create mode 100644 android/res/drawable-mdpi/ic_route_via.png
 create mode 100644 android/res/drawable-xhdpi/ic_place_page_phone.png
 create mode 100644 android/res/drawable-xhdpi/ic_route_remove.png
 create mode 100644 android/res/drawable-xhdpi/ic_route_via.png
 create mode 100644 android/res/drawable-xxhdpi/ic_place_page_phone.png
 create mode 100644 android/res/drawable-xxhdpi/ic_route_remove.png
 create mode 100644 android/res/drawable-xxhdpi/ic_route_via.png
 create mode 100644 android/res/drawable-xxxhdpi/ic_place_page_phone.png
 create mode 100644 android/res/drawable-xxxhdpi/ic_route_remove.png
 create mode 100644 android/res/drawable-xxxhdpi/ic_route_via.png

diff --git a/android/res/drawable-hdpi/ic_opentable.png b/android/res/drawable-hdpi/ic_opentable.png
index fff32a337cd9f6342b826e47b4166024f34b24d4..d3f2f7971d7241d434fca085037cba4f6f611257 100644
GIT binary patch
literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0003@Nkl<ZXx{CZ
zF|vX%5Qd$hcl07&z*ATQE$6YNgy9qxP<a3wXE=sZQhatikVh~QaCP=8$&&n&&F&_<
zS}BU6D2k#e$|A5OAfce7qN1cAAz=F%F$Z#L{-Y-6u&kIpXT~_QUq+0_kykn5%`Ioc
z2^&sq=9P2Bmg{Vi@GN)dZ<pqAoW<GcouzpqYYOfo?u9@%CIR<pa4K$7CHZ7Qx!amm
zPZm_aRpZzZ5wUyv8jdV>AtvTBVinqoS(7zCXRKQzsbQHLeq-lzGgzj!g0jx<S!<*)
zEaP|P@C}xQt+SqK97j3qtlm7sjw|g1MZF24W~>@qB<{@<5877l1l^qox_`IJ#2xAd
z!ak9f7=vFZ9bZyh1ztbIUC;zxVZ~kY1wMnsJro5#r3E${1h!*DHmq7TE+p-=^iskP
jwe%E4Q4~c{lpp2+n~*c%esSu?00000NkvXXu0mjfj~u5$

literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001@s001Ni1^@s6!duBr00001b5ch_0Itp)
z=>Px%ib+I4R9Fe!nK4TpK@^3vX>5c*QYh&(0SiGiNJt}sg@sM3_Z#9ruo47ovGs3Q
zq_VV;5JCtxLTo~aRRVzo41v6SM|Nd=d&hNW-p;Oj;V|=N=AL`c%<Syj-RwaE8xDsV
zVV1#bumGOsctZIde9Q5P@({ewvTR7%O+(NW*au%h9n*OEO?65c2~C0>@C(G4{KYfb
zx<Hax0$;#5O?*qOi6i&`{2r$whfBPJ<l+dr3H~{WG*K1*n`Gh$wg&z-p~T=+oV6-(
zI)<Z+AkQFp2OdWe)pP#A@R!^Y&V6nVeH}I04;Y(Llu}bX#cjq|t#xCoq-<LEDGT0;
zWG~+jV9`gOp#38;UReK9Vz%N+%c3-InpEXcvKV3d-`52*^SIuMY^_IRDfM&U3>>q>
zKPgRPyiTN9v$MKUyvIOs6i;y#Kg7<-^SS9rk{jRxxTfD5mILjx?!cP$w~U{5dG#Bp
zJ=Dq*4AVTg^f0P@-c3Sv+EzW|tC~+4Ffq!Pb578w{t#Oo<<vE{3(R17yZT2>&r>0`
z&9?btIp*!#R^J`kO8H3Gs|rV}zeH5QQFNaa6;D~!?{T|&aJ|tdVIkJFr`u9K5>_=!
zR{urFY~W+9zDrfr?~Zlr<$SnOdwF<VsYcv=KkjGT<x@T82K^a-J+g#Ynj3UTW~}mF
z$PK3fpFJ!8&{I)dhZbQAZDt<VTd{6J%)EU2_t?Te1>HNg>Q2a*$8Y6%jF}cXR_>^Q
z>*g+$N4Kd7-iie&8R%r}+{>IIzo-&%oqPQjCCGI~T>oB}76K7B0D2YOgo!u(D{e<z
z|2|4M;`;X)sSu}<t<&0vzv$!M72>NSP;rues{IcQVy=7(;=k<x0000<MNUMnLSTXe
C7*r|%

diff --git a/android/res/drawable-hdpi/ic_place_page_phone.png b/android/res/drawable-hdpi/ic_place_page_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..5342c8849dadf3dc16b9f0f21fcfcbc04dc04950
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006ANkl<ZXa()T
zKS-2u0LS6)d3C35Sr!>J$rVD828Cd9WiCQPM-4#@7f3^c65>{tWKcBJ6b1d+igE~A
zTq1-BNys2Fkfsm=HIER3?#xg9?tH!X{&+6F?>YRQN3tx-vMkH8EX!AHrb<Q7!VB)w
zLzDbOBU2=3QvqT)zH^7|@&i?jV~nZ*G2G_4N~OHUJsj=ILoH|M;t4Z2MyZpRXlDt>
zTdjg19eg5Vii7eBTbRVHS*xOgOC&KS*(q;upIon160OW(j1ZO=xIwNZ4#<VAG*BfM
zj*-IXl^2MT@0nbP0l#_4eyyMzBSDSUA0ZaVwMe~I5F=xe%UVW|uNeLE0z>5M*9xLc
z<LJ^dPGgMA3&hFySUG6oBSwn7N+ZlXMnvn6N@mD)R(S~X8RMyzF^JJAFED`HFcm65
z3&tE3N}~_sn!La+Qe-u%2!bqN)G3WljEC|DkI3p)Q5+^plxn3>OOz-L@&?<O#qmWO
z0dcZUY9nA6$1J;5end#%cuz>>M;l2TBkWQ6ae=I#oFbtA2yv0;++v^n$4%TO=;bJ5
zWc+22L-H2^1}JTaR{4uKNlJT1hy28G60Bv66Y>xBykRXfgybjAGfgSq2*_X5@PI!Q
z_koDYfgSYmgIp=Dvq|Mch;zK+7a0>A(MCX!X0C9XYFU<LS(as4mgTd5f38J%qT?PK
P00000NkvXXu0mjf#OD1E

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/ic_route_remove.png b/android/res/drawable-hdpi/ic_route_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..33bd5f957f09612a48eaf20a52387b31981d6f69
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawGCW-zLo)8Yy}XgP!GOorG5pNI
z6)!ib@kSor64IhoSomGMV$%~228M=9pU!-{wbTCjsqNX$LEHYU=F}1l`MmvBO?Gpg
zfQrWi1;-{9P9c>QK^JCxyOZ7g%VfoRUaL*@F_|gnm4VhM$=$L$S)S5zVG)qS;OXk;
Jvd$@?2>>=IK34z$

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/ic_route_via.png b/android/res/drawable-hdpi/ic_route_via.png
new file mode 100644
index 0000000000000000000000000000000000000000..322765336aa0611743cc69812c193b3595358742
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawzI(bjhGg7(d(DuK(NUzmaH^ll
zthFLm)l9uR8dGFlHXe0TzP;nHnxE5CIW6@7{!ahKbY~T%#CcEtYcId4zd1jB+eHCE
zAo!_u><y#E#$_)RGmhRp;Cx}3m`TutCOeL(sB;t7wJ#70_VRkhQ_Au0bmUz%Wp(w%
zvi8fIj~+bs%fVGW&F@s7yY;V+WzQ|2PZCL=zM^7jm+`6XH#tRAR76;2FTLMyE_}QH
z&^4~;({=JwZXXto_Ri4_pRhmtS?-Fvwcq&ok4+DEUv>KG$M@}fzMiT&qoFzT;%C7v
zTNmE@#jz?7=m;*ZYr-`wy6Zd}TlpNpj@@Sb#h&kZ|LNbmfkD9F>FVdQ&MBb@0N{9m
A0ssI2

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_opentable.png b/android/res/drawable-mdpi/ic_opentable.png
index ae53c7be0c529be5daf4e150cea4d79280315a97..10a78cfdd5737245af7a905dfd6696f4dbfae62c 100644
GIT binary patch
literal 266
zcmV+l0rmcgP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002dNkl<ZSi|j>
z!3~5U5Jf%NgT|U{gv2W?(1U%@3k^_!oJ=%t4{JCqS#?n`oA8b^lm872GgeihP$>Kz
zbO<yChr^%|boYt3j4XVzFw)*3-!t)ziT<kmz{(yg!?my9mw#LI@n=7AhAHwc7&*%r
z*O<#`gC(MA5&VKUlB-czEQ)%I=s;vf($FB8gPcAxP`*@c5fg|=UoC^2IWn-m)NT<M
zh%~;s33BdngXBk)`jV5k=>rcf`KZV+?2?b`3=1d2%FM9zGyJv`3WY*4UfmV89<9x2
Q@&Et;07*qoM6N<$g166arvLx|

literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001Na000;W1^@s6lDJ<^00001b5ch_0Itp)
z=>Px$mq|oHR7efgmqAJcF&KrN3f*~t78ioY5$X-RK%v{Zb=Nz%D0l-G_AXrrE~E!&
zSBho)9?lGZVoD~RjMN_<ll*ykefcL%)8edSlx2B|#4Wf1*I*138}JHVz;jU)?>zep
zjEun}_yVyIN8H+MUSkMPz!s#2=1j7>L2w54sZI=Eb7xshA*9N5F;n}JMz=~KpgnWU
zYpPB7Pig(yQ-g%kJ;1$4;K!)alBN@d(>u^%CHiW=f%5~DW7B&kUfCm|ZH08s<Tj&4
zNK@KP3|RdTEWoCM+QWwN)6k(8i%$smK>I>aTe(=c+Laj|PAsenBWq_g+?m@sYD1fc
zsZMt7%wtHE@k7Uc6AbQrLZCltCR7bLqX5rO?d-g^d&th|wJk$Wflu&rPQ?OzrS1ax
zP|l~h+SD()so|{rItTh6<g{n>ngq3#i^a-!8117tjj47RpIQU|^I)t_(xqKVruNdF
z(n*@Ul0W%zO*M5o*N@scl{%dZnlYtH9dkFze}y%sdb#Ac`r6kfLQg7{^>5HOW9XCB
TuAAey00000NkvXXu0mjfpNrbj

diff --git a/android/res/drawable-mdpi/ic_place_page_phone.png b/android/res/drawable-mdpi/ic_place_page_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..19aaf77f54eb26facb272fccd8ba28a42448c471
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00041Nkl<ZSPAXH
z&ufkW00;0d(`L(rgW|B_=1j_EY9t#wxnQ&dwelw@wVT6Mv{^eyDW&`a<U&zSa#Kpm
zO%AjCZ0zvyKJR0{%<0+to;;sVQcEqh)bhX6nKcZ!?3k{!hJN2nWfhYOU)<4`jk4W)
z{L+_YhTQg2VZoJbjJrzH`HTJTDNLj~r!4tlch+&v0>)C6VJoiZ5B&!1Op_6Ow>Q=3
zwP?v_JJMtlpIk_j2bfJ&o?CG-O@=*HIGY9sFlS4uF>1w7mKnpGZE5ftM^cS0AC(^4
zlvTXI(KNV^^Qp=;r5jnpY2yy2!Ju)6Q<ZM-6y|iLJ)BUwnRYRwG@AC%;gQmm?!;zi
zT(T>zqt`2?dDEULd^KTDT1Bsi)>|-ZUs^+lTmEIyR9eMxZ>=}4Bdubqt3FumjYDZI
sokl$IQ(;C=+Cz_%22x8cwbWAk4fhv`qkhSiFaQ7m07*qoM6N<$f>q<Vt^fc4

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_route_remove.png b/android/res/drawable-mdpi/ic_route_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..25d3b375255424c911330373380f070d7cdafc14
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}t7f%<*kcif|=MM5RC~&Yi-de1k
zb=2v@)BYFiy|d;r<@vKPe3-sLVoh1aquv9IxBm+(I5Zp(ZJhS5I@V!wOZzld1_o|f
Yp5@Cswo3f&0h-6)>FVdQ&MBb@0ILHj8~^|S

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_route_via.png b/android/res/drawable-mdpi/ic_route_via.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d0aa0fd31756c8df1b4c4f2b4aa0924b3dd686f
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D7Ec$)kch)?uN>rUHV|MrpnYWR
zhlM(y7OHUv3bB4rpX@Hw$@Io$!EB~I+rGc)m=d&0WU=h-jo}C0<eqD&FD+;`lnt5f
zYx*Uk?$ejj8Mog5D=0IuYvl@a-Pm-?EP+{7$%*myQKnt-f$t|N+xQ8-J^qEA|E=2o
oi%iq%8095D?B@&eS~*$#m%%e(-hV=UK=&|sy85}Sb4q9e0Eu}>qyPW_

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/ic_opentable.png b/android/res/drawable-xhdpi/ic_opentable.png
index 1d7641a1efce4aa30b7852a48d2d6372c43d031e..98463bacaf7d300eee7f2d6fdd326d7b0d1f8aab 100644
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0005QNkl<Zc-rln
zF^+>U5JeNEN<@<~;vn=KfD@#k38&x=^jw0HiXMq0&{I)?5TeQ7X0=)`MC&YIu=l?f
zd-TUP;~CqB10jSELI@#*5JCtctAH~+L`YGh#()7eN~DP3;k<Y0SNKTK;T0Vc__*#<
z`~@Kz$j~6fWnbb?2vFf2Dg-#~MZS#!f1!ZA2l>vMV=vBwv$gy?dd#86eOviUaNln6
z^ouyqZ?ceJ&sh88f5BECI14OEp*W}_z|sV2cin1n2P%cTGeWFEs4it|R&k(Fl;*+5
zTKH-lNLF(oQB$sTt2xjuQ1al22XeG%k>i2m=({H==7|^%ELd<5<0;w8n=Ai@OfZ<?
z_M=5485CWimn#`~qq(D>jZ9|ZEFhH{eRpKrm70Zgo&%3bqYt4?DIp`Cv>r?JEay3p
zPa4gIHnoHd=SBAVJM}yV+DW6W&}NX3VNF`MBzg}2+yU*EkoG^Z?qO8>jm&^l!hmGX
z_;lKYf=2g}Qv0IbfMXTy54H?ATGak<*MQ@711>lWxMDKklFxu^*3Y1-^F{a9?yT=q
ygKue`zK=bGl1JC)HiQsD2qA<JLI@#bw|oF@%!40i^U9w90000<MNUMnLSTZ_`sl|1

literal 1080
zcmV-81jqY{P)<h;3K|Lk000e1NJLTq002k;001xu1^@s6vYb5Y00001b5ch_0Itp)
z=>Px&@<~KNRA>e5o4rpJK@`Q`<0XC&C`fDwg$;#?tp-XVvBl6+m>B#6tSzW%=rMNm
zVnu@Sqr_lqVuB5Y+L(|C3YzHicW{?1%iejjkJ)t|*_#}8cjnH$XV1>;o1I<St%$7K
z?Ouh>T`&V~fJrb0MuBV}?17Kq19%NywA<}NwinY7WenU0&%k$3*3?FA6+>cP4C7>m
z!DH|Zgfhia%;AAm3GyBA5PSwznPMwPXP|_F@C4Wfb(wNa41`D!odQ+%8cTHLoQhf`
z2rhs_>kMirSMG%<MG~<Z1n^B!TBLTBs=``b`wh5KWu6kTkMO<2yy>lPo5}=29NiqZ
z!MHD(n*6?y=QbjJ^2s;k<5boMarE=L4q_8Wry@@42}d0}trCIA_yF8;X8ymG;wFwg
zE%*@Q%4im=XQdc>PgW2OwMmBBk8ELnzlt98h$OL#BOSz1T%8uQ2hn@<u(%7-r*CKS
z2r9KYaGhSH6@o$w-GlCtWl+SCAmS>{rd1)3nJm%@r$E7m7{g18U0=bVEj8#SeT`vO
zxafA$gE+x9SOi;OKY{jD<|Cw50z-<^CEgP-4Kx%4?W;_6p-h~`-8KXm2QPtTs&oD_
zQNLm}?xS2!;IkHE)q#*J11nap7KzkzT;foDZ1ORC5_KE@+|K>?4-rgp(i4#nkZ%av
zNaLQ_5?w>c*A~wNND2tB;~S)h->Q`(UrwCW9<h9@ck;2*W8H(irrb#bmv5*A^QS2}
zk8K%WS2&ZqhL<KwBd*q&x&!X^h4UQZ{KW54#<$<yQF0vkG$yBbi~o7;7dbB%1v&W@
zE2?bDS}h6mzJw4i-w;<)RBo2wQ^wa7*5odM%8X-|@1Bc6i8|MPE+3|hZ@z8z*yheS
zZhq#OqGZ*|?hkQu(yUaA*{`w{xqa0wB)++-lS92L4`G^Xt#RRItzb#r8ujM9%xY_t
z_vW7Tq`n_DXg>!+nkIpo=jeUfNCNGvEYt*%P{%fB2p8-MXhwdqA66{|eajhsdK%vJ
z^^eGJGvQuHDfB$(d102g3!R)p-Q<oXV3=vjz6%Ox+Y#!d`A>aIu5?w+Czc}=!lJaC
zaJK5h-K5hD^dc=lHLrbALGoL!h?X#y^5qd8FC|=^)PmlF(oFQC4*Odm*0-zg;5Lmw
zzf;cEwi1Dq43V0T7cA9P&ehS^6Z7Cm$B~%0%qQHuD21K}ok|K3eTQQ%)1Gp!=U_46
zR8KbFEDX2i6TDtxA(9?6L%ymZoR`J_5oanMr_+1}oQh#>5vlo*+!7~Sj!@0NB4h=z
y_7N)Te`cv{qG$=?Dn~3Wy6HoL84$(4L;VF^I#|qT*5CmE0000<MNUMnLSTZ8+Wn#c

diff --git a/android/res/drawable-xhdpi/ic_place_page_phone.png b/android/res/drawable-xhdpi/ic_place_page_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..11a7f833fefd8970943ea44eabac884a1f6cb1e0
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0007`Nkl<ZcmeIf
zPe|W&9LMpOKYy7i`5Sfl78@m`<+^I26C2wh0)wcFd00D)8cN{?ZHqia9=gm+5fyBg
z30o8t7#-R?*d-!<8~erP!gY}0!c{VhsrdKV;nVN;`+k3ZfAi<%`}=<3{dh>m7-Nhv
z#u#IaF~%4ZJ?eRyT9t*z0#i&d#sIq&H?%SfT;XArfrnp~_sA$NNR!1GRvCDdn&&tV
zDh?PS?=Kn@3Xd=|98k5<$vQ<tDuWDd9OM|2tW&hcpsI;RZsIpfowmWFoZv1+pOaR#
z@CBugr~*8~C>!K`qUxZRt!`4QitrNukoTslff>T|sY0|dgR@GHqQ?Yba@43oJj=g0
zzmZndI7PT#mB3?xDbCVMN&&pg2F_cG8tsJpNhR>e%W*&fe1`J}jfxg2<_Wi70eBQ`
z@UDFDxQ8>KsPQ%7&MN?qpdtD2A<iX5jl+b?sRS8%_>#PJ_NjnooK<!yT0F$xgqc(*
zUS$F2XZeuB=~vYFh%iT02L0r9tAG)lQALeCtWoM0(khGZa89d$*KsZ=dVEFDBCWa)
zUcs4E0WaYEsOZs6&@J5;EjZIEpao}I)xbr9I+QFt#WH?plr#+Ex592E3w2E4_l=T<
z9yamoSJLn)e#>+!Sx9pUzj?ZpEM&Nj-!g}kEIi2_g2rjq|7hTSa{SJ>yr{V1d6o!T
zV~ieBJjXOemwAnp;)q_B*y>N#D0PE3NGpEmV2(=7Fi5@Ph9|g2<>oj^lj4OYF0vDM
z86l%MA<f5ZvJ+Wq6fbn~D?9PH;)XOQS)?-8NhywK=6kmH1CJ@bXlINS%30!VY7}>P
ze83!AWqC$PK^=XZ<2HHgjPQVxhrPVRI9KVEF~%5Uj4{R-V~jDzRL6f0Hj<&^O|Sw0
O0000<MNUMnLSTYUnN}VE

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/ic_route_remove.png b/android/res/drawable-xhdpi/ic_route_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f963f424c1b850464b88a1f7f1fc347d7059016
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg$~;{hLn>~)y|j_{fPw&v<F5sg
z=FXXFi`vWIap<t~&szB)Y!^r)1H%J>!lSphe*bfa^W#JY#^o#<9`~|v2q-u-FfcM9
zGd_4b#NVoa&Yj`Ss2lIlYiL{VqN|$hG}|Jme_D|p$fN^qatq^TnXt5;{{iB9y85}S
Ib4q9e0NQ~zX8-^I

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/ic_route_via.png b/android/res/drawable-xhdpi/ic_route_via.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7851c18e159412ce8a7e5e8ef1c0c7646010fcc
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgUU<4VhE&{od()7wMM0o7G5Hbe
z8;eOxSy{tB$;ouJc=aD(ycf2cQ8;<?(FOm*y^Qq*(>M+T^?|^jUa_~oZf*S{{vhD(
z3;hF}j2sROOa(prR!?MHKi^Hg(p6PdRMoZ8*LLcDt@+lCo37b)$!~pmYT3oQhS#4|
zGdKVLd?zwD|89-6g7m#}pWd=8QBYrAFso<JU51UC_5W(;&*r$8*AOyQa@N#<wJN(A
zy+W5|hsA6S;y9rH<%aK_zlOJ}m0#CQsW@Qpy`gZ|Z|<|o>!vVNEH@EoFqdKyXkd_8
gygn}l;!=aR%)2E^^7b;Hssjmly85}Sb4q9e0L_eZSO5S3

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/ic_opentable.png b/android/res/drawable-xxhdpi/ic_opentable.png
index 2d8fbad6330d4d102a05da774d35c1900334b446..25411cae08e13b168d4d098cfa550420c888a581 100644
GIT binary patch
literal 793
zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq0058x0058(1ONa4O;0K_0008uNkl<Zc-rmU
zA#d_P9LMoxBV>XJERtm51z@+3jMsp|ksz5Mya_ClS5YL%1eu;;itG_cOan_$74Un+
zqn@mA-NDgo`F=F*wZD{W?|<#x+yDRo000000000000000Tn*i-u8xKZG}lt0B1H<d
z)Lemv>Zq>UYmKI&o&s%TvQeO(D%TXvz1o^;r{CCVs<!U)A5KXFtz>JZflB!er=Y$<
zohnpcg*?Xdq)(m8r=Ic^PEjN6bxwPYRLn~}Rei{X4^{IJ&x^k0%C}y!9#2b=T#D4n
zay;E%KJD1pshi!a$9+8iB5Gx`?}>CNQRez0RULNC@!fTn?r17Hy0IU>>1XG;NF$|T
zl$}AvK9zv>nHYemaK<s$@5gBV4`bC=n)?3Nd%{!$3O%nEX`r+X{4S=hQV(e5abZ?%
z`JnA@KvORQn)(_~<wAo~^WfFbNg}<<7d<}%ns^gXaH&&nYOIB}+G?S(nn!<omtdCk
zm^XD*Q%NP&)YaQb``TP!!dj1-{b+cm$AiDGpKwB7YW&z=LtiKCvF<vaXRTu!UhDb5
z79H!8c~?1hk7d1E@3Z6j>RBIbdL4fiX=r`*ln)+9+4?FPx(#S{wDDQ&Hi6}-G>#rg
z!^3V`O=I&h-L>X+U9<6M?7Hi@%Yeql=EpHxEv-((IAx=*)qa;Q16mlHU&L%>SLUc0
zkEUi<_HY@{*4X?uW-Gf%9%J=JCA*2B>j~(=zkv9Q(MfZgcX^xVL6M;bgH^|aRZq$t
ze>^UCP%xw9O3|KapR7&$FmcG#GcPZ=kBHY_jO8s}pfW_nD|m*0c!|>(5w8IoBjQDJ
zLqL3rV2p^5S&R|!Ig~LXKB!ADWy2?##;b^rdX0S%pM@LmXe=yXd@f>XiUb1?7B?{t
zV_6<2LA{6tmJ$?ZS)waJOclLql4y~)$(1eg_FqhQEE5O-0000000000000000P^fF
X+{9mj%1~B&00000NkvXXu0mjfXq|BZ

literal 1832
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
W?Tz(POKda%0000<MNUMnLSTYVY>M;%

diff --git a/android/res/drawable-xxhdpi/ic_place_page_phone.png b/android/res/drawable-xxhdpi/ic_place_page_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a6fc893703915861dbf4d8eacb491ece63f658d
GIT binary patch
literal 1217
zcmV;y1U~zTP)<h;3K|Lk000e1NJLTq0058x0058(1ONa4O;0K_000DtNkl<Zc-rlo
zeP~uy9LG0pQ`=%`RBC8t+KY)aOA2f`Nh?azkVg}Xs5G!blY;2Y#2~c5!m@<5q$~=8
zBAO^khD1pcS!U%JW~hawD{|46)92G4kI%UGx%b@HNjvxXe)i`%=l5_vyD#VWJLgtZ
z2qA<JLI@#*5JCtcgb+dqA%qY@2qA<JLI@#*IK?oNr7U1J;~7*A)2-wRCNVI^h_@(`
zr;R4&advj~oW(W(ex^Qwpd#J0Fo)_a3i_yLlCAVlEU3UimT-Eu^xWr~;JlQA01k0y
zcJz$qZ`b5@QJGp0z&0+*f}Z|t_e^a@q>(vR^BP;&Pu`%Yo$Kuv^rX+kw#STdE(_U6
zmrtZ_9<W=_l^pZ^-%m*ptCqR!@`<&MDqHmo;zz^Hu_a-|e%!@=Pqa-@-;8}t&`SZ2
z*oldw4&+h(Es3_qMm;weAFco&q>6nlzm>#WXq%oP{1W(*&U1OH_~-MDE8a1#vrEt-
z!q|}V7i!q-ig%ciHVL{qR8Th;ru>aF*zJngVw0e1Iztt`8W>?Z_iz)V1N)5Ph%4eu
zn-qN(DyWNL5mJpktmHCduPJmpBJQ>5h0jXDc|Kw;cAO@L8~Q!#ig<@Tf+j~0)WML*
z$!Z6)eEZe8ZnGbvrNVt9O>K{$=;;{Qe4fXBdp_jqHQAnPXhQ@+?WRo1Q0{od_l5A2
zqertnf^tN`u)t$3&Ft{3#!qmwPv6Ck9)DR=l%<A_2!e8fF^03cB=h=%!Jb|tqbTo-
zikcz_ni?8qJo{WDp7ZJRwWEExJ%X+Y)$<Q^5#kKvfMZOj_m$5wNBdTrmW$sfUkSP5
zOyq=P)Dlm7y|bimlc2?cdiF%$z+t^(+^3$_D%Xm-&K^NECE1d@L~&J&NE2Ku>l#mc
ztD}8_P1n#<MnO-+jC9a3_7YF))^s)R|4-0hjv53t#*7rGfDaw5x7t-aGo`IDE6L<o
z-t#xs(>mMHI?gUZXL8tA&;e@_%Tun%RDiujZi<=xcfNu?mz$!ZslD@{&a$G{eFg2#
z<bkL}g6e!WjR983O;OP_!+Ls>+!PhP;;ZNgW8|hFXaGBW6}54W>=YD@;CEj|d%0M4
z3W^$Cg$ZZ*zCm^hiXJqqiH@_%|EM{mn9m|+c#9laRrHLp1kzf%Yr#<7>)G2l$|{DI
z^ZTs8PUdjh$$qza65USLazXY5_2Zq84aN1$qS<(K=1uc~hO8*6;%(B9=lwV(TRX3!
zmr2XV8BcdvL3+MmdX^R4Z&(+_<6CaG^t5yYMGYLHH)vx)MvEt$=kv)+GWJFPWX~=|
z)w~#Z@I20Sl-XOY(RC0iIb*Z?z^-LoF9^zZGC~7irPA|8_S29`?&jBotLrsovI#&f
z%OahUb$<^%t-R_+wLBd1&5)CKy=NE8LDB&3<;zexe=@(kYmno3A>bg^Cyb~NRC6P1
zJ)4hREY%qix2Sp^qvhlSd}q4v7PGw+xRjjs^@R{Z2qA<JLI@#*5JCtcgb+dqA%qY@
f2qA<JA}Rj?`kp{}VAk$W00000NkvXXu0mjfoM2Sj

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/ic_route_remove.png b/android/res/drawable-xxhdpi/ic_route_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1c238d2edb5872c3f28d627b068c8f6ebd215b7
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^6F``S8Ays|{O<-*iUB?$u0Z-fUT|LV^-rK8?vfzC
zV1|bOpFf>Ap2E0WVmH&Z9YEm<PZ!6K3dXnRHu5?qia0#<UMVD8pzN~RfMfQG9EGT<
zmsU&){}_B%ePYFZ^8+V2|4A`07@Rt1@@rOV`p2aU?YtlVN%*&Ug22zT4T^BEFxPBa
z;O6tkw6gkcM!26<mEOK$X3XcK&*WU6JKNoyoAiKzp@Dr(Q&YSp|0Wxt8yGxY{an^L
HB{Ts5N-J)<

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/ic_route_via.png b/android/res/drawable-xxhdpi/ic_route_via.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5259a6c93dfb211efc4dc643876f97a2737b720
GIT binary patch
literal 514
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFrM^uaSW-r_4bybpHiUA@sAe|
z1r#vyCuOYoz;W-OazM00im=}S&ONNX)f`d6o;fBHkDa<N))sr#Ch<m+`NLYfui4LL
zKRo;Y>;)5`nNZ-aDgJZj_CFt|{f>FD>1^@5>04}{$IR|`xURYT+B4+~XU!Y)wg`GC
zG_nYR2qVwgOUmaRoyT1nH|MC`{AcgyK4W|kA^&B$WZJycu$w89L#NG5pAnooYniA1
zV;j-*m&<!DueLoOD!1vh^SW2P#gjaD&3LlpoK5-5SL+VB%zP#=`Pa93&R4gHFWsJ=
zt(SlOtIb8DbN3~#8;ebQHt)NRk%#?Xo=qpJ3-wkdmz>#9@bPuezBN0~?AnkO;l7~q
z;XBE#VZB`C7x(lzoW9no-}PE-ZRu$%rnOPxb{gxXw_IEMiepP=Y{mW^>+VNw7tAPM
z5N>a1Z#a9)@jv#GBJQUAU42q~tK-Tm62JWymi>0B^wyPQ-oN!acinZpto8ZNz3v)|
zJHK5%zubBF#f$UY3<XR2e{MeW=|?JC)tTILQ*N^T3X~B^Kb6D0w!85fkg9c-goY9@
zs3vdmtV&-nbMuXTm;dCxHnA_B#SRN`hQ90iF<EQBI(_*(4<zR4>gTe~DWM4fIQsAJ

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxxhdpi/ic_opentable.png b/android/res/drawable-xxxhdpi/ic_opentable.png
index 1b1de05206088d049d5840620923a2b1bec0c68b..26682a15f58719c2b7c6fd478621801c4c2a0198 100644
GIT binary patch
literal 1077
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1#{zspT!Hlep$`uG%iaR|#Hl36
zFPMSXB)Vzk(M$K={N(fLJOA%Lf6Bo>j9%ZFqpl?1wz?oP*Z(c6!b#KDZl5E6^~+>$
zyZLyEry7sc?5BR8Hs<}E$TaDg-+P}^3=B+nJY5_^Dj44!bY*l3WMJ5^{(S4dOwI#>
z?YZ1QyTIT;^4i;Va}<}wc=;L5Ilgc0>Fq1l_E+vSbkF~KN+w3thNIb$;m-8?tw)=k
z3t#*_f1Ufv?3$B2bDpy&9_e0W@ZsSGi%RcG=U>x~6ihx<bWioX$eqPqlghQZS&xU9
z$_IrPcwVlmnQ+~#z^(j&@II>@3;#c!{IAL)LE`6@!iLhzXT;A4>qLj`ONmXmy6v;;
zZ?<l;e*Mp85u4v!Nr+E4xh1H(v`O@^kMA=^u`kM7C96+Z2Q5}UQhH@o^M+>*YxhZ=
z$XXf69XQqf>>jSB5Z||1td^|28VYVxO%{Yqm~^p&$LY}=w<m@vDkdt8J?2uM*aYjm
zoP*?rn52XqoIH}9IDT|y_<UjhT$g!4-|tDp!9FHMp0g_guQ#`Mvezf_F>@$%ZF=+X
zzyI5_4BtLX%G%Uhy!8FkQjITD!)rEQN}JUaX1uk_US-~z&x#f4{y&l*b3d8?c(EJb
z$3J`ee(gA2Q4`Vsk*Voh&EM-G!ppMv+cmiTGBa5row162-M{KQ$<KSaBNDv!d2?&q
zOXMB=`+sNpnY(g28~?{wJ!^V<a8l&|motsFK2Ko1Y9GkST*4Q&heheAq@XfO$(4_P
z%QEaH++DiUw|?U9&mMh_CvtbCsV>L}3O$~~AUbW?c7~F}UJjR+?CQJ8q$T6~p5eu`
zsSOJ~ePuthuJ~ZG*IjN$1gDS5%aG%57(^SF@iUaD+cADrRrx1S|H`z>eACze*(sma
zw$vD_-}gH$pYf!B%8!8k^`8U&Uq4qXtsrvLfFbAP28Nxrzt6k7|Fc}NQ~L0<Cu=6z
z=UD1K>)(Cu^-uP8@!)?apP!voU(zl0<gnZ$vy}%XpNQQ2*+~4C@a{PZKX!@Qo@?KK
z^!;a64$&z!oF2T|0WHC<GVkK}Y^UzFTIW=<U{an)!m3EN!xGCp;~pC<uLt4>7Cs5{
d*kS4R0b~85PcvWNthoyk@pScbS?83{1ORHZSTg_s

literal 2695
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
BBQ*d3

diff --git a/android/res/drawable-xxxhdpi/ic_place_page_phone.png b/android/res/drawable-xxxhdpi/ic_place_page_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cd6c3e601680c9013c3ca4120684cbf8aca7386
GIT binary patch
literal 1604
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxxhdpi/ic_route_remove.png b/android/res/drawable-xxxhdpi/ic_route_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f7ee06a32b1c781aa132b2731313a6b3430a0aa
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvG8AvYpRA>UER04cLT!Hj|LSPGL?@ORMo{}KH
zV1|bOpFdsc)A}=!b=TYH%LGBjdAc};R4~51XvpUnDB^l?`I29T%=#TJ>V|@83k;b9
zv$teT4a;tk61k)C<X=lfHj}mba-cS#YxrMZnZ0bO!+$x6Ev63^W|ljAYx#9-KMM=X
z4>n72ZVn8PGV|&M1KkZB%!{`i(BkX4%yipggFko4;{%Gi7j|Dc@FnEZobs<npF{}d
iPWyVYCKhbTj{~AioX_GXKE1IM#P@Xdb6Mw<&;$To9eg(c

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxxhdpi/ic_route_via.png b/android/res/drawable-xxxhdpi/ic_route_via.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8316e978f7859210ee12a2c2e7b124a4b92f7f3
GIT binary patch
literal 644
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX16#+gWu0Z<#K!9T_o~!}dtx*!>
z7tA2D^vVAv(r@1^U-nG7X#dU6VojI1>w{h}{^MN5(|n~s>t{BT)2G$qyA-3^85kHR
zd%8G=R4~51%~~dHDB=3he6qNS@n+k*|G7@DU817bTypMjSplzc(`Rm=1qe_V9D4u9
z=GnKcMVId?f3k2-le_x7kXh4&b*COXFW|ty$Rgn2;K-rSaP-b(;eIXOuMbYtE`4<8
zZkujuEGI+5qb=5@+poX>zN>Wk+DANX%I<E58@-I?efjHCZxm*@%y@s2S*YZ*$*u8Q
zXPgObczP;)?X*+(YM$mtoSnM6bARTdGrr>gmK_a=j6VNIc5@-4{eq%;m*#!@SK9~d
zGxN(S|NXUU|7|P7kbQ1_GJWc`C024WlA6)E?tJOBrG8wuPK6$yxLC>E-Re~6+l1<%
zCtFGbw8LZBtyRnTcAW}6e=x3dZ}YsOtK}QQlHM*@9}`=r^WczwhkfC){=m2t`+ZXq
z45!~Nn#Ic-eM<iRmGzck4-;O`e%8Bx;Y{u7)A=GM-hJ11KKP;d`ue&V*R)Q~_N_X(
zU9#XTF!5ZT;u9>^ka^0!hk*$gG+^SW3`mp-5wO5yWzBF=`?j*-(om47r>mdKI;Vst
E0NylF6aWAK

literal 0
HcmV?d00001

diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
index c89c8e2988..08dbc41c26 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
+++ b/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
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 0a3150bfd4..23712a06f3 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -93,6 +93,8 @@ public class RoutingController
   private MapObject mStartPoint;
   @Nullable
   private MapObject mEndPoint;
+  @Nullable
+  private MapObject mStopPoint;
 
   private int mLastBuildProgress;
   @Framework.RouterType
@@ -433,6 +435,28 @@ public class RoutingController
     LocationHelper.INSTANCE.restart();
   }
 
+  public void addStop(@NonNull MapObject mapObject)
+  {
+    mStopPoint = mapObject;
+//  TODO call api method
+  }
+
+  public void removeStop()
+  {
+    mStopPoint = null;
+//  TODO call api method
+  }
+
+  public boolean hasStopPoint()
+  {
+    return mStopPoint != null;
+  }
+
+  public boolean isStopPoint(@NonNull MapObject mapObject)
+  {
+    return mStopPoint != null && mStopPoint.equals(mapObject);
+  }
+
   private void suggestRebuildRoute()
   {
     final AlertDialog.Builder builder = new AlertDialog.Builder(mContainer.getActivity())
@@ -484,6 +508,7 @@ public class RoutingController
 
     mStartPoint = null;
     mEndPoint = null;
+    mStopPoint = null;
     setPointsInternal();
     mWaitingPoiPickSlot = NO_SLOT;
     mUberRequestHandled = false;
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
index 746956b5fd..982c651a62 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java
+++ b/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);
+      }
     }
   }
 
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index f9a2ec26a1..db5c1b497f 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -522,6 +522,20 @@ public class PlacePageView extends RelativeLayout
           }
           break;
 
+        case ROUTE_ADD:
+          if (mMapObject != null
+              && (RoutingController.get().isPlanning() || RoutingController.get().isNavigating()))
+          {
+            RoutingController.get().addStop(mMapObject);
+            setMapObject(mMapObject, true, null);
+          }
+          break;
+
+        case ROUTE_REMOVE:
+          RoutingController.get().removeStop();
+          setMapObject(mMapObject, true, null);
+          break;
+
         case BOOKING:
         case OPENTABLE:
           onSponsoredClick(true /* book */, false);
@@ -1388,6 +1402,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().isStopPoint(mapObject))
+    {
+      buttons.add(PlacePageButtons.Item.ROUTE_REMOVE);
+      mButtons.setItems(buttons);
+      return;
+    }
 
     if (showBackButton || ParsedMwmRequest.isPickPointMode())
       buttons.add(PlacePageButtons.Item.BACK);
@@ -1421,6 +1441,8 @@ public class PlacePageView extends RelativeLayout
     {
       buttons.add(PlacePageButtons.Item.ROUTE_FROM);
       buttons.add(PlacePageButtons.Item.ROUTE_TO);
+      if (RoutingController.get().isBuilt() && !RoutingController.get().hasStopPoint())
+        buttons.add(PlacePageButtons.Item.ROUTE_ADD);
     }
 
     buttons.add(PlacePageButtons.Item.SHARE);

From 36b87005334afdf0aa5a150e3097740943fd97a3 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: Wed, 14 Jun 2017 16:09:28 +0300
Subject: [PATCH 4/4] [android] Implemented add/remove stop points logic

---
 .../src/com/mapswithme/maps/MwmActivity.java  | 12 +++++
 .../maps/routing/RoutePointInfo.java          | 45 ++++++++++++-------
 .../maps/routing/RoutingController.java       | 43 +++++++++++++-----
 .../maps/widget/placepage/PlacePageView.java  | 14 +++---
 4 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index c2577f48f4..19af8d699b 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/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()))
diff --git a/android/src/com/mapswithme/maps/routing/RoutePointInfo.java b/android/src/com/mapswithme/maps/routing/RoutePointInfo.java
index 96fa983332..2b7d5a47a6 100644
--- a/android/src/com/mapswithme/maps/routing/RoutePointInfo.java
+++ b/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()
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 23712a06f3..030361e153 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/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.
@@ -93,8 +95,6 @@ public class RoutingController
   private MapObject mStartPoint;
   @Nullable
   private MapObject mEndPoint;
-  @Nullable
-  private MapObject mStopPoint;
 
   private int mLastBuildProgress;
   @Framework.RouterType
@@ -279,7 +279,10 @@ public class RoutingController
 
     RoutePoint[] routePoints = Framework.nativeGetRoutePoints();
     if (routePoints.length < 2)
+    {
+      setBuildState(BuildState.NONE);
       return;
+    }
 
     mLogger.d(TAG, "build");
     mUberRequestHandled = false;
@@ -437,28 +440,45 @@ public class RoutingController
 
   public void addStop(@NonNull MapObject mapObject)
   {
-    mStopPoint = mapObject;
-//  TODO call api method
+    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()
+  public void removeStop(@NonNull MapObject mapObject)
   {
-    mStopPoint = null;
-//  TODO call api method
+    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 hasStopPoint()
+  public boolean isStopPointAllowed()
   {
-    return mStopPoint != null;
+    return Framework.nativeCouldAddIntermediatePoint();
   }
 
-  public boolean isStopPoint(@NonNull MapObject mapObject)
+  public boolean isRoutePoint(@NonNull MapObject mapObject)
   {
-    return mStopPoint != null && mStopPoint.equals(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)
@@ -508,7 +528,6 @@ public class RoutingController
 
     mStartPoint = null;
     mEndPoint = null;
-    mStopPoint = null;
     setPointsInternal();
     mWaitingPoiPickSlot = NO_SLOT;
     mUberRequestHandled = false;
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index db5c1b497f..34babed468 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -523,17 +523,13 @@ public class PlacePageView extends RelativeLayout
           break;
 
         case ROUTE_ADD:
-          if (mMapObject != null
-              && (RoutingController.get().isPlanning() || RoutingController.get().isNavigating()))
-          {
+          if (mMapObject != null)
             RoutingController.get().addStop(mMapObject);
-            setMapObject(mMapObject, true, null);
-          }
           break;
 
         case ROUTE_REMOVE:
-          RoutingController.get().removeStop();
-          setMapObject(mMapObject, true, null);
+          if (mMapObject != null)
+            RoutingController.get().removeStop(mMapObject);
           break;
 
         case BOOKING:
@@ -1402,7 +1398,7 @@ public class PlacePageView extends RelativeLayout
   private void setButtons(@NonNull MapObject mapObject, boolean showBackButton, boolean showRoutingButton)
   {
     List<PlacePageButtons.Item> buttons = new ArrayList<>();
-    if (RoutingController.get().isStopPoint(mapObject))
+    if (RoutingController.get().isRoutePoint(mapObject))
     {
       buttons.add(PlacePageButtons.Item.ROUTE_REMOVE);
       mButtons.setItems(buttons);
@@ -1441,7 +1437,7 @@ public class PlacePageView extends RelativeLayout
     {
       buttons.add(PlacePageButtons.Item.ROUTE_FROM);
       buttons.add(PlacePageButtons.Item.ROUTE_TO);
-      if (RoutingController.get().isBuilt() && !RoutingController.get().hasStopPoint())
+      if (RoutingController.get().isStopPointAllowed())
         buttons.add(PlacePageButtons.Item.ROUTE_ADD);
     }