drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-22 22:23:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] Review fixes

Browse Source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn
2025-06-19 14:10:23 +04:00
committed by Konstantin Pastbin
parent aec82794ac
commit 1bb2b2274f
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData.h
View File

@@ -12,8 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) MWMMarkGroupID groupId; @property(nonatomic, readonly) MWMMarkGroupID groupId;
@property(nonatomic, readwrite, nonnull) TrackInfo * trackInfo; @property(nonatomic, readwrite, nonnull) TrackInfo * trackInfo;
@property(nonatomic, readwrite, nullable) ElevationProfileData * elevationProfileData; @property(nonatomic, readwrite, nullable) ElevationProfileData * elevationProfileData;
@property(nonatomic, readonly) double activePoint; @property(nonatomic, readonly) double activePointDistance;
@property(nonatomic, readonly) double myPosition; @property(nonatomic, readonly) double myPositionDistance;
@property(nonatomic) MWMVoidBlock onActivePointChangedHandler; @property(nonatomic) MWMVoidBlock onActivePointChangedHandler;
- (instancetype)initWithTrackInfo:(TrackInfo *)trackInfo - (instancetype)initWithTrackInfo:(TrackInfo *)trackInfo

8
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData.mm
View File

@@ -4,7 +4,7 @@
@interface PlacePageTrackData () @interface PlacePageTrackData ()
@property(nonatomic, readwrite) double activePoint; @property(nonatomic, readwrite) double activePointDistance;
@end @end
@@ -23,7 +23,7 @@
} }
- (void)updateActivePointDistance:(double)distance { - (void)updateActivePointDistance:(double)distance {
self.activePoint = distance; self.activePointDistance = distance;
if (self.onActivePointChangedHandler) if (self.onActivePointChangedHandler)
self.onActivePointChangedHandler(); self.onActivePointChangedHandler();
} }
@@ -40,8 +40,8 @@
_trackInfo = [[TrackInfo alloc] initWithTrackStatistics:track.GetStatistics()]; _trackInfo = [[TrackInfo alloc] initWithTrackStatistics:track.GetStatistics()];
auto const & bm = GetFramework().GetBookmarkManager(); auto const & bm = GetFramework().GetBookmarkManager();
_activePoint = bm.GetElevationActivePoint(_trackId); _activePointDistance = bm.GetElevationActivePoint(_trackId);
_myPosition = bm.GetElevationMyPosition(_trackId); _myPositionDistance = bm.GetElevationMyPosition(_trackId);
_onActivePointChangedHandler = onActivePointChangedHandler; _onActivePointChangedHandler = onActivePointChangedHandler;
auto const & elevationInfo = track.GetElevationInfo(); auto const & elevationInfo = track.GetElevationInfo();

2
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
View File

@@ -119,7 +119,7 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
if (!self || !rawData().IsTrack()) if (!self || !rawData().IsTrack())
return; return;
auto const & trackInfo = GetFramework().GetBookmarkManager().GetTrackSelectionInfo(rawData().GetTrackId()); auto const & trackInfo = GetFramework().GetBookmarkManager().GetTrackSelectionInfo(rawData().GetTrackId());
auto latlon = mercator::ToLatLon(trackInfo.m_trackPoint); auto const latlon = mercator::ToLatLon(trackInfo.m_trackPoint);
_locationCoordinate = CLLocationCoordinate2DMake(latlon.m_lat, latlon.m_lon); _locationCoordinate = CLLocationCoordinate2DMake(latlon.m_lat, latlon.m_lon);
self.previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()]; self.previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()];
} }

16
iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
View File

