diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h index 5c784f4124..b1511b8386 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h @@ -1,4 +1,5 @@ #import "MWMCircularProgressState.h" +#import "MWMRouterType.h" @class MWMNavigationDashboardEntity; @class MWMNavigationDashboardManager; diff --git a/iphone/Maps/Common/MWMTypes.h b/iphone/Maps/Common/MWMTypes.h index c0394d7e7d..a719c76586 100644 --- a/iphone/Maps/Common/MWMTypes.h +++ b/iphone/Maps/Common/MWMTypes.h @@ -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, diff --git a/iphone/Maps/Core/Routing/MWMCoreRouterType.h b/iphone/Maps/Core/Routing/MWMCoreRouterType.h index 6b1e853244..b9690f9368 100644 --- a/iphone/Maps/Core/Routing/MWMCoreRouterType.h +++ b/iphone/Maps/Core/Routing/MWMCoreRouterType.h @@ -1,3 +1,5 @@ +#import "MWMRouterType.h" + #include "routing/router.hpp" static inline routing::RouterType coreRouterType(MWMRouterType type) diff --git a/iphone/Maps/Core/Routing/MWMRouter.h b/iphone/Maps/Core/Routing/MWMRouter.h index a9015e6451..451a070601 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.h +++ b/iphone/Maps/Core/Routing/MWMRouter.h @@ -1,4 +1,5 @@ #import "MWMRoutePoint.h" +#import "MWMRouterType.h" typedef void (^MWMImageHeightBlock)(UIImage *, NSString *); diff --git a/iphone/Maps/Core/Routing/MWMRouterType.h b/iphone/Maps/Core/Routing/MWMRouterType.h new file mode 100644 index 0000000000..69988fcd2e --- /dev/null +++ b/iphone/Maps/Core/Routing/MWMRouterType.h @@ -0,0 +1,6 @@ +typedef NS_ENUM(NSUInteger, MWMRouterType) { + MWMRouterTypeVehicle, + MWMRouterTypePedestrian, + MWMRouterTypeBicycle, + MWMRouterTypeTaxi +}; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index d96c6c34ce..8a8fcb9d6d 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -1873,6 +1873,7 @@ 342360A61F34906700AFE44D /* RouteManagerCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RouteManagerCell.xib; sourceTree = ""; }; 342360B11F349F9800AFE44D /* MWMRouteManagerPointType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouteManagerPointType.h; sourceTree = ""; }; 342639461EA0FDB30025EB89 /* MWMSearchItemType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchItemType.h; sourceTree = ""; }; + 3426DEB11F45AE2800D1C43C /* MWMRouterType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterType.h; sourceTree = ""; }; 3427AF0B1E49E3A500D466DB /* MWMConsts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMConsts.h; sourceTree = ""; }; 342CC5EF1C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationLoginViewController.h; sourceTree = ""; }; 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationLoginViewController.mm; sourceTree = ""; }; @@ -3083,6 +3084,7 @@ 340475351E081A4600C92850 /* MWMRouter.h */, 340475361E081A4600C92850 /* MWMRouter.mm */, 340B33C41F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm */, + 3426DEB11F45AE2800D1C43C /* MWMRouterType.h */, ); path = Routing; sourceTree = "";