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

[MAPSME-5374] Updated intermediateIndex type.

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

4
iphone/Maps/Core/Routing/MWMRoutePoint+CPP.h
View file

@ -9,12 +9,12 @@
- (instancetype)initWithURLSchemeRoutePoint:(url_scheme::RoutePoint const &)point
type:(MWMRoutePointType)type
intermediateIndex:(int8_t)intermediateIndex;
intermediateIndex:(size_t)intermediateIndex;
- (instancetype)initWithRouteMarkData:(RouteMarkData const &)point;
- (instancetype)initWithPoint:(m2::PointD const &)point
title:(NSString *)title
subtitle:(NSString *)subtitle
type:(MWMRoutePointType)type
intermediateIndex:(int8_t)intermediateIndex;
intermediateIndex:(size_t)intermediateIndex;
@end

4
iphone/Maps/Core/Routing/MWMRoutePoint.h
View file

@ -7,14 +7,14 @@ typedef NS_ENUM(NSUInteger, MWMRoutePointType) {
@interface MWMRoutePoint : NSObject
- (instancetype)initWithLastLocationAndType:(MWMRoutePointType)type
intermediateIndex:(int8_t)intermediateIndex;
intermediateIndex:(size_t)intermediateIndex;
@property(copy, nonatomic, readonly) NSString * title;
@property(copy, nonatomic, readonly) NSString * subtitle;
@property(copy, nonatomic, readonly) NSString * latLonString;
@property(nonatomic, readonly) BOOL isMyPosition;
@property(nonatomic) MWMRoutePointType type;
@property(nonatomic) int8_t intermediateIndex;
@property(nonatomic) size_t intermediateIndex;
@property(nonatomic, readonly) double latitude;
@property(nonatomic, readonly) double longitude;

6
iphone/Maps/Core/Routing/MWMRoutePoint.mm
View file

@ -17,7 +17,7 @@
@implementation MWMRoutePoint
- (instancetype)initWithLastLocationAndType:(MWMRoutePointType)type
intermediateIndex:(int8_t)intermediateIndex
intermediateIndex:(size_t)intermediateIndex
{
auto lastLocation = [MWMLocationManager lastLocation];
if (!lastLocation)
@ -40,7 +40,7 @@
- (instancetype)initWithURLSchemeRoutePoint:(url_scheme::RoutePoint const &)point
type:(MWMRoutePointType)type
intermediateIndex:(int8_t)intermediateIndex
intermediateIndex:(size_t)intermediateIndex
{
self = [super init];
if (self)
@ -83,7 +83,7 @@
title:(NSString *)title
subtitle:(NSString *)subtitle
type:(MWMRoutePointType)type
intermediateIndex:(int8_t)intermediateIndex
intermediateIndex:(size_t)intermediateIndex
{
self = [super init];
if (self)

2
iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
View file

@ -731,7 +731,7 @@ using namespace place_page;
#pragma mark - Getters
- (RouteMarkType)routeMarkType { return m_info.GetRouteMarkType(); }
- (int8_t)intermediateIndex { return m_info.GetIntermediateIndex(); }
- (size_t)intermediateIndex { return m_info.GetIntermediateIndex(); }
- (NSString *)address { return @(m_info.GetAddress().c_str()); }
- (NSString *)apiURL { return @(m_info.GetApiUrl().c_str()); }
- (std::vector<Sections> const &)sections { return m_sections; }

2
iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
View file

@ -367,7 +367,7 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
}
- (MWMRoutePoint *)routePointWithType:(MWMRoutePointType)type
intermediateIndex:(int8_t)intermediateIndex
intermediateIndex:(size_t)intermediateIndex
{
auto data = self.data;
if (!data)

6
map/place_page_info.hpp
View file

@ -171,8 +171,8 @@ public:
/// Routing
void SetRouteMarkType(RouteMarkType type) { m_routeMarkType = type; }
RouteMarkType GetRouteMarkType() const { return m_routeMarkType; }
void SetIntermediateIndex(int8_t index) { m_intermediateIndex = index; }
int8_t GetIntermediateIndex() const { return m_intermediateIndex; }
void SetIntermediateIndex(size_t index) { m_intermediateIndex = index; }
size_t GetIntermediateIndex() const { return m_intermediateIndex; }
void SetIsRoutePoint() { m_isRoutePoint = true; }
/// CountryId
@ -236,7 +236,7 @@ private:
/// Routing
RouteMarkType m_routeMarkType;
int8_t m_intermediateIndex = 0;
size_t m_intermediateIndex = 0;
bool m_isRoutePoint = false;
bool m_isMyPosition = false;