diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-27 15:05:11 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-04 07:29:08 -0700 |
| commit | 89f1ffc6d29d5631dfd322834397ec2247c5c9d7 (patch) | |
| tree | 277bd6ca61cbecaa9c659273992da2abbe9a431e /src/mbgl/annotation | |
| parent | 806da5d940aed7021f921ab98b9ae8e4e364f732 (diff) | |
| download | qtlocation-mapboxgl-89f1ffc6d29d5631dfd322834397ec2247c5c9d7.tar.gz | |
[core] UpdateParameters ⇢ TileParameters
Diffstat (limited to 'src/mbgl/annotation')
| -rw-r--r-- | src/mbgl/annotation/annotation_tile.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/annotation/annotation_tile.hpp | 4 | ||||
| -rw-r--r-- | src/mbgl/annotation/render_annotation_source.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/annotation/render_annotation_source.hpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index 796ca04ba6..1253681414 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -2,7 +2,7 @@ #include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/storage/file_source.hpp> -#include <mbgl/renderer/update_parameters.hpp> +#include <mbgl/renderer/tile_parameters.hpp> #include <mbgl/style/style.hpp> #include <utility> @@ -10,7 +10,7 @@ namespace mbgl { AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID, - const UpdateParameters& parameters) + const TileParameters& parameters) : GeometryTile(overscaledTileID, AnnotationManager::SourceID, parameters, *parameters.style.glyphAtlas, parameters.annotationManager.spriteAtlas), diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 6ca9079f9e..ea4ff5ebd5 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -7,12 +7,12 @@ namespace mbgl { class AnnotationManager; -class UpdateParameters; +class TileParameters; class AnnotationTile : public GeometryTile { public: AnnotationTile(const OverscaledTileID&, - const UpdateParameters&); + const TileParameters&); ~AnnotationTile() override; void setNecessity(Necessity) final; diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp index f926b6ce9a..a62d2d51d3 100644 --- a/src/mbgl/annotation/render_annotation_source.cpp +++ b/src/mbgl/annotation/render_annotation_source.cpp @@ -35,7 +35,7 @@ std::map<UnwrappedTileID, RenderTile>& RenderAnnotationSource::getRenderTiles() return tilePyramid.getRenderTiles(); } -void RenderAnnotationSource::updateTiles(const UpdateParameters& parameters) { +void RenderAnnotationSource::updateTiles(const TileParameters& parameters) { tilePyramid.updateTiles(parameters, SourceType::Annotations, util::tileSize, diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index ae0a43c5c7..9ae9340477 100644 --- a/src/mbgl/annotation/render_annotation_source.hpp +++ b/src/mbgl/annotation/render_annotation_source.hpp @@ -14,7 +14,7 @@ public: // Called when the camera has changed. May load new tiles, unload obsolete tiles, or // trigger re-placement of existing complete tiles. - void updateTiles(const UpdateParameters&) final; + void updateTiles(const TileParameters&) final; // Removes all tiles (by putting them into the cache). void removeTiles() final; |