diff options
Diffstat (limited to 'platform')
33 files changed, 43 insertions, 21 deletions
diff --git a/platform/android/src/style/layers/background_layer.hpp b/platform/android/src/style/layers/background_layer.hpp index c1b25b41bd..654031c6f4 100644 --- a/platform/android/src/style/layers/background_layer.hpp +++ b/platform/android/src/style/layers/background_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/background_layer_factory.hpp> #include <mbgl/style/layers/background_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/circle_layer.hpp b/platform/android/src/style/layers/circle_layer.hpp index 6db97127c0..191b3924ff 100644 --- a/platform/android/src/style/layers/circle_layer.hpp +++ b/platform/android/src/style/layers/circle_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/circle_layer_factory.hpp> #include <mbgl/style/layers/circle_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/custom_layer.hpp b/platform/android/src/style/layers/custom_layer.hpp index 814cfea3ca..0d6f4a408d 100644 --- a/platform/android/src/style/layers/custom_layer.hpp +++ b/platform/android/src/style/layers/custom_layer.hpp @@ -1,6 +1,7 @@ #pragma once #include "layer.hpp" +#include <mbgl/layermanager/custom_layer_factory.hpp> #include <mbgl/style/layers/custom_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/fill_extrusion_layer.hpp b/platform/android/src/style/layers/fill_extrusion_layer.hpp index 2d41a189a9..15dad67b01 100644 --- a/platform/android/src/style/layers/fill_extrusion_layer.hpp +++ b/platform/android/src/style/layers/fill_extrusion_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/fill_extrusion_layer_factory.hpp> #include <mbgl/style/layers/fill_extrusion_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/fill_layer.hpp b/platform/android/src/style/layers/fill_layer.hpp index 776f2c3a88..b021ddca14 100644 --- a/platform/android/src/style/layers/fill_layer.hpp +++ b/platform/android/src/style/layers/fill_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/fill_layer_factory.hpp> #include <mbgl/style/layers/fill_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/heatmap_layer.hpp b/platform/android/src/style/layers/heatmap_layer.hpp index 51966ec93e..9e3db0c89a 100644 --- a/platform/android/src/style/layers/heatmap_layer.hpp +++ b/platform/android/src/style/layers/heatmap_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/heatmap_layer_factory.hpp> #include <mbgl/style/layers/heatmap_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/hillshade_layer.hpp b/platform/android/src/style/layers/hillshade_layer.hpp index b63f85e36c..2f4ea30c22 100644 --- a/platform/android/src/style/layers/hillshade_layer.hpp +++ b/platform/android/src/style/layers/hillshade_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/hillshade_layer_factory.hpp> #include <mbgl/style/layers/hillshade_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/layer.hpp.ejs b/platform/android/src/style/layers/layer.hpp.ejs index e82470e270..28e00b2731 100644 --- a/platform/android/src/style/layers/layer.hpp.ejs +++ b/platform/android/src/style/layers/layer.hpp.ejs @@ -8,6 +8,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/<%- type.replace('-', '_') %>_layer_factory.hpp> #include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/line_layer.hpp b/platform/android/src/style/layers/line_layer.hpp index 7c16822ef8..75a367ab70 100644 --- a/platform/android/src/style/layers/line_layer.hpp +++ b/platform/android/src/style/layers/line_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/line_layer_factory.hpp> #include <mbgl/style/layers/line_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/raster_layer.hpp b/platform/android/src/style/layers/raster_layer.hpp index 6be6792776..53bee85e2b 100644 --- a/platform/android/src/style/layers/raster_layer.hpp +++ b/platform/android/src/style/layers/raster_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/raster_layer_factory.hpp> #include <mbgl/style/layers/raster_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/style/layers/symbol_layer.hpp b/platform/android/src/style/layers/symbol_layer.hpp index b38a659b06..f52597ef6f 100644 --- a/platform/android/src/style/layers/symbol_layer.hpp +++ b/platform/android/src/style/layers/symbol_layer.hpp @@ -4,6 +4,7 @@ #include "layer.hpp" #include "../transition_options.hpp" +#include <mbgl/layermanager/symbol_layer_factory.hpp> #include <mbgl/style/layers/symbol_layer.hpp> #include <jni/jni.hpp> diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm index 5ddfff5534..c754de43c2 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer.mm +++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLBackgroundStyleLayer_Private.h" +#include <mbgl/style/layers/background_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLBackgroundStyleLayer_Private.h b/platform/darwin/src/MGLBackgroundStyleLayer_Private.h index a6295a7c5a..b50a681b41 100644 --- a/platform/darwin/src/MGLBackgroundStyleLayer_Private.h +++ b/platform/darwin/src/MGLBackgroundStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/background_layer.hpp> +#include <mbgl/layermanager/background_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm index 0562414b05..83113d6027 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.mm +++ b/platform/darwin/src/MGLCircleStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLCircleStyleLayer_Private.h" +#include <mbgl/style/layers/circle_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLCircleStyleLayer_Private.h b/platform/darwin/src/MGLCircleStyleLayer_Private.h index a023e2a88b..788de6274f 100644 --- a/platform/darwin/src/MGLCircleStyleLayer_Private.h +++ b/platform/darwin/src/MGLCircleStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/circle_layer.hpp> +#include <mbgl/layermanager/circle_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm index e4e9c707ea..8ec6000eae 100644 --- a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm +++ b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLFillExtrusionStyleLayer_Private.h" +#include <mbgl/style/layers/fill_extrusion_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h b/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h index fdd99d74f4..2525b044af 100644 --- a/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h +++ b/platform/darwin/src/MGLFillExtrusionStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/fill_extrusion_layer.hpp> +#include <mbgl/layermanager/fill_extrusion_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm index f5dc62cd5b..69de3e7d62 100644 --- a/platform/darwin/src/MGLFillStyleLayer.mm +++ b/platform/darwin/src/MGLFillStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLFillStyleLayer_Private.h" +#include <mbgl/style/layers/fill_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLFillStyleLayer_Private.h b/platform/darwin/src/MGLFillStyleLayer_Private.h index 28f24f056d..01f8b16f32 100644 --- a/platform/darwin/src/MGLFillStyleLayer_Private.h +++ b/platform/darwin/src/MGLFillStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/fill_layer.hpp> +#include <mbgl/layermanager/fill_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLHeatmapStyleLayer.mm b/platform/darwin/src/MGLHeatmapStyleLayer.mm index a3816c0fdd..ec6fdbde78 100644 --- a/platform/darwin/src/MGLHeatmapStyleLayer.mm +++ b/platform/darwin/src/MGLHeatmapStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLHeatmapStyleLayer_Private.h" +#include <mbgl/style/layers/heatmap_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLHeatmapStyleLayer_Private.h b/platform/darwin/src/MGLHeatmapStyleLayer_Private.h index e81920ae39..407036cedf 100644 --- a/platform/darwin/src/MGLHeatmapStyleLayer_Private.h +++ b/platform/darwin/src/MGLHeatmapStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/heatmap_layer.hpp> +#include <mbgl/layermanager/heatmap_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLHillshadeStyleLayer.mm b/platform/darwin/src/MGLHillshadeStyleLayer.mm index c1f47b0b68..95620b139d 100644 --- a/platform/darwin/src/MGLHillshadeStyleLayer.mm +++ b/platform/darwin/src/MGLHillshadeStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLHillshadeStyleLayer_Private.h" +#include <mbgl/style/layers/hillshade_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLHillshadeStyleLayer_Private.h b/platform/darwin/src/MGLHillshadeStyleLayer_Private.h index e92cc7f3ec..4c427f2137 100644 --- a/platform/darwin/src/MGLHillshadeStyleLayer_Private.h +++ b/platform/darwin/src/MGLHillshadeStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/hillshade_layer.hpp> +#include <mbgl/layermanager/hillshade_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm index 8fdd9a0bcc..f227ed0bb7 100644 --- a/platform/darwin/src/MGLLineStyleLayer.mm +++ b/platform/darwin/src/MGLLineStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLLineStyleLayer_Private.h" +#include <mbgl/style/layers/line_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLLineStyleLayer_Private.h b/platform/darwin/src/MGLLineStyleLayer_Private.h index 85dbffb8ca..b4c7b3ee7c 100644 --- a/platform/darwin/src/MGLLineStyleLayer_Private.h +++ b/platform/darwin/src/MGLLineStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/line_layer.hpp> +#include <mbgl/layermanager/line_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLOpenGLStyleLayer_Private.h b/platform/darwin/src/MGLOpenGLStyleLayer_Private.h index cce062b53d..27a536c60c 100644 --- a/platform/darwin/src/MGLOpenGLStyleLayer_Private.h +++ b/platform/darwin/src/MGLOpenGLStyleLayer_Private.h @@ -2,7 +2,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/custom_layer.hpp> +#include <mbgl/layermanager/custom_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm index bcaffe1c4a..cf1b8da84e 100644 --- a/platform/darwin/src/MGLRasterStyleLayer.mm +++ b/platform/darwin/src/MGLRasterStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLRasterStyleLayer_Private.h" +#include <mbgl/style/layers/raster_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLRasterStyleLayer_Private.h b/platform/darwin/src/MGLRasterStyleLayer_Private.h index 5388d64302..7b123ed888 100644 --- a/platform/darwin/src/MGLRasterStyleLayer_Private.h +++ b/platform/darwin/src/MGLRasterStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/raster_layer.hpp> +#include <mbgl/layermanager/raster_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs index 0cccd16a40..c744db72ed 100644 --- a/platform/darwin/src/MGLStyleLayer.mm.ejs +++ b/platform/darwin/src/MGLStyleLayer.mm.ejs @@ -16,6 +16,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGL<%- camelize(type) %>StyleLayer_Private.h" +#include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp> #include <mbgl/style/transition_options.hpp> <% if (enumProperties) { -%> diff --git a/platform/darwin/src/MGLStyleLayer_Private.h.ejs b/platform/darwin/src/MGLStyleLayer_Private.h.ejs index 8cb8d6281a..a6e6b9cd87 100644 --- a/platform/darwin/src/MGLStyleLayer_Private.h.ejs +++ b/platform/darwin/src/MGLStyleLayer_Private.h.ejs @@ -11,7 +11,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp> +#include <mbgl/layermanager/<%- type.replace('-', '_') %>_layer_factory.hpp> namespace mbgl { diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm index 481570fdeb..5da74d8fac 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.mm +++ b/platform/darwin/src/MGLSymbolStyleLayer.mm @@ -10,6 +10,7 @@ #import "MGLLoggingConfiguration_Private.h" #import "MGLSymbolStyleLayer_Private.h" +#include <mbgl/style/layers/symbol_layer.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/darwin/src/MGLSymbolStyleLayer_Private.h b/platform/darwin/src/MGLSymbolStyleLayer_Private.h index 5e5755ad67..4c3505a9d4 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer_Private.h +++ b/platform/darwin/src/MGLSymbolStyleLayer_Private.h @@ -4,7 +4,7 @@ #include "MGLStyleLayer_Private.h" -#include <mbgl/style/layers/symbol_layer.hpp> +#include <mbgl/layermanager/symbol_layer_factory.hpp> namespace mbgl { diff --git a/platform/default/layer_manager.cpp b/platform/default/layer_manager.cpp index 86343369b4..05d0f4d1ae 100644 --- a/platform/default/layer_manager.cpp +++ b/platform/default/layer_manager.cpp @@ -1,14 +1,15 @@ #include <mbgl/layermanager/layer_manager.hpp> -#include <mbgl/style/layers/background_layer.hpp> -#include <mbgl/style/layers/circle_layer.hpp> -#include <mbgl/style/layers/custom_layer.hpp> -#include <mbgl/style/layers/fill_extrusion_layer.hpp> -#include <mbgl/style/layers/fill_layer.hpp> -#include <mbgl/style/layers/heatmap_layer.hpp> -#include <mbgl/style/layers/hillshade_layer.hpp> -#include <mbgl/style/layers/line_layer.hpp> -#include <mbgl/style/layers/raster_layer.hpp> -#include <mbgl/style/layers/symbol_layer.hpp> + +#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/line_layer_factory.hpp> +#include <mbgl/layermanager/raster_layer_factory.hpp> +#include <mbgl/layermanager/symbol_layer_factory.hpp> #include <map> #include <memory> |