@@ -2,8 +2,8 @@ import Chart
import CoreApi import CoreApi
protocol TrackActivePointPresenter: AnyObject { protocol TrackActivePointPresenter: AnyObject {
func updateActivePoint(_ distance: Double) func updateActivePointDistance(_ distance: Double)
func updateMyPosition(_ distance: Double) func updateMyPositionDistance(_ distance: Double)
} }
protocol ElevationProfilePresenterProtocol: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, TrackActivePointPresenter { protocol ElevationProfilePresenterProtocol: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, TrackActivePointPresenter {
@@ -71,14 +71,14 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
configure() configure()
} }
func updateActivePoint(_ distance: Double) { func updateActivePointDistance(_ distance: Double) {
guard let view, !view.isChartViewInfoHidden else { return } guard let view, !view.isChartViewInfoHidden else { return }
view.setActivePoint(distance) view.setActivePointDistance(distance)
} }
func updateMyPosition(_ distance: Double) { func updateMyPositionDistance(_ distance: Double) {
guard let view, !view.isChartViewInfoHidden else { return } guard let view, !view.isChartViewInfoHidden else { return }
view.setMyPosition(distance) view.setMyPositionDistance(distance)
} }
func configure() { func configure() {
@@ -101,8 +101,8 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
return return
} }
view?.setActivePoint(trackData.activePoint) view?.setActivePointDistance(trackData.activePointDistance)
view?.setMyPosition(trackData.myPosition) view?.setMyPositionDistance(trackData.myPositionDistance)
} }
func onDifficultyButtonPressed() { func onDifficultyButtonPressed() {

8
iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
View File

@@ -8,8 +8,8 @@ protocol ElevationProfileViewProtocol: AnyObject {
var isChartViewInfoHidden: Bool { get set } var isChartViewInfoHidden: Bool { get set }
func setChartData(_ data: ChartPresentationData) func setChartData(_ data: ChartPresentationData)
func setActivePoint(_ distance: Double) func setActivePointDistance(_ distance: Double)
func setMyPosition(_ distance: Double) func setMyPositionDistance(_ distance: Double)
func reloadDescription() func reloadDescription()
} }
@@ -143,11 +143,11 @@ extension ElevationProfileViewController: ElevationProfileViewProtocol {
chartView.chartData = data chartView.chartData = data
} }
func setActivePoint(_ distance: Double) { func setActivePointDistance(_ distance: Double) {
chartView.setSelectedPoint(distance) chartView.setSelectedPoint(distance)
} }
func setMyPosition(_ distance: Double) { func setMyPositionDistance(_ distance: Double) {
chartView.myPosition = distance chartView.myPosition = distance
} }

6
iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
View File

@@ -56,16 +56,16 @@ class PlacePageInteractor: NSObject {
private func subscribeOnTrackActivePointUpdates() { private func subscribeOnTrackActivePointUpdates() {
guard placePageData.objectType == .track, let trackData = placePageData.trackData else { return } guard placePageData.objectType == .track, let trackData = placePageData.trackData else { return }
bookmarksManager.setElevationActivePointChanged(trackData.trackId) { [weak self] distance in bookmarksManager.setElevationActivePointChanged(trackData.trackId) { [weak self] distance in
self?.trackActivePointPresenter?.updateActivePoint(distance) self?.trackActivePointPresenter?.updateActivePointDistance(distance)
trackData.updateActivePointDistance(distance) trackData.updateActivePointDistance(distance)
} }
bookmarksManager.setElevationMyPositionChanged(trackData.trackId) { [weak self] distance in bookmarksManager.setElevationMyPositionChanged(trackData.trackId) { [weak self] distance in
self?.trackActivePointPresenter?.updateMyPosition(distance) self?.trackActivePointPresenter?.updateMyPositionDistance(distance)
} }
} }
private func unsubscribeFromTrackActivePointUpdates() { private func unsubscribeFromTrackActivePointUpdates() {
guard placePageData.objectType == .track, let trackData = placePageData.trackData else { return } guard placePageData.trackData?.onActivePointChangedHandler != nil else { return }
bookmarksManager.resetElevationActivePointChanged() bookmarksManager.resetElevationActivePointChanged()
bookmarksManager.resetElevationMyPositionChanged() bookmarksManager.resetElevationMyPositionChanged()
} }