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

fix 3

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-10-18 23:43:51 +04:00
parent 28f0dfeac1
commit edc86c72d3
23 changed files with 221 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.h
View file

@ -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

2
iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.mm
View file

@ -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;
}

3
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h
View file

@ -9,6 +9,7 @@
@class PlacePageBookmarkData;
@class ElevationProfileData;
@class MWMMapNodeAttributes;
@class TrackStatistics;
typedef NS_ENUM(NSInteger, PlacePageRoadType) {
PlacePageRoadTypeToll,
@ -31,7 +32,7 @@ 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) ElevationProfileData *trackStatisticsData;
@property(nonatomic, readonly, nullable) TrackStatistics *trackStatistics;
@property(nonatomic, readonly, nullable) ElevationProfileData *elevationProfileData;
@property(nonatomic, readonly, nullable) MWMMapNodeAttributes *mapNodeAttributes;
@property(nonatomic, readonly, nullable) NSString *bookingSearchUrl;

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

@ -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"
@ -66,7 +67,9 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
if (_isTrack) {
auto const & bm = GetFramework().GetBookmarkManager();
auto const & trackId = rawData().GetTrackId();
if (bm.GetTrack(trackId)->HasAltitudes()) {
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)

1
iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics+Core.h
View file

@ -6,6 +6,5 @@
@interface TrackStatistics (Core)
- (instancetype)initWithTrackData:(Track const *)track;
- (instancetype)initWithGpsTrackInfo:(GpsTrackCollection::GpsTrackInfo const &)info;
@end

3
iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics.h
View file

@ -6,7 +6,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) double length;
@property (nonatomic, readonly) double duration;
@property (nonatomic, readonly) double elevationGain;
@property (nonatomic, readonly) double ascend;
@property (nonatomic, readonly) double descend;
@end

15
iphone/CoreApi/CoreApi/TrackRecorder/TrackStatistics.mm
View file

@ -10,18 +10,9 @@
self = [super init];
if (self) {
_length = track->GetLengthMeters();
// TODO: add methods to call
_duration = 0;
_elevationGain = 0;
}
return self;
}
- (instancetype)initWithGpsTrackInfo:(GpsTrackCollection::GpsTrackInfo const &)trackInfo {
if (self = [super init]) {
_length = trackInfo.length;
_duration = trackInfo.duration;
_elevationGain = trackInfo.elevationGain;
_duration = track->GetDurationInSeconds();
_ascend = 0;
_descend = 0;
}
return self;
}

26
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -493,7 +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 /* TrackDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA1EA942CC25A0D00DBDCAA /* TrackDetailsViewController.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 */; };
@ -1423,7 +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 /* TrackDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackDetailsViewController.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>"; };
@ -2936,7 +2942,6 @@
99C6531F23F2F178004322F3 /* Components */ = {
isa = PBXGroup;
children = (
EDA1EA982CC25A4200DBDCAA /* TrackDetails */,
99A906D423F6F7020005872B /* ActionBarViewController.swift */,
99A906D523F6F7020005872B /* OpeningHoursViewController.swift */,
99A906CD23F6F7010005872B /* PlacePageBookmarkViewController.swift */,
@ -2946,6 +2951,7 @@
99A906D823F6F7030005872B /* WikiDescriptionViewController.swift */,
4726254821C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift */,
99C964222428C0D500E41723 /* PlacePageHeader */,
EDA1EA982CC25A4200DBDCAA /* TrackStatistics */,
993DF0C223F6BD0600AC231A /* ElevationDetails */,
99DEF9D523E420D2006BFD21 /* ElevationProfile */,
EDE8EAE32C2DB74A002777F5 /* OpenInAppActionSheet */,
@ -3158,12 +3164,15 @@
path = ColorPicker;
sourceTree = "<group>";
};
EDA1EA982CC25A4200DBDCAA /* TrackDetails */ = {
EDA1EA982CC25A4200DBDCAA /* TrackStatistics */ = {
isa = PBXGroup;
children = (
EDA1EA942CC25A0D00DBDCAA /* TrackDetailsViewController.swift */,
EDA1EA9B2CC260C200DBDCAA /* TrackStatisticsBuilder.swift */,
EDA1EA942CC25A0D00DBDCAA /* TrackStatisticsViewController.swift */,
EDA1EA992CC260B400DBDCAA /* TrackStatisticsViewModel.swift */,
EDA1EA9D2CC2CED100DBDCAA /* TrackStatisticsTableViewCell.swift */,
);
path = TrackDetails;
path = TrackStatistics;
sourceTree = "<group>";
};
EDC4E3422C5D1BD3009286A2 /* RecentlyDeletedTests */ = {
@ -4369,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 */,
@ -4562,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 */,
@ -4692,7 +4704,7 @@
993DF0C923F6BD0600AC231A /* ElevationDetailsBuilder.swift in Sources */,
674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */,
34AB66291FC5AA330078E451 /* RouteManagerViewController.swift in Sources */,
EDA1EA972CC25A3B00DBDCAA /* TrackDetailsViewController.swift in Sources */,
EDA1EA972CC25A3B00DBDCAA /* TrackStatisticsViewController.swift in Sources */,
3404754D1E081A4600C92850 /* MWMKeyboard.m in Sources */,
EDE243E52B6D3F400057369B /* OSMView.swift in Sources */,
993DF10C23F6BDB100AC231A /* MWMTableViewCellRenderer.swift in Sources */,

5
iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileBuilder.swift
View file

@ -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,

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

@ -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

27
iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
View file

@ -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
}

45
iphone/Maps/UI/PlacePage/Components/TrackDetails/TrackDetailsViewController.swift
View file

@ -1,45 +0,0 @@
class TrackDetailsBuilder {
static func build(data: PlacePageData) -> TrackDetailsViewController {
let viewModel = TrackDetailsViewModel(data: data)
let viewController = TrackDetailsViewController(viewModel: viewModel)
return viewController
}
}
struct TrackDetailsViewModel {
let distance: String
let duration: String
init(data: PlacePageData) {
let track = BookmarksManager.shared().track(withId: data.previewData.)
distance = data.
duration = data.
}
}
class TrackDetailsViewController: MWMTableViewController {
var viewModel: TrackDetailsViewModel
init(viewModel: TrackDetailsViewModel) {
self.viewModel = viewModel
super.init()
}
@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
setupView()
}
private func setupView() {
tableView.register(cell: UITableViewCell.self)
}
}

7
iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsBuilder.swift Normal file
View file

@ -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
}
}

