summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@gmail.com>2019-01-16 17:31:59 -0500
committerGitHub <noreply@github.com>2019-01-16 17:31:59 -0500
commit49ee543e729d54c14b2f938803a92e082448ea44 (patch)
treedc14ce61daac62bbcfeb374c32bbabf01087b101
parent77e7bd93f06a0e127e000d7e9281e96db148edde (diff)
downloadqtlocation-mapboxgl-49ee543e729d54c14b2f938803a92e082448ea44.tar.gz
[macos] Fixes MGLMapView.visibleAnnotations (#13745)
-rw-r--r--platform/macos/CHANGELOG.md1
-rw-r--r--platform/macos/src/MGLMapView.mm2
2 files changed, 2 insertions, 1 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index 28ff0fc453..fab8e972fc 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -5,6 +5,7 @@
* Added an `MGLStyle.performsPlacementTransitions` property to control how long it takes for colliding labels to fade out. ([#13565](https://github.com/mapbox/mapbox-gl-native/pull/13565))
* Fixed a crash when casting large numbers in `NSExpression`. ([#13580](https://github.com/mapbox/mapbox-gl-native/pull/13580))
* Added the `-[MGLShapeSource leavesOfCluster:offset:limit:]`, `-[MGLShapeSource childrenOfCluster:]`, `-[MGLShapeSource zoomLevelForExpandingCluster:]` methods for inspecting a cluster in an `MGLShapeSource`s created with the `MGLShapeSourceOptionClustered` option. Feature querying now returns clusters represented by `MGLPointFeatureCluster` objects (that conform to the `MGLCluster` protocol). ([#12952](https://github.com/mapbox/mapbox-gl-native/pull/12952)
+* Fixed a bug with `MGLMapView.visibleAnnotations` that resulted in incorrect results and performance degradation. ([#13745](https://github.com/mapbox/mapbox-gl-native/pull/13745))
## 0.13.0 - December 20, 2018
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 0a07c9e057..a5779aa602 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -1845,7 +1845,7 @@ public:
- (nullable NSArray<id <MGLAnnotation>> *)visibleAnnotations
{
- return [self visibleFeaturesInRect:self.bounds];
+ return [self visibleAnnotationsInRect:self.bounds];
}
- (nullable NSArray<id <MGLAnnotation>> *)visibleAnnotationsInRect:(CGRect)rect