summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2017-09-10 14:29:20 -0700
committerMinh Nguyễn <mxn@1ec5.org>2017-11-02 15:19:54 -0700
commit539ec4de6d5d522f6948b251ae51c5ab455e8307 (patch)
treefeb2b454d27a9aa55dc3f1a8387431cb0da778f0
parent77daa8fde2333c7783182c83008410ae07d9ce75 (diff)
downloadqtlocation-mapboxgl-539ec4de6d5d522f6948b251ae51c5ab455e8307.tar.gz
[ios] Create a place feature accessibility element, not an abstract feature accessibility element
-rw-r--r--platform/ios/src/MGLMapView.mm7
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 0622802502..00c80eba22 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -2411,9 +2411,6 @@ public:
return nil;
}
- std::vector<MGLAnnotationTag> visibleAnnotations = [self annotationTagsInRect:self.bounds];
- NSArray *visiblePlaceFeatures = self.visiblePlaceFeatures;
-
// Compass
NSUInteger compassIndex = 0;
if (index == compassIndex)
@@ -2435,6 +2432,7 @@ public:
}
// Visible annotations
+ std::vector<MGLAnnotationTag> visibleAnnotations = [self annotationTagsInRect:self.bounds];
NSRange visibleAnnotationRange = NSMakeRange(NSMaxRange(userLocationAnnotationRange), visibleAnnotations.size());
if (NSLocationInRange(index, visibleAnnotationRange))
{
@@ -2456,6 +2454,7 @@ public:
}
// Visible place features
+ NSArray *visiblePlaceFeatures = self.visiblePlaceFeatures;
NSRange visiblePlaceFeatureRange = NSMakeRange(NSMaxRange(visibleAnnotationRange), visiblePlaceFeatures.count);
if (NSLocationInRange(index, visiblePlaceFeatureRange))
{
@@ -2566,7 +2565,7 @@ public:
}
if (!element)
{
- element = [[MGLFeatureAccessibilityElement alloc] initWithAccessibilityContainer:self feature:feature];
+ element = [[MGLPlaceFeatureAccessibilityElement alloc] initWithAccessibilityContainer:self feature:feature];
}
if (!feature)
{