29
iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsTableViewCell.swift Normal file
View file

@ -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
}
}
}

47
iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsViewController.swift Normal file
View file

@ -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
}
}

42
iphone/Maps/UI/PlacePage/Components/TrackStatistics/TrackStatisticsViewModel.swift Normal file
View file

@ -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)]
}
}

56
iphone/Maps/UI/PlacePage/PlacePage.storyboard
View file

@ -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>

8
iphone/Maps/UI/PlacePage/PlacePageBuilder.swift
View file

@ -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)

33
iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift
View file

@ -29,15 +29,16 @@ class PlacePageElevationLayout: IPlacePageLayout {
return vc
} ()
lazy var infoViewController: PlacePageInfoViewController = {
let vc = storyboard.instantiateViewController(ofType: PlacePageInfoViewController.self)
vc.placePageInfoData = placePageData.infoData
vc.delegate = interactor
func trackStatisticsViewController(statistics: TrackStatistics) -> TrackStatisticsViewController {
let vc = TrackStatisticsBuilder.build(statistics: statistics)
return vc
} ()
}
lazy var elevationMapViewController: ElevationProfileViewController = {
return ElevationProfileBuilder.build(data: placePageData, delegate: interactor)
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) {
@ -55,11 +56,15 @@ class PlacePageElevationLayout: IPlacePageLayout {
bookmarkViewController.view.isHidden = false
}
if placePageData.infoData != nil {
viewControllers.append(infoViewController)
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)
}
viewControllers.append(elevationMapViewController)
return viewControllers
}
@ -67,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
}

6
iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
View file

@ -205,9 +205,9 @@ using namespace storage;
}
- (void)editTrack:(PlacePageData *)data {
EditTrackViewController * editTrackController = [[EditTrackViewController alloc] init];
[editBookmarkController configureWithPlacePageData:data];
[[MapViewController sharedController].navigationController pushViewController:editBookmarkController animated:YES];
// EditTrackViewController * editTrackController = [[EditTrackViewController alloc] init];
// [editBookmarkController configureWithPlacePageData:data];
// [[MapViewController sharedController].navigationController pushViewController:editBookmarkController animated:YES];
}
- (void)showPlaceDescription:(NSString *)htmlString

2
iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm
View file

@ -157,7 +157,7 @@
}
+ (void)editTrack:(PlacePageData *)data {
[[MWMMapViewControlsManager manager].placePageManager editTrack:data];
// [[MWMMapViewControlsManager manager].placePageManager editTrack:data];
}
+ (void)searchBookingHotels:(PlacePageData *)data {

17
map/elevation_info.cpp
View file

@ -44,26 +44,27 @@ ElevationInfo::ElevationInfo(Track const & track)
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 & pt1 = points[i - 1].GetPoint();
auto const & pt2 = points[i].GetPoint();
auto const deltaAltitude = points[i].GetAltitude() - points[i - 1].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 (m_minAltitude == geometry::kInvalidAltitude || points[i].GetAltitude() < m_minAltitude)
m_minAltitude = points[i].GetAltitude();
if (m_maxAltitude == geometry::kInvalidAltitude || points[i].GetAltitude() > m_maxAltitude)
m_maxAltitude = points[i].GetAltitude();
if (currentPointAltitude < m_minAltitude)
m_minAltitude = currentPointAltitude;
if (currentPointAltitude > m_maxAltitude)
m_maxAltitude = currentPointAltitude;
}
auto const & timestamps = trackData.m_geometry.m_timestamps[0];

1
map/framework.cpp
View file

@ -621,6 +621,7 @@ void Framework::FillUserMarkInfo(UserMark const * mark, place_page::Info & outIn
void Framework::FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const
{
info.SetBookmarkData(bmk.GetData());
info.SetBookmarkCategoryName(GetBookmarkManager().GetCategoryName(bmk.GetGroupId()));
info.SetBookmarkId(bmk.GetId());
info.SetBookmarkCategoryId(bmk.GetGroupId());