* [android] Update release script to support CircleCI builds (#8950) * update release script to trigger builds on circleci now * update release script to trigger builds on circleci now * [core] When a layer is added, reload its source's tiles * [android] - keep observer when timeout occurs, make observer param nullable, fixup log messages (#8919) * [android] - avoid crashing when deleting already deleted region (#8920) * [android] - update LOST to 2.3.0 (#8872) * [android] - update proguard config, allow debug mimification, update OkHttp to latest version (#8944) * [core, android, ios, macos, qt] v10 default styles Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL. Cherry-picked fromed54849e99. * [ios, macos] Updated documented default style version MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version. Cherry-picked fromca97dd8cf4. * [ios, macos] Undeprecated unversioned style URL factory methods Undeprecated the unversioned style URL factory methods in MGLStyle for consistency with the Android and Qt SDKs. Added warnings about using them with the runtime styling API. Refactored mbgl::util::default_styles to track different versions for different styles. Cherry-picked from9e384b78fb. * [core, android, ios, macos] Added Traffic Day/Night to default styles The Styles API section of the Mapbox API Documentation site now lists Traffic Day v2 and Traffic Night v2, so this change adds those styles to all the places where styles are listed. Also switched iosapp and macosapp to unversioned style factory methods since MGLStyleDefaultVersion is no longer applicable for all styles. Cherry-picked from4d6f54553d. * [android] Release android-v5.1.0-beta.2 (#8976) * [android] url getter on sources * [android] fix ui test filter in makefile * [android] - build SNAPSHOT from release branch (#8958) * [android] - update changelog for 5.1.0-beta.2 * [android] - bump version number * [android] - Camera change listener v2.0 * [core] allow filesource url transform reset * [android] Update attribution wordmark (#8774) * Update wordmark on android * Moved attribution i icon to the right of mapbox word (in mapview preview image) * update padding and margin * [android] update hardcoded branch name * revert version to 5.1.0-SNAPSHOT * [android] - MarkerView deselect events with OnMarkerViewClickListener integration (#8996) * [android] - publish SNAPSHOT from release 5.1.0 branch (#8995) * [ios, macos] edited identity interpolation mode documentation (#8657) * [ios, macos] Factored out tile URL template guide Factored out redundant tile URL template documentation from the MGLRasterSource and MGLVectorSource documentation into a jazzy guide. This documentation used to live in one place, on a method on MGLTileSource, but that method had to be moved to MGLTileSource’s concrete subclasses. A jazzy guide is easier to link to, in any case. * [ios] Telemetry button in modal view controllers (#9027) Fixes #8980. * [android] - bump tools and support lib version due to SNAPSHOT dependencies (#9046) * [android] - bump tools and support lib version for SNAPSHOT dependencies * revert unsupported Circle CI build tools version * [core] Make destructor virtual to avoid object splicing during destruction * [core] add error for non-virtual destructor deletes + add virtual dtors * [android] - remove marker from selected markers when removing marker from annotation manager. (#9047) * Observe layout guides (#7716) * [ios] observe layout guides * [ios] update changelog * [ios, macos] Change == to = in style function initializers * [ios] Add annotation view initializer with annotation and reuse id (#9029) * [ios] Remove annotation view from container view when annotation removed (#9025) The annotation container view keeps an array of annotation views that is separate from the array of subviews that is a property of the UIView parent class. This removes an annotation view from that container view array when the associated annotation is removed. This avoids issue related to previously removed annotation views continuing to be involved in map view logic around annotation view selection due to taps. * [android] - correct bearing conversion when animating the map with jumpTo, easeTo and animateTo. (#9050) * [ios, macos] Updated `maximumZoomLevel` description, cherry-picked #8818 (#8842) Cherry-picked froma3e4e67ea6. * [ios] Updated podspecs and changelog for v3.5.3 (#8870) Cherry-picked from25c19902a2. * [ios] Update podspecs and changelog for iOS v3.5.4 Cherry-picked fromdb7bb509e9. * [ios, macos] Updated changelogs * [ios, macos] changed TRUE -> 'true' (#9059) fixes #9056 * [ios, macos] Light property implementation in MGLStyle (#9043) * [ios, macos] Add MGLLight to MGLStyle * [ios, macos] Implement Objc bindings for Light object * [ios, macos] Remove rawLight from MGLLight and re-implement it as value class * [ios, macos] Fix build on macos * [ios, macos] Add MGLLight documentation, Move MGLLightPosition to MGLLight * [ios, macos] Add MGLLight tests. * [ios, macos] Update changelogs * [ios, macos] Fix misspelling * [ios, macos] Fix MGLLightAnchor enum property names * [ios, macos] Update documentation. Improve varialble naming. * [ios, macos] Rename MGLLightPosition to MGLSphericalPosition * [ios, macos] Update data types of MGLSphericalPosition * [android] - horizontally rotated in snapshot (#9083) * Cherry-pick arabic text to release branch v3.6.0 (#9071) * [core] Throttle tiles to redo symbol placement at most once every 300ms. Fixes issue #8435 and prepares for pitch-scaling changes in issue #8967. * [core] Disable letter-spacing for Arabic labels (issue #9057) * [ios,macos] multipolygon coordinate (#8713) * [ios] MGLMultiPolygon's coordinate property implemented * [ios,macos] Add polylabalel to project config * [ios,macos] Change coordinate property for MGLPolyline,MGLPolygon,MGLMultiPolygon * [macos] Change project configuration to support polilabel * [ios,macos] Add MGLLocationCoordinate2DFromPoint * [ios, macos] Update changelogs * [ios, macos] remove unnecesary variables * [ios, macos] Add radians conversions * [ios, macos] Add coordinate calc to MGLPolyline * [ios, macos] Move radian fuctions to MGLGeometry_Private.h * [ios, macos] Fix code style * [ios, macos] Fix code indentation * [ios, macos] Fix radian per meters constant * [ios, macos] Add test scenarios to testPolyline * [ios, macos] Fix test accuracy * [ios, macos] More robust Streets localization Added Arabic, Portuguese, and Simplified Chinese to the list of languages with specialized fields in the Mapbox Streets source. Rely on NSBundle to select the most appropriate locale based on the user’s preferred languages. * [ios] Fallback to Mapbox.bundle as the framework bundle (#9074) Fixes an issue where localizations could not be found when using static builds. Throws exception if our bundle can't be found. * [ios] Move image resources to an asset catalog & switch to PDFs * [ios, macos] Updated changelogs Reorganized the changelogs with a new packaging section. Added blurbs about #9062, #8713, #9060, and #9031. * [ios] Update pods spec for iOS v3.6.0-beta.1 * [macos] Enable View ‣ Traffic Night Enable the View ‣ Traffic Night menu item and check it when that style is active. * [android] - stop location updates when toggle MyLocationView state (#9099) * [android] - LatLngBounds bearing default value (#9102) * [ios, macos] Fix MGLLight.achor to accept style functions * [ios] Fix annotation initializers for subclasses of MGLAnnotationView (#9104) Use a common init function in both of the provided initializers so that subclasses of `MGLAnnotationView` written in Swift don't need to override `init(annotation, reuseIdentifier)` * [ios] Moved `MGLLight` in jazzy table of contents (#9111) * [android] - logo placement for creating a Mapview programatically (#9094) * [android] - Correct logo placement for creating a Mapview programatically, fixup non default placements * Fixed NIGHTY_TWO_DP typo to NINETY_TWO_DP * [android] - add binding support for Light (#9013) * [android] Update Lost to final version 3.0.0 (#9112) * update lost to final version 3.0.0 * bump MAS version to 2.1.1 * [android] - convert dp to pixels when getting meters per pixel at. (#9048) * Release Android v5.1.0-beta.3 (#9115) * [android] - Changelog update for Android release v5.1.0-beta.3 * update CI & version * reset release properties * [android] - harden orientation changes (#9128) * [ios] Remove filter of single metric event * [ios] remove layout guide observers * Migrate to GL JS–powered feedback form (#9078) * [ios, macos] Updated feedback URL * [ios, macos] Add referrer, heading, pitch to feedback URL * [ios, macos] Updated changelogs for feedback changes * [ios] Vary referrer by platform * [android] - javadoc update for 5.1.0 release (#9138) * [android] - javadoc update for 5.1.0 release * oxford comma * Grammar/spelling tweaks * grammar tweak * grammar tweak * Grammar tweaks * Grammar tweaks * [android] fix missing access token variable issue (#9151) * [ios] Update pods spec for iOS v3.6.0-beta.2 * [android] Cherry picking 9133 (#9145) * [android] Fix tracking mode + camera race condition (#9133) * [android] fix tracking mode + camera race condition * fix resetTrackingModesIfRequired bug (comparing current camera position with target camera position * cherry pick #9133 and update CHANGELOG * add null check to prevent null pointer exception * add null check in custom location engine activity to prevent null pointer exception (#9159) * [core] Make TransformState LatLngBounds optional * [ios] Make annotation view rotation alignment configurable (#9147) This commit adds `rotatesWithMap` property on `MGLAnnotationView`. This property, when set to `YES` fixes the annotation to a map such that view follows map's rotation angle. This is useful when user wants to display rotation-dependent annotations (e.g. sector lights). * [android] - validate if gestures should execute (#9173)
355 lines
13 KiB
Plaintext
355 lines
13 KiB
Plaintext
#import "MGLAnnotationView.h"
|
|
#import "MGLAnnotationView_Private.h"
|
|
#import "MGLMapView_Private.h"
|
|
#import "MGLAnnotation.h"
|
|
|
|
#import "NSBundle+MGLAdditions.h"
|
|
|
|
#include <mbgl/util/constants.hpp>
|
|
|
|
@interface MGLAnnotationView () <UIGestureRecognizerDelegate>
|
|
|
|
@property (nonatomic, readwrite, nullable) NSString *reuseIdentifier;
|
|
@property (nonatomic, readwrite) CATransform3D lastAppliedScaleTransform;
|
|
@property (nonatomic, readwrite) CATransform3D lastAppliedRotateTransform;
|
|
@property (nonatomic, weak) UIPanGestureRecognizer *panGestureRecognizer;
|
|
@property (nonatomic, weak) UILongPressGestureRecognizer *longPressRecognizer;
|
|
@property (nonatomic, weak) MGLMapView *mapView;
|
|
|
|
@end
|
|
|
|
@implementation MGLAnnotationView
|
|
|
|
+ (BOOL)supportsSecureCoding {
|
|
return YES;
|
|
}
|
|
|
|
- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier {
|
|
self = [super initWithFrame:CGRectZero];
|
|
if (self) {
|
|
[self commonInitWithAnnotation:nil reuseIdentifier:reuseIdentifier];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithAnnotation:(nullable id<MGLAnnotation>)annotation reuseIdentifier:(nullable NSString *)reuseIdentifier {
|
|
self = [super initWithFrame:CGRectZero];
|
|
if (self) {
|
|
[self commonInitWithAnnotation:annotation reuseIdentifier:reuseIdentifier];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)commonInitWithAnnotation:(nullable id<MGLAnnotation>)annotation reuseIdentifier:(nullable NSString *)reuseIdentifier {
|
|
_lastAppliedScaleTransform = CATransform3DIdentity;
|
|
_annotation = annotation;
|
|
_reuseIdentifier = [reuseIdentifier copy];
|
|
_scalesWithViewingDistance = YES;
|
|
_enabled = YES;
|
|
}
|
|
|
|
- (instancetype)initWithCoder:(NSCoder *)decoder {
|
|
if (self = [super initWithCoder:decoder]) {
|
|
_reuseIdentifier = [decoder decodeObjectOfClass:[NSString class] forKey:@"reuseIdentifier"];
|
|
_annotation = [decoder decodeObjectOfClass:[NSObject class] forKey:@"annotation"];
|
|
_centerOffset = [decoder decodeCGVectorForKey:@"centerOffset"];
|
|
_scalesWithViewingDistance = [decoder decodeBoolForKey:@"scalesWithViewingDistance"];
|
|
_rotatesToMatchCamera = [decoder decodeBoolForKey:@"rotatesToMatchCamera"];
|
|
_selected = [decoder decodeBoolForKey:@"selected"];
|
|
_enabled = [decoder decodeBoolForKey:@"enabled"];
|
|
self.draggable = [decoder decodeBoolForKey:@"draggable"];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)encodeWithCoder:(NSCoder *)coder {
|
|
[super encodeWithCoder:coder];
|
|
[coder encodeObject:_reuseIdentifier forKey:@"reuseIdentifier"];
|
|
[coder encodeObject:_annotation forKey:@"annotation"];
|
|
[coder encodeCGVector:_centerOffset forKey:@"centerOffset"];
|
|
[coder encodeBool:_scalesWithViewingDistance forKey:@"scalesWithViewingDistance"];
|
|
[coder encodeBool:_rotatesToMatchCamera forKey:@"rotatesToMatchCamera"];
|
|
[coder encodeBool:_selected forKey:@"selected"];
|
|
[coder encodeBool:_enabled forKey:@"enabled"];
|
|
[coder encodeBool:_draggable forKey:@"draggable"];
|
|
}
|
|
|
|
- (void)prepareForReuse
|
|
{
|
|
// Intentionally left blank. The default implementation of this method does nothing.
|
|
}
|
|
|
|
- (void)setCenterOffset:(CGVector)centerOffset
|
|
{
|
|
_centerOffset = centerOffset;
|
|
self.center = self.center;
|
|
}
|
|
|
|
- (void)setSelected:(BOOL)selected
|
|
{
|
|
[self setSelected:selected animated:NO];
|
|
}
|
|
|
|
- (void)setSelected:(BOOL)selected animated:(BOOL)animated
|
|
{
|
|
[self willChangeValueForKey:@"selected"];
|
|
_selected = selected;
|
|
[self didChangeValueForKey:@"selected"];
|
|
}
|
|
|
|
- (CGPoint)center
|
|
{
|
|
CGPoint center = super.center;
|
|
center.x -= _centerOffset.dx;
|
|
center.y -= _centerOffset.dy;
|
|
return center;
|
|
}
|
|
|
|
- (void)setCenter:(CGPoint)center
|
|
{
|
|
center.x += _centerOffset.dx;
|
|
center.y += _centerOffset.dy;
|
|
|
|
super.center = center;
|
|
[self updateScaleTransformForViewingDistance];
|
|
[self updateRotateTransform];
|
|
}
|
|
|
|
- (void)setScalesWithViewingDistance:(BOOL)scalesWithViewingDistance
|
|
{
|
|
if (_scalesWithViewingDistance != scalesWithViewingDistance)
|
|
{
|
|
_scalesWithViewingDistance = scalesWithViewingDistance;
|
|
[self updateScaleTransformForViewingDistance];
|
|
}
|
|
}
|
|
|
|
- (void)updateScaleTransformForViewingDistance
|
|
{
|
|
if (self.scalesWithViewingDistance == NO || self.dragState == MGLAnnotationViewDragStateDragging) return;
|
|
|
|
CGFloat superviewHeight = CGRectGetHeight(self.superview.frame);
|
|
if (superviewHeight > 0.0) {
|
|
// Find the maximum amount of scale reduction to apply as the view's center moves from the top
|
|
// of the superview to the bottom. For example, if this view's center has moved 25% of the way
|
|
// from the top of the superview towards the bottom then the maximum scale reduction is 1 - .25
|
|
// or 75%. The range goes from a maximum of 100% to 0% as the view moves from the top to the bottom
|
|
// along the y axis of its superview.
|
|
CGFloat maxScaleReduction = 1.0 - self.center.y / superviewHeight;
|
|
|
|
// The pitch intensity represents how much the map view is actually pitched compared to
|
|
// what is possible. The value will range from 0% (not pitched at all) to 100% (pitched as much
|
|
// as the map view will allow). The map view's maximum pitch is defined in `mbgl::util::PITCH_MAX`.
|
|
// Since it is possible for the map view to report a pitch less than 0 due to the nature of
|
|
// how the gesture information is captured, the value is guarded with MAX.
|
|
CGFloat pitchIntensity = MAX(self.mapView.camera.pitch, 0) / MGLDegreesFromRadians(mbgl::util::PITCH_MAX);
|
|
|
|
// The pitch adjusted scale is the inverse proportion of the maximum possible scale reduction
|
|
// multiplied by the pitch intensity. For example, if the maximum scale reduction is 75% and the
|
|
// map view is 50% pitched then the annotation view should be reduced by 37.5% (.75 * .5). The
|
|
// reduction is then normalized for a scale of 1.0.
|
|
CGFloat pitchAdjustedScale = 1.0 - maxScaleReduction * pitchIntensity;
|
|
|
|
// We keep track of each viewing distance scale transform that we apply. Each iteration,
|
|
// we can account for it so that we don't get cumulative scaling every time we move.
|
|
// We also avoid clobbering any existing transform passed in by the client, too.
|
|
CATransform3D undoOfLastScaleTransform = CATransform3DInvert(_lastAppliedScaleTransform);
|
|
CATransform3D newScaleTransform = CATransform3DMakeScale(pitchAdjustedScale, pitchAdjustedScale, 1);
|
|
CATransform3D effectiveTransform = CATransform3DConcat(undoOfLastScaleTransform, newScaleTransform);
|
|
self.layer.transform = CATransform3DConcat(self.layer.transform, effectiveTransform);
|
|
_lastAppliedScaleTransform = newScaleTransform;
|
|
}
|
|
}
|
|
|
|
- (void)setRotatesToMatchCamera:(BOOL)rotatesToMatchCamera
|
|
{
|
|
if (_rotatesToMatchCamera != rotatesToMatchCamera)
|
|
{
|
|
_rotatesToMatchCamera = rotatesToMatchCamera;
|
|
[self updateRotateTransform];
|
|
}
|
|
}
|
|
|
|
- (void)updateRotateTransform
|
|
{
|
|
if (self.rotatesToMatchCamera == NO) return;
|
|
|
|
CGFloat directionRad = self.mapView.direction * M_PI / 180.0;
|
|
CATransform3D newRotateTransform = CATransform3DMakeRotation(-directionRad, 0, 0, 1);
|
|
self.layer.transform = CATransform3DConcat(CATransform3DIdentity, newRotateTransform);
|
|
|
|
_lastAppliedRotateTransform = newRotateTransform;
|
|
}
|
|
|
|
#pragma mark - Draggable
|
|
|
|
- (void)setDraggable:(BOOL)draggable
|
|
{
|
|
[self willChangeValueForKey:@"draggable"];
|
|
_draggable = draggable;
|
|
[self didChangeValueForKey:@"draggable"];
|
|
|
|
if (draggable)
|
|
{
|
|
[self enableDrag];
|
|
}
|
|
else
|
|
{
|
|
[self disableDrag];
|
|
}
|
|
}
|
|
|
|
- (void)enableDrag
|
|
{
|
|
if (!_longPressRecognizer)
|
|
{
|
|
UILongPressGestureRecognizer *recognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)];
|
|
recognizer.delegate = self;
|
|
[self addGestureRecognizer:recognizer];
|
|
_longPressRecognizer = recognizer;
|
|
}
|
|
|
|
if (!_panGestureRecognizer)
|
|
{
|
|
UIPanGestureRecognizer *recognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)];
|
|
recognizer.delegate = self;
|
|
[self addGestureRecognizer:recognizer];
|
|
_panGestureRecognizer = recognizer;
|
|
}
|
|
}
|
|
|
|
- (void)disableDrag
|
|
{
|
|
[self removeGestureRecognizer:_longPressRecognizer];
|
|
[self removeGestureRecognizer:_panGestureRecognizer];
|
|
}
|
|
|
|
- (void)handleLongPress:(UILongPressGestureRecognizer *)sender
|
|
{
|
|
switch (sender.state) {
|
|
case UIGestureRecognizerStateBegan:
|
|
self.dragState = MGLAnnotationViewDragStateStarting;
|
|
break;
|
|
case UIGestureRecognizerStateChanged:
|
|
self.dragState = MGLAnnotationViewDragStateDragging;
|
|
break;
|
|
case UIGestureRecognizerStateCancelled:
|
|
self.dragState = MGLAnnotationViewDragStateCanceling;
|
|
break;
|
|
case UIGestureRecognizerStateEnded:
|
|
self.dragState = MGLAnnotationViewDragStateEnding;
|
|
break;
|
|
case UIGestureRecognizerStateFailed:
|
|
self.dragState = MGLAnnotationViewDragStateNone;
|
|
break;
|
|
case UIGestureRecognizerStatePossible:
|
|
break;
|
|
}
|
|
}
|
|
|
|
- (void)handlePan:(UIPanGestureRecognizer *)sender
|
|
{
|
|
self.center = [sender locationInView:sender.view.superview];
|
|
|
|
if (sender.state == UIGestureRecognizerStateEnded) {
|
|
self.dragState = MGLAnnotationViewDragStateNone;
|
|
}
|
|
}
|
|
|
|
- (void)setDragState:(MGLAnnotationViewDragState)dragState
|
|
{
|
|
[self setDragState:dragState animated:YES];
|
|
}
|
|
|
|
- (void)setDragState:(MGLAnnotationViewDragState)dragState animated:(BOOL)animated
|
|
{
|
|
[self willChangeValueForKey:@"dragState"];
|
|
_dragState = dragState;
|
|
[self didChangeValueForKey:@"dragState"];
|
|
|
|
if (dragState == MGLAnnotationViewDragStateStarting)
|
|
{
|
|
[self.mapView.calloutViewForSelectedAnnotation dismissCalloutAnimated:animated];
|
|
[self.superview bringSubviewToFront:self];
|
|
}
|
|
else if (dragState == MGLAnnotationViewDragStateCanceling)
|
|
{
|
|
if (!self.annotation) {
|
|
[NSException raise:NSInvalidArgumentException
|
|
format:@"Annotation property should not be nil."];
|
|
}
|
|
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];
|
|
[(NSObject *)self.annotation setValue:[NSValue valueWithMGLCoordinate:coordinate] forKey:@"coordinate"];
|
|
}
|
|
}
|
|
}
|
|
|
|
- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
|
|
{
|
|
BOOL isDragging = self.dragState == MGLAnnotationViewDragStateDragging;
|
|
|
|
if (gestureRecognizer == _panGestureRecognizer && !(isDragging))
|
|
{
|
|
return NO;
|
|
}
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
|
|
{
|
|
return otherGestureRecognizer == _longPressRecognizer || otherGestureRecognizer == _panGestureRecognizer;
|
|
}
|
|
|
|
#pragma mark UIAccessibility methods
|
|
|
|
- (BOOL)isAccessibilityElement {
|
|
return !self.hidden;
|
|
}
|
|
|
|
- (UIAccessibilityTraits)accessibilityTraits {
|
|
return UIAccessibilityTraitButton | UIAccessibilityTraitAdjustable;
|
|
}
|
|
|
|
- (NSString *)accessibilityLabel {
|
|
return [self.annotation respondsToSelector:@selector(title)] ? self.annotation.title : super.accessibilityLabel;
|
|
}
|
|
|
|
- (NSString *)accessibilityValue {
|
|
return [self.annotation respondsToSelector:@selector(subtitle)] ? self.annotation.subtitle : super.accessibilityValue;
|
|
}
|
|
|
|
- (NSString *)accessibilityHint {
|
|
return NSLocalizedStringWithDefaultValue(@"ANNOTATION_A11Y_HINT", nil, nil, @"Shows more info", @"Accessibility hint");
|
|
}
|
|
|
|
- (CGRect)accessibilityFrame {
|
|
CGRect accessibilityFrame = self.frame;
|
|
CGRect minimumFrame = CGRectInset({ self.center, CGSizeZero },
|
|
-MGLAnnotationAccessibilityElementMinimumSize.width / 2,
|
|
-MGLAnnotationAccessibilityElementMinimumSize.height / 2);
|
|
accessibilityFrame = CGRectUnion(accessibilityFrame, minimumFrame);
|
|
return accessibilityFrame;
|
|
}
|
|
|
|
- (void)accessibilityIncrement {
|
|
[self.superview accessibilityIncrement];
|
|
}
|
|
|
|
- (void)accessibilityDecrement {
|
|
[self.superview accessibilityDecrement];
|
|
}
|
|
|
|
@end
|