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 /include/mbgl/map | |
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 'include/mbgl/map')
-rw-r--r-- | include/mbgl/map/map.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 26ac154b8b..0e3cee4e70 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -25,9 +25,9 @@ class Backend; class View; class FileSource; class Scheduler; -class SpriteImage; namespace style { +class Image; class Source; class Layer; } // namespace style @@ -154,9 +154,9 @@ public: LatLng latLngForPixel(const ScreenCoordinate&) const; // Annotations - void addAnnotationIcon(const std::string&, std::shared_ptr<const SpriteImage>); - void removeAnnotationIcon(const std::string&); - double getTopOffsetPixelsForAnnotationIcon(const std::string&); + void addAnnotationImage(const std::string&, std::unique_ptr<style::Image>); + void removeAnnotationImage(const std::string&); + double getTopOffsetPixelsForAnnotationImage(const std::string&); AnnotationID addAnnotation(const Annotation&); void updateAnnotation(AnnotationID, const Annotation&); @@ -174,10 +174,10 @@ public: void addLayer(std::unique_ptr<style::Layer>, const optional<std::string>& beforeLayerID = {}); std::unique_ptr<style::Layer> removeLayer(const std::string& layerID); - // Add image, bound to the style - void addImage(const std::string&, std::unique_ptr<const SpriteImage>); + // Images + void addImage(const std::string&, std::unique_ptr<style::Image>); void removeImage(const std::string&); - const SpriteImage* getImage(const std::string&); + const style::Image* getImage(const std::string&); // Defaults std::string getStyleName() const; |