diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index 91d0d44b89..04f9b304d3 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -124,7 +124,7 @@ 9957FAE8237AE5B000855F48 /* Logger.h in Headers */ = {isa = PBXBuildFile; fileRef = 9957FAE6237AE5B000855F48 /* Logger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9957FAE9237AE5B000855F48 /* Logger.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9957FAE7237AE5B000855F48 /* Logger.mm */; }; 9974CA2923DF1968003FE824 /* ElevationProfileData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9974CA2723DF1968003FE824 /* ElevationProfileData.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9974CA2A23DF1968003FE824 /* ElevationProfileData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9974CA2823DF1968003FE824 /* ElevationProfileData.m */; }; + 9974CA2A23DF1968003FE824 /* ElevationProfileData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9974CA2823DF1968003FE824 /* ElevationProfileData.mm */; }; 9974CA2D23DF197B003FE824 /* ElevationProfileData+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 9974CA2B23DF197B003FE824 /* ElevationProfileData+Core.h */; }; 999D3A64237B097C00C5F7A8 /* DeepLinkSubscriptionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 999D3A62237B097C00C5F7A8 /* DeepLinkSubscriptionData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 999D3A65237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 999D3A63237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm */; }; @@ -259,7 +259,7 @@ 9957FAE6237AE5B000855F48 /* Logger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = ""; }; 9957FAE7237AE5B000855F48 /* Logger.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Logger.mm; sourceTree = ""; }; 9974CA2723DF1968003FE824 /* ElevationProfileData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ElevationProfileData.h; sourceTree = ""; }; - 9974CA2823DF1968003FE824 /* ElevationProfileData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ElevationProfileData.m; sourceTree = ""; }; + 9974CA2823DF1968003FE824 /* ElevationProfileData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ElevationProfileData.mm; sourceTree = ""; }; 9974CA2B23DF197B003FE824 /* ElevationProfileData+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ElevationProfileData+Core.h"; sourceTree = ""; }; 999D3A62237B097C00C5F7A8 /* DeepLinkSubscriptionData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkSubscriptionData.h; sourceTree = ""; }; 999D3A63237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DeepLinkSubscriptionData.mm; sourceTree = ""; }; @@ -633,7 +633,7 @@ isa = PBXGroup; children = ( 9974CA2723DF1968003FE824 /* ElevationProfileData.h */, - 9974CA2823DF1968003FE824 /* ElevationProfileData.m */, + 9974CA2823DF1968003FE824 /* ElevationProfileData.mm */, 9974CA2B23DF197B003FE824 /* ElevationProfileData+Core.h */, 9940621E23EAC57900493D1A /* ElevationHeightPoint.h */, 9940621F23EAC57900493D1A /* ElevationHeightPoint.m */, @@ -809,7 +809,7 @@ 47942D9D237D927800DEFAE3 /* PlacePageBookmarkData.mm in Sources */, 4738A8E1239FACE7007C0F43 /* CoreBanner.mm in Sources */, 47942D86237CC55500DEFAE3 /* MWMOpeningHoursCommon.mm in Sources */, - 9974CA2A23DF1968003FE824 /* ElevationProfileData.m in Sources */, + 9974CA2A23DF1968003FE824 /* ElevationProfileData.mm in Sources */, 47942D82237CC52A00DEFAE3 /* MWMOpeningHours.mm in Sources */, 47942D73237CC41400DEFAE3 /* OpeningHours.mm in Sources */, 47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */, diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index f533d75e88..a8976f3a94 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -119,5 +119,7 @@ typedef void (^PingCompletionBlock)(BOOL success); - (NSString *)deviceId; - (NSDictionary *)getCatalogHeaders; +- (void)setElevationActivePoint:(double)distance trackId:(uint64_t)trackId; + @end NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index 8ad53cbc2c..a5344966e0 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -768,4 +768,8 @@ return [result copy]; } +- (void)setElevationActivePoint:(double)distance trackId:(uint64_t)trackId { + self.bm.SetElevationActivePoint(trackId, distance); +} + @end diff --git a/iphone/CoreApi/CoreApi/Common/MWMTypes.h b/iphone/CoreApi/CoreApi/Common/MWMTypes.h index 241dae7e04..1222ba25b0 100644 --- a/iphone/CoreApi/CoreApi/Common/MWMTypes.h +++ b/iphone/CoreApi/CoreApi/Common/MWMTypes.h @@ -8,7 +8,7 @@ typedef void (^MWMBoolBlock)(BOOL); typedef NS_ENUM(NSUInteger, MWMDayTime) { MWMDayTimeDay, MWMDayTimeNight }; -typedef NS_ENUM(NSUInteger, MWMUnits) { MWMUnitsMetric, MWMUnitsImperial }; +typedef NS_ENUM(NSUInteger, MWMUnits) { MWMUnitsMetric, MWMUnitsImperial } NS_SWIFT_NAME(Units); typedef NS_ENUM(NSUInteger, MWMTheme) { MWMThemeDay, diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.h b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.h index e5fb666e14..e5982da5ea 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.h @@ -5,9 +5,9 @@ NS_ASSUME_NONNULL_BEGIN @interface ElevationHeightPoint : NSObject @property(nonatomic, readonly) double distance; -@property(nonatomic, readonly) double height; +@property(nonatomic, readonly) double altitude; -- (instancetype)initWithDistance:(double)distance andHeight:(double)height; +- (instancetype)initWithDistance:(double)distance andAltitude:(double)altitude; @end diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.m b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.m index af6bec5988..84346997d2 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.m +++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationHeightPoint.m @@ -2,11 +2,11 @@ @implementation ElevationHeightPoint -- (instancetype)initWithDistance:(double)distance andHeight:(double)height { +- (instancetype)initWithDistance:(double)distance andAltitude:(double)altitude { self = [super init]; if (self) { _distance = distance; - _height = height; + _altitude = altitude; } return self; } diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h index 46f52e842c..b69dbdd798 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData+Core.h @@ -1,9 +1,13 @@ #import "ElevationProfileData.h" +#include "map/elevation_info.hpp" + NS_ASSUME_NONNULL_BEGIN @interface ElevationProfileData (Core) +- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo activePoint:(double)activePoint; + @end NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h index bc7b04620c..fbfcbf89f7 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.h @@ -11,16 +11,17 @@ typedef NS_ENUM(NSInteger, ElevationDifficulty) { @interface ElevationProfileData : NSObject -@property(nonatomic, readonly) NSString* serverId; -@property(nonatomic, readonly) NSString* ascent; -@property(nonatomic, readonly) NSString* descent; -@property(nonatomic, readonly) NSString* maxAttitude; -@property(nonatomic, readonly) NSString* minAttitude; +@property(nonatomic, readonly) uint64_t trackId; +@property(nonatomic, readonly) NSUInteger ascent; +@property(nonatomic, readonly) NSUInteger descent; +@property(nonatomic, readonly) NSUInteger maxAttitude; +@property(nonatomic, readonly) NSUInteger minAttitude; @property(nonatomic, readonly) ElevationDifficulty difficulty; -@property(nonatomic, readonly) NSString* trackTime; -@property(nonatomic, readonly, nullable) NSString* extendedDifficultyGrade; -@property(nonatomic, readonly, nullable) NSString* extendedDifficultyDescription; -@property(nonatomic, readonly) NSArray* points; +@property(nonatomic, readonly) NSUInteger trackTime; +//@property(nonatomic, readonly, nullable) NSString *extendedDifficultyGrade; +//@property(nonatomic, readonly, nullable) NSString *extendedDifficultyDescription; +@property(nonatomic, readonly) NSArray *points; +@property(nonatomic, readonly) double activePoint; @end diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.m b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.m deleted file mode 100644 index 10bdb5841c..0000000000 --- a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.m +++ /dev/null @@ -1,31 +0,0 @@ -#import "ElevationProfileData.h" - -@implementation ElevationProfileData - -- (instancetype)init { - self = [super init]; - if (self) { - _serverId = @"0"; - _ascent = @"10000 m"; - _descent = @"20000 m"; - _maxAttitude = @"1213 m"; - _minAttitude = @"22134 m"; - _difficulty = ElevationDifficultyModerate; - _trackTime = @"3h 12m"; - _extendedDifficultyGrade = @"S5"; - _extendedDifficultyDescription = - @"On a S2 trail you will face bigger roots and stones (but never the Rolling Stones). Usually the ground isn’t " - @"compact and you will find steps and stairs. Oftentimes there are narrow turns and the steepness in some spots " - @"can be up to 70%."; - - NSMutableArray *randPoints = [[NSMutableArray alloc] init]; - for (int i = 0; i < 100; i++) { - [randPoints addObject:[[ElevationHeightPoint alloc] initWithDistance:arc4random() % 100 - andHeight:arc4random() % 200]]; - } - _points = randPoints; - } - return self; -} - -@end diff --git a/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm new file mode 100644 index 0000000000..7bcc5958e2 --- /dev/null +++ b/iphone/CoreApi/CoreApi/PlacePageData/ElevationProfile/ElevationProfileData.mm @@ -0,0 +1,32 @@ +#import "ElevationProfileData+Core.h" + +@implementation ElevationProfileData + +@end + +@implementation ElevationProfileData (Core) + +- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo activePoint:(double)activePoint { + self = [super init]; + if (self) { + _trackId = elevationInfo.GetId(); + _ascent = elevationInfo.GetAscent(); + _descent = elevationInfo.GetDescent(); + _maxAttitude = elevationInfo.GetMaxAltitude(); + _minAttitude = elevationInfo.GetMinAltitude(); + _difficulty = (ElevationDifficulty)elevationInfo.GetDifficulty(); + _trackTime = elevationInfo.GetDuration(); + NSMutableArray *pointsArray = [NSMutableArray array]; + for (auto const &p : elevationInfo.GetPoints()) { + ElevationHeightPoint *point = [[ElevationHeightPoint alloc] initWithDistance:p.m_distance + andAltitude:p.m_altitude]; + [pointsArray addObject:point]; + } + _points = [pointsArray copy]; + _activePoint = activePoint; + } + return self; +} + + +@end diff --git a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h index a56a94f219..1510deea3c 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h @@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic, readonly, nullable) HotelRooms *hotelRooms; @property(nonatomic, readonly, nullable) UgcData *ugcData; @property(nonatomic, readonly, nullable) ElevationProfileData *elevationProfileData; -@property(nonatomic, readonly) MWMMapNodeAttributes *mapNodeAttributes; +@property(nonatomic, readonly, nullable) MWMMapNodeAttributes *mapNodeAttributes; @property(nonatomic, readonly, nullable) NSString *bookingSearchUrl; @property(nonatomic, readonly) BOOL isLargeToponim; @property(nonatomic, readonly) BOOL isSightseeing; diff --git a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm index 45e4bac2cc..4b3d5cacf8 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm @@ -132,15 +132,26 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) { _sponsoredDeeplink = @(rawData().GetSponsoredDeepLink().c_str()); } - _mapNodeAttributes = [[MWMStorage sharedStorage] attributesForCountry:@(rawData().GetCountryId().c_str())]; - [[MWMStorage sharedStorage] addObserver:self]; -// _elevationProfileData = [[ElevationProfileData alloc] init]; + if (rawData().IsTrack()) { + auto const &bm = GetFramework().GetBookmarkManager(); + auto const &trackId = rawData().GetTrackId(); + _elevationProfileData = [[ElevationProfileData alloc] initWithElevationInfo:bm.MakeElevationInfo(trackId) + activePoint:bm.GetElevationActivePoint(trackId)]; + } + + auto const &countryId = rawData().GetCountryId(); + if (!countryId.empty()) { + _mapNodeAttributes = [[MWMStorage sharedStorage] attributesForCountry:@(rawData().GetCountryId().c_str())]; + [[MWMStorage sharedStorage] addObserver:self]; + } } return self; } - (void)dealloc { - [[MWMStorage sharedStorage] removeObserver:self]; + if (self.mapNodeAttributes != nil) { + [[MWMStorage sharedStorage] removeObserver:self]; + } } - (void)loadOnlineDataWithCompletion:(MWMVoidBlock)completion { diff --git a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib index df6199410a..c01dc61b64 100644 --- a/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Subscription/BookmarksSubscriptionViewController.xib @@ -1,9 +1,9 @@ - + - + diff --git a/iphone/Maps/Core/Settings/MWMSettings.h b/iphone/Maps/Core/Settings/MWMSettings.h index d6553725b7..18f2260d05 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.h +++ b/iphone/Maps/Core/Settings/MWMSettings.h @@ -1,3 +1,4 @@ +NS_SWIFT_NAME(Settings) @interface MWMSettings : NSObject + (BOOL)adServerForbidden; diff --git a/iphone/Maps/Core/Theme/Core/ThemeManager.swift b/iphone/Maps/Core/Theme/Core/ThemeManager.swift index 4bd807b9f9..a5b66f4485 100644 --- a/iphone/Maps/Core/Theme/Core/ThemeManager.swift +++ b/iphone/Maps/Core/Theme/Core/ThemeManager.swift @@ -13,7 +13,7 @@ final class ThemeManager: NSObject { @objc static func setDarkModeEnabled(_ val: Bool) { instance.isDarkModeEnabled = val - instance.update(theme: MWMSettings.theme()) + instance.update(theme: Settings.theme()) } private func update(theme: MWMTheme) { @@ -68,7 +68,7 @@ final class ThemeManager: NSObject { } @objc static func invalidate() { - instance.update(theme: MWMSettings.theme()) + instance.update(theme: Settings.theme()) } @available(iOS, deprecated:13.0) diff --git a/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift b/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift index 6675cc43b0..b7cc0a3203 100644 --- a/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift @@ -56,7 +56,7 @@ class ActionBarViewController: UIViewController { stackView.addArrangedSubview(button) if buttonType == .download { downloadButton = button - updateDownloadButtonState(placePageData.mapNodeAttributes.nodeStatus) + updateDownloadButtonState(placePageData.mapNodeAttributes!.nodeStatus) } } } @@ -79,8 +79,8 @@ class ActionBarViewController: UIViewController { } func updateDownloadButtonState(_ nodeStatus: MapNodeStatus) { - guard let downloadButton = downloadButton else { return } - switch self.placePageData.mapNodeAttributes.nodeStatus { + guard let downloadButton = downloadButton, let mapNodeAttributes = placePageData.mapNodeAttributes else { return } + switch mapNodeAttributes.nodeStatus { case .downloading: downloadButton.mapDownloadProgress?.state = .progress case .applying, .inQueue: @@ -97,14 +97,16 @@ class ActionBarViewController: UIViewController { } private func configButton1() { - switch placePageData.mapNodeAttributes.nodeStatus { - case .onDiskOutOfDate, .onDisk, .undefined: - break - case .downloading, .applying, .inQueue, .error, .notDownloaded, .partly: - visibleButtons.append(.download) - return - @unknown default: - fatalError() + if let mapNodeAttributes = placePageData.mapNodeAttributes { + switch mapNodeAttributes.nodeStatus { + case .onDiskOutOfDate, .onDisk, .undefined: + break + case .downloading, .applying, .inQueue, .error, .notDownloaded, .partly: + visibleButtons.append(.download) + return + @unknown default: + fatalError() + } } var buttons: [ActionBarButtonType] = [] if isRoutePlanning { diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationDetails/ElevationDetailsPresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationDetails/ElevationDetailsPresenter.swift index 6499fd8bbe..ed33ae21cd 100644 --- a/iphone/Maps/UI/PlacePage/Components/ElevationDetails/ElevationDetailsPresenter.swift +++ b/iphone/Maps/UI/PlacePage/Components/ElevationDetails/ElevationDetailsPresenter.swift @@ -20,8 +20,8 @@ class ElevationDetailsPresenter { extension ElevationDetailsPresenter: ElevationDetailsPresenterProtocol { func configure() { view?.setDifficulty(data.difficulty) - view?.setExtendedDifficultyGrade(data.extendedDifficultyGrade ?? "") - view?.setDifficultyDescription(data.extendedDifficultyDescription ?? "") +// view?.setExtendedDifficultyGrade(data.extendedDifficultyGrade ?? "") +// view?.setDifficultyDescription(data.extendedDifficultyDescription ?? "") Statistics.logEvent(kStatElevationProfilePageDetailsOpen, withParameters: [kStatType: data.difficulty.rawValue]); } diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileBuilder.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileBuilder.swift index b3e240ec6e..aba969e77b 100644 --- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileBuilder.swift +++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileBuilder.swift @@ -6,8 +6,9 @@ class ElevationProfileBuilder { let storyboard = UIStoryboard.instance(.placePage) let viewController = storyboard.instantiateViewController(ofType: ElevationProfileViewController.self); let presenter = ElevationProfilePresenter(view: viewController, - data: elevationProfileData, - delegate: delegate) + data: elevationProfileData, + imperialUnits: Settings.measurementUnits() == .imperial, + delegate: delegate) viewController.presenter = presenter diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift index 5ced0ba737..d4f3a3955e 100644 --- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift +++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift @@ -1,3 +1,5 @@ +import Chart + protocol ElevationProfilePresenterProtocol: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout { func configure() func onAppear() @@ -7,15 +9,17 @@ protocol ElevationProfilePresenterProtocol: UICollectionViewDataSource, UICollec func onDragBegin() func onZoomBegin() func onNavigateBegin() + func onMapPointChanged(_ point: CGFloat) } protocol ElevationProfileViewControllerDelegate: AnyObject { func openDifficultyPopup() + func updateMapPoint(_ distance: Double) } fileprivate struct DescriptionsViewModel { let title: String - let value: String + let value: UInt let imageName: String } @@ -24,16 +28,20 @@ class ElevationProfilePresenter: NSObject { private let data: ElevationProfileData private let delegate: ElevationProfileViewControllerDelegate? - private let cellSpacing: CGFloat = 8 private let descriptionModels: [DescriptionsViewModel] + private let chartData: ElevationProfileChartData + private let imperialUnits: Bool init(view: ElevationProfileViewProtocol, data: ElevationProfileData, + imperialUnits: Bool, delegate: ElevationProfileViewControllerDelegate?) { self.view = view self.data = data + self.imperialUnits = imperialUnits self.delegate = delegate + chartData = ElevationProfileChartData(data) descriptionModels = [ DescriptionsViewModel(title: L("elevation_profile_ascent"), value: data.ascent, imageName: "ic_em_ascent_24"), @@ -47,25 +55,31 @@ class ElevationProfilePresenter: NSObject { extension ElevationProfilePresenter: ElevationProfilePresenterProtocol { func configure() { view?.setDifficulty(data.difficulty) - view?.setTrackTime(data.trackTime) - if let extendedDifficultyGrade = data.extendedDifficultyGrade { - view?.isExtendedDifficultyLabelHidden = false - view?.setExtendedDifficultyGrade(extendedDifficultyGrade) - } else { + view?.setTrackTime("\(data.trackTime)") + let presentationData = ChartPresentationData(chartData, + formatter: ChartFormatter(imperial: imperialUnits), + useFilter: true) + view?.setChartData(presentationData) + let routeLength = data.points.last!.distance + view?.setActivePoint(data.activePoint / routeLength) +// if let extendedDifficultyGrade = data.extendedDifficultyGrade { +// view?.isExtendedDifficultyLabelHidden = false +// view?.setExtendedDifficultyGrade(extendedDifficultyGrade) +// } else { view?.isExtendedDifficultyLabelHidden = true - } +// } } func onAppear() { Statistics.logEvent(kStatElevationProfilePageOpen, - withParameters: [kStatServerId: data.serverId, + withParameters: [/*kStatServerId: data.serverId,*/ //TODO: clarify kStatMethod: "info|track", kStatState: "preview"]) } func onDissapear() { Statistics.logEvent(kStatElevationProfilePageClose, - withParameters: [kStatServerId: data.serverId, + withParameters: [/*kStatServerId: data.serverId,*/ //TODO: clarify kStatMethod: "swipe"]) } @@ -75,7 +89,7 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol { func onDragBegin() { Statistics.logEvent(kStatElevationProfilePageDrag, - withParameters: [kStatServerId: data.serverId, + withParameters: [/*kStatServerId: data.serverId,*/ //TODO: clarify kStatAction: "zoom_in|zoom_out|drag", kStatSide: "left|right|all"]) } @@ -83,13 +97,24 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol { func onZoomBegin() { Statistics.logEvent(kStatElevationProfilePageZoom, - withParameters: [kStatServerId: data.serverId, + withParameters: [/*kStatServerId: data.serverId,*/ //TODO: clarify kStatIsZoomIn: true]) } func onNavigateBegin() { Statistics.logEvent(kStatElevationProfilePageNavigationAction, - withParameters: [kStatServerId: data.serverId]) + withParameters: [/*kStatServerId: data.serverId,*/ //TODO: clarify + :]) + } + + func onMapPointChanged(_ point: CGFloat) { + let x1 = Int(floor(point)) + let x2 = Int(ceil(point)) + let d1: Double = chartData.points[x1].distance + let d2: Double = chartData.points[x2].distance + let dx = Double(point.truncatingRemainder(dividingBy: 1)) + let distance = d1 + (d2 - d1) * dx + delegate?.updateMapPoint(distance) } } @@ -103,7 +128,7 @@ extension ElevationProfilePresenter { func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "ElevationProfileDescriptionCell", for: indexPath) as! ElevationProfileDescriptionCell let model = descriptionModels[indexPath.row] - cell.configure(title: model.title, value: model.value, imageName: model.imageName) + cell.configure(title: model.title, value: "\(model.value)", imageName: model.imageName) return cell } } @@ -123,3 +148,111 @@ extension ElevationProfilePresenter { return cellSpacing } } + +fileprivate struct ElevationProfileChartData { + struct Line: IChartLine { + var values: [Int] + var name: String + var color: UIColor + var type: ChartLineType + } + + fileprivate let chartLines: [Line] + fileprivate let distances: [Double] + fileprivate let points: [ElevationHeightPoint] + + init(_ elevationData: ElevationProfileData) { + points = ElevationProfileChartData.rearrangePoints(elevationData.points) + let values = points.map { Int($0.altitude) } +// let formatter = MKDistanceFormatter() +// formatter.unitStyle = .abbreviated +// formatter.units = .metric +// labels = points.map { formatter.string(fromDistance: $0.distance )} + distances = points.map { $0.distance } + let color = UIColor(red: 0.12, green: 0.59, blue: 0.94, alpha: 1) + let l1 = Line(values: values, name: "Altitude", color: color, type: .line) + let l2 = Line(values: values, name: "Altitude", color: color.withAlphaComponent(0.12), type: .lineArea) + chartLines = [l1, l2] + } + + private static func rearrangePoints(_ points: [ElevationHeightPoint]) -> [ElevationHeightPoint] { + if points.isEmpty { + return [] + } + + var result: [ElevationHeightPoint] = [] + + let distance = points.last?.distance ?? 0 + let step = floor(distance / Double(points.count)) + result.append(points[0]) + var currentDistance = step + var i = 1 + while i < points.count { + let prevPoint = points[i - 1] + let nextPoint = points[i] + if currentDistance > nextPoint.distance { + i += 1 + continue + } + result.append(ElevationHeightPoint(distance: currentDistance, + andAltitude: altBetweenPoints(prevPoint, nextPoint, at: currentDistance))) + currentDistance += step + if currentDistance > nextPoint.distance { + i += 1 + } + } + + return result + } + + private static func altBetweenPoints(_ p1: ElevationHeightPoint, + _ p2: ElevationHeightPoint, + at distance: Double) -> Double { + assert(distance > p1.distance && distance < p2.distance, "distance must be between points") + + let d = (distance - p1.distance) / (p2.distance - p1.distance) + return p1.altitude + round(Double(p2.altitude - p1.altitude) * d) + } + +} + +extension ElevationProfileChartData: IChartData { + public var xAxisValues: [Double] { + distances + } + + public var lines: [IChartLine] { + chartLines + } + + public var type: ChartType { + .regular + } +} + +fileprivate struct ChartFormatter: IFormatter { + private let distanceFormatter: MKDistanceFormatter + private let altFormatter: MeasurementFormatter + private let imperial: Bool + + init(imperial: Bool) { + self.imperial = imperial + + distanceFormatter = MKDistanceFormatter() + distanceFormatter.units = imperial ? .imperial : .metric + distanceFormatter.unitStyle = .abbreviated + + altFormatter = MeasurementFormatter() + altFormatter.unitOptions = [.providedUnit] + } + + func distanceString(from value: Double) -> String { + distanceFormatter.string(fromDistance: value) + } + + func altitudeString(from value: Double) -> String { + let alt = imperial ? value / 0.3048 : value + let measurement = Measurement(value: alt.rounded(), unit: imperial ? UnitLength.feet : UnitLength.meters) + return altFormatter.string(from: measurement) + } +} diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift index c40d7eb3b1..453df8049d 100644 --- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift @@ -1,3 +1,5 @@ +import Chart + protocol ElevationProfileViewProtocol: class { var presenter: ElevationProfilePresenterProtocol? { get set } @@ -5,11 +7,14 @@ protocol ElevationProfileViewProtocol: class { func setExtendedDifficultyGrade(_ value: String) func setTrackTime(_ value: String?) func setDifficulty(_ value: ElevationDifficulty) + func setChartData(_ data: ChartPresentationData) + func setActivePoint(_ distance: Double) } class ElevationProfileViewController: UIViewController { var presenter: ElevationProfilePresenterProtocol? + @IBOutlet private var chartView: ChartView! @IBOutlet private var graphViewContainer: UIView! @IBOutlet private var descriptionCollectionView: UICollectionView! @IBOutlet private var difficultyView: DifficultyView! @@ -22,6 +27,9 @@ class ElevationProfileViewController: UIViewController { descriptionCollectionView.dataSource = presenter descriptionCollectionView.delegate = presenter presenter?.configure() + chartView.onSelectedPointChanged = { [weak self] in + self?.presenter?.onMapPointChanged($0) + } } override func viewDidAppear(_ animated: Bool) { @@ -55,10 +63,20 @@ extension ElevationProfileViewController: ElevationProfileViewProtocol { func setExtendedDifficultyGrade(_ value: String) { extendedDifficultyGradeLabel.text = value } + func setTrackTime(_ value: String?) { trackTimeLabel.text = value } + func setDifficulty(_ value: ElevationDifficulty) { difficultyView.difficulty = value } + + func setChartData(_ data: ChartPresentationData) { + chartView.chartData = data + } + + func setActivePoint(_ distance: Double) { + chartView.setInfoX(CGFloat(distance)) + } } diff --git a/iphone/Maps/UI/PlacePage/PlacePage.storyboard b/iphone/Maps/UI/PlacePage/PlacePage.storyboard index cf1f32b71c..6ca1209130 100644 --- a/iphone/Maps/UI/PlacePage/PlacePage.storyboard +++ b/iphone/Maps/UI/PlacePage/PlacePage.storyboard @@ -2962,18 +2962,28 @@ - + - + + + + + + + - + + + + + - + @@ -3048,7 +3058,7 @@ - + @@ -3066,7 +3076,7 @@ - + + @@ -3141,7 +3152,7 @@ - + diff --git a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift index 2461e317c6..c3f4fc067d 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift @@ -205,11 +205,14 @@ extension PlacePageInteractor: ActionBarViewControllerDelegate { case .call: MWMPlacePageManagerHelper.call(placePageData) case .download: - switch placePageData.mapNodeAttributes.nodeStatus { + guard let mapNodeAttributes = placePageData.mapNodeAttributes else { + fatalError("Download button can't be displayed if mapNodeAttributes is empty") + } + switch mapNodeAttributes.nodeStatus { case .downloading, .inQueue, .applying: - Storage.shared().cancelDownloadNode(placePageData.mapNodeAttributes.countryId) + Storage.shared().cancelDownloadNode(mapNodeAttributes.countryId) case .notDownloaded, .partly, .error: - Storage.shared().downloadNode(placePageData.mapNodeAttributes.countryId) + Storage.shared().downloadNode(mapNodeAttributes.countryId) case .undefined, .onDiskOutOfDate, .onDisk: fatalError("Download button shouldn't be displayed when node is in these states") @unknown default: @@ -251,4 +254,8 @@ extension PlacePageInteractor: ElevationProfileViewControllerDelegate { func openDifficultyPopup() { MWMPlacePageManagerHelper.openElevationDifficultPopup(placePageData) } + + func updateMapPoint(_ distance: Double) { + MWMBookmarksManager.shared().setElevationActivePoint(distance, trackId: placePageData.elevationProfileData!.trackId) + } } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift index 5899510210..f5a078b5ce 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift @@ -92,7 +92,7 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout { lazy var buttonsViewController: PlacePageButtonsViewController = { let vc = storyboard.instantiateViewController(ofType: PlacePageButtonsViewController.self) vc.buttonsData = placePageData.buttonsData! - vc.buttonsEnabled = placePageData.mapNodeAttributes.nodeStatus == .onDisk + vc.buttonsEnabled = placePageData.mapNodeAttributes!.nodeStatus == .onDisk vc.delegate = interactor return vc } () @@ -208,8 +208,8 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout { placePageData.onMapNodeStatusUpdate = { [weak self] in guard let self = self else { return } - self.actionBarViewController.updateDownloadButtonState(self.placePageData.mapNodeAttributes.nodeStatus) - if self.placePageData.mapNodeAttributes.nodeStatus == .onDisk { + self.actionBarViewController.updateDownloadButtonState(self.placePageData.mapNodeAttributes!.nodeStatus) + if self.placePageData.mapNodeAttributes!.nodeStatus == .onDisk { self.actionBarViewController.resetButtons() if self.placePageData.buttonsData != nil { self.buttonsViewController.buttonsEnabled = true diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift index 48fcb9e234..03e720995f 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift @@ -31,7 +31,7 @@ class PlacePageElevationLayout: IPlacePageLayout { private func configureViewControllers() -> [UIViewController] { var viewControllers = [UIViewController]() - viewControllers.append(previewViewController) +// viewControllers.append(previewViewController) viewControllers.append(elevationMapViewController) return viewControllers