From c4e4cc5081965d03132eea754c27ece3c95961cb Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 22 Jun 2016 12:31:49 -0700 Subject: [core] Adjust layer source properties to better reflect reality * Layer source ID is immutable; must be provided to the constructor * Layer source layer is mutable * Layers with GeoJSON sources do not have a source layer While here, make Layer::copy impl-private. --- src/mbgl/style/layers/raster_layer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/mbgl/style/layers/raster_layer.cpp') diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index fb7f08fbe9..cdba19ac4e 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -6,10 +6,11 @@ namespace mbgl { namespace style { -RasterLayer::RasterLayer(const std::string& layerID) +RasterLayer::RasterLayer(const std::string& layerID, const std::string& sourceID) : Layer(Type::Raster, std::make_unique()) , impl(static_cast(baseImpl.get())) { impl->id = layerID; + impl->source = sourceID; } RasterLayer::RasterLayer(const Impl& other) @@ -25,14 +26,11 @@ std::unique_ptr RasterLayer::Impl::clone() const { // Source -void RasterLayer::setSource(const std::string& sourceID) { - impl->source = sourceID; -} - const std::string& RasterLayer::getSourceID() const { return impl->source; } + // Layout properties -- cgit v1.2.1