tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios] fixes #5544 support canceling a drag operation and not by default (#5561)

Browse Source
This commit is contained in:
Fredrik Karlsson
2016-07-05 22:47:54 +02:00
committed by GitHub
parent 546469459f
commit 7b6ef80b5d
4 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/ios/app/MBXViewController.m
View File

@@ -605,12 +605,6 @@ static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXVie
return annotationView;
}
- (void)mapView:(MGLMapView *)mapView didDragAnnotationView:(nonnull MGLAnnotationView *)annotationView toCoordinate:(CLLocationCoordinate2D)coordinate
{
MGLPointAnnotation *annotation = (MGLPointAnnotation *)annotationView.annotation;
annotation.coordinate = coordinate;
}
- (BOOL)mapView:(__unused MGLMapView *)mapView annotationCanShowCallout:(__unused id <MGLAnnotation>)annotation
{
return YES;

3
platform/ios/src/MGLAnnotationView.h
View File

@@ -202,9 +202,6 @@ typedef NS_ENUM(NSUInteger, MGLAnnotationViewDragState) {
attempting to stop an operation that has already been initiated; doing so can
lead to undefined behavior. Once begun, the drag operation should always
continue to completion.
`-mapView:didDragAnnotationView:toCoordinate:` is called when a view is
dropped.
*/
@property (nonatomic, assign, getter=isDraggable) BOOL draggable;

16
platform/ios/src/MGLAnnotationView.mm
View File

@@ -212,13 +212,21 @@
[self.mapView.calloutViewForSelectedAnnotation dismissCalloutAnimated:animated];
[self.superview bringSubviewToFront:self];
}
if (dragState == MGLAnnotationViewDragStateEnding)
else if (dragState == MGLAnnotationViewDragStateCanceling)
{
if ([self.mapView.delegate respondsToSelector:@selector(mapView:didDragAnnotationView:toCoordinate:)])
self.panGestureRecognizer.enabled = NO;
self.longPressRecognizer.enabled = NO;
self.center = [self.mapView convertCoordinate:self.annotation.coordinate toPointToView:self.mapView];
self.panGestureRecognizer.enabled = YES;
self.longPressRecognizer.enabled = YES;
self.dragState = MGLAnnotationViewDragStateNone;
}
else if (dragState == MGLAnnotationViewDragStateEnding)
{
if ([self.annotation respondsToSelector:@selector(setCoordinate:)])
{
CLLocationCoordinate2D coordinate = [self.mapView convertPoint:self.center toCoordinateFromView:self.mapView];
[self.mapView.delegate mapView:self.mapView didDragAnnotationView:self toCoordinate:coordinate];
[(NSObject *)self.annotation setValue:[NSValue valueWithMGLCoordinate:coordinate] forKey:@"coordinate"];
}
}
}

21
platform/ios/src/MGLMapViewDelegate.h
View File

@@ -284,27 +284,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)mapView:(MGLMapView *)mapView didAddAnnotationViews:(NS_ARRAY_OF(MGLAnnotationView *) *)annotationViews;
#pragma mark Dragging Annotation Views
/**
Tells the delegate that the user has dragged the given annotation view to a new
location.
This method is called as soon as the user finishes dragging and drops the
annotation view at a new location.
To permanently move the corresponding annotation to the new geographic
coordinate, set the annotation’s `coordinate` property to the given coordinate.
Otherwise, the annotation view will return to the original location
corresponding to that property’s value.
@param mapView The map view containing the annotation view.
@param annotationView The annotation view that was dragged.
@param coordinate The geographic coordinate corresponding to the location to
which the user has dragged the annotation view.
*/
- (void)mapView:(MGLMapView *)mapView didDragAnnotationView:(MGLAnnotationView *)annotationView toCoordinate:(CLLocationCoordinate2D)coordinate;
#pragma mark Selecting Annotations
/**