diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-21 14:52:19 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-24 15:52:28 -0700 |
| commit | 5dd98df50ba1210b1eef0d8d6655713a725f2995 (patch) | |
| tree | b289bb3cbad5d1c3076816f4891a057d6089fc93 /platform/macos/src/MGLMapView.mm | |
| parent | 6f708ac5458fe332e25ca398431928b7ff5ba404 (diff) | |
| download | qtlocation-mapboxgl-5dd98df50ba1210b1eef0d8d6655713a725f2995.tar.gz | |
[all] Rationalize style::Image
A style has a collection of images, just as it has collections of sources and layers.
* Name things appropriately
* Use std::unique_ptr
Diffstat (limited to 'platform/macos/src/MGLMapView.mm')
| -rw-r--r-- | platform/macos/src/MGLMapView.mm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index cf3a5afe7f..a36766b745 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -28,7 +28,7 @@ #import <mbgl/util/default_thread_pool.hpp> #import <mbgl/map/backend.hpp> #import <mbgl/map/backend_scope.hpp> -#import <mbgl/sprite/sprite_image.hpp> +#import <mbgl/style/image.hpp> #import <mbgl/storage/default_file_source.hpp> #import <mbgl/storage/network_status.hpp> #import <mbgl/math/wrap.hpp> @@ -1949,8 +1949,7 @@ public: return; } - std::shared_ptr<mbgl::SpriteImage> sprite(annotationImage.image.mgl_spriteImage); - _mbglMap->addAnnotationIcon(iconIdentifier.UTF8String, sprite); + _mbglMap->addAnnotationImage(iconIdentifier.UTF8String, annotationImage.image.mgl_styleImage); // Create a slop area with a “radius” equal to the annotation image’s entire // size, allowing the eventual click to be on any point within this image. |