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

[iOS] add my position tracking on elevation chart

Browse source
This commit is contained in:
Aleksey Belousov 2020-03-28 05:09:28 +03:00 • committed by Vladimir Byko-Ianko
parent 0344e3b1c7
commit 3ec759fe5a
11 changed files with 87 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
iphone/Chart/Chart/Views/ChartInfo/ChartInfoView.swift
View file

@ -10,6 +10,7 @@ struct ChartLineInfo {
protocol ChartInfoViewDelegate: AnyObject {
func chartInfoView(_ view: ChartInfoView, infoAtPointX pointX: CGFloat) -> (String, [ChartLineInfo])?
func chartInfoView(_ view: ChartInfoView, didCaptureInfoView captured: Bool)
func chartInfoView(_ view: ChartInfoView, didMoveToPoint pointX: CGFloat)
}
class ChartInfoView: UIView {
@ -35,6 +36,18 @@ class ChartInfoView: UIView {
}
}
var myPositionX: CGFloat = -1 {
didSet {
if myPositionX < 0 || myPositionX > 1 {
myPositionView.isHidden = true
return
}
myPositionView.isHidden = false
myPositionView.center = CGPoint(x: bounds.width * myPositionX, y: myPositionView.center.y)
updateMyPosition()
}
}
var bgColor: UIColor = UIColor.white
var textColor: UIColor = UIColor.black {
@ -78,6 +91,11 @@ class ChartInfoView: UIView {
updateViews(point: lineInfo!.point)
}
private func updateMyPosition() {
guard let (_, myPositionPoints) = delegate?.chartInfoView(self, infoAtPointX: myPositionView.center.x) else { return }
myPositionView.updatePoint(myPositionPoints[0].point.y)
}
@objc func onPan(_ sender: UIPanGestureRecognizer) {
let x = sender.location(in: self).x
switch sender.state {
@ -85,13 +103,14 @@ class ChartInfoView: UIView {
break
case .began:
guard let lineInfo = lineInfo else { return }
captured = abs(x - lineInfo.point.x) < 22
captured = abs(x - lineInfo.point.x) <= 22
case .changed:
if captured {
if x < bounds.minX || x > bounds.maxX {
return
}
update(x)
delegate?.chartInfoView(self, didMoveToPoint: x)
}
case .ended, .cancelled, .failed:
captured = false
@ -141,6 +160,7 @@ class ChartInfoView: UIView {
myPositionView.frame = mf
update(bounds.width * infoX)
updateMyPosition()
}
}

6
iphone/Chart/Chart/Views/ChartInfo/ChartMyPositionView.swift
View file

@ -13,6 +13,8 @@ class ChartMyPositionView: UIView {
shapeLayer.lineWidth = 2
shapeLayer.strokeColor = UIColor(red: 0.142, green: 0.614, blue: 0.95, alpha: 0.3).cgColor
addSubview(pinView)
transform = CGAffineTransform.identity.scaledBy(x: 1, y: -1)
pinView.transform = CGAffineTransform.identity.scaledBy(x: 1, y: -1)
}
required init?(coder: NSCoder) {
@ -28,6 +30,10 @@ class ChartMyPositionView: UIView {
pinView.center = CGPoint(x: bounds.midX, y: bounds.midY)
}
func updatePoint(_ y: CGFloat) {
pinView.center = CGPoint(x: bounds.midX, y: y + pinView.bounds.height / 2)
}
}
fileprivate class MyPositionPinView: UIView {

22
iphone/Chart/Chart/Views/ChartView.swift
View file

@ -20,6 +20,12 @@ public class ChartView: UIView {
private var pinchStartUpper = 0
private var pinchGR: UIPinchGestureRecognizer!
public var myPosition: Double = -1 {
didSet {
setMyPosition(myPosition)
}
}
public var previewSelectorColor: UIColor = UIColor.lightGray.withAlphaComponent(0.9) {
didSet {
chartPreviewView.selectorColor = previewSelectorColor
@ -156,7 +162,13 @@ public class ChartView: UIView {
lower = chartData.xAxisValueAt(CGFloat(chartPreviewView.minX))
}
chartInfoView.infoX = CGFloat((x - lower) / rangeLength)
}
fileprivate func setMyPosition(_ x: Double) {
let upper = chartData.xAxisValueAt(CGFloat(chartPreviewView.maxX))
let lower = chartData.xAxisValueAt(CGFloat(chartPreviewView.minX))
let rangeLength = upper - lower
chartInfoView.myPositionX = CGFloat((x - lower) / rangeLength)
}
override public func layoutSubviews() {
@ -274,10 +286,19 @@ extension ChartView: ChartPreviewViewDelegate {
xAxisView.setBounds(lower: minX, upper: maxX)
updateCharts(animationStyle: .none)
chartInfoView.update()
setMyPosition(myPosition)
let x = chartInfoView.infoX * CGFloat(xAxisView.upperBound - xAxisView.lowerBound) + CGFloat(xAxisView.lowerBound)
onSelectedPointChanged?(x)
}
}
extension ChartView: ChartInfoViewDelegate {
func chartInfoView(_ view: ChartInfoView, didMoveToPoint pointX: CGFloat) {
let p = convert(CGPoint(x: pointX, y: 0), from: view)
let x = (p.x / bounds.width) * CGFloat(xAxisView.upperBound - xAxisView.lowerBound) + CGFloat(xAxisView.lowerBound)
onSelectedPointChanged?(x)
}
func chartInfoView(_ view: ChartInfoView, didCaptureInfoView captured: Bool) {
panGR.isEnabled = !captured
}
@ -305,7 +326,6 @@ extension ChartView: ChartInfoViewDelegate {
let v1 = line.originalValues[x1]
let v2 = line.originalValues[x2]
let v = round(dx * CGFloat(v2 - v1)) + CGFloat(v1)
onSelectedPointChanged?(x)
result.append(ChartLineInfo(name: line.name,
color: line.color,
point: chartsContainerView.convert(CGPoint(x: p.x, y: py), to: view),

3
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
View file

@ -122,6 +122,9 @@ typedef void (^ElevationPointChangedBlock)(double distance);
- (void)setElevationActivePoint:(double)distance trackId:(uint64_t)trackId;
- (void)setElevationActivePointChanged:(uint64_t)trackId callback:(ElevationPointChangedBlock)callback;
- (void)resetElevationActivePointChanged;
- (void)setElevationMyPositionChanged:(uint64_t)trackId callback:(ElevationPointChangedBlock)callback;
- (void)resetElevationMyPositionChanged;
@end
NS_ASSUME_NONNULL_END

12
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
View file

@ -783,4 +783,16 @@
self.bm.SetElevationActivePointChangedCallback(nullptr);
}
- (void)setElevationMyPositionChanged:(uint64_t)trackId callback:(ElevationPointChangedBlock)callback {
__weak __typeof(self) ws = self;
self.bm.SetElevationMyPositionChangedCallback([callback, trackId, ws] () {
callback(ws.bm.GetElevationMyPosition(trackId));
});
}
- (void)resetElevationMyPositionChanged {
self.bm.SetElevationMyPositionChangedCallback(nullptr);
}
@end

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

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

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

@ -22,6 +22,7 @@ typedef NS_ENUM(NSInteger, ElevationDifficulty) {
//@property(nonatomic, readonly, nullable) NSString *extendedDifficultyDescription;
@property(nonatomic, readonly) NSArray<ElevationHeightPoint *> *points;
@property(nonatomic, readonly) double activePoint;
@property(nonatomic, readonly) double myPosition;
@end

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

@ -6,7 +6,9 @@
@implementation ElevationProfileData (Core)
- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo activePoint:(double)activePoint {
- (instancetype)initWithElevationInfo:(ElevationInfo const &)elevationInfo
activePoint:(double)activePoint
myPosition:(double)myPosition {
self = [super init];
if (self) {
_trackId = elevationInfo.GetId();
@ -24,6 +26,7 @@
}
_points = [pointsArray copy];
_activePoint = activePoint;
_myPosition = myPosition;
}
return self;
}

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

@ -136,7 +136,8 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
auto const &bm = GetFramework().GetBookmarkManager();
auto const &trackId = rawData().GetTrackId();
_elevationProfileData = [[ElevationProfileData alloc] initWithElevationInfo:bm.MakeElevationInfo(trackId)
activePoint:bm.GetElevationActivePoint(trackId)];
activePoint:bm.GetElevationActivePoint(trackId)
myPosition:bm.GetElevationMyPosition(trackId)];
}
auto const &countryId = rawData().GetCountryId();

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

@ -50,6 +50,11 @@ class ElevationProfilePresenter: NSObject {
DescriptionsViewModel(title: L("elevation_profile_minaltitude"), value: data.minAttitude, imageName: "ic_em_min_attitude_24")
]
}
deinit {
MWMBookmarksManager.shared().resetElevationActivePointChanged()
MWMBookmarksManager.shared().resetElevationMyPositionChanged()
}
}
extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
@ -61,6 +66,7 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
useFilter: true)
view?.setChartData(presentationData)
view?.setActivePoint(data.activePoint)
view?.setMyPosition(data.myPosition)
// if let extendedDifficultyGrade = data.extendedDifficultyGrade {
// view?.isExtendedDifficultyLabelHidden = false
// view?.setExtendedDifficultyGrade(extendedDifficultyGrade)
@ -71,6 +77,9 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
MWMBookmarksManager.shared().setElevationActivePointChanged(data.trackId) { [weak self] distance in
self?.view?.setActivePoint(distance)
}
MWMBookmarksManager.shared().setElevationMyPositionChanged(data.trackId) { [weak self] distance in
self?.view?.setMyPosition(distance)
}
}
func onAppear() {

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

@ -9,6 +9,7 @@ protocol ElevationProfileViewProtocol: class {
func setDifficulty(_ value: ElevationDifficulty)
func setChartData(_ data: ChartPresentationData)
func setActivePoint(_ distance: Double)
func setMyPosition(_ distance: Double)
}
class ElevationProfileViewController: UIViewController {
@ -79,4 +80,8 @@ extension ElevationProfileViewController: ElevationProfileViewProtocol {
func setActivePoint(_ distance: Double) {
chartView.setSelectedPoint(distance)
}
func setMyPosition(_ distance: Double) {
chartView.myPosition = distance
}
}