[core, android, darwin] Move layer factories to separate files

cmake/core-files.txt

@@ -95,10 +95,30 @@ src/mbgl/gl/vertex_array_extension.hpp
 src/mbgl/gl/vertex_buffer.hpp
 
 # layermanager
+include/mbgl/layermanager/background_layer_factory.hpp
+include/mbgl/layermanager/circle_layer_factory.hpp
+include/mbgl/layermanager/custom_layer_factory.hpp
+include/mbgl/layermanager/fill_extrusion_layer_factory.hpp
+include/mbgl/layermanager/fill_layer_factory.hpp
+include/mbgl/layermanager/heatmap_layer_factory.hpp
+include/mbgl/layermanager/hillshade_layer_factory.hpp
 include/mbgl/layermanager/layer_factory.hpp
 include/mbgl/layermanager/layer_manager.hpp
+include/mbgl/layermanager/line_layer_factory.hpp
+include/mbgl/layermanager/raster_layer_factory.hpp
+include/mbgl/layermanager/symbol_layer_factory.hpp
+src/mbgl/layermanager/background_layer_factory.cpp
+src/mbgl/layermanager/circle_layer_factory.cpp
+src/mbgl/layermanager/custom_layer_factory.cpp
+src/mbgl/layermanager/fill_extrusion_layer_factory.cpp
+src/mbgl/layermanager/fill_layer_factory.cpp
+src/mbgl/layermanager/heatmap_layer_factory.cpp
+src/mbgl/layermanager/hillshade_layer_factory.cpp
 src/mbgl/layermanager/layer_factory.cpp
 src/mbgl/layermanager/layer_manager.cpp
+src/mbgl/layermanager/line_layer_factory.cpp
+src/mbgl/layermanager/raster_layer_factory.cpp
+src/mbgl/layermanager/symbol_layer_factory.cpp
 
 # layout
 src/mbgl/layout/clip_lines.cpp

include/mbgl/layermanager/background_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class BackgroundLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/circle_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class CircleLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/custom_layer_factory.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+#include <mbgl/style/layer.hpp>
+
+#include <array>
+
+namespace mbgl {
+
+class CustomLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/fill_extrusion_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class FillExtrusionLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/fill_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class FillLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/heatmap_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class HeatmapLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/hillshade_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class HillshadeLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/line_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class LineLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/raster_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class RasterLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/layermanager/symbol_layer_factory.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mbgl/layermanager/layer_factory.hpp>
+
+namespace mbgl {
+
+class SymbolLayerFactory : public LayerFactory {
+protected:
+    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
+    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
+    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
+};
+
+} // namespace mbgl

include/mbgl/style/layers/background_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
@@ -57,12 +56,4 @@ class BackgroundLayer : public Layer {
 };
 
 } // namespace style
-
-class BackgroundLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/circle_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
@@ -105,12 +104,4 @@ class CircleLayer : public Layer {
 };
 
 } // namespace style
-
-class CircleLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/custom_layer.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/layer.hpp>
 
 #include <array>
@@ -87,12 +86,4 @@ class CustomLayer : public Layer {
 };
 
 } // namespace style
-
-class CustomLayerFactory : public LayerFactory {
-    // LayerFactory overrides.
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/fill_extrusion_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
@@ -87,12 +86,4 @@ class FillExtrusionLayer : public Layer {
 };
 
 } // namespace style
-
-class FillExtrusionLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/fill_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
@@ -81,12 +80,4 @@ class FillLayer : public Layer {
 };
 
 } // namespace style
-
-class FillLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/heatmap_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/color_ramp_property_value.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
@@ -70,12 +69,4 @@ class HeatmapLayer : public Layer {
 };
 
 } // namespace style
-
-class HeatmapLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/hillshade_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
@@ -75,12 +74,4 @@ class HillshadeLayer : public Layer {
 };
 
 } // namespace style
-
-class HillshadeLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/layer.hpp.ejs

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 <% if (type === 'heatmap' || type === 'line') { -%>
 #include <mbgl/style/color_ramp_property_value.hpp>
 <% } -%>
@@ -73,12 +72,4 @@ protected:
 };
 
 } // namespace style
-
-class <%- camelize(type) %>LayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/line_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/color_ramp_property_value.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
@@ -126,12 +125,4 @@ class LineLayer : public Layer {
 };
 
 } // namespace style
-
-class LineLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl

include/mbgl/style/layers/raster_layer.hpp

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <mbgl/layermanager/layer_factory.hpp>
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/property_value.hpp>
@@ -87,12 +86,4 @@ class RasterLayer : public Layer {
 };
 
 } // namespace style
-
-class RasterLayerFactory : public LayerFactory {
-protected:
-    const style::LayerTypeInfo* getTypeInfo() const noexcept final;
-    std::unique_ptr<style::Layer> createLayer(const std::string& id, const style::conversion::Convertible& value) noexcept final;
-    std::unique_ptr<RenderLayer> createRenderLayer(Immutable<style::Layer::Impl>) noexcept final;
-};
-
 } // namespace mbgl