1 files changed, 12 insertions, 16 deletions
diff --git a/src/mbgl/style/layer.cpp b/src/mbgl/style/layer.cpp
index e2eba0e2e0..fe51dd09ca 100644
--- a/src/mbgl/style/layer.cpp
+++ b/src/mbgl/style/layer.cpp
@@ -1,16 +1,23 @@
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/layer_impl.hpp>
-#include <mbgl/style/layer_type.hpp>
+#include <mbgl/style/layer_observer.hpp>
 
 namespace mbgl {
 namespace style {
 
-Layer::Layer(LayerType type_, std::unique_ptr<Impl> baseImpl_)
-    : type(type_), baseImpl(std::move(baseImpl_)) {
+static LayerObserver nullObserver;
+
+Layer::Layer(Immutable<Impl> impl)
+    : baseImpl(std::move(impl)),
+      observer(&nullObserver) {
 }
 
 Layer::~Layer() = default;
 
+LayerType Layer::getType() const {
+    return baseImpl->type;
+}
+
 const std::string& Layer::getID() const {
     return baseImpl->id;
 }
@@ -19,27 +26,16 @@ VisibilityType Layer::getVisibility() const {
     return baseImpl->visibility;
 }
 
-void Layer::setVisibility(VisibilityType value) {
-    if (value == getVisibility())
-        return;
-    baseImpl->visibility = value;
-    baseImpl->observer->onLayerVisibilityChanged(*this);
-}
-
 float Layer::getMinZoom() const {
     return baseImpl->minZoom;
 }
 
-void Layer::setMinZoom(float minZoom) const {
-    baseImpl->minZoom = minZoom;
-}
-
 float Layer::getMaxZoom() const {
     return baseImpl->maxZoom;
 }
 
-void Layer::setMaxZoom(float maxZoom) const {
-    baseImpl->maxZoom = maxZoom;
+void Layer::setObserver(LayerObserver* observer_) {
+    observer = observer_ ? observer_ : &nullObserver;
 }
 
 } // namespace style