From 5a4de6de89251bea082530db21d6611d7a28c6db Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Tue, 4 Feb 2014 14:22:44 -0500 Subject: [PATCH] clean up / add more / better document gestures --- README.md | 4 ++- ios/MBXViewController.mm | 77 ++++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 4faf5b965..0ec74bc4c 100644 --- a/README.md +++ b/README.md @@ -124,4 +124,6 @@ bin/convert-style.js > resources/style.pbf && bin/build-style.js - Use two fingers to rotate - Double-tap to zoom in one level - Two-finger single-tap to zoom out one level -- Long-press to reset north \ No newline at end of file +- Long-press to reset north +- Two-finger long press to reset the transform +- Three-finger long press to toggle debug information \ No newline at end of file diff --git a/ios/MBXViewController.mm b/ios/MBXViewController.mm index 62cd8ce01..fcdf12fcd 100644 --- a/ios/MBXViewController.mm +++ b/ios/MBXViewController.mm @@ -95,6 +95,14 @@ class MBXMapView UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPressGesture:)]; [self.view addGestureRecognizer:longPress]; + UILongPressGestureRecognizer *twoFingerLongPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleTwoFingerLongPressGesture:)]; + twoFingerLongPress.numberOfTouchesRequired = 2; + [self.view addGestureRecognizer:twoFingerLongPress]; + + UILongPressGestureRecognizer *threeFingerLongPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleThreeFingerLongPressGesture:)]; + threeFingerLongPress.numberOfTouchesRequired = 3; + [self.view addGestureRecognizer:threeFingerLongPress]; + UIPinchGestureRecognizer *pinch = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(handlePinchGesture:)]; [self.view addGestureRecognizer:pinch]; @@ -124,33 +132,56 @@ class MBXMapView - (void)handlePanGesture:(UIPanGestureRecognizer *)pan { if (pan.state == UIGestureRecognizerStateBegan) + { self.center = CGPointMake(0, 0); + } + else if (pan.state == UIGestureRecognizerStateChanged) + { + CGPoint delta = CGPointMake([pan translationInView:pan.view].x - self.center.x, + [pan translationInView:pan.view].y - self.center.y); - CGPoint delta = CGPointMake([pan translationInView:pan.view].x - self.center.x, - [pan translationInView:pan.view].y - self.center.y); + mapView->map.moveBy(delta.x, delta.y); - mapView->map.moveBy(delta.x, delta.y); - - self.center = CGPointMake(self.center.x + delta.x, self.center.y + delta.y); + self.center = CGPointMake(self.center.x + delta.x, self.center.y + delta.y); + } } -- (void)handleDoubleTapGesture:(UIPanGestureRecognizer *)doubleTap +- (void)handleDoubleTapGesture:(UITapGestureRecognizer *)doubleTap { - CGPoint gesturePoint = [doubleTap locationInView:doubleTap.view]; + if (doubleTap.state == UIGestureRecognizerStateEnded) + { + CGPoint gesturePoint = [doubleTap locationInView:doubleTap.view]; - mapView->map.scaleBy(2, gesturePoint.x, gesturePoint.y); + mapView->map.scaleBy(2, gesturePoint.x, gesturePoint.y); + } } -- (void)handleTwoFingerTapGesture:(UIPanGestureRecognizer *)twoFingerTap +- (void)handleTwoFingerTapGesture:(UITapGestureRecognizer *)twoFingerTap { - CGPoint gesturePoint = [twoFingerTap locationInView:twoFingerTap.view]; + if (twoFingerTap.state == UIGestureRecognizerStateEnded) + { + CGPoint gesturePoint = [twoFingerTap locationInView:twoFingerTap.view]; - mapView->map.scaleBy(0.5, gesturePoint.x, gesturePoint.y); + mapView->map.scaleBy(0.5, gesturePoint.x, gesturePoint.y); + } } - (void)handleLongPressGesture:(UILongPressGestureRecognizer *)longPress { - mapView->map.resetNorth(); + if (longPress.state == UIGestureRecognizerStateBegan) + mapView->map.resetNorth(); +} + +- (void)handleTwoFingerLongPressGesture:(UILongPressGestureRecognizer *)twoFingerLongPress +{ + if (twoFingerLongPress.state == UIGestureRecognizerStateBegan) + mapView->map.resetPosition(); +} + +- (void)handleThreeFingerLongPressGesture:(UILongPressGestureRecognizer *)threeFingerLongPress +{ + if (threeFingerLongPress.state == UIGestureRecognizerStateBegan) + mapView->map.toggleDebug(); } - (void)handlePinchGesture:(UIPinchGestureRecognizer *)pinch @@ -158,19 +189,29 @@ class MBXMapView CGFloat scale = mapView->map.getScale(); if (pinch.state == UIGestureRecognizerStateBegan) - self.zoom = log2f(scale); + { + self.zoom = log2f(scale); + } + else if (pinch.state == UIGestureRecognizerStateChanged) + { + CGFloat tolerance = 3; - CGFloat newZoom = self.zoom + (pinch.scale > 1 ? ((pinch.scale / 10) * 1) : (((1 - pinch.scale) / 0.9) * -1)); + CGFloat newZoom = self.zoom + (pinch.scale > 1 ? (pinch.scale / tolerance) : ((1 - pinch.scale) * -tolerance)); - mapView->map.setScale(powf(2, newZoom)); + mapView->map.setScale(powf(2, newZoom)); + } } - (void)handleRotateGesture:(UIRotationGestureRecognizer *)rotate { if (rotate.state == UIGestureRecognizerStateBegan) - self.angle = mapView->map.getAngle(); - - mapView->map.setAngle(self.angle + rotate.rotation); + { + self.angle = mapView->map.getAngle(); + } + else if (rotate.state == UIGestureRecognizerStateChanged) + { + mapView->map.setAngle(self.angle + rotate.rotation); + } } CADisplayLink *displayLink;