summaryrefslogtreecommitdiff
path: root/src/mbgl/style/sources
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/style/sources')
-rw-r--r--src/mbgl/style/sources/custom_geometry_source_impl.cpp17
-rw-r--r--src/mbgl/style/sources/custom_geometry_source_impl.hpp4
2 files changed, 7 insertions, 14 deletions
diff --git a/src/mbgl/style/sources/custom_geometry_source_impl.cpp b/src/mbgl/style/sources/custom_geometry_source_impl.cpp
index 67d52bdc24..95da377277 100644
--- a/src/mbgl/style/sources/custom_geometry_source_impl.cpp
+++ b/src/mbgl/style/sources/custom_geometry_source_impl.cpp
@@ -4,27 +4,20 @@
namespace mbgl {
namespace style {
-CustomGeometrySource::Impl::Impl(std::string id_,
- const CustomGeometrySource::Options options)
+CustomGeometrySource::Impl::Impl(std::string id_, CustomGeometrySource::Options options)
: Source::Impl(SourceType::CustomVector, std::move(id_)),
- tileOptions(options.tileOptions),
+ tileOptions(makeMutable<CustomGeometrySource::TileOptions>(options.tileOptions)),
zoomRange(options.zoomRange),
- loaderRef({}) {
-}
+ loaderRef({}) {}
CustomGeometrySource::Impl::Impl(const Impl& impl, ActorRef<CustomTileLoader> loaderRef_)
- : Source::Impl(impl),
- tileOptions(impl.tileOptions),
- zoomRange(impl.zoomRange),
- loaderRef(loaderRef_){
-
-}
+ : Source::Impl(impl), tileOptions(impl.tileOptions), zoomRange(impl.zoomRange), loaderRef(loaderRef_) {}
optional<std::string> CustomGeometrySource::Impl::getAttribution() const {
return {};
}
-CustomGeometrySource::TileOptions CustomGeometrySource::Impl::getTileOptions() const {
+Immutable<CustomGeometrySource::TileOptions> CustomGeometrySource::Impl::getTileOptions() const {
return tileOptions;
}
diff --git a/src/mbgl/style/sources/custom_geometry_source_impl.hpp b/src/mbgl/style/sources/custom_geometry_source_impl.hpp
index ce7187202d..1ae77b02ec 100644
--- a/src/mbgl/style/sources/custom_geometry_source_impl.hpp
+++ b/src/mbgl/style/sources/custom_geometry_source_impl.hpp
@@ -15,12 +15,12 @@ public:
optional<std::string> getAttribution() const final;
- CustomGeometrySource::TileOptions getTileOptions() const;
+ Immutable<CustomGeometrySource::TileOptions> getTileOptions() const;
Range<uint8_t> getZoomRange() const;
optional<ActorRef<CustomTileLoader>> getTileLoader() const;
private:
- CustomGeometrySource::TileOptions tileOptions;
+ Immutable<CustomGeometrySource::TileOptions> tileOptions;
Range<uint8_t> zoomRange;
optional<ActorRef<CustomTileLoader>> loaderRef;
};