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

[iOS] pass serverID to elevation profile stats

Browse source 
https://jira.mail.ru/browse/MAPSME-13635
This commit is contained in:
Aleksey Belousov 2020-04-10 17:37:44 +03:00 • committed by Vladimir Byko-Ianko
parent 5ea074b1ef
commit b0f6d6a7ab
5 changed files with 8 additions and 2 deletions
iphone
CoreApi/CoreApi/PlacePageData
ElevationProfile
ElevationProfileData+Core.hElevationProfileData.hElevationProfileData.mm
PlacePageData.mm
Maps/UI/PlacePage/Components/ElevationProfile
ElevationProfilePresenter.swift

1
iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h
View file

@ -7,6 +7,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface ElevationProfileData (Core)
- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo
serverId:(NSString *)serverId
activePoint:(double)activePoint
myPosition:(double)myPosition;

1
iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h
View file

@ -13,6 +13,7 @@ typedef NS_ENUM(NSInteger, ElevationDifficulty) {
@interface ElevationProfileData : NSObject
@property(nonatomic, readonly) uint64_t trackId;
@property(nonatomic, readonly) NSString *serverId;
@property(nonatomic, readonly) NSUInteger ascent;
@property(nonatomic, readonly) NSUInteger descent;
@property(nonatomic, readonly) NSUInteger maxAttitude;

2
iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm
View file

@ -21,10 +21,12 @@ static ElevationDifficulty convertDifficulty(uint8_t difficulty) {
@implementation ElevationProfileData (Core)
- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo
serverId:(NSString *)serverId
activePoint:(double)activePoint
myPosition:(double)myPosition {
self = [super init];
if (self) {
_serverId = serverId;
_trackId = elevationInfo.GetId();
_ascent = elevationInfo.GetAscent();
_descent = elevationInfo.GetDescent();

2
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
View file

@ -135,7 +135,9 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
auto const &bm = GetFramework().GetBookmarkManager();
auto const &trackId = rawData().GetTrackId();
auto const &elevationInfo = bm.MakeElevationInfo(trackId);
auto const &serverId = bm.GetCategoryServerId(rawData().GetBookmarkCategoryId());
_elevationProfileData = [[ElevationProfileData alloc] initWithElevationInfo:elevationInfo
serverId:@(serverId.c_str())
activePoint:bm.GetElevationActivePoint(trackId)
myPosition:bm.GetElevationMyPosition(trackId)];
_previewData = [[PlacePagePreviewData alloc] initWithElevationInfo:elevationInfo];

4
iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
View file

@ -89,12 +89,12 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
}
func onAppear() {
Statistics.logEvent(kStatElevationProfilePageOpen, withParameters: [kStatServerId: data.trackId,
Statistics.logEvent(kStatElevationProfilePageOpen, withParameters: [kStatServerId: data.serverId,
kStatState: "preview"])
}
func onDissapear() {
Statistics.logEvent(kStatElevationProfilePageClose, withParameters: [kStatServerId: data.trackId])
Statistics.logEvent(kStatElevationProfilePageClose, withParameters: [kStatServerId: data.serverId])
}
func onDifficultyButtonPressed() {