pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed iOS build

Browse source
This commit is contained in:
VladiMihaylenko 2017-06-05 13:31:31 +03:00
parent 337806ef56
commit 8c2a0f67ae
14 changed files with 68 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -264,7 +264,7 @@ extern NSString * const kAlohalyticsTapEventKey;
MapViewController * ownerController = self.ownerController;
if (platform::migrate::NeedMigrate())
{
if (GetFramework().IsRoutingActive())
if (GetFramework().GetRoutingManager().IsRoutingActive())
{
[Statistics logEvent:kStatDownloaderMigrationProhibitedDialogue
withParameters:@{kStatFrom : kStatDownloader}];
@ -441,7 +441,7 @@ extern NSString * const kAlohalyticsTapEventKey;
if (![MWMRouter router].startPoint.isMyPosition)
{
dispatch_async(dispatch_get_main_queue(), ^{
GetFramework().DisableFollowMode();
GetFramework().GetRoutingManager().DisableFollowMode();
[self.navigationManager updateDashboard];
});
}

2
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
View file

@ -206,7 +206,7 @@ NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger im
- (BOOL)zoomHidden { return self.sideView.zoomHidden; }
- (void)setZoomHidden:(BOOL)zoomHidden
{
if (GetFramework().IsRoutingActive())
if (GetFramework().GetRoutingManager().IsRoutingActive())
self.sideView.zoomHidden = NO;
else
self.sideView.zoomHidden = [MWMSettings zoomButtonsEnabled] ? zoomHidden : YES;

4
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
View file

@ -23,7 +23,7 @@ using namespace routing::turns;
_progress = info.m_completionPercent;
auto & f = GetFramework();
CLLocation * lastLocation = [MWMLocationManager lastLocation];
if (lastLocation && f.GetRouter() == routing::RouterType::Pedestrian)
if (lastLocation && f.GetRoutingManager().GetRouter() == routing::RouterType::Pedestrian)
{
_isPedestrian = YES;
string distance;
@ -78,7 +78,7 @@ using namespace routing::turns;
UIImage * image(routing::turns::TurnDirection t, bool isNextTurn)
{
if (GetFramework().GetRouter() == routing::RouterType::Pedestrian)
if (GetFramework().GetRoutingManager().GetRouter() == routing::RouterType::Pedestrian)
return [UIImage imageNamed:@"ic_direction"];
NSString * imageName;

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -65,7 +65,7 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
- (void)updateFollowingInfo:(location::FollowingInfo const &)info
{
if (GetFramework().IsRouteFinished())
if (GetFramework().GetRoutingManager().IsRouteFinished())
{
[MWMRouter stopRouting];
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);

15
iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
View file

@ -153,7 +153,7 @@ vector<pair<string, string>> availableLanguages()
if (active && ![self isValid])
[self createSynthesizer];
[self setAudioSessionActive:active];
GetFramework().EnableTurnNotifications(active ? true : false);
GetFramework().GetRoutingManager().EnableTurnNotifications(active ? true : false);
runAsyncOnMainQueue(^{
[[NSNotificationCenter defaultCenter]
postNotificationName:[[self class] ttsStatusNotificationKey]
@ -164,7 +164,10 @@ vector<pair<string, string>> availableLanguages()
- (BOOL)active
{
return [[self class] isTTSEnabled] && GetFramework().AreTurnNotificationsEnabled() ? YES : NO;
return [[self class] isTTSEnabled] &&
GetFramework().GetRoutingManager().AreTurnNotificationsEnabled()
? YES
: NO;
}
+ (NSString *)savedLanguage
@ -222,7 +225,7 @@ vector<pair<string, string>> availableLanguages()
LOG(LERROR, ("Cannot convert UI locale or default locale to twine language. MWMTextToSpeech "
"is invalid."));
else
GetFramework().SetTurnNotificationsLocale(twineLang);
GetFramework().GetRoutingManager().SetTurnNotificationsLocale(twineLang);
}
else
{
@ -242,12 +245,12 @@ vector<pair<string, string>> availableLanguages()
- (void)playTurnNotifications
{
Framework & frm = GetFramework();
if (!frm.IsRoutingActive())
auto & routingManager = GetFramework().GetRoutingManager();
if (!routingManager.IsRoutingActive())
return;
vector<string> notifications;
frm.GenerateTurnNotifications(notifications);
routingManager.GenerateTurnNotifications(notifications);
if (![self isValid])
return;

4
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -235,7 +235,7 @@ using namespace osm_auth_ios;
case ParsedMapApi::ParsingResult::Route:
{
auto const parsedData = f.GetParsedRoutingData();
f.SetRouter(parsedData.m_type);
f.GetRoutingManager().SetRouter(parsedData.m_type);
auto const points = parsedData.m_points;
auto const & p1 = points[0];
auto const & p2 = points[1];
@ -944,7 +944,7 @@ using namespace osm_auth_ios;
- (void)showAlert:(BOOL)isRate
{
if (!Platform::IsConnected() || GetFramework().IsRoutingActive())
if (!Platform::IsConnected() || GetFramework().GetRoutingManager().IsRoutingActive())
return;
if (isRate)

2
iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
View file

@ -98,7 +98,7 @@ using namespace storage;
NodeAttrs nodeAttrs;
s.GetNodeAttrs(m_countryId, nodeAttrs);
if (!nodeAttrs.m_present && !f.IsRoutingActive())
if (!nodeAttrs.m_present && !f.GetRoutingManager().IsRoutingActive())
{
BOOL const isMultiParent = nodeAttrs.m_parentInfo.size() > 1;
BOOL const noParrent = (nodeAttrs.m_parentInfo[0].m_id == s.GetRootId());

4
iphone/Maps/Core/Framework/MWMFrameworkListener.mm
View file

@ -106,13 +106,13 @@ void loopWrappers(TObservers * observers, TLoopBlock block)
// This will help to avoid unnecessary parameters copying and will make all our framework
// callbacks
// consistent: every notification to UI will run on a main UI thread.
f.SetRouteBuildingListener(
f.GetRoutingManager().SetRouteBuildingListener(
[observers](IRouter::ResultCode code, TCountriesVec const & absentCountries) {
loopWrappers(observers, [code, absentCountries](TRouteBuildingObserver observer) {
[observer processRouteBuilderEvent:code countries:absentCountries];
});
});
f.SetRouteProgressListener([observers](float progress) {
f.GetRoutingManager().SetRouteProgressListener([observers](float progress) {
loopWrappers(observers, [progress](TRouteBuildingObserver observer) {
if ([observer respondsToSelector:@selector(processRouteBuilderProgress:)])
[observer processRouteBuilderProgress:progress];

12
iphone/Maps/Core/Location/MWMLocationManager.mm
View file

@ -123,10 +123,10 @@ BOOL keepRunningInBackground()
if (needGPSForTrackRecorder)
return YES;
auto const & f = GetFramework();
bool const isRouteBuilt = f.IsRouteBuilt();
bool const isRouteFinished = f.IsRouteFinished();
bool const isRouteRebuildingOnly = f.IsRouteRebuildingOnly();
auto const & routingManager = GetFramework().GetRoutingManager();
bool const isRouteBuilt = routingManager.IsRouteBuilt();
bool const isRouteFinished = routingManager.IsRouteFinished();
bool const isRouteRebuildingOnly = routingManager.IsRouteRebuildingOnly();
bool const needGPSForRouting = ((isRouteBuilt || isRouteRebuildingOnly) && !isRouteFinished);
if (needGPSForRouting)
return YES;
@ -333,9 +333,9 @@ void setPermissionRequested()
[manager.predictor setMyPositionMode:mode];
[manager processLocationStatus:manager.lastLocationStatus];
auto const & f = GetFramework();
if (f.IsRoutingActive())
if (f.GetRoutingManager().IsRoutingActive())
{
switch (f.GetRouter())
switch (f.GetRoutingManager().GetRouter())
{
case routing::RouterType::Vehicle: manager.geoMode = GeoMode::VehicleRouting; break;
case routing::RouterType::Pedestrian: manager.geoMode = GeoMode::PedestrianRouting; break;

46
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -64,8 +64,11 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
return router;
}
+ (BOOL)hasRouteAltitude { return GetFramework().HasRouteAltitude(); }
+ (BOOL)isTaxi { return GetFramework().GetRouter() == routing::RouterType::Taxi; }
+ (BOOL)hasRouteAltitude { return GetFramework().GetRoutingManager().HasRouteAltitude(); }
+ (BOOL)isTaxi
{
return GetFramework().GetRoutingManager().GetRouter() == routing::RouterType::Taxi;
}
+ (void)startRouting
{
auto router = [self router];
@ -97,7 +100,7 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
[MWMNavigationDashboardManager manager].taxiDataSource = nil;
}
+ (BOOL)isRoutingActive { return GetFramework().IsRoutingActive(); }
+ (BOOL)isRoutingActive { return GetFramework().GetRoutingManager().IsRoutingActive(); }
- (instancetype)initRouter
{
self = [super init];
@ -124,10 +127,10 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
if (type == self.type)
return;
[self doStop];
GetFramework().SetRouter(coreRouterType(type));
GetFramework().GetRoutingManager().SetRouter(coreRouterType(type));
}
- (MWMRouterType)type { return routerType(GetFramework().GetRouter()); }
- (MWMRouterType)type { return routerType(GetFramework().GetRoutingManager().GetRouter()); }
- (BOOL)arePointsValidForRouting
{
return self.startPoint.isValid && self.finishPoint.isValid && self.startPoint != self.finishPoint;
@ -196,10 +199,11 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
auto finishPoint = mercatorMWMRoutePoint(self.finishPoint);
// Taxi can't be used as best router.
if (bestRouter && ![[self class] isTaxi])
self.type = routerType(GetFramework().GetBestRouter(startPoint, finishPoint));
f.BuildRoute(startPoint, finishPoint, isP2P, 0 /* timeoutSec */);
f.SetRouteStartPoint(startPoint, isMarkerPoint(self.startPoint));
f.SetRouteFinishPoint(finishPoint, isMarkerPoint(self.finishPoint));
self.type =
routerType(GetFramework().GetRoutingManager().GetBestRouter(startPoint, finishPoint));
f.GetRoutingManager().BuildRoute(startPoint, finishPoint, isP2P, 0 /* timeoutSec */);
f.GetRoutingManager().SetRouteStartPoint(startPoint, isMarkerPoint(self.startPoint));
f.GetRoutingManager().SetRouteFinishPoint(finishPoint, isMarkerPoint(self.finishPoint));
[mapViewControlsManager onRouteRebuild];
}
@ -218,7 +222,7 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
if (self.startPoint.isMyPosition)
{
GetFramework().FollowRoute();
GetFramework().GetRoutingManager().FollowRoute();
[[MWMMapViewControlsManager manager] onRouteStart];
MapsAppDelegate * app = [MapsAppDelegate theApp];
app.routingPlaneMode = MWMRoutingPlaneModeNone;
@ -265,10 +269,10 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
{
// Don't save taxi routing type as default.
if ([[self class] isTaxi])
GetFramework().SetRouter(routing::RouterType::Vehicle);
GetFramework().GetRoutingManager().SetRouter(routing::RouterType::Vehicle);
[self clearAltitudeImagesData];
GetFramework().CloseRouting();
GetFramework().GetRoutingManager().CloseRouting();
MapsAppDelegate * app = [MapsAppDelegate theApp];
app.routingPlaneMode = MWMRoutingPlaneModeNone;
[MWMRouterSavedState remove];
@ -278,11 +282,11 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
- (void)updateFollowingInfo
{
auto & f = GetFramework();
if (!f.IsRoutingActive())
auto const & f = GetFramework();
if (!f.GetRoutingManager().IsRoutingActive())
return;
location::FollowingInfo info;
f.GetRouteFollowingInfo(info);
f.GetRoutingManager().GetRouteFollowingInfo(info);
if (info.IsValid())
[[MWMNavigationDashboardManager manager] updateFollowingInfo:info];
}
@ -308,8 +312,8 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
int32_t minRouteAltitude = 0;
int32_t maxRouteAltitude = 0;
measurement_utils::Units units = measurement_utils::Units::Metric;
if (!GetFramework().GenerateRouteAltitudeChart(width, height, imageRGBAData,
minRouteAltitude, maxRouteAltitude, units))
if (!GetFramework().GetRoutingManager().GenerateRouteAltitudeChart(
width, height, imageRGBAData, minRouteAltitude, maxRouteAltitude, units))
{
return;
}
@ -343,11 +347,11 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
- (void)onLocationUpdate:(location::GpsInfo const &)info
{
auto & f = GetFramework();
if (f.IsRoutingActive())
auto const & routingManager = GetFramework().GetRoutingManager();
if (routingManager.IsRoutingActive())
{
MWMTextToSpeech * tts = [MWMTextToSpeech tts];
if (f.IsOnRoute() && tts.active)
if (routingManager.IsOnRoute() && tts.active)
[tts playTurnNotifications];
[self updateFollowingInfo];
@ -358,7 +362,7 @@ bool isMarkerPoint(MWMRoutePoint * point) { return point.isValid && !point.isMyP
if (state.forceStateChange == MWMRouterForceStateChange::Rebuild)
{
state.forceStateChange = MWMRouterForceStateChange::Start;
self.type = routerType(GetFramework().GetLastUsedRouter());
self.type = routerType(GetFramework().GetRoutingManager().GetLastUsedRouter());
[self buildToPoint:state.restorePoint bestRouter:NO];
}
}

8
iphone/Maps/Core/Routing/MWMRouterSavedState.mm
View file

@ -49,11 +49,11 @@ static NSString * const kETAKey = @"eta";
+ (void)store
{
Framework & f = GetFramework();
if (!f.IsOnRoute())
if (!f.GetRoutingManager().IsOnRoute())
return;
location::FollowingInfo routeInfo;
f.GetRouteFollowingInfo(routeInfo);
m2::PointD const endPoint = f.GetRouteEndPoint();
f.GetRoutingManager().GetRouteFollowingInfo(routeInfo);
m2::PointD const endPoint = f.GetRoutingManager().GetRouteEndPoint();
NSMutableDictionary * const stateDict = [NSMutableDictionary dictionary];
NSUInteger size;
NSGetSizeAndAlignment(@encode(m2::PointD), &size, nullptr);
@ -75,7 +75,7 @@ static NSString * const kETAKey = @"eta";
+ (void)restore
{
if (GetFramework().IsRoutingActive())
if (GetFramework().GetRoutingManager().IsRoutingActive())
return;
if ([MWMRouterSavedState state].forceStateChange == MWMRouterForceStateChange::None)
[self remove];

2
iphone/Maps/Core/Storage/MWMStorage.mm
View file

@ -51,7 +51,7 @@ using namespace storage;
+ (void)deleteNode:(TCountryId const &)countryId
{
auto & f = GetFramework();
if (f.IsRoutingActive())
if (f.GetRoutingManager().IsRoutingActive())
{
[[MWMAlertViewController activeAlertController] presentDeleteMapProhibitedAlert];
return;

7
iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -287,10 +287,11 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
- (void)ttsButtonStatusChanged:(NSNotification *)notification
{
auto & f = GetFramework();
if (!f.IsRoutingActive())
auto const & f = GetFramework();
if (!f.GetRoutingManager().IsRoutingActive())
return;
BOOL const isPedestrianRouting = f.GetRouter() == routing::RouterType::Pedestrian;
BOOL const isPedestrianRouting =
f.GetRoutingManager().GetRouter() == routing::RouterType::Pedestrian;
MWMButton * ttsButton = self.ttsSoundButton;
ttsButton.hidden = isPedestrianRouting || ![MWMTextToSpeech isTTSEnabled];
if (!ttsButton.hidden)

8
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -109,6 +109,8 @@
F6B283081C1B03320081957A /* gps_track_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B283001C1B03320081957A /* gps_track_storage.hpp */; };
F6B283091C1B03320081957A /* gps_track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6B283011C1B03320081957A /* gps_track.cpp */; };
F6B2830A1C1B03320081957A /* gps_track.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6B283021C1B03320081957A /* gps_track.hpp */; };
F6D2CE7E1EDEB7F500636DFD /* routing_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6D2CE7C1EDEB7F500636DFD /* routing_manager.cpp */; };
F6D2CE7F1EDEB7F500636DFD /* routing_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6D2CE7D1EDEB7F500636DFD /* routing_manager.hpp */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@ -236,6 +238,8 @@
F6B283001C1B03320081957A /* gps_track_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_storage.hpp; sourceTree = "<group>"; };
F6B283011C1B03320081957A /* gps_track.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track.cpp; sourceTree = "<group>"; };
F6B283021C1B03320081957A /* gps_track.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track.hpp; sourceTree = "<group>"; };
F6D2CE7C1EDEB7F500636DFD /* routing_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_manager.cpp; sourceTree = "<group>"; };
F6D2CE7D1EDEB7F500636DFD /* routing_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_manager.hpp; sourceTree = "<group>"; };
F6DA2A961CCE24DB00F087B5 /* libdrape_frontend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape_frontend.a; path = "../../../omim-xcode-build/Debug/libdrape_frontend.a"; sourceTree = "<group>"; };
F6DA2A981CCE252600F087B5 /* libeditor.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeditor.a; path = "../../../omim-xcode-build/Debug/libeditor.a"; sourceTree = "<group>"; };
F6DA2A991CCE252600F087B5 /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "../../../omim-xcode-build/Debug/liboauthcpp.a"; sourceTree = "<group>"; };
@ -418,6 +422,8 @@
45580ABC1E2CBD5E00CD535D /* benchmark_tools.cpp */,
F63421F61DF9BF9100A96868 /* reachable_by_taxi_checker.cpp */,
F63421F71DF9BF9100A96868 /* reachable_by_taxi_checker.hpp */,
F6D2CE7C1EDEB7F500636DFD /* routing_manager.cpp */,
F6D2CE7D1EDEB7F500636DFD /* routing_manager.hpp */,
347B60741DD9926D0050FA24 /* traffic_manager.cpp */,
347B60751DD9926D0050FA24 /* traffic_manager.hpp */,
348AB57A1D7EE0C6009F8301 /* chart_generator.cpp */,
@ -495,6 +501,7 @@
6753469C1A4054E800A0A8C3 /* track.hpp in Headers */,
675346651A4054E800A0A8C3 /* framework.hpp in Headers */,
674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */,
F6D2CE7F1EDEB7F500636DFD /* routing_manager.hpp in Headers */,
670E39411C46C5C700E9C0A6 /* gps_tracker.hpp in Headers */,
45580ABF1E2CBD5E00CD535D /* benchmark_tools.hpp in Headers */,
342D833B1D5233E8000D8AEA /* displacement_mode_manager.hpp in Headers */,
@ -619,6 +626,7 @@
342D833A1D5233E8000D8AEA /* displacement_mode_manager.cpp in Sources */,
45201E931CE4AC90008A4842 /* api_mark_point.cpp in Sources */,
675346661A4054E800A0A8C3 /* ge0_parser.cpp in Sources */,
F6D2CE7E1EDEB7F500636DFD /* routing_manager.cpp in Sources */,
3D74ABBE1EA76F1D0063A898 /* local_ads_supported_types.cpp in Sources */,
0C2B73DE1E92AB9900530BB8 /* local_ads_manager.cpp in Sources */,
F6B283071C1B03320081957A /* gps_track_storage.cpp in Sources */,