[core] Merge annotation_tile_data.{hpp,cpp} into annotation_tile.{hpp,cpp}

This commit is contained in:
John Firebaugh
2016-06-07 15:23:24 -07:00
parent 0035eb0122
commit 078392eda9
6 changed files with 36 additions and 49 deletions

View File

@@ -2,11 +2,26 @@
#include <mbgl/annotation/annotation_manager.hpp>
#include <mbgl/util/constants.hpp>
#include <mbgl/storage/file_source.hpp>
#include <mbgl/style/update_parameters.hpp>
#include <utility>
namespace mbgl {
AnnotationTileData::AnnotationTileData(const OverscaledTileID& overscaledTileID,
std::string sourceID,
const style::UpdateParameters& parameters)
: GeometryTileData(overscaledTileID, sourceID, parameters.style, parameters.mode),
annotationManager(parameters.annotationManager) {
annotationManager.addTileData(*this);
}
AnnotationTileData::~AnnotationTileData() {
annotationManager.removeTileData(*this);
}
void AnnotationTileData::setNecessity(Necessity) {}
AnnotationTileFeature::AnnotationTileFeature(FeatureType type_, GeometryCollection geometries_,
std::unordered_map<std::string, std::string> properties_)
: type(type_),