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

[MAPSME-5374] [ios] Refactored router type.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-08-17 14:31:26 +03:00 • committed by Vladimir Byko-Ianko
parent 56d85c3666
commit 8da13713ba
6 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h
View file

@ -1,4 +1,5 @@
#import "MWMCircularProgressState.h"
#import "MWMRouterType.h"
@class MWMNavigationDashboardEntity;
@class MWMNavigationDashboardManager;

7
iphone/Maps/Common/MWMTypes.h
View file

@ -6,13 +6,6 @@ typedef NS_ENUM(NSUInteger, MWMDayTime) { MWMDayTimeDay, MWMDayTimeNight };
typedef NS_ENUM(NSUInteger, MWMUnits) { MWMUnitsMetric, MWMUnitsImperial };
typedef NS_ENUM(NSUInteger, MWMRouterType) {
MWMRouterTypeVehicle,
MWMRouterTypePedestrian,
MWMRouterTypeBicycle,
MWMRouterTypeTaxi
};
typedef NS_ENUM(NSUInteger, MWMTheme) {
MWMThemeDay,
MWMThemeNight,

2
iphone/Maps/Core/Routing/MWMCoreRouterType.h
View file

@ -1,3 +1,5 @@
#import "MWMRouterType.h"
#include "routing/router.hpp"
static inline routing::RouterType coreRouterType(MWMRouterType type)

1
iphone/Maps/Core/Routing/MWMRouter.h
View file

@ -1,4 +1,5 @@
#import "MWMRoutePoint.h"
#import "MWMRouterType.h"
typedef void (^MWMImageHeightBlock)(UIImage *, NSString *);

6
iphone/Maps/Core/Routing/MWMRouterType.h Normal file
View file

@ -0,0 +1,6 @@
typedef NS_ENUM(NSUInteger, MWMRouterType) {
MWMRouterTypeVehicle,
MWMRouterTypePedestrian,
MWMRouterTypeBicycle,
MWMRouterTypeTaxi
};

2
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -1873,6 +1873,7 @@
342360A61F34906700AFE44D /* RouteManagerCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RouteManagerCell.xib; sourceTree = "<group>"; };
342360B11F349F9800AFE44D /* MWMRouteManagerPointType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouteManagerPointType.h; sourceTree = "<group>"; };
342639461EA0FDB30025EB89 /* MWMSearchItemType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchItemType.h; sourceTree = "<group>"; };
3426DEB11F45AE2800D1C43C /* MWMRouterType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterType.h; sourceTree = "<group>"; };
3427AF0B1E49E3A500D466DB /* MWMConsts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMConsts.h; sourceTree = "<group>"; };
342CC5EF1C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationLoginViewController.h; sourceTree = "<group>"; };
342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationLoginViewController.mm; sourceTree = "<group>"; };
@ -3083,6 +3084,7 @@
340475351E081A4600C92850 /* MWMRouter.h */,
340475361E081A4600C92850 /* MWMRouter.mm */,
340B33C41F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm */,
3426DEB11F45AE2800D1C43C /* MWMRouterType.h */,
);
path = Routing;
sourceTree = "<group>";