fix 3

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
[ios] add TrackRecordingInfo mapper class for the core's GpsTrackInfo
2024-10-18 23:43:51 +04:00 · 2024-10-18 13:16:14 +04:00 · 2024-10-18 13:16:04 +04:00 · 2024-10-17 18:16:20 +04:00
31 changed files with 416 additions and 168 deletions
--- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
+++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
@ -88,6 +88,9 @@
 		AC6A585728057EF6003EABAF /* StringUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = AC6A585628057CC1003EABAF /* StringUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		ED0B1FF42CAAE3FF006E31A4 /* DeepLinkInAppFeatureHighlightData.h in Headers */ = {isa = PBXBuildFile; fileRef = ED0B1FF22CAAE3FF006E31A4 /* DeepLinkInAppFeatureHighlightData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		ED0B1FF52CAAE3FF006E31A4 /* DeepLinkInAppFeatureHighlightData.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED0B1FF32CAAE3FF006E31A4 /* DeepLinkInAppFeatureHighlightData.mm */; };
+		ED6FD54D2CB95A5500F6099F /* TrackStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6FD54B2CB95A5500F6099F /* TrackStatistics.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED6FD54E2CB95A5500F6099F /* TrackStatistics.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED6FD54C2CB95A5500F6099F /* TrackStatistics.mm */; };
+		ED6FD5542CB9736A00F6099F /* TrackStatistics+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6FD5532CB9736A00F6099F /* TrackStatistics+Core.h */; };
 		EDC4E3512C5D222D009286A2 /* RecentlyDeletedCategory.mm in Sources */ = {isa = PBXBuildFile; fileRef = EDC4E34E2C5D222D009286A2 /* RecentlyDeletedCategory.mm */; };
 		EDC4E3522C5D222D009286A2 /* RecentlyDeletedCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = EDC4E34F2C5D222D009286A2 /* RecentlyDeletedCategory.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EDC4E3532C5D222D009286A2 /* RecentlyDeletedCategory+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = EDC4E3502C5D222D009286A2 /* RecentlyDeletedCategory+Core.h */; };
@ -182,6 +185,9 @@
 		AC6A585628057CC1003EABAF /* StringUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringUtils.h; sourceTree = "<group>"; };
 		ED0B1FF22CAAE3FF006E31A4 /* DeepLinkInAppFeatureHighlightData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkInAppFeatureHighlightData.h; sourceTree = "<group>"; };
 		ED0B1FF32CAAE3FF006E31A4 /* DeepLinkInAppFeatureHighlightData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkInAppFeatureHighlightData.mm; sourceTree = "<group>"; };
+		ED6FD54B2CB95A5500F6099F /* TrackStatistics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrackStatistics.h; sourceTree = "<group>"; };
+		ED6FD54C2CB95A5500F6099F /* TrackStatistics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TrackStatistics.mm; sourceTree = "<group>"; };
+		ED6FD5532CB9736A00F6099F /* TrackStatistics+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TrackStatistics+Core.h"; sourceTree = "<group>"; };
 		EDC4E34E2C5D222D009286A2 /* RecentlyDeletedCategory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RecentlyDeletedCategory.mm; sourceTree = "<group>"; };
 		EDC4E34F2C5D222D009286A2 /* RecentlyDeletedCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentlyDeletedCategory.h; sourceTree = "<group>"; };
 		EDC4E3502C5D222D009286A2 /* RecentlyDeletedCategory+Core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RecentlyDeletedCategory+Core.h"; sourceTree = "<group>"; };
@ -222,6 +228,7 @@
 		470015F12342509C00EBF03D /* CoreApi */ = {
 			isa = PBXGroup;
 			children = (
+				ED6FD5452CB959EE00F6099F /* TrackRecorder */,
 				47F4F1F623A333280022FD56 /* Storage */,
 				9957FAE5237AE59C00855F48 /* Logger */,
 				9957FAC1237AABD800855F48 /* DeepLink */,
@ -423,6 +430,16 @@
 			path = ElevationProfile;
 			sourceTree = "<group>";
 		};
+		ED6FD5452CB959EE00F6099F /* TrackRecorder */ = {
+			isa = PBXGroup;
+			children = (
+				ED6FD54B2CB95A5500F6099F /* TrackStatistics.h */,
+				ED6FD5532CB9736A00F6099F /* TrackStatistics+Core.h */,
+				ED6FD54C2CB95A5500F6099F /* TrackStatistics.mm */,
+			);
+			path = TrackRecorder;
+			sourceTree = "<group>";
+		};
 		EDC4E3542C5D2251009286A2 /* RecentlyDeletedCategory */ = {
 			isa = PBXGroup;
 			children = (
@ -440,6 +457,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED6FD54D2CB95A5500F6099F /* TrackStatistics.h in Headers */,
 				9957FAE8237AE5B000855F48 /* Logger.h in Headers */,
 				470015F42342509C00EBF03D /* CoreApi.h in Headers */,
 				479F705F234FBB8F00011E2E /* MWMBookmarkGroup.h in Headers */,
@ -482,6 +500,7 @@
 				47F4F1F923A3336C0022FD56 /* MWMMapNodeAttributes.h in Headers */,
 				479F704A234F785B00011E2E /* MWMTypes.h in Headers */,
 				47C637D72354AEBE00E12DE0 /* MWMMapOverlayManager.h in Headers */,
+				ED6FD5542CB9736A00F6099F /* TrackStatistics+Core.h in Headers */,
 				47942D9C237D927800DEFAE3 /* PlacePageBookmarkData.h in Headers */,
 				EDC4E3522C5D222D009286A2 /* RecentlyDeletedCategory.h in Headers */,
 				47942D72237CC40B00DEFAE3 /* OpeningHours.h in Headers */,
@ -595,6 +614,7 @@
 				47EEAFF42350CEDB005CF316 /* AppInfo.mm in Sources */,
 				47E8163623B1889C008FD836 /* MWMStorage.mm in Sources */,
 				EDC4E3512C5D222D009286A2 /* RecentlyDeletedCategory.mm in Sources */,
+				ED6FD54E2CB95A5500F6099F /* TrackStatistics.mm in Sources */,
 				47CA68DE2502022400671019 /* MWMBookmark.mm in Sources */,
 				9957FAE9237AE5B000855F48 /* Logger.mm in Sources */,
 			);
--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.h
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.h
@ -4,13 +4,16 @@

 NS_ASSUME_NONNULL_BEGIN

+@class TrackStatistics;
+
 NS_SWIFT_NAME(Track)
@interface MWMTrack : NSObject

@property(nonatomic, readonly) MWMTrackID trackId;
-@property(nonatomic, readonly) NSString *trackName;
+@property(nonatomic, readonly) NSString * trackName;
@property(nonatomic, readonly) NSInteger trackLengthMeters;
-@property(nonatomic, readonly) UIColor *trackColor;
+@property(nonatomic, readonly) UIColor * trackColor;
+@property(nonatomic, readonly) TrackStatistics * statistics;

@end

--- a/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.mm
+++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.mm
@ -1,4 +1,5 @@
 #import "MWMTrack+Core.h"
+#import "TrackStatistics+Core.h"

@implementation MWMTrack

@ -14,6 +15,7 @@
    _trackLengthMeters = track->GetLengthMeters();
    auto const color = track->GetColor(0);
    _trackColor = [UIColor colorWithRed:color.GetRedF() green:color.GetGreenF() blue:color.GetBlueF() alpha:1.f];
+    _statistics = [[TrackStatistics alloc] initWithTrackData:track];
  }
  return self;
 }
