Sync chart cursor across route analysis charts

OsmAnd.xcodeproj/project.pbxproj

@@ -832,6 +832,7 @@
 		46903D6B29B5F77A004459F1 /* OABaseWebViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 46903D6A29B5F77A004459F1 /* OABaseWebViewController.xib */; };
 		46903D6E29B664B2004459F1 /* OAWikiLanguagesWebViewContoller.m in Sources */ = {isa = PBXBuildFile; fileRef = 46903D6D29B664B2004459F1 /* OAWikiLanguagesWebViewContoller.m */; };
 		4695B25F2CF0A5D3003FB38A /* TrackChartHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4695B25E2CF0A5CB003FB38A /* TrackChartHelper.swift */; };
+		A5C7E00133F0000100C0DE01 /* RouteChartSynchronizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C7E00033F0000100C0DE01 /* RouteChartSynchronizer.swift */; };
 		46993C0A2986BCB70047F2F5 /* img_help_announcement_time_day@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 46993C092986BCB60047F2F5 /* img_help_announcement_time_day@3x.png */; };
 		469F0C222C627E2A00874CC6 /* PaletteCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 469F0C212C627E2A00874CC6 /* PaletteCollectionViewCell.swift */; };
 		469F0C242C627F9000874CC6 /* PaletteCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 469F0C232C627F9000874CC6 /* PaletteCollectionViewCell.xib */; };
@@ -4681,6 +4682,7 @@
 		46903D6C29B6649A004459F1 /* OAWikiLanguagesWebViewContoller.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAWikiLanguagesWebViewContoller.h; sourceTree = "<group>"; };
 		46903D6D29B664B2004459F1 /* OAWikiLanguagesWebViewContoller.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAWikiLanguagesWebViewContoller.m; sourceTree = "<group>"; };
 		4695B25E2CF0A5CB003FB38A /* TrackChartHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackChartHelper.swift; sourceTree = "<group>"; };
+		A5C7E00033F0000100C0DE01 /* RouteChartSynchronizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouteChartSynchronizer.swift; sourceTree = "<group>"; };
 		46993C092986BCB60047F2F5 /* img_help_announcement_time_day@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "img_help_announcement_time_day@3x.png"; path = "Resources/Icons/img_help_announcement_time_day@3x.png"; sourceTree = "<group>"; };
 		469F0C212C627E2A00874CC6 /* PaletteCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteCollectionViewCell.swift; sourceTree = "<group>"; };
 		469F0C232C627F9000874CC6 /* PaletteCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PaletteCollectionViewCell.xib; sourceTree = "<group>"; };
@@ -12415,6 +12417,7 @@
 				3284BEBB2EABA32C0011A9BA /* GpxAppearanceInfo.swift */,
 				FA8516EF2D42946D00B321C6 /* GpxDataItemHandler.swift */,
 				4695B25E2CF0A5CB003FB38A /* TrackChartHelper.swift */,
+				A5C7E00033F0000100C0DE01 /* RouteChartSynchronizer.swift */,
 				DA5A7AC026C563A100F274C7 /* OAGPXDatabase.h */,
 				DA5A7ABB26C563A100F274C7 /* OAGPXDatabase.mm */,
 				320F71352A8643550071C0E7 /* OAGPXDocumentAdapter.h */,
@@ -18334,6 +18337,7 @@
 				DA9F841C29CC96EF00127DAE /* OAShapeLayer.m in Sources */,
 				46CBC9722B96126C005CC244 /* GlideBaseWidget.swift in Sources */,
 				4695B25F2CF0A5D3003FB38A /* TrackChartHelper.swift in Sources */,
+				A5C7E00133F0000100C0DE01 /* RouteChartSynchronizer.swift in Sources */,
 				DA5A835526C563A800F274C7 /* OAGPXTrackCell.m in Sources */,
 				27E3C2032DF1ADD40053958E /* OAStreetNameWidgetParams.mm in Sources */,
 				DA5A844926C563A900F274C7 /* OADiscountToolbarViewController.mm in Sources */,

Sources/Controllers/PlanRoute/Cells/AnalyzeCardCell.swift

@@ -6,16 +6,19 @@
 //
 
 import UIKit
