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

[ios] Support touch panning gestures in CarPlay

Browse source 
Signed-off-by: Fabian Wüthrich <me@fabwu.ch>
This commit is contained in:
Fabian Wüthrich 2023-12-12 21:14:08 -08:00 • committed by Alexander Borsuk
parent 1f362694e8
commit c1de096229
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h
View file

@ -23,6 +23,7 @@ NS_SWIFT_NAME(FrameworkHelper)
+ (MWMMarkGroupID)invalidCategoryId;
+ (void)zoomMap:(MWMZoomMode)mode;
+ (void)moveMap:(UIOffset)offset;
+ (void)scrollMap:(double)distanceX :(double) distanceY;
+ (void)deactivateMapSelection:(BOOL)notifyUI NS_SWIFT_NAME(deactivateMapSelection(notifyUI:));
+ (void)switchMyPositionMode;
+ (void)stopLocationFollow;

4
iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm
View file

@ -112,6 +112,10 @@
GetFramework().Move(offset.horizontal, offset.vertical, true);
}
+ (void)scrollMap:(double) distanceX :(double) distanceY {
GetFramework().Scroll(distanceX, distanceY);
}
+ (void)deactivateMapSelection:(BOOL)notifyUI {
GetFramework().DeactivateMapSelection(notifyUI);
}

5
iphone/Maps/Classes/CarPlay/CarPlayService.swift
View file

@ -375,6 +375,11 @@ extension CarPlayService: CPMapTemplateDelegate {
isUserPanMap = true
}
func mapTemplate(_ mapTemplate: CPMapTemplate, didUpdatePanGestureWithTranslation translation: CGPoint, velocity: CGPoint) {
let scaleFactor = self.carplayVC?.mapView?.contentScaleFactor ?? 1
FrameworkHelper.scrollMap(-scaleFactor * translation.x, -scaleFactor * translation.y);
}
func mapTemplate(_ mapTemplate: CPMapTemplate, startedTrip trip: CPTrip, using routeChoice: CPRouteChoice) {
guard let info = routeChoice.userInfo as? RouteInfo else {
if let info = routeChoice.userInfo as? [String: Any],