diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index ac9600867c..d143ffec2d 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -1,19 +1,27 @@
package app.organicmaps.routing;
import android.app.Activity;
+import android.content.Context;
import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
+import android.content.SharedPreferences;
+import android.widget.Toast;
import androidx.annotation.DrawableRes;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AppCompatActivity;
+
import app.organicmaps.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@@ -181,6 +189,26 @@ public class RoutingPlanController extends ToolbarController
return (mFrameHeight > 0);
}
+ void addStopToast() {
+ SharedPreferences prefs = MwmApplication.prefs(requireActivity().getApplicationContext());
+ SharedPreferences.Editor editor = prefs.edit();
+ editor.putBoolean(String.valueOf(R.string.toast_dismiss), false);
+ editor.apply();
+
+ View progressFrame = getToolbar().findViewById(R.id.progress_frame);
+ LayoutInflater inflater = requireActivity().getLayoutInflater();
+ View layout = inflater.inflate(R.layout.toast_custom,null);
+
+ TextView text = layout.findViewById(R.id.toast_custom);
+ text.setText(R.string.add_stop_toast);
+
+ Toast toast = new Toast(progressFrame.getContext());
+ toast.setDuration(Toast.LENGTH_LONG);
+ toast.setGravity(Gravity.BOTTOM, 0, 160);
+ toast.setView(layout);
+ toast.show();
+ }
+
private void updateProgressLabels()
{
RoutingController.BuildState buildState = RoutingController.get().getBuildState();
@@ -212,6 +240,13 @@ public class RoutingPlanController extends ToolbarController
final boolean showStartButton = !RoutingController.get().isRulerRouterType();
mRoutingBottomMenuController.setStartButton(showStartButton);
mRoutingBottomMenuController.showAltitudeChartAndRoutingDetails();
+
+ SharedPreferences prefs = MwmApplication.prefs(requireActivity().getApplicationContext());
+ boolean ShowToast = prefs.getBoolean(String.valueOf(R.string.toast_dismiss), true);
+
+ if (ShowToast) {
+ addStopToast();
+ }
}
public void updateBuildProgress(int progress, @Framework.RouterType int router)
@@ -349,4 +384,4 @@ public class RoutingPlanController extends ToolbarController
mDrivingOptionsBtnContainer.removeOnLayoutChangeListener(this);
}
}
-}
+}
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/toast_custom_shape.xml b/android/app/src/main/res/drawable/toast_custom_shape.xml
new file mode 100644
index 0000000000..0dac6ea816
--- /dev/null
+++ b/android/app/src/main/res/drawable/toast_custom_shape.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/toast_custom.xml b/android/app/src/main/res/layout/toast_custom.xml
new file mode 100644
index 0000000000..a2bb8360fd
--- /dev/null
+++ b/android/app/src/main/res/layout/toast_custom.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 9e4d0b3eb7..31346465ef 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -612,6 +612,8 @@
ExitAdd a starting point to plan a routeAdd a destination to plan a route
+ Select any place to add an intermediate stop
+ Don\'t show againRemoveAdd Stop
@@ -697,6 +699,7 @@
Avoid ferriesAvoid freeways
+ Manage routeUnable to calculate routeA route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.Define roads to avoid
@@ -2200,4 +2203,4 @@
Events VenueAuctionCollectables
-
+
\ No newline at end of file
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index a6ba22f89c..6bfe44d6f5 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -20194,6 +20194,51 @@
zh-Hans = 添加起点以规划路线
zh-Hant = 新增起點以計劃路線
+ [routing_add_stop_point]
+ tags = ios
+ en = Select any place to add an intermediate stop
+ af = Kies enige plek om ’n tussenstop by te voeg
+ ar = حدد أي مكان لإضافة توقف وسيط
+ az = Bir ara durmaq əlavə etmək üçün hər hansı bir yeri seçin
+ be = Выберыце любое месца, каб дадаць пралягчы стоп
+ bg = Изберете която и да е точка, за да добавите междинна спирка
+ ca = Seleccioneu qualsevol lloc per afegir una parada intermèdia
+ cs = Vyberte libovolné místo pro přidání mezipřistání
+ da = Vælg et hvilket som helst sted for at tilføje en mellemlanding
+ de = Wählen Sie einen beliebigen Ort aus, um einen Zwischenstopp hinzuzufügen
+ el = Επιλέξτε οποιοδήποτε μέρος για να προσθέσετε μια ενδιάμεση στάση
+ es = Selecciona cualquier lugar para añadir una parada intermedia
+ et = Valige mis tahes koht, et lisada vahepeatuse punkt
+ eu = Hautatu edozein toki eta gehitu eten erdia
+ fa = یک مکان را برای اضافه کردن یک توقف وسطی انتخاب کنید
+ fi = Valitse mikä tahansa paikka lisätäksesi välipysäkin
+ fr = Sélectionnez n'importe quel endroit pour ajouter un arrêt intermédiaire
+ he = בחרו בכל מקום להוסיף תחנה ביניים
+ hi = बिच का एक स्थान जोड़ने के लिए कोई भी स्थान चुनें
+ hu = Válasszon ki bármilyen helyet egy köztes megálló hozzáadásához
+ id = Pilih tempat mana pun untuk menambahkan titik persinggahan
+ it = Seleziona qualsiasi posto per aggiungere una fermata intermedia
+ ja = 中間停留所を追加する場所を選択してください
+ ko = 중간 정차지를 추가할 위치를 선택하세요
+ lt = Pasirinkite bet kurį vietą, kad pridėtumėte tarpinę stotelę
+ mr = बीचीकडील थांबायला कोणत्याही ठिकाणी निवडा
+ nb = Velg et hvilket som helst sted for å legge til en mellomlanding
+ nl = Selecteer een willekeurige plaats om een tussenstop toe te voegen
+ pl = Wybierz dowolne miejsce, aby dodać przystanek pośredni
+ pt = Selecione qualquer lugar para adicionar uma paragem intermédia
+ pt-BR = Selecione qualquer lugar para adicionar uma parada intermediária
+ ro = Selectați orice loc pentru a adăuga un punct intermediar de oprire
+ ru = Выберите любое место, чтобы добавить промежуточную остановку
+ sk = Vyberte ľubovoľné miesto pre pridanie medzipristátia
+ sv = Välj valfri plats för att lägga till ett mellanstopp
+ sw = Chagua eneo lolote kuongeza kituo cha kati
+ th = เลือกสถานที่ใดก็ได้เพื่อเพิ่มจุดหยุดระหว่างทาง
+ tr = Araya bir durak eklemek için herhangi bir yeri seçin
+ uk = Виберіть будь-яке місце, щоб додати проміжну зупинку
+ vi = Chọn bất kỳ địa điểm nào để thêm điểm dừng trung gian
+ zh-Hans = 选择任何地点添加中途停靠点
+ zh-Hant = 選擇任何地點添加中途停靠點
+
[routing_add_finish_point]
tags = android,ios
en = Add a destination to plan a route
@@ -30345,4 +30390,4 @@
uk = Переглянути меню
vi = Xem thực đơn
zh-Hans = 查看菜单
- zh-Hant = 查看選單
+ zh-Hant = 查看選單
\ No newline at end of file
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift
index 762d8fc636..de080590af 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift
@@ -57,4 +57,4 @@ final class BookmarksListInfoViewController: UIViewController {
let formattedText = NSAttributedString.string(withHtml: htmlText, defaultAttributes: [:])
return formattedText?.string
}
-}
+}
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomAlert/Toast/Toast.swift b/iphone/Maps/Classes/CustomAlert/Toast/Toast.swift
index 44ebd057eb..a83a59954b 100644
--- a/iphone/Maps/Classes/CustomAlert/Toast/Toast.swift
+++ b/iphone/Maps/Classes/CustomAlert/Toast/Toast.swift
@@ -91,7 +91,43 @@ final class Toast: NSObject {
userInfo: nil,
repeats: false)
}
-
+
+ @objc func show(in view: UIView?, alignment: Alignment, pinToSafeArea: Bool = true, withOffset offset: CGFloat ) {
+ guard let view = view else { return }
+ blurView.translatesAutoresizingMaskIntoConstraints = false
+ view.addSubview(blurView)
+
+ let leadingConstraint = blurView.leadingAnchor.constraint(greaterThanOrEqualTo: view.leadingAnchor, constant: 16)
+ let trailingConstraint = blurView.trailingAnchor.constraint(lessThanOrEqualTo: view.trailingAnchor, constant: -16)
+
+ NSLayoutConstraint.activate([
+ leadingConstraint,
+ trailingConstraint
+ ])
+
+ let verticalConstraint: NSLayoutConstraint
+ if alignment == .bottom {
+ verticalConstraint = blurView.bottomAnchor.constraint(equalTo: pinToSafeArea ? view.safeAreaLayoutGuide.bottomAnchor : view.bottomAnchor, constant: offset)
+ } else {
+ verticalConstraint = blurView.topAnchor.constraint(equalTo: pinToSafeArea ? view.safeAreaLayoutGuide.topAnchor : view.topAnchor, constant: offset)
+ }
+
+ NSLayoutConstraint.activate([
+ verticalConstraint,
+ blurView.centerXAnchor.constraint(equalTo: pinToSafeArea ? view.safeAreaLayoutGuide.centerXAnchor : view.centerXAnchor)
+ ])
+
+ UIView.animate(withDuration: kDefaultAnimationDuration) {
+ self.blurView.alpha = 1
+ }
+
+ timer = Timer.scheduledTimer(timeInterval: 3,
+ target: self,
+ selector: #selector(hide),
+ userInfo: nil,
+ repeats: false)
+ }
+
@objc func hide() {
timer?.invalidate()
if self.blurView.superview != nil {
@@ -101,4 +137,4 @@ final class Toast: NSObject {
Self.toasts.removeAll(where: { $0 === self }) }
}
}
-}
+}
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoVIewTests.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoVIewTests.swift
new file mode 100644
index 0000000000..8c2b1cabe8
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoVIewTests.swift
@@ -0,0 +1,66 @@
+import XCTest
+@testable import Organic_Maps_Debug
+
+final class MWMNavigationInfoViewTests: XCTestCase {
+
+ var userDefaults: UserDefaults!
+
+ override func setUp() {
+ super.setUp()
+ userDefaults = UserDefaults(suiteName: "com.example.OrganicMapsTests") // Use a test-specific suite
+ userDefaults.removePersistentDomain(forName: "com.example.OrganicMapsTests") // Clear UserDefaults before each test
+ }
+
+ override func tearDown() {
+ userDefaults = nil
+ super.tearDown()
+ }
+
+ func testAddStopToastAppearsOnlyInFirstSession() {
+
+ // Simulate first session
+ var isFirstSession = false;
+ if ( userDefaults.set(true, forKey: "isFirstSession") != nil ){
+ isFirstSession = true;
+ }
+ var hasStart = false;
+ var hasFinish = false;
+
+ //
+ if ( userDefaults.set(true, forKey: "hasStart") != nil ){
+ hasStart = true;
+ }
+ if ( userDefaults.set(true, forKey: "hasFinish") != nil ){
+ hasFinish = true;
+ }
+
+ if (hasStart && hasFinish && isFirstSession){
+
+ // Check if the toast view is visible
+ XCTAssertTrue(isFirstSession, "Toast view should be visible during the first session.")
+
+ }else if ( hasStart && hasFinish && !isFirstSession){
+
+ // Check if the toast view is hidden
+ XCTAssertFalse(!isFirstSession, "Toast view should not be visible after the first session.")
+ }
+
+
+ // Simulate subsequent session
+ if ( userDefaults.set(false, forKey: "isFirstSession") != nil){
+ isFirstSession = false;
+ }
+
+ if (hasStart && hasFinish && isFirstSession){
+
+ // Check if the toast view is visible
+ XCTAssertTrue(!isFirstSession, "Toast view should be visible during the first session.")
+
+ }else if ( hasStart && hasFinish && !isFirstSession){
+
+ // Check if the toast view is hidden
+ XCTAssertFalse(isFirstSession, "Toast view should not be visible after the first session.")
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
index fe608f7dd0..becc693068 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
@@ -12,6 +12,8 @@
#import "UIImageView+Coloring.h"
#import "location_util.h"
+#include
+
#include "geometry/angles.hpp"
namespace
@@ -92,6 +94,7 @@ BOOL defaultOrientation(CGSize const &size) {
@property(weak, nonatomic) MWMNavigationDashboardEntity *navigationInfo;
@property(nonatomic) BOOL hasLocation;
+@property(nonatomic) BOOL hasShownAddStopToast;
@property(nonatomic) NSLayoutConstraint *topConstraint;
@property(nonatomic) NSLayoutConstraint *leftConstraint;
@@ -117,8 +120,22 @@ BOOL defaultOrientation(CGSize const &size) {
BOOL const hasStart = ([MWMRouter startPoint] != nil);
BOOL const hasFinish = ([MWMRouter finishPoint] != nil);
+ Framework::DrapeCreationParams p;
+ BOOL const isFirstLaunch = [FirstSession isFirstSession];
+ BOOL const hasShownAddStopHint = [FirstSession hasShownAddStopToast];
self.hasLocation = ([MWMLocationManager lastLocation] != nil);
+
+ if (hasStart && hasFinish && isFirstLaunch && !hasShownAddStopHint) {
+ [self setToastViewHidden:YES];
+
+ MWMToast *toast = [MWMToast toastWithText:L(@"routing_add_stop_point")];
+
+ [toast showIn:[UIApplication sharedApplication].keyWindow alignment:MWMToastAlignmentBottom pinToSafeArea:YES withOffset:-103];
+
+ return;
+ }
+
if (hasStart && hasFinish) {
[self setToastViewHidden:YES];
return;
@@ -144,6 +161,10 @@ BOOL defaultOrientation(CGSize const &size) {
[toastView configWithIsStart:YES withLocationButton:NO];
}
+-(BOOL)isFirstLaunch{
+ return self.isFirstLaunch;
+}
+
- (IBAction)openSearch {
BOOL const isStart = self.toastView.isStart;
auto searchManager = [MWMSearchManager manager];
@@ -489,4 +510,4 @@ BOOL defaultOrientation(CGSize const &size) {
- (void)applyTheme {
[self setSearchState:_searchState];
}
-@end
+@end
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift
index 9fc700476f..2212d3ae81 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.swift
@@ -207,6 +207,11 @@ final class RouteManagerViewController: MWMViewController, UITableViewDataSource
})
}
+ @IBAction func onAddStop(_ sender: UIButton) {
+ viewModel.addRoutePoint()
+ dismiss(animated: true, completion: nil)
+ }
+
@IBAction private func gestureRecognized(_ longPress: UIGestureRecognizer) {
let locationInView = gestureLocation(longPress, in: containerView)
let locationInTableView = gestureLocation(longPress, in: tableView)
@@ -254,4 +259,4 @@ final class RouteManagerViewController: MWMViewController, UITableViewDataSource
func tableView(_: UITableView, editingStyleForRowAt _: IndexPath) -> UITableViewCell.EditingStyle {
return canDeleteRow ? .delete : .none
}
-}
+}
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib
index 939db26e45..59c0ec5096 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib
@@ -1,9 +1,9 @@
-
+
-
+
@@ -23,14 +23,14 @@
-
+
-
+
@@ -40,7 +40,7 @@
+
@@ -81,7 +82,6 @@
-
@@ -100,11 +100,11 @@
-
+
-
+
@@ -155,7 +167,7 @@
-
+
@@ -175,7 +187,7 @@
-
-
+
@@ -263,6 +275,7 @@
+
@@ -272,8 +285,7 @@
-
-
+
@@ -290,4 +302,4 @@
-
+
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModel.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModel.swift
index 57ff63eb14..6c482fcb76 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModel.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModel.swift
@@ -18,6 +18,9 @@ final class RouteManagerViewModel: NSObject, RouteManagerViewModelProtocol {
MWMRouter.updatePreviewMode()
refreshControlsCallback()
}
+ func addRoutePoint() {
+ MWMRouter.cancelRouteManagerTransaction()
+ }
func movePoint(at index: Int, to newIndex: Int) {
MWMRouter.movePoint(at: index, to: newIndex)
MWMRouter.updatePreviewMode()
@@ -29,4 +32,4 @@ final class RouteManagerViewModel: NSObject, RouteManagerViewModelProtocol {
refreshControlsCallback()
reloadCallback()
}
-}
+}
\ No newline at end of file
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModelProtocol.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModelProtocol.swift
index c8700af447..8a68cb984d 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModelProtocol.swift
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewModelProtocol.swift
@@ -10,6 +10,7 @@ protocol RouteManagerViewModelProtocol: AnyObject {
func cancelTransaction()
func addLocationPoint()
+ func addRoutePoint()
func movePoint(at index: Int, to newIndex: Int)
func deletePoint(at index: Int)
-}
+}
\ No newline at end of file
diff --git a/iphone/Maps/Classes/FirstSession.h b/iphone/Maps/Classes/FirstSession.h
index e4d2c29c29..b05a73c95d 100644
--- a/iphone/Maps/Classes/FirstSession.h
+++ b/iphone/Maps/Classes/FirstSession.h
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/***************************
The MIT License (MIT)
Copyright (c) 2021 Alexander Borsuk from Minsk, Belarus
@@ -20,7 +20,7 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- *******************************************************************************/
+ ***************************/
#ifndef FIRSTSESSION_H
#define FIRSTSESSION_H
@@ -40,6 +40,8 @@
+ (void)setup:(NSArray *)serverUrls withLaunchOptions:(NSDictionary *)options;
// Returns YES if it is a first session, before app goes into background.
+ (BOOL)isFirstSession;
+// Returns YES if it has already showed the add stop hint.
++ (BOOL)hasShownAddStopToast;
// Returns summary time of all active user sessions up to now.
+ (NSInteger)totalSecondsSpentInTheApp;
@@ -57,4 +59,4 @@
+ (NSString *)installationId;
@end
-#endif // #ifndef FIRSTSESSION_H
+#endif // #ifndef FIRSTSESSION_H
\ No newline at end of file
diff --git a/iphone/Maps/Classes/FirstSession.mm b/iphone/Maps/Classes/FirstSession.mm
index 6ea496b06a..59b896ca8e 100644
--- a/iphone/Maps/Classes/FirstSession.mm
+++ b/iphone/Maps/Classes/FirstSession.mm
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/***************************
The MIT License (MIT)
Copyright (c) 2021 Alexander Borsuk from Minsk, Belarus
@@ -20,7 +20,7 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- *******************************************************************************/
+ ***************************/
#if ! __has_feature(objc_arc)
#error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag
@@ -60,6 +60,7 @@ static NSString * const kIsAlohalyticsDisabledKey = @"AlohalyticsDisabledKey";
// setup should be called to activate counting.
static NSDate * gSessionStartTime = nil;
static BOOL gIsFirstSession = NO;
+static int gHasShownAddStopToast = 1;
static NSString * gInstallationId = nil;
@implementation FirstSession
@@ -92,6 +93,11 @@ static NSString * gInstallationId = nil;
return [self installationId] != nil && gIsFirstSession;
}
++ (BOOL)hasShownAddStopToast {
+ gHasShownAddStopToast -= 1;
+ return gHasShownAddStopToast==1;
+}
+
+ (NSDate *)firstLaunchDate {
NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];
NSDate * date = [ud objectForKey:kFirstLaunchDateKey];
@@ -147,4 +153,4 @@ static NSString * gInstallationId = nil;
return gInstallationId;
}
-@end
+@end
\ No newline at end of file
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 602ebaa971..2eeee45055 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -926,6 +926,8 @@
"routing_add_start_point" = "Add a starting point to plan a route";
+"routing_add_stop_point" = "Select any place to add an intermediate stop"
+
"routing_add_finish_point" = "Add a destination to plan a route";
"planning_route_manage_route" = "Manage Route";
@@ -3907,4 +3909,4 @@
"type.shop.auction" = "Auction";
-"type.shop.collector" = "Collectables";
+"type.shop.collector" = "Collectables";
\ No newline at end of file
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 8c3e9cf071..5921b2e48e 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -926,6 +926,8 @@
"routing_add_start_point" = "Add a starting point to plan a route";
+"routing_add_stop_point" = "Select any place to add an intermediate stop"
+
"routing_add_finish_point" = "Add a destination to plan a route";
"planning_route_manage_route" = "Manage Route";
@@ -3907,4 +3909,4 @@
"type.shop.auction" = "Auction";
-"type.shop.collector" = "Collectables";
+"type.shop.collector" = "Collectables";
\ No newline at end of file
diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index fab7dd21e1..4c0d382e75 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -103,7 +103,6 @@ RouteMarkData GetLastPassedPoint(BookmarkManager * bmManager, vectorMyPositionMark().GetPivot();
data.m_isMyPosition = false;
- data.m_replaceWithMyPositionAfterRestart = true;
}
return data;
@@ -117,7 +116,6 @@ void SerializeRoutePoint(json_t * node, RouteMarkData const & data)
ToJSONObject(*node, "subtitle", data.m_subTitle);
ToJSONObject(*node, "x", data.m_position.x);
ToJSONObject(*node, "y", data.m_position.y);
- ToJSONObject(*node, "replaceWithMyPosition", data.m_replaceWithMyPositionAfterRestart);
}
RouteMarkData DeserializeRoutePoint(json_t * node)
@@ -135,8 +133,6 @@ RouteMarkData DeserializeRoutePoint(json_t * node)
FromJSONObject(node, "x", data.m_position.x);
FromJSONObject(node, "y", data.m_position.y);
- FromJSONObject(node, "replaceWithMyPosition", data.m_replaceWithMyPositionAfterRestart);
-
return data;
}
@@ -151,7 +147,7 @@ string SerializeRoutePoints(vector const & points)
json_array_append_new(pointsNode.get(), pointNode.release());
}
unique_ptr buffer(
- json_dumps(pointsNode.get(), JSON_COMPACT));
+ json_dumps(pointsNode.get(), JSON_COMPACT | JSON_ENSURE_ASCII));
return string(buffer.get());
}
@@ -418,7 +414,7 @@ void RoutingManager::OnBuildRouteReady(Route const & route, RouterResultCode cod
m2::RectD routeRect = route.GetPoly().GetLimitRect();
routeRect.Scale(kRouteScaleMultiplier);
m_drapeEngine.SafeCall(&df::DrapeEngine::SetModelViewRect, routeRect,
- true /* applyRotation */, -1 /* zoom */, true /* isAnim */,
+ true /* applyRotation /, -1 / zoom /, true / isAnim */,
true /* useVisibleViewport */);
}
@@ -834,8 +830,12 @@ size_t RoutingManager::GetRoutePointsCount() const
bool RoutingManager::CouldAddIntermediatePoint() const
{
- if (!IsRoutingActive())
+ //if there isn't already a start or a finish point, we can't add an intermediate point
+ RoutePointsLayout routePoints(*m_bmManager);
+ int pointsCount = routePoints.GetRoutePointsCount();
+ if ( pointsCount == 0){
return false;
+ }
return m_bmManager->GetUserMarkIds(UserMark::Type::ROUTING).size()
< RoutePointsLayout::kMaxIntermediatePointsCount + 2;
@@ -995,9 +995,9 @@ void RoutingManager::ReorderIntermediatePoints()
prevPoints[i]->SetIntermediateIndex(i < insertIndex ? i : i + 1);
}
-void RoutingManager::GenerateNotifications(vector & turnNotifications, bool announceStreets)
+void RoutingManager::GenerateNotifications(vector & turnNotifications)
{
- m_routingSession.GenerateNotifications(turnNotifications, announceStreets);
+ m_routingSession.GenerateNotifications(turnNotifications);
}
void RoutingManager::BuildRoute(uint32_t timeoutSec)
@@ -1055,7 +1055,7 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
//m2::RectD rect = ShowPreviewSegments(routePoints);
//rect.Scale(kRouteScaleMultiplier);
//m_drapeEngine.SafeCall(&df::DrapeEngine::SetModelViewRect, rect, true /* applyRotation */,
- // -1 /* zoom */, true /* isAnim */, true /* useVisibleViewport */);
+ // -1 /* zoom /, true / isAnim /, true / useVisibleViewport */);
m_routingSession.ClearPositionAccumulator();
m_routingSession.SetUserCurrentPosition(routePoints.front().m_position);
@@ -1111,7 +1111,7 @@ void RoutingManager::CheckLocationForRouting(location::GpsInfo const & info)
m_routingSession.RebuildRoute(
mercator::FromLatLon(info.m_latitude, info.m_longitude),
[this](Route const & route, RouterResultCode code) { OnRebuildRouteReady(route, code); },
- nullptr /* needMoreMapsCallback */, nullptr /* removeRouteCallback */,
+ nullptr /* needMoreMapsCallback /, nullptr / removeRouteCallback */,
RouterDelegate::kNoTimeout, SessionState::RouteRebuilding, true /* adjustToPrevRoute */);
}
}
@@ -1401,18 +1401,13 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler)
[this, handler, points = std::move(points)]() mutable
{
ASSERT(m_bmManager != nullptr, ());
- // If we have found my position and the saved route used the user's position, we use my position as start point.
- bool routeUsedPosition = false;
+ // If we have found my position, we use my position as start point.
auto const & myPosMark = m_bmManager->MyPositionMark();
auto editSession = m_bmManager->GetEditSession();
editSession.ClearGroup(UserMark::Type::ROUTING);
for (auto & p : points)
{
- // Check if the saved route used the user's position
- if (p.m_replaceWithMyPositionAfterRestart && p.m_pointType == RouteMarkType::Start)
- routeUsedPosition = true;
-
- if (p.m_replaceWithMyPositionAfterRestart && p.m_pointType == RouteMarkType::Start && myPosMark.HasPosition())
+ if (p.m_pointType == RouteMarkType::Start && myPosMark.HasPosition())
{
RouteMarkData startPt;
startPt.m_pointType = RouteMarkType::Start;
@@ -1426,9 +1421,9 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler)
}
}
- // If we don't have my position and the saved route used it, save loading timestamp.
- // Probably we will get my position soon.
- if (routeUsedPosition && !myPosMark.HasPosition())
+ // If we don't have my position, save loading timestamp. Probably
+ // we will get my position soon.
+ if (!myPosMark.HasPosition())
m_loadRoutePointsTimestamp = chrono::steady_clock::now();
if (handler)
@@ -1574,4 +1569,4 @@ void RoutingManager::SetSubroutesVisibility(bool visible)
bool RoutingManager::IsSpeedCamLimitExceeded() const
{
return m_routingSession.IsSpeedCamLimitExceeded();
-}
+}
\ No newline at end of file