+import DGCharts
 
 final class AnalyzeCardCell: UITableViewCell {
 
-    let cardView = UIView()
-
     private enum Layout {
         static let cornerRadius: CGFloat = 24
         static let horizontalInset: CGFloat = 16
     }
 
+    let cardView = UIView()
+
+    weak var chartView: BarLineChartViewBase?
+
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         setupView()
@@ -27,6 +30,7 @@ final class AnalyzeCardCell: UITableViewCell {
 
     override func prepareForReuse() {
         super.prepareForReuse()
+        chartView = nil
         cardView.subviews.forEach { $0.removeFromSuperview() }
     }
 

Sources/Controllers/PlanRoute/Tabs/PlanRouteAnalyzeViewController.swift

@@ -39,20 +39,25 @@ private struct AnalyzeStatItem {
 }
 
 private final class AnalyzeChartDelegateProxy: NSObject, ChartViewDelegate {
-    var onNothingSelected: (() -> Void)?
-    var onValueSelected: (() -> Void)?
-    var onTranslated: (() -> Void)?
+    var onNothingSelected: ((ChartViewBase) -> Void)?
+    var onValueSelected: ((ChartViewBase, Highlight) -> Void)?
+    var onTranslated: ((ChartViewBase) -> Void)?
+    var onScaled: ((ChartViewBase) -> Void)?
 
     func chartValueNothingSelected(_ chartView: ChartViewBase) {
-        onNothingSelected?()
+        onNothingSelected?(chartView)
     }
 
     func chartValueSelected(_ chartView: ChartViewBase, entry: ChartDataEntry, highlight: Highlight) {
-        onValueSelected?()
+        onValueSelected?(chartView, highlight)
     }
 
     func chartTranslated(_ chartView: ChartViewBase, dX: CGFloat, dY: CGFloat) {
-        onTranslated?()
+        onTranslated?(chartView)
+    }
+
+    func chartScaled(_ chartView: ChartViewBase, scaleX: CGFloat, scaleY: CGFloat) {
+        onScaled?(chartView)
     }
 }
 
@@ -63,6 +68,7 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
     var onAttachToRoadsRequested: (() -> Void)?
 
     private let tableView = CancelableTableView(frame: .zero, style: .plain)
+    private let chartSynchronizer = RouteChartSynchronizer()
 
     private var selectedYAxisTypes: [NSNumber] = [
         NSNumber(value: GPXDataSetType.altitude.rawValue),
@@ -82,27 +88,32 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
     private var cachedSyntheticSteepnessSignature: Double = -1
     private var pendingSteepnessSignature: Double = -1
     private var lastRenderState: AnalyzeRenderState?
+    private var currentChartDataSignature: String?
     private var trackChartFilePath: String?
     private var trackChartHelper: TrackChartHelper?
-    private var highlightDrawX: CGFloat = -1
-    private var lastTranslation: CGPoint = .zero
-    private weak var dataSource: PlanRouteAnalyzeDataSource?
-    private weak var chartView: ElevationChart?
-    private weak var yAxisButton: UIButton?
-    private weak var xAxisButton: UIButton?
+    private var chartView: ElevationChart?
     private lazy var chartDelegateProxy: AnalyzeChartDelegateProxy = {
         let proxy = AnalyzeChartDelegateProxy()
-        proxy.onNothingSelected = { [weak self] in
+        proxy.onNothingSelected = { [weak self] _ in
+            self?.chartSynchronizer.clearSynchronizedHighlights()
             self?.hideChartLocation()
         }
-        proxy.onValueSelected = { [weak self] in
-            self?.refreshChartOnMap()
+        proxy.onValueSelected = { [weak self] chart, highlight in
+            guard let self, let chartView, chart === chartView else { return }
+            chartSynchronizer.syncHighlight(highlight, sourceChart: chartView)
+            refreshChartOnMap()
+        }
+        proxy.onTranslated = { [weak self] chart in
+            self?.handleChartViewPortChanged(chart)
         }
-        proxy.onTranslated = { [weak self] in
-            self?.handleChartTranslated()
+        proxy.onScaled = { [weak self] chart in
+            self?.handleChartViewPortChanged(chart)
         }
         return proxy
     }()
+    private weak var dataSource: PlanRouteAnalyzeDataSource?
+    private weak var yAxisButton: UIButton?
+    private weak var xAxisButton: UIButton?
 
     private var currentState: AnalyzeState {
         cachedState
@@ -165,6 +176,13 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
         }
         wasCalculatingElevation = isElevationCalculating
         let analysisData = dataSource?.analysisData
+        let nextChartDataSignature = chartDataSignature(for: analysisData)
+        if currentChartDataSignature != nextChartDataSignature {
+            chartSynchronizer.reset()
+            chartView = nil
+            currentChartDataSignature = nextChartDataSignature
+            hideChartLocation()
+        }
         cachedHasElevationData = analysisData?.hasElevationData == true
         cachedHasSpeedData = analysisData?.hasSpeedData == true
         cachedHasOverviewData = cachedHasElevationData || cachedHasSpeedData
@@ -177,6 +195,8 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
                                    roadAttributeStatistics: cachedRoadAttributeStatistics)
         let renderState = makeRenderState(analysisData: analysisData)
         if renderState.graphSignature == nil {
+            chartSynchronizer.reset()
+            chartView = nil
             hideChartLocation()
         }
         applyRenderState(renderState)
@@ -249,6 +269,7 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
                                      secondType: secondType,
                                      axisType: selectedXAxisType,
                                      calcWithoutGaps: GpxUtils.calcWithoutGaps(gpxFile, gpxDataItem: gpxItem, overrideIsGeneralTrack: true))
+        chartSynchronizer.setPrimaryChart(chart)
         if !chart.highlighted.isEmpty {
             refreshChartOnMap()
         }
@@ -275,12 +296,9 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
                             segment: segment)
     }
 
-    private func bindChartGestures(_ chart: ElevationChart) {
+    private func bindChartGestures(_ chart: BarLineChartViewBase) {
         chart.delegate = chartDelegateProxy
         chart.gestureRecognizers?.forEach { recognizer in
-            if recognizer is UIPanGestureRecognizer {
-                recognizer.addTarget(self, action: #selector(onChartScrolled(_:)))
-            }
             recognizer.addTarget(self, action: #selector(onChartGesture(_:)))
         }
     }
@@ -315,57 +333,9 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
         dataSource?.hideChartHighlight()
     }
 
-    @objc private func onChartScrolled(_ recognizer: UIPanGestureRecognizer) {
-        guard let chart = recognizer.view as? ElevationChart else { return }
-
-        if recognizer.state == .changed {
-            if chart.lowestVisibleX > 0.1,
-               roundedChartValue(chart.highestVisibleX) != roundedChartValue(chart.chartXMax) {
-                lastTranslation = recognizer.translation(in: chart)
-                return
-            }
-
-            let touchPoint = recognizer.location(in: chart)
-            let translation = recognizer.translation(in: chart)
-            let highlightX = chart.isFullyZoomedOut
-                ? touchPoint.x
-                : highlightDrawX + (lastTranslation.x - translation.x)
-            guard let highlight = chart.getHighlightByTouchPoint(CGPoint(x: highlightX, y: 0)) else { return }
-            chart.lastHighlighted = highlight
-            chart.highlightValue(highlight, callDelegate: true)
-        } else if recognizer.state == .ended {
-            lastTranslation = .zero
-            if let highlight = chart.highlighted.first {
-                highlightDrawX = highlight.drawX
-            }
-        }
-    }
-
-    @objc private func onChartGesture(_ recognizer: UIGestureRecognizer) {
-        guard let chart = recognizer.view as? ElevationChart else { return }
-
-        if recognizer.state == .began {
-            if let highlight = chart.highlighted.first {
-                highlightDrawX = highlight.drawX
-            } else {
-                highlightDrawX = -1
-            }
-        } else if (recognizer is UIPinchGestureRecognizer
-                    || (recognizer is UITapGestureRecognizer
-                        && (recognizer as? UITapGestureRecognizer)?.numberOfTapsRequired == 2))
-                    && recognizer.state == .ended {
-            refreshChartOnMap()
-        }
-    }
-
-    private func roundedChartValue(_ value: Double) -> Double {
-        (value * 10).rounded() / 10
-    }
-
-    private func handleChartTranslated() {
-        guard let chart = self.chartView, highlightDrawX != -1 else { return }
-        guard let highlight = chart.getHighlightByTouchPoint(CGPoint(x: highlightDrawX, y: 0)) else { return }
-        chart.highlightValue(highlight, callDelegate: true)
+    private func handleChartViewPortChanged(_ chart: ChartViewBase) {
+        guard let chart = chart as? BarLineChartViewBase else { return }
+        chartSynchronizer.syncViewPort(from: chart)
     }
 
     private func resolvedYAxisTypes() -> (GPXDataSetType, GPXDataSetType) {
@@ -448,6 +418,17 @@ final class PlanRouteAnalyzeViewController: UIViewController, PlanRouteTabConten
         ].joined(separator: "|")
     }
 
+    private func chartDataSignature(for analysisData: PlanRouteAnalysisData?) -> String? {
+        guard let analysis = analysisData?.gpxAnalysis,
+              let gpxFile = analysisData?.gpxFile else { return nil }
+        return [
+            gpxFile.path,
+            String(analysis.totalDistance),
+            String(analysis.timeSpan),
+            String(analysis.startTime)
+        ].joined(separator: "|")
+    }
+
     private func statsSignature(for analysisData: PlanRouteAnalysisData?) -> String? {
         guard cachedHasOverviewData, let analysisData else { return nil }
         return [
@@ -644,8 +625,6 @@ extension PlanRouteAnalyzeViewController: UITableViewDataSource {
 
         let chart = ElevationChart(frame: .zero)
         chart.translatesAutoresizingMaskIntoConstraints = false
-        chartView = chart
-        bindChartGestures(chart)
 
         let gpxItem = dataItem(for: gpxFile)
         let useHours = (analysis.timeSpan / Self.millisecondsPerHour) > 0
@@ -664,6 +643,8 @@ extension PlanRouteAnalyzeViewController: UITableViewDataSource {
                                      axisType: selectedXAxisType,
                                      calcWithoutGaps: GpxUtils.calcWithoutGaps(gpxFile, gpxDataItem: gpxItem, overrideIsGeneralTrack: true))
         chart.dragYEnabled = false
+        chartView = chart
+        bindChartGestures(chart)
 
         let recalcSeparator = SeparatorView()
         recalcSeparator.translatesAutoresizingMaskIntoConstraints = false
@@ -701,6 +682,7 @@ extension PlanRouteAnalyzeViewController: UITableViewDataSource {
             recalcBtn.heightAnchor.constraint(equalToConstant: 50)
         ])
 
+        cell.chartView = chart
         return cell
     }
 
@@ -880,7 +862,6 @@ extension PlanRouteAnalyzeViewController: UITableViewDataSource {
         let isExpanded = expandedStatIndexes.contains(statIndex)
 
         let barChart = HorizontalBarChartView(frame: .zero)
-        barChart.isUserInteractionEnabled = false
         barChart.translatesAutoresizingMaskIntoConstraints = false
         GpxUIHelper.refreshBarChart(chartView: barChart,
                                     statistics: stat,
@@ -897,6 +878,7 @@ extension PlanRouteAnalyzeViewController: UITableViewDataSource {
         rightAxis.drawGridLinesEnabled = true
         rightAxis.gridColor = .chartAxisGridLine
         rightAxis.labelTextColor = .textColorSecondary
+        bindChartGestures(barChart)
 
         let legendView = isExpanded ? makeExpandedRoadAttrLegend(stat: stat) : makeCompactRoadAttrLegend(stat: stat)
         card.addSubview(barChart)
@@ -909,6 +891,7 @@ extension PlanRouteAnalyzeViewController: UITableViewDataSource {
             barChart.heightAnchor.constraint(equalToConstant: 54)
         ])
 
+        cell.chartView = barChart
         return cell
     }
 
@@ -1223,6 +1206,16 @@ extension PlanRouteAnalyzeViewController: UITableViewDataSource {
 
 extension PlanRouteAnalyzeViewController: UITableViewDelegate {
 
+    func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
+        guard let chart = (cell as? AnalyzeCardCell)?.chartView else { return }
+        cell.layoutIfNeeded()
+        if let primaryChart = chart as? ElevationChart {
+            chartSynchronizer.setPrimaryChart(primaryChart)
+        } else if let barChart = chart as? HorizontalBarChartView {
+            chartSynchronizer.registerBarChart(barChart)
+        }
+    }
+
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: false)
         guard case .hasData = currentState,
@@ -1780,6 +1773,18 @@ private extension PlanRouteAnalyzeViewController {
 
 private extension PlanRouteAnalyzeViewController {
 
+    @objc private func onChartGesture(_ recognizer: UIGestureRecognizer) {
+        let isDoubleTap = (recognizer as? UITapGestureRecognizer)?.numberOfTapsRequired == 2
+        guard recognizer is UIPinchGestureRecognizer || isDoubleTap,
+              recognizer.state == .ended,
+              let chart = recognizer.view as? BarLineChartViewBase else { return }
+        refreshChartOnMap()
+        DispatchQueue.main.async {
+            chart.layoutIfNeeded()
+            self.chartSynchronizer.syncViewPort(from: chart)
+        }
+    }
+
     @objc private func onRecalculateTapped() {
         showGetElevationSheet()
     }