Authored by Justin R. Miller

refs #186: don't begin tap gesture zooms in/out if at max/min zoom

@@ -1561,6 +1561,8 @@ @@ -1561,6 +1561,8 @@
1561 1561
1562 - (void)doubleTapAtPoint:(CGPoint)aPoint 1562 - (void)doubleTapAtPoint:(CGPoint)aPoint
1563 { 1563 {
  1564 + if (self.zoom < self.maxZoom)
  1565 + {
1564 [self registerZoomEventByUser:YES]; 1566 [self registerZoomEventByUser:YES];
1565 1567
1566 if (self.zoomingInPivotsAroundCenter) 1568 if (self.zoomingInPivotsAroundCenter)
@@ -1577,6 +1579,7 @@ @@ -1577,6 +1579,7 @@
1577 1579
1578 [self zoomInToNextNativeZoomAt:aPoint animated:YES]; 1580 [self zoomInToNextNativeZoomAt:aPoint animated:YES];
1579 } 1581 }
  1582 + }
1580 1583
1581 if (_delegateHasDoubleTapOnMap) 1584 if (_delegateHasDoubleTapOnMap)
1582 [_delegate doubleTapOnMap:self at:aPoint]; 1585 [_delegate doubleTapOnMap:self at:aPoint];
@@ -1615,6 +1618,8 @@ @@ -1615,6 +1618,8 @@
1615 1618
1616 - (void)handleTwoFingerSingleTap:(UIGestureRecognizer *)recognizer 1619 - (void)handleTwoFingerSingleTap:(UIGestureRecognizer *)recognizer
1617 { 1620 {
  1621 + if (self.zoom > self.minZoom)
  1622 + {
1618 [self registerZoomEventByUser:YES]; 1623 [self registerZoomEventByUser:YES];
1619 1624
1620 CGPoint centerPoint = [self convertPoint:self.center fromView:self.superview]; 1625 CGPoint centerPoint = [self convertPoint:self.center fromView:self.superview];
@@ -1623,6 +1628,7 @@ @@ -1623,6 +1628,7 @@
1623 centerPoint = [self coordinateToPixel:self.userLocation.location.coordinate]; 1628 centerPoint = [self coordinateToPixel:self.userLocation.location.coordinate];
1624 1629
1625 [self zoomOutToNextNativeZoomAt:centerPoint animated:YES]; 1630 [self zoomOutToNextNativeZoomAt:centerPoint animated:YES];
  1631 + }
1626 1632
1627 if (_delegateHasSingleTapTwoFingersOnMap) 1633 if (_delegateHasSingleTapTwoFingersOnMap)
1628 [_delegate singleTapTwoFingersOnMap:self at:[recognizer locationInView:self]]; 1634 [_delegate singleTapTwoFingersOnMap:self at:[recognizer locationInView:self]];