--- a/iphone/CoreApi/CoreApi/CoreApi-swift.h
+++ b/iphone/CoreApi/CoreApi/CoreApi-swift.h
@ -28,6 +28,7 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[];
 #import <CoreApi/MWMTrack.h>
 #import <CoreApi/MWMTypes.h>
 #import <CoreApi/RecentlyDeletedCategory.h>
+#import <CoreApi/TrackStatistics.h>

 #pragma mark - Place Page

--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData+Core.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData+Core.h
@ -6,7 +6,6 @@ NS_ASSUME_NONNULL_BEGIN

@interface PlacePagePreviewData (Core)

- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo;
 - (instancetype)initWithRawData:(place_page::Info const &)rawData;

@end
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
@ -1,6 +1,7 @@
 #import "PlacePagePreviewData+Core.h"

 #include "3party/opening_hours/opening_hours.hpp"
+#include "kml/types.hpp"

 static PlacePageDataSchedule convertOpeningHours(std::string_view rawOH)
 {
@ -50,14 +51,6 @@ static PlacePageDataSchedule convertOpeningHours(std::string_view rawOH)

@implementation PlacePagePreviewData (Core)

- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo {
-  self = [super init];
-  if (self) {
-     _title = @(elevationInfo.GetName().c_str());
-  }
-  return self;
-}
-
 - (instancetype)initWithRawData:(place_page::Info const &)rawData {
  self = [super init];
  if (self) {
@ -69,6 +62,13 @@ static PlacePageDataSchedule convertOpeningHours(std::string_view rawOH)
    _isMyPosition = rawData.IsMyPosition();
    //_isPopular = rawData.GetPopularity() > 0;
    _schedule = convertOpeningHours(rawData.GetOpeningHours());
+
+    if (rawData.IsTrack()) {
+      _coordinates = nullptr;
+      _address = nullptr;
+      _isMyPosition = false;
+      _schedule = convertOpeningHours("");
+    }
  }
  return self;
 }
--- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h
@ -9,6 +9,7 @@
@class PlacePageBookmarkData;
@class ElevationProfileData;
@class MWMMapNodeAttributes;
+@class TrackStatistics;

 typedef NS_ENUM(NSInteger, PlacePageRoadType) {
  PlacePageRoadTypeToll,
@ -31,12 +32,14 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly, nullable) PlacePageBookmarkData *bookmarkData;
@property(nonatomic, readonly) PlacePageRoadType roadType;
@property(nonatomic, readonly, nullable) NSString *wikiDescriptionHtml;
+@property(nonatomic, readonly, nullable) TrackStatistics *trackStatistics;
@property(nonatomic, readonly, nullable) ElevationProfileData *elevationProfileData;
@property(nonatomic, readonly, nullable) MWMMapNodeAttributes *mapNodeAttributes;
@property(nonatomic, readonly, nullable) NSString *bookingSearchUrl;
@property(nonatomic, readonly) BOOL isMyPosition;
@property(nonatomic, readonly) BOOL isPreviewPlus;
@property(nonatomic, readonly) BOOL isRoutePoint;
+@property(nonatomic, readonly) BOOL isTrack;
@property(nonatomic, readonly) CLLocationCoordinate2D locationCoordinate;
@property(nonatomic, copy, nullable) MWMVoidBlock onBookmarkStatusUpdate;
@property(nonatomic, copy, nullable) MWMVoidBlock onMapNodeStatusUpdate;
--- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
@ -6,6 +6,7 @@
 #import "PlacePageBookmarkData+Core.h"
 #import "ElevationProfileData+Core.h"
 #import "MWMMapNodeAttributes.h"
+#import "TrackStatistics+Core.h"

 #include <CoreApi/CoreApi.h>
 #include "platform/network_policy.hpp"
@ -62,17 +63,20 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
      [tagsArray addObject:@(s.c_str())];
    }

-    if (rawData().IsTrack()) {
-      auto const &bm = GetFramework().GetBookmarkManager();
-      auto const &trackId = rawData().GetTrackId();
-      auto const &elevationInfo = bm.MakeElevationInfo(trackId);
-      _elevationProfileData = [[ElevationProfileData alloc] initWithElevationInfo:elevationInfo
-                                                                      activePoint:bm.GetElevationActivePoint(trackId)
-                                                                       myPosition:bm.GetElevationMyPosition(trackId)];
-      _previewData = [[PlacePagePreviewData alloc] initWithElevationInfo:elevationInfo];
-    } else {
-      _previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()];
+    _isTrack = rawData().IsTrack();
+    if (_isTrack) {
+      auto const & bm = GetFramework().GetBookmarkManager();
+      auto const & trackId = rawData().GetTrackId();
+      auto const & track = bm.GetTrack(trackId);
+      _trackStatistics = [[TrackStatistics alloc] initWithTrackData:track];
+      if (track->HasAltitudes()) {
+        auto const & elevationInfo = bm.MakeElevationInfo(trackId);
+        _elevationProfileData = [[ElevationProfileData alloc] initWithElevationInfo:elevationInfo
+                                                                        activePoint:bm.GetElevationActivePoint(trackId)
+                                                                         myPosition:bm.GetElevationMyPosition(trackId)];
+      }
    }
+    _previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()];

    auto const &countryId = rawData().GetCountryId();
    if (!countryId.empty()) {
--- a/iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics+Core.h
+++ b/iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics+Core.h
@ -0,0 +1,10 @@
+#import "TrackStatistics.h"
+
+#include <CoreApi/Framework.h>
+#include "map/gps_track_collection.hpp"
+
+@interface TrackStatistics (Core)
+
+- (instancetype)initWithTrackData:(Track const *)track;
+
+@end
--- a/iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics.h
+++ b/iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics.h
@ -0,0 +1,14 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TrackStatistics : NSObject
+
+@property (nonatomic, readonly) double length;
+@property (nonatomic, readonly) double duration;
+@property (nonatomic, readonly) double ascend;
+@property (nonatomic, readonly) double descend;
+
+@end
+
+NS_ASSUME_NONNULL_END
--- a/iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics.mm
+++ b/iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics.mm
@ -0,0 +1,20 @@
+#import "TrackStatistics+Core.h"
+
+@implementation TrackStatistics
+
+@end
+
+@implementation TrackStatistics (Core)
+
+- (instancetype)initWithTrackData:(Track const *)track {
+  self = [super init];
+  if (self) {
+    _length = track->GetLengthMeters();
+    _duration = track->GetDurationInSeconds();
+    _ascend = 0;
+    _descend = 0;
+  }
+  return self;
+}
+
+@end
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@ -493,6 +493,10 @@
 		ED8270F02C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */; };
 		ED9857082C4ED02D00694F6C /* MailComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED9857072C4ED02D00694F6C /* MailComposer.swift */; };
 		ED9966802B94FBC20083CE55 /* ColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED99667D2B94FBC20083CE55 /* ColorPicker.swift */; };
+		EDA1EA972CC25A3B00DBDCAA /* TrackStatisticsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA1EA942CC25A0D00DBDCAA /* TrackStatisticsViewController.swift */; };
+		EDA1EA9A2CC260B400DBDCAA /* TrackStatisticsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA1EA992CC260B400DBDCAA /* TrackStatisticsViewModel.swift */; };
+		EDA1EA9C2CC260C200DBDCAA /* TrackStatisticsBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA1EA9B2CC260C200DBDCAA /* TrackStatisticsBuilder.swift */; };
+		EDA1EA9E2CC2CED100DBDCAA /* TrackStatisticsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA1EA9D2CC2CED100DBDCAA /* TrackStatisticsTableViewCell.swift */; };
 		EDBD68072B625724005DD151 /* LocationServicesDisabledAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */; };
 		EDBD680B2B62572E005DD151 /* LocationServicesDisabledAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */; };
 		EDC3573B2B7B5029001AE9CA /* CALayer+SetCorner.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC3573A2B7B5029001AE9CA /* CALayer+SetCorner.swift */; };
@ -1422,6 +1426,10 @@
 		ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewDetailedSwitchCell.swift; sourceTree = "<group>"; };
 		ED9857072C4ED02D00694F6C /* MailComposer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailComposer.swift; sourceTree = "<group>"; };
 		ED99667D2B94FBC20083CE55 /* ColorPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPicker.swift; sourceTree = "<group>"; };
+		EDA1EA942CC25A0D00DBDCAA /* TrackStatisticsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackStatisticsViewController.swift; sourceTree = "<group>"; };
+		EDA1EA992CC260B400DBDCAA /* TrackStatisticsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackStatisticsViewModel.swift; sourceTree = "<group>"; };
+		EDA1EA9B2CC260C200DBDCAA /* TrackStatisticsBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackStatisticsBuilder.swift; sourceTree = "<group>"; };
+		EDA1EA9D2CC2CED100DBDCAA /* TrackStatisticsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackStatisticsTableViewCell.swift; sourceTree = "<group>"; };
 		EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LocationServicesDisabledAlert.xib; sourceTree = "<group>"; };
 		EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationServicesDisabledAlert.swift; sourceTree = "<group>"; };
 		EDC3573A2B7B5029001AE9CA /* CALayer+SetCorner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+SetCorner.swift"; sourceTree = "<group>"; };
@ -2943,6 +2951,7 @@
 				99A906D823F6F7030005872B /* WikiDescriptionViewController.swift */,
 				4726254821C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift */,
 				99C964222428C0D500E41723 /* PlacePageHeader */,
+				EDA1EA982CC25A4200DBDCAA /* TrackStatistics */,
 				993DF0C223F6BD0600AC231A /* ElevationDetails */,
 				99DEF9D523E420D2006BFD21 /* ElevationProfile */,
 				EDE8EAE32C2DB74A002777F5 /* OpenInAppActionSheet */,
@ -3155,6 +3164,17 @@
 			path = ColorPicker;
 			sourceTree = "<group>";
 		};
+		EDA1EA982CC25A4200DBDCAA /* TrackStatistics */ = {
+			isa = PBXGroup;
+			children = (
+				EDA1EA9B2CC260C200DBDCAA /* TrackStatisticsBuilder.swift */,
+				EDA1EA942CC25A0D00DBDCAA /* TrackStatisticsViewController.swift */,
+				EDA1EA992CC260B400DBDCAA /* TrackStatisticsViewModel.swift */,
+				EDA1EA9D2CC2CED100DBDCAA /* TrackStatisticsTableViewCell.swift */,
+			);
+			path = TrackStatistics;
+			sourceTree = "<group>";
+		};
 		EDC4E3422C5D1BD3009286A2 /* RecentlyDeletedTests */ = {
 			isa = PBXGroup;
 			children = (
@ -4358,8 +4378,10 @@
 				6741A9C01BF340DE002C974C /* MWMTextView.m in Sources */,
 				F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.m in Sources */,
 				F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.m in Sources */,
+				EDA1EA9A2CC260B400DBDCAA /* TrackStatisticsViewModel.swift in Sources */,
 				F6E2FD651E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.m in Sources */,
 				F6E2FF2D1E097BA00083EBEC /* MWMSearchCell.mm in Sources */,
+				EDA1EA9E2CC2CED100DBDCAA /* TrackStatisticsTableViewCell.swift in Sources */,
 				3454D7C51E07F045004AF2AD /* UIButton+Orientation.m in Sources */,
 				34AB66831FC5AA330078E451 /* NavigationAddPointToastView.swift in Sources */,
 				F6E2FE4C1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */,
@ -4551,6 +4573,7 @@
 				CDB4D4E4222E8FF600104869 /* CarPlayService.swift in Sources */,
 				F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */,
 				F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
+				EDA1EA9C2CC260C200DBDCAA /* TrackStatisticsBuilder.swift in Sources */,
 				3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */,
 				34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */,
 				ED79A5D82BDF8D6100952D1F /* DefaultLocalDirectoryMonitor.swift in Sources */,
@ -4681,6 +4704,7 @@
 				993DF0C923F6BD0600AC231A /* ElevationDetailsBuilder.swift in Sources */,
 				674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */,
 				34AB66291FC5AA330078E451 /* RouteManagerViewController.swift in Sources */,
+				EDA1EA972CC25A3B00DBDCAA /* TrackStatisticsViewController.swift in Sources */,
 				3404754D1E081A4600C92850 /* MWMKeyboard.m in Sources */,
 				EDE243E52B6D3F400057369B /* OSMView.swift in Sources */,
 				993DF10C23F6BDB100AC231A /* MWMTableViewCellRenderer.swift in Sources */,
--- a/iphone/Maps/UI/PlacePage/Components/ElevationDetails/ElevationDetailsViewController.xib
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationDetails/ElevationDetailsViewController.xib
@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_1" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
@ -23,7 +24,7 @@
            <rect key="frame" x="0.0" y="0.0" width="312" height="484"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AUN-AX-DfY">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AUN-AX-DfY">
                    <rect key="frame" x="16" y="68" width="280" height="21"/>
                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                    <nil key="textColor"/>
@ -33,7 +34,7 @@
                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="semibold18:blackPrimaryText"/>
                    </userDefinedRuntimeAttributes>
                </label>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sd4-IT-eto" customClass="DifficultyView" customModule="OMaps" customModuleProvider="target">
+                <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sd4-IT-eto" customClass="DifficultyView" customModule="Organic_Maps" customModuleProvider="target">
                    <rect key="frame" x="16" y="105" width="40" height="10"/>
                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                    <constraints>
@ -41,7 +42,7 @@
                        <constraint firstAttribute="height" constant="10" id="gSS-Bl-tXK"/>
                    </constraints>
                </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Moderate difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kDg-1H-1c1">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Moderate difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kDg-1H-1c1">
                    <rect key="frame" x="16" y="125" width="280" height="17"/>
                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
                    <nil key="textColor"/>
@ -50,7 +51,7 @@
                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
                    </userDefinedRuntimeAttributes>
                </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dke-As-9Jm" customClass="InsetsLabel" customModule="OMaps" customModuleProvider="target">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dke-As-9Jm" customClass="InsetsLabel" customModule="Organic_Maps" customModuleProvider="target">
                    <rect key="frame" x="16" y="158" width="15.5" height="17"/>
                    <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
@ -60,7 +61,7 @@
                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="ElevationProfileExtendedDifficulty"/>
                    </userDefinedRuntimeAttributes>
                </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ed-wc-w74">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" ambiguous="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ed-wc-w74">
                    <rect key="frame" x="16" y="183" width="280" height="221"/>
                    <string key="text">Vivamus eu mattis lectus. Phasellus eu ex risus. Quisque ornare augue lectus, eget dignissim turpis ultrices quis. In sit amet sapien laoreet, gravida lorem eget, pharetra ipsum. Morbi ut massa dui. Aenean placerat libero ac ante finibus semper. Nullam semper nibh eget mauris vestibulum, eu cursus nunc finibus. Aliquam fringilla fermentum libero fringilla dictum. Donec eu semper ipsum. Sed in purus neque.</string>
                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
@ -70,9 +71,9 @@
                        <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
                    </userDefinedRuntimeAttributes>
                </label>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vDr-Ie-c5L">
-                    <rect key="frame" x="16" y="420" width="280" height="48"/>
-                    <color key="backgroundColor" systemColor="linkColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vDr-Ie-c5L">
+                    <rect key="frame" x="16" y="386" width="280" height="48"/>
+                    <color key="backgroundColor" systemColor="linkColor"/>
                    <constraints>
                        <constraint firstAttribute="height" constant="48" id="DsE-3h-I1o"/>
                        <constraint firstAttribute="width" constant="280" id="JhA-fQ-QGN"/>
@ -89,6 +90,7 @@
                    </connections>
                </button>
            </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
            <constraints>
                <constraint firstItem="vDr-Ie-c5L" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="03I-DI-Xet"/>
@ -110,11 +112,15 @@
                <constraint firstItem="AUN-AX-DfY" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="wm3-Eh-4No"/>
            </constraints>
            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
            <userDefinedRuntimeAttributes>
                <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
            </userDefinedRuntimeAttributes>
            <point key="canvasLocation" x="131.8840579710145" y="291.29464285714283"/>
        </view>
    </objects>
+    <resources>
+        <systemColor name="linkColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileBuilder.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileBuilder.swift
@ -1,8 +1,5 @@
 class ElevationProfileBuilder {
-  static func build(data: PlacePageData, delegate: ElevationProfileViewControllerDelegate?) -> ElevationProfileViewController {
-    guard let elevationProfileData = data.elevationProfileData else {
-      fatalError()
-    }
+  static func build(elevationProfileData: ElevationProfileData, delegate: ElevationProfileViewControllerDelegate?) -> ElevationProfileViewController {
    let storyboard = UIStoryboard.instance(.placePage)
    let viewController = storyboard.instantiateViewController(ofType: ElevationProfileViewController.self);
    let presenter = ElevationProfilePresenter(view: viewController,
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
@ -61,13 +61,6 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
      view?.isDifficultyHidden = true
    }

-    if data.trackTime != 0, let eta = DateComponentsFormatter.etaString(from: TimeInterval(data.trackTime)) {
-      view?.isTimeHidden = false
-      view?.setTrackTime("\(eta)")
-    } else {
-      view?.isTimeHidden = true
-    }
-
    view?.isBottomPanelHidden = data.trackTime == 0 && data.difficulty == .disabled
    view?.isExtendedDifficultyLabelHidden = true

--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
@ -5,10 +5,8 @@ protocol ElevationProfileViewProtocol: AnyObject {
  
  var isExtendedDifficultyLabelHidden: Bool { get set }
  var isDifficultyHidden: Bool { get set }
-  var isTimeHidden: Bool { get set }
  var isBottomPanelHidden: Bool { get set }
  func setExtendedDifficultyGrade(_ value: String)
-  func setTrackTime(_ value: String?)
  func setDifficulty(_ value: ElevationDifficulty)
  func setChartData(_ data: ChartPresentationData)
  func setActivePoint(_ distance: Double)
@ -24,15 +22,12 @@ class ElevationProfileViewController: UIViewController {
  @IBOutlet private var difficultyView: DifficultyView!
  @IBOutlet private var difficultyTitle: UILabel!
  @IBOutlet private var extendedDifficultyGradeLabel: UILabel!
-  @IBOutlet private var trackTimeLabel: UILabel!
-  @IBOutlet private var trackTimeTitle: UILabel!
  @IBOutlet private var extendedGradeButton: UIButton!
-  @IBOutlet private var diffucultyConstraint: NSLayoutConstraint!
+  @IBOutlet private var difficultyConstraint: NSLayoutConstraint!

-  private let diffucultiVisibleConstraint: CGFloat = 60
-  private let diffucultyHiddenConstraint: CGFloat = 10
+  private let difficultyVisibleConstraint: CGFloat = 60
+  private let difficultyHiddenConstraint: CGFloat = 10
  private var difficultyHidden: Bool = false
-  private var timeHidden: Bool = false
  private var bottomPanelHidden: Bool = false

  override func viewDidLoad() {
@ -77,25 +72,15 @@ extension ElevationProfileViewController: ElevationProfileViewProtocol {
    }
  }

-  var isTimeHidden: Bool {
-    get { timeHidden }
-    set {
-      timeHidden = newValue
-      trackTimeLabel.isHidden = newValue
-      trackTimeTitle.isHidden = newValue
-    }
-  }
-
  var isBottomPanelHidden: Bool {
    get { bottomPanelHidden }
    set {
      bottomPanelHidden = newValue
      if newValue == true {
-        isTimeHidden = true
        isExtendedDifficultyLabelHidden = true
        isDifficultyHidden = true
      }
-      diffucultyConstraint.constant = newValue ? diffucultyHiddenConstraint : diffucultiVisibleConstraint
+      difficultyConstraint.constant = newValue ? difficultyHiddenConstraint : difficultyVisibleConstraint
    }
  }
  
@ -103,10 +88,6 @@ extension ElevationProfileViewController: ElevationProfileViewProtocol {
    extendedDifficultyGradeLabel.text = value
  }

-  func setTrackTime(_ value: String?) {
-    trackTimeLabel.text = value
-  }
-
  func setDifficulty(_ value: ElevationDifficulty) {
    difficultyView.difficulty = value
  }
--- a/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsBuilder.swift
+++ b/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsBuilder.swift
@ -0,0 +1,7 @@
+final class TrackStatisticsBuilder {
+  static func build(statistics: TrackStatistics) -> TrackStatisticsViewController {
+    let viewModel = TrackStatisticsViewModel(statistics: statistics)
+    let viewController = TrackStatisticsViewController(viewModel: viewModel)
+    return viewController
+  }
+}
--- a/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsTableViewCell.swift
+++ b/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsTableViewCell.swift
@ -0,0 +1,29 @@
+final class TrackStatisticsTableViewCell: UITableViewCell {
+
+  override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+    super.init(style: .value1, reuseIdentifier: reuseIdentifier)
+  }
+
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  func configure(text: String, detailText: String) {
+    let detailTextFont: UIFont = .bold16()
+    let detailTextColor: UIColor = .black
+    if #available(iOS 14.0, *) {
+      var configuration = UIListContentConfiguration.valueCell()
+      configuration.text = text
+      configuration.secondaryText = detailText
+      configuration.secondaryTextProperties.font = detailTextFont
+      configuration.secondaryTextProperties.color = detailTextColor
+      contentConfiguration = configuration
+    } else {
+      textLabel?.text = text
+      detailTextLabel?.text = detailText
+      detailTextLabel?.font = detailTextFont
+      detailTextLabel?.textColor = detailTextColor
+    }
+  }
+}
--- a/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsViewController.swift
@ -0,0 +1,47 @@
+class TrackStatisticsViewController: MWMTableViewController {
+
+  private var viewModel: TrackStatisticsViewModel
+  private var viewHeightConstraint: NSLayoutConstraint?
+
+  init(viewModel: TrackStatisticsViewModel) {
+    self.viewModel = viewModel
+    super.init(nibName: nil, bundle: nil)
+  }
+
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+  
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    setupView()
+  }
+
+  override func viewWillLayoutSubviews() {
+    super.viewWillLayoutSubviews()
+    viewHeightConstraint?.constant = tableView.contentSize.height
+  }
+
+  private func setupView() {
+    viewHeightConstraint = view.heightAnchor.constraint(equalToConstant: .zero)
+    viewHeightConstraint?.isActive = true
+    tableView.register(cell: TrackStatisticsTableViewCell.self)
+    tableView.allowsSelection = false
+  }
+
+  override func numberOfSections(in tableView: UITableView) -> Int {
+    viewModel.data.count
+  }
+
+  override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    viewModel.data[section].cells.count
+  }
+
+  override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    let cell = tableView.dequeueReusableCell(cell: TrackStatisticsTableViewCell.self, indexPath: indexPath)
+    let cellData = viewModel.data[indexPath.section].cells[indexPath.row]
+    cell.configure(text: cellData.text, detailText: cellData.detailText)
+    return cell
+  }
+}
--- a/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsViewModel.swift
+++ b/iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsViewModel.swift
@ -0,0 +1,42 @@
+struct TrackStatisticsViewModel {
+  private var statistics: TrackStatistics
+
+  enum Section: Int, CaseIterable {
+    case statistics
+  }
+
+  struct SectionModel {
+    var cells: [CellModel]
+  }
+
+  struct CellModel {
+    var text: String
+    var detailText: String
+  }
+
+  private static let distanceFormatter: MKDistanceFormatter = {
+    let formatter = MKDistanceFormatter()
+    formatter.units = Settings.measurementUnits() == .imperial ? .imperial : .metric
+    formatter.unitStyle = .abbreviated
+    return formatter
+  }()
+
+  private(set) var data: [SectionModel] = []
+
+  init(statistics: TrackStatistics) {
+    self.statistics = statistics
+    self.data = Self.buildData(from: statistics)
+  }
+
+  private static func buildData(from statistics: TrackStatistics) -> [SectionModel] {
+    let length = distanceFormatter.string(fromDistance: statistics.length)
+    let duration = DateComponentsFormatter.etaString(from: statistics.duration)
+    var rows: [CellModel] = []
+    rows.append(CellModel(text: L("length"), detailText: length))
+    if let duration = duration {
+      // TODO: Localize string
+      rows.append(CellModel(text: L("duration"), detailText: duration))
+    }
+    return [SectionModel(cells: rows)]
+  }
+}
--- a/iphone/Maps/UI/PlacePage/PlacePage.storyboard
+++ b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
@ -636,7 +636,7 @@
                                        </userDefinedRuntimeAttributes>
                                    </imageView>
                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8eU-Fj-XRv" customClass="CopyLabel" customModule="Organic_Maps" customModuleProvider="target">
-                                        <rect key="frame" x="56" y="10" width="311" height="24"/>
+                                        <rect key="frame" x="56" y="10" width="267" height="24"/>
                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                        <nil key="textColor"/>
@ -1403,14 +1403,14 @@
        <scene sceneID="0yF-nr-ALU">
            <objects>
                <viewController storyboardIdentifier="ElevationProfileViewController" id="d1y-Na-lDm" customClass="ElevationProfileViewController" customModule="Organic_Maps" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" ambiguous="YES" id="7Mx-au-yIa">
+                    <view key="view" contentMode="scaleToFill" id="7Mx-au-yIa">
                        <rect key="frame" x="0.0" y="0.0" width="375" height="319"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-gT-ZfM">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-gT-ZfM">
                                <rect key="frame" x="0.0" y="20" width="375" height="156"/>
                                <subviews>
-                                    <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jIS-0e-Ztd" customClass="ChartView" customModule="Chart">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jIS-0e-Ztd" customClass="ChartView" customModule="Chart">
                                        <rect key="frame" x="16" y="0.0" width="343" height="156"/>
                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                    </view>
@ -1424,7 +1424,7 @@
                                    <constraint firstAttribute="height" constant="176" id="utH-YA-2pe"/>
                                </constraints>
                            </view>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Xc9-ED-V4K">
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Xc9-ED-V4K">
                                <rect key="frame" x="16" y="192" width="343" height="68"/>
                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <constraints>
@ -1499,7 +1499,7 @@
                                    </collectionViewCell>
                                </cells>
                            </collectionView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" ambiguous="YES" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIo-No-CbK">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIo-No-CbK">
                                <rect key="frame" x="16" y="281" width="68" height="20.5"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <nil key="textColor"/>
@ -1509,7 +1509,7 @@
                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
                                </userDefinedRuntimeAttributes>
                            </label>
-                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-z0-p88" customClass="DifficultyView" customModule="Organic_Maps" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-z0-p88" customClass="DifficultyView" customModule="Organic_Maps" customModuleProvider="target">
                                <rect key="frame" x="91" y="287" width="40" height="10"/>
                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <constraints>
@ -1517,32 +1517,13 @@
                                    <constraint firstAttribute="width" constant="40" id="Sor-5l-zjy"/>
                                </constraints>
                            </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="1h 10m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQJ-fW-QVh">
-                                <rect key="frame" x="301" y="281" width="58" height="20.5"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:blackPrimaryText"/>
-                                </userDefinedRuntimeAttributes>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Time:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoy-lg-Wl9">
-                                <rect key="frame" x="249" y="280.5" width="43" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="elevation_profile_time"/>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/>
-                                </userDefinedRuntimeAttributes>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g6D-fD-0Ug">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g6D-fD-0Ug">
                                <rect key="frame" x="133" y="276.5" width="30" height="30"/>
                                <connections>
                                    <action selector="onExtendedDifficultyButtonPressed:" destination="d1y-Na-lDm" eventType="touchUpInside" id="4zH-m2-OSE"/>
                                </connections>
                            </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPk-XR-oL1" customClass="InsetsLabel" customModule="Organic_Maps" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPk-XR-oL1" customClass="InsetsLabel" customModule="Organic_Maps" customModuleProvider="target">
                                <rect key="frame" x="138.5" y="281" width="19" height="20.5"/>
                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
@ -1556,18 +1537,13 @@
                        <viewLayoutGuide key="safeArea" id="ezp-sJ-36x"/>
                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                        <constraints>
-                            <constraint firstItem="hoy-lg-Wl9" firstAttribute="baseline" secondItem="FIo-No-CbK" secondAttribute="baseline" id="7IY-jn-lps"/>
                            <constraint firstItem="bc9-z0-p88" firstAttribute="leading" secondItem="FIo-No-CbK" secondAttribute="trailing" constant="7" id="CDd-Zf-CvI"/>
                            <constraint firstItem="Xc9-ED-V4K" firstAttribute="top" secondItem="jKi-gT-ZfM" secondAttribute="bottom" constant="16" id="Izs-S0-cku"/>
-                            <constraint firstItem="ezp-sJ-36x" firstAttribute="trailing" secondItem="dQJ-fW-QVh" secondAttribute="trailing" constant="16" id="L0f-4H-Rdv"/>
                            <constraint firstItem="g6D-fD-0Ug" firstAttribute="centerY" secondItem="GPk-XR-oL1" secondAttribute="centerY" id="P9X-9S-8dI"/>
-                            <constraint firstItem="dQJ-fW-QVh" firstAttribute="leading" secondItem="hoy-lg-Wl9" secondAttribute="trailing" constant="9" id="TRv-Jp-YEl"/>
                            <constraint firstItem="GPk-XR-oL1" firstAttribute="leading" secondItem="bc9-z0-p88" secondAttribute="trailing" constant="7.6666666666666856" id="W9l-Ip-nhH"/>
                            <constraint firstItem="g6D-fD-0Ug" firstAttribute="centerX" secondItem="GPk-XR-oL1" secondAttribute="centerX" id="YFV-Au-wTO"/>
-                            <constraint firstItem="hoy-lg-Wl9" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="GPk-XR-oL1" secondAttribute="trailing" constant="8" id="eP3-qC-a2f"/>
                            <constraint firstItem="FIo-No-CbK" firstAttribute="leading" secondItem="ezp-sJ-36x" secondAttribute="leading" constant="16" id="eg2-uX-NgT"/>
                            <constraint firstItem="jKi-gT-ZfM" firstAttribute="leading" secondItem="ezp-sJ-36x" secondAttribute="leading" id="kKJ-Jg-wRO"/>
-                            <constraint firstItem="dQJ-fW-QVh" firstAttribute="baseline" secondItem="FIo-No-CbK" secondAttribute="baseline" id="kvI-gM-iyU"/>
                            <constraint firstItem="ezp-sJ-36x" firstAttribute="trailing" secondItem="Xc9-ED-V4K" secondAttribute="trailing" constant="16" id="mxE-Mk-VH2"/>
                            <constraint firstItem="bc9-z0-p88" firstAttribute="bottom" secondItem="FIo-No-CbK" secondAttribute="baseline" id="opM-hk-CFP"/>
                            <constraint firstItem="ezp-sJ-36x" firstAttribute="bottom" secondItem="Xc9-ED-V4K" secondAttribute="bottom" constant="59" id="vaG-aV-kw5"/>
@ -1585,14 +1561,12 @@
                    <connections>
                        <outlet property="chartView" destination="jIS-0e-Ztd" id="KHY-Bn-Pe6"/>
                        <outlet property="descriptionCollectionView" destination="Xc9-ED-V4K" id="dHB-dH-HYE"/>
+                        <outlet property="difficultyConstraint" destination="vaG-aV-kw5" id="fkz-u2-wYh"/>
                        <outlet property="difficultyTitle" destination="FIo-No-CbK" id="Rbh-8b-zK9"/>
                        <outlet property="difficultyView" destination="bc9-z0-p88" id="p5u-Au-7i2"/>
-                        <outlet property="diffucultyConstraint" destination="vaG-aV-kw5" id="t7C-va-ntM"/>
                        <outlet property="extendedDifficultyGradeLabel" destination="GPk-XR-oL1" id="SpR-XZ-6ou"/>
                        <outlet property="extendedGradeButton" destination="g6D-fD-0Ug" id="8br-bF-NqA"/>
                        <outlet property="graphViewContainer" destination="jKi-gT-ZfM" id="SUq-a3-G5F"/>
-                        <outlet property="trackTimeLabel" destination="dQJ-fW-QVh" id="LxB-Xa-NrL"/>
-                        <outlet property="trackTimeTitle" destination="hoy-lg-Wl9" id="Eed-Ul-Fd6"/>
                    </connections>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="mfQ-ai-TWx" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@ -1823,16 +1797,16 @@
        <image name="ic_placepage_open_hours" width="28" height="28"/>
        <image name="img_direction_light" width="32" height="32"/>
        <systemColor name="opaqueSeparatorColor">
-            <color red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.77647058823529413" green="0.77647058823529413" blue="0.78431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
        </systemColor>
        <systemColor name="separatorColor">
-            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
        </systemColor>
        <systemColor name="systemBackgroundColor">
            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
        </systemColor>
        <systemColor name="systemRedColor">
-            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
        </systemColor>
    </resources>
 </document>
--- a/iphone/Maps/UI/PlacePage/PlacePageBuilder.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageBuilder.swift
@ -9,8 +9,8 @@
    let interactor = PlacePageInteractor(viewController: viewController,
                                         data: data,
                                         mapViewController: MapViewController.shared()!)
-    let layout:IPlacePageLayout
-    if data.elevationProfileData != nil {
+    let layout: IPlacePageLayout
+    if data.isTrack {
      layout = PlacePageElevationLayout(interactor: interactor, storyboard: storyboard, data: data)
    } else {
      layout = PlacePageCommonLayout(interactor: interactor, storyboard: storyboard, data: data)
@ -30,8 +30,8 @@
    let interactor = PlacePageInteractor(viewController: viewController,
                                         data: data,
                                         mapViewController: MapViewController.shared()!)
-    let layout:IPlacePageLayout
-    if data.elevationProfileData != nil {
+    let layout: IPlacePageLayout
+    if data.isTrack {
      layout = PlacePageElevationLayout(interactor: interactor, storyboard: viewController.storyboard!, data: data)
    } else {
      layout = PlacePageCommonLayout(interactor: interactor, storyboard: viewController.storyboard!, data: data)
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift
@ -22,11 +22,25 @@ class PlacePageElevationLayout: IPlacePageLayout {
    return PlacePageHeaderBuilder.build(data: placePageData.previewData, delegate: interactor, headerType: .fixed)
  } ()

-  lazy var elevationMapViewController: ElevationProfileViewController = {
-    let vc = ElevationProfileBuilder.build(data: placePageData, delegate: interactor)
+  lazy var bookmarkViewController: PlacePageBookmarkViewController = {
+    let vc = storyboard.instantiateViewController(ofType: PlacePageBookmarkViewController.self)
+    vc.view.isHidden = true
+    vc.delegate = interactor
    return vc
  } ()

+  func trackStatisticsViewController(statistics: TrackStatistics) -> TrackStatisticsViewController {
+    let vc = TrackStatisticsBuilder.build(statistics: statistics)
+    return vc
+  }
+
+  lazy var elevationMapViewController: ElevationProfileViewController? = {
+    guard let elevationProfileData = placePageData.elevationProfileData else {
+      return nil
+    }
+    return ElevationProfileBuilder.build(elevationProfileData: elevationProfileData, delegate: interactor)
+  } ()
+
  init(interactor: PlacePageInteractor, storyboard: UIStoryboard, data: PlacePageData) {
    self.interactor = interactor
    self.storyboard = storyboard
@ -35,7 +49,22 @@ class PlacePageElevationLayout: IPlacePageLayout {

  private func configureViewControllers() -> [UIViewController] {
    var viewControllers = [UIViewController]()
-    viewControllers.append(elevationMapViewController)
+
+    viewControllers.append(bookmarkViewController)
+    if let bookmarkData = placePageData.bookmarkData {
+      bookmarkViewController.bookmarkData = bookmarkData
+      bookmarkViewController.view.isHidden = false
+    }
+
+    guard let trackStatistics = placePageData.trackStatistics else {
+      let message = "Track statistics should not be nil"
+      LOG(.critical, message)
+      fatalError(message)
+    }
+    viewControllers.append(trackStatisticsViewController(statistics: trackStatistics))
+    if let elevationMapViewController {
+      viewControllers.append(elevationMapViewController)
+    }

    return viewControllers
  }
@ -43,8 +72,12 @@ class PlacePageElevationLayout: IPlacePageLayout {
  func calculateSteps(inScrollView scrollView: UIScrollView, compact: Bool) -> [PlacePageState] {
    var steps: [PlacePageState] = []
    let scrollHeight = scrollView.height
-    let previewHeight = elevationMapViewController.getPreviewHeight()
    steps.append(.closed(-scrollHeight))
+    guard let elevationMapViewController else {
+      steps.append(.full(0))
+      return steps
+    }
+    let previewHeight = elevationMapViewController.getPreviewHeight()
    guard let previewView = elevationMapViewController.view else {
        return steps
    }
--- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
@ -204,6 +204,12 @@ using namespace storage;
  [[MapViewController sharedController].navigationController pushViewController:editBookmarkController animated:YES];
 }

+- (void)editTrack:(PlacePageData *)data {
+//  EditTrackViewController * editTrackController = [[EditTrackViewController alloc] init];
+//  [editBookmarkController configureWithPlacePageData:data];
+//  [[MapViewController sharedController].navigationController pushViewController:editBookmarkController animated:YES];
+}
+
 - (void)showPlaceDescription:(NSString *)htmlString
 {
  [self.ownerViewController openFullPlaceDescriptionWithHtml:htmlString];
--- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm
@ -156,6 +156,10 @@
  [[MWMMapViewControlsManager manager].placePageManager editBookmark:data];
 }

+ (void)editTrack:(PlacePageData *)data {
+//  [[MWMMapViewControlsManager manager].placePageManager editTrack:data];
+}
+
 + (void)searchBookingHotels:(PlacePageData *)data {
  [[MWMMapViewControlsManager manager].placePageManager searchBookingHotels:data];
 }
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@ -930,7 +930,7 @@ Track::TrackSelectionInfo BookmarkManager::FindNearestTrack(
    for (auto trackId : category.GetUserLines())
    {
      auto const track = GetTrack(trackId);
-      if (!track->IsInteractive() || (tracksFilter && !tracksFilter(track)))
+      if (tracksFilter && !tracksFilter(track))
        continue;

      track->UpdateSelectionInfo(touchRect, selectionInfo);
@ -1037,13 +1037,21 @@ void BookmarkManager::SetTrackSelectionInfo(Track::TrackSelectionInfo const & tr
  CHECK_THREAD_CHECKER(m_threadChecker, ());
  CHECK_NOT_EQUAL(trackSelectionInfo.m_trackId, kml::kInvalidTrackId, ());

-  auto es = GetEditSession();
-  auto const markId = GetTrackSelectionMarkId(trackSelectionInfo.m_trackId);
-  CHECK_NOT_EQUAL(markId, kml::kInvalidMarkId, ());
+//  auto es = GetEditSession();
+//  auto const markId = GetTrackSelectionMarkId(trackSelectionInfo.m_trackId);
+//  if (markId == kml::kInvalidMarkId)
+//  {
+//    SetTrackSelectionMark(trackSelectionInfo.m_trackId, trackSelectionInfo.m_trackPoint,
+//                          trackSelectionInfo.m_distFromBegM);
+//    return;
+//  }
+//  CHECK_NOT_EQUAL(markId, kml::kInvalidMarkId, ());
+//
+//  auto trackSelectionMark = GetMarkForEdit<TrackSelectionMark>(markId);
+//  trackSelectionMark->SetPosition(trackSelectionInfo.m_trackPoint);
+//  trackSelectionMark->SetDistance(trackSelectionInfo.m_distFromBegM);
+  SetTrackSelectionMark(trackSelectionInfo.m_trackId, trackSelectionInfo.m_trackPoint, trackSelectionInfo.m_distFromBegM);

-  auto trackSelectionMark = GetMarkForEdit<TrackSelectionMark>(markId);
-  trackSelectionMark->SetPosition(trackSelectionInfo.m_trackPoint);
-  trackSelectionMark->SetDistance(trackSelectionInfo.m_distFromBegM);

  if (notifyListeners && m_elevationActivePointChanged != nullptr)
    m_elevationActivePointChanged();
@ -1092,8 +1100,8 @@ void BookmarkManager::OnTrackDeselected()

  auto es = GetEditSession();
  auto * trackSelectionMark = GetMarkForEdit<TrackSelectionMark>(markId);
-  auto const isVisible = IsVisible(GetTrack(m_selectedTrackId)->GetGroupId());
-  trackSelectionMark->SetIsVisible(isVisible);
+//  auto const isVisible = IsVisible(GetTrack(m_selectedTrackId)->GetGroupId());
+  trackSelectionMark->SetIsVisible(false);

  m_selectedTrackId = kml::kInvalidTrackId;
 }
--- a/map/elevation_info.cpp
+++ b/map/elevation_info.cpp
@ -34,38 +34,42 @@ ElevationInfo::ElevationInfo(Track const & track)
  , m_name(track.GetName())
 {
  // (Distance, Elevation) chart doesn't have a sence for multiple track's geometry.
+  auto const & trackData = track.GetData();
+  ASSERT_EQUAL(trackData.m_geometry.m_lines.size(), 1, ());
  auto const & points = track.GetSingleGeometry();
  if (points.empty())
    return;

  m_points.reserve(points.size());
-  m_points.emplace_back(0, points[0].GetAltitude());
+
+  auto const & baseAltitude = points[0].GetAltitude();
+  m_points.emplace_back(0, baseAltitude);
+  m_minAltitude = baseAltitude;
+  m_maxAltitude = baseAltitude;
+
  double distance = 0.0;
  for (size_t i = 1; i < points.size(); ++i)
  {
    distance += mercator::DistanceOnEarth(points[i - 1].GetPoint(), points[i].GetPoint());
    m_points.emplace_back(distance, points[i].GetAltitude());
+
+    auto const & previousPointAltitude = points[i - 1].GetAltitude();
+    auto const & currentPointAltitude = points[i].GetAltitude();
+    auto const deltaAltitude = currentPointAltitude - previousPointAltitude;
+    if (deltaAltitude > 0)
+      m_ascent += deltaAltitude;
+    else
+      m_descent -= deltaAltitude;
+
+    if (currentPointAltitude < m_minAltitude)
+      m_minAltitude = currentPointAltitude;
+    if (currentPointAltitude > m_maxAltitude)
+      m_maxAltitude = currentPointAltitude;
  }

-  auto const & properties = track.GetData().m_properties;
-
-  FillProperty(properties, kAscentKey, m_ascent);
-  FillProperty(properties, kDescentKey, m_descent);
-  FillProperty(properties, kLowestPointKey, m_minAltitude);
-  FillProperty(properties, kHighestPointKey, m_maxAltitude);
-
-  uint8_t difficulty;
-  FillProperty(properties, kDifficultyKey, difficulty);
-
-  if (difficulty > kMaxDifficulty)
-  {
-    LOG(LWARNING, ("Invalid difficulty value", m_difficulty, "in track", track.GetName()));
-    m_difficulty = Difficulty ::Unknown;
-  }
-  else
-  {
-    m_difficulty = static_cast<Difficulty>(difficulty);
-  }
-
-  FillProperty(properties, kDurationKey, m_duration);
+  auto const & timestamps = trackData.m_geometry.m_timestamps[0];
+  m_duration = timestamps.back() - timestamps.front();
+  ASSERT_GREATER(m_duration, 0, ("Track duration is less than zero", GetId()));
+  
+  m_difficulty = Difficulty::Unknown;
 }
--- a/map/elevation_info.hpp
+++ b/map/elevation_info.hpp
@ -39,10 +39,10 @@ public:
  std::string const & GetName() const { return m_name; }
  size_t GetSize() const { return m_points.size(); };
  Points const & GetPoints() const { return m_points; };
-  uint16_t GetAscent() const { return m_ascent; }
-  uint16_t GetDescent() const { return m_descent; }
-  uint16_t GetMinAltitude() const { return m_minAltitude; }
-  uint16_t GetMaxAltitude() const { return m_maxAltitude; }
+  geometry::Altitude GetAscent() const { return m_ascent; }
+  geometry::Altitude GetDescent() const { return m_descent; }
+  geometry::Altitude GetMinAltitude() const { return m_minAltitude; }
+  geometry::Altitude GetMaxAltitude() const { return m_maxAltitude; }
  uint8_t GetDifficulty() const { return m_difficulty; }
  uint32_t GetDuration() const { return m_duration; }

@ -52,13 +52,13 @@ private:
  // Points with distance from start of the track and altitude.
  Points m_points;
  // Ascent in meters.
-  uint16_t m_ascent = 0;
+  geometry::Altitude m_ascent = 0;
  // Descent in meters.
-  uint16_t m_descent = 0;
+  geometry::Altitude m_descent = 0;
  // Altitude in meters.
-  uint16_t m_minAltitude = 0;
+  geometry::Altitude m_minAltitude = 0;
  // Altitude in meters.
-  uint16_t m_maxAltitude = 0;
+  geometry::Altitude m_maxAltitude = 0;
  // Some digital difficulty level with value in range [0-kMaxDifficulty]
  // or kInvalidDifficulty when difficulty is not found or incorrect.
  Difficulty m_difficulty = Difficulty::Unknown;
--- a/map/framework.cpp
+++ b/map/framework.cpp
@ -621,8 +621,8 @@ void Framework::FillUserMarkInfo(UserMark const * mark, place_page::Info & outIn

 void Framework::FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const
 {
-  info.SetBookmarkCategoryName(GetBookmarkManager().GetCategoryName(bmk.GetGroupId()));
  info.SetBookmarkData(bmk.GetData());
+  info.SetBookmarkCategoryName(GetBookmarkManager().GetCategoryName(bmk.GetGroupId()));
  info.SetBookmarkId(bmk.GetId());
  info.SetBookmarkCategoryId(bmk.GetGroupId());
  auto const description = GetPreferredBookmarkStr(info.GetBookmarkData().m_description);
@ -649,6 +649,7 @@ void Framework::FillTrackInfo(Track const & track, m2::PointD const & trackPoint
  info.SetTrackId(track.GetId());
  info.SetBookmarkCategoryId(track.GetGroupId());
  info.SetMercator(trackPoint);
+  info.SetCustomName(track.GetName());
 }

 search::ReverseGeocoder::Address Framework::GetAddressAtPoint(m2::PointD const & pt) const
@ -888,8 +889,8 @@ void Framework::ShowTrack(kml::TrackId trackId)
  auto es = GetBookmarkManager().GetEditSession();
  es.SetIsVisible(track->GetGroupId(), true /* visible */);

-  if (track->IsInteractive())
-    bm.SetDefaultTrackSelection(trackId, true /* showInfoSign */);
+//  if (track->IsInteractive())
+//    bm.SetDefaultTrackSelection(trackId, true /* showInfoSign */);
 }

 void Framework::ShowBookmarkCategory(kml::MarkGroupId categoryId, bool animation)
@ -908,13 +909,13 @@ void Framework::ShowBookmarkCategory(kml::MarkGroupId categoryId, bool animation
  es.SetIsVisible(categoryId, true /* visible */);

  auto const & trackIds = bm.GetTrackIds(categoryId);
-  for (auto trackId : trackIds)
-  {
-    if (!bm.GetTrack(trackId)->IsInteractive())
-      continue;
-    bm.SetDefaultTrackSelection(trackId, true /* showInfoSign */);
-    break;
-  }
+//  for (auto trackId : trackIds)
+//  {
+//    if (!bm.GetTrack(trackId)->IsInteractive())
+//      continue;
+//    bm.SetDefaultTrackSelection(trackId, true /* showInfoSign */);
+//    break;
+//  }
 }

 void Framework::ShowFeature(FeatureID const & featureId)
@ -2219,8 +2220,8 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
  auto const isFeatureMatchingEnabled = buildInfo.IsFeatureMatchingEnabled();

  // Using VisualParams inside FindTrackInTapPosition/GetDefaultTapRect requires drapeEngine.
-  if (m_drapeEngine != nullptr && buildInfo.IsTrackMatchingEnabled() &&
-      !(isFeatureMatchingEnabled && selectedFeature.IsValid()))
+  if (m_drapeEngine != nullptr && buildInfo.IsTrackMatchingEnabled() && isFeatureMatchingEnabled
+      /*!(isFeatureMatchingEnabled && selectedFeature.IsValid())*/)
  {
    auto const trackSelectionInfo = FindTrackInTapPosition(buildInfo);
    if (trackSelectionInfo.m_trackId != kml::kInvalidTrackId)
--- a/map/track.cpp
+++ b/map/track.cpp
@ -68,7 +68,7 @@ Track::Track(kml::TrackData && data, bool interactive)
 {
  m_data.m_id = GetId();
  CHECK(m_data.m_geometry.IsValid(), ());
-  if (interactive && HasAltitudes())
+  if (interactive)
    CacheDataForInteraction();
 }

@ -161,6 +161,19 @@ double Track::GetLengthMeters() const
  return len;
 }

+double Track::GetDurationInSeconds() const
+{
+  ASSERT(m_data.m_geometry.HasTimestamps(), ());
+  double duration = 0.0;
+  for (size_t i = 0; i < m_data.m_geometry.m_timestamps.size(); ++i)
+  {
+    ASSERT(m_data.m_geometry.HasTimestampsFor(i), ());
+    auto const & timestamps = m_data.m_geometry.m_timestamps[i];
+    duration += timestamps.back() - timestamps.front();
+  }
+  return duration;
+}
+
 double Track::GetLengthMetersImpl(kml::MultiGeometry::LineT const & line, size_t ptIdx) const
 {
  if (m_interactionData)
--- a/map/track.hpp
+++ b/map/track.hpp
@ -27,6 +27,7 @@ public:

  m2::RectD GetLimitRect() const;
  double GetLengthMeters() const;
+  double GetDurationInSeconds() const;
  bool IsInteractive() const;

  std::pair<m2::PointD, double> GetCenterPoint() const;
@ -67,13 +68,15 @@ public:
  /// @name This functions are valid only for the single line geometry.
  /// @{
  kml::MultiGeometry::LineT const & GetSingleGeometry() const;
+
+  bool HasAltitudes() const;
+
 private:
  std::vector<double> GetLengthsImpl() const;
  /// @}
  m2::RectD GetLimitRectImpl() const;

  void CacheDataForInteraction();
-  bool HasAltitudes() const;

  double GetLengthMetersImpl(kml::MultiGeometry::LineT const & line, size_t ptIdx) const;
Author	SHA1	Message	Date
Kiryl Kaveryn	edc86c72d3	fix 3 Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2024-10-18 23:43:51 +04:00
Kiryl Kaveryn	28f0dfeac1	[ios] add `TrackRecordingInfo` mapper class for the core's `GpsTrackInfo` Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2024-10-18 13:16:14 +04:00
Kiryl Kaveryn	c187bcc72b	fix 2 Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>	2024-10-18 13:16:04 +04:00
Kiryl Kaveryn	0270f995e7	fix Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com> # Conflicts: # iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift	2024-10-17 18:16:20 +04:00