1 files changed, 46 insertions, 50 deletions

diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp
index d571c3fd2e..02a1f0be82 100644
--- a/platform/android/src/style/layers/layer.cpp
+++ b/platform/android/src/style/layers/layer.cpp
@@ -3,6 +3,7 @@
 
 #include <jni/jni.hpp>
 
+#include <mbgl/style/style.hpp>
 #include <mbgl/style/transition_options.hpp>
 #include <mbgl/util/logging.hpp>
 
@@ -53,7 +54,7 @@ namespace android {
         }
 
         // Add layer to map
-        _map.addLayer(releaseCoreLayer(), before);
+        _map.getStyle().addLayer(releaseCoreLayer(), before);
 
         // Save pointer to the map
         this->map = &_map;
@@ -91,19 +92,31 @@ namespace android {
         Value value(env, jvalue);
 
         // Convert and set property
-        optional<mbgl::style::conversion::Error> error = mbgl::style::conversion::setPaintProperty(layer, jni::Make<std::string>(env, jname), value, mbgl::optional<std::string>());
+        optional<mbgl::style::conversion::Error> error = mbgl::style::conversion::setPaintProperty(layer, jni::Make<std::string>(env, jname), value);
         if (error) {
             mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message);
             return;
         }
     }
 
+    struct SetFilterEvaluator {
+        style::Filter filter;
+
+        void operator()(style::BackgroundLayer&) { Log::Warning(mbgl::Event::JNI, "BackgroundLayer doesn't support filters"); }
+        void operator()(style::CustomLayer&) { Log::Warning(mbgl::Event::JNI, "CustomLayer doesn't support filters"); }
+        void operator()(style::RasterLayer&) { Log::Warning(mbgl::Event::JNI, "RasterLayer doesn't support filters"); }
+
+        template <class LayerType>
+        void operator()(LayerType& layer) {
+            layer.setFilter(filter);
+        }
+    };
+
     void Layer::setFilter(jni::JNIEnv& env, jni::Array<jni::Object<>> jfilter) {
         using namespace mbgl::style;
         using namespace mbgl::style::conversion;
 
         Value wrapped(env, jfilter);
-        Filter filter;
 
         Error error;
         optional<Filter> converted = convert<Filter>(wrapped, error);
@@ -111,62 +124,45 @@ namespace android {
             mbgl::Log::Error(mbgl::Event::JNI, "Error setting filter: " + error.message);
             return;
         }
-        filter = std::move(*converted);
-
-        if (layer.is<FillLayer>()) {
-            layer.as<FillLayer>()->setFilter(filter);
-        } else if (layer.is<LineLayer>()) {
-            layer.as<LineLayer>()->setFilter(filter);
-        } else if (layer.is<SymbolLayer>()) {
-            layer.as<SymbolLayer>()->setFilter(filter);
-        } else if (layer.is<CircleLayer>()) {
-            layer.as<CircleLayer>()->setFilter(filter);
-        } else if (layer.is<FillExtrusionLayer>()){
-            layer.as<FillExtrusionLayer>()->setFilter(filter);
-        } else {
-            mbgl::Log::Warning(mbgl::Event::JNI, "Layer doesn't support filters");
-        }
+
+        layer.accept(SetFilterEvaluator {std::move(*converted)});
     }
 
-    void Layer::setSourceLayer(jni::JNIEnv& env, jni::String sourceLayer) {
-        using namespace mbgl::style;
+    struct SetSourceLayerEvaluator {
+        std::string sourceLayer;
 
-        std::string layerId = jni::Make<std::string>(env, sourceLayer);
-
-        if (layer.is<FillLayer>()) {
-            layer.as<FillLayer>()->setSourceLayer(layerId);
-        } else if (layer.is<LineLayer>()) {
-            layer.as<LineLayer>()->setSourceLayer(layerId);
-        } else if (layer.is<SymbolLayer>()) {
-            layer.as<SymbolLayer>()->setSourceLayer(layerId);
-        } else if (layer.is<CircleLayer>()) {
-            layer.as<CircleLayer>()->setSourceLayer(layerId);
-        } else if(layer.is<FillExtrusionLayer>()) {
-            layer.as<FillExtrusionLayer>()->setSourceLayer(layerId);
-        } else {
-            mbgl::Log::Warning(mbgl::Event::JNI, "Layer doesn't support source layer");
+        void operator()(style::BackgroundLayer&) { Log::Warning(mbgl::Event::JNI, "BackgroundLayer doesn't support source layer"); }
+        void operator()(style::CustomLayer&) { Log::Warning(mbgl::Event::JNI, "CustomLayer doesn't support source layer"); }
+        void operator()(style::RasterLayer&) { Log::Warning(mbgl::Event::JNI, "RasterLayer doesn't support source layer"); }
+
+        template <class LayerType>
+        void operator()(LayerType& layer) {
+            layer.setSourceLayer(sourceLayer);
         }
+    };
+
+    void Layer::setSourceLayer(jni::JNIEnv& env, jni::String sourceLayer) {
+        layer.accept(SetSourceLayerEvaluator {jni::Make<std::string>(env, sourceLayer)});
     }
 
-    jni::String Layer::getSourceLayer(jni::JNIEnv& env) {
-        using namespace mbgl::style;
+    struct GetSourceLayerEvaluator {
+        std::string noop(std::string layerType) {
+            Log::Warning(mbgl::Event::JNI, "%s doesn't support source layer", layerType.c_str());
+            return {};
+        }
 
-        std::string sourceLayerId;
-        if (layer.is<FillLayer>()) {
-            sourceLayerId = layer.as<FillLayer>()->getSourceLayer();
-        } else if (layer.is<LineLayer>()) {
-            sourceLayerId = layer.as<LineLayer>()->getSourceLayer();
-        } else if (layer.is<SymbolLayer>()) {
-            sourceLayerId = layer.as<SymbolLayer>()->getSourceLayer();
-        } else if (layer.is<CircleLayer>()) {
-            sourceLayerId = layer.as<CircleLayer>()->getSourceLayer();
-        } else if (layer.is<FillExtrusionLayer>()) {
-            sourceLayerId = layer.as<FillExtrusionLayer>()->getSourceLayer();
-        } else {
-            mbgl::Log::Warning(mbgl::Event::JNI, "Layer doesn't support source layer");
+        std::string operator()(style::BackgroundLayer&) { return noop("BackgroundLayer"); }
+        std::string operator()(style::CustomLayer&) { return noop("CustomLayer"); }
+        std::string operator()(style::RasterLayer&) { return noop("RasterLayer"); }
+
+        template <class LayerType>
+        std::string operator()(LayerType& layer) {
+            return layer.getSourceLayer();
         }
+    };
 
-        return jni::Make<jni::String>(env, sourceLayerId);
+    jni::String Layer::getSourceLayer(jni::JNIEnv& env) {
+        return jni::Make<jni::String>(env, layer.accept(GetSourceLayerEvaluator()));
     }
 
     jni::jfloat Layer::getMinZoom(jni::JNIEnv&){