diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-01-25 10:01:36 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-01-25 15:38:07 +0200 |
commit | 8fedfbf160ab7228c5a51d1f6d4586b1ea54bac3 (patch) | |
tree | 125e2b27e8acdf24ff21ba6a65b19e33abf805f9 /platform/android/src/style/layers/layer_manager.cpp | |
parent | ee6edcdf7e42a116b4fc020123497d38991cde4b (diff) | |
download | qtlocation-mapboxgl-8fedfbf160ab7228c5a51d1f6d4586b1ea54bac3.tar.gz |
[android, darwin] Fix core-only layer creation
In the layer manager implementations `addLayerTypeCoreOnly()`
should be called with core-only modules.
Diffstat (limited to 'platform/android/src/style/layers/layer_manager.cpp')
-rw-r--r-- | platform/android/src/style/layers/layer_manager.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/platform/android/src/style/layers/layer_manager.cpp b/platform/android/src/style/layers/layer_manager.cpp index 7822502cfa..d0c54ee00f 100644 --- a/platform/android/src/style/layers/layer_manager.cpp +++ b/platform/android/src/style/layers/layer_manager.cpp @@ -24,52 +24,52 @@ namespace android { LayerManagerAndroid::LayerManagerAndroid() { #if defined(MBGL_LAYER_FILL_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<FillJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<FillLayerFactory>()); #elif !defined(MBGL_LAYER_FILL_DISABLE_ALL) addLayerType(std::make_unique<FillJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_LINE_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<LineJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<LineLayerFactory>()); #elif !defined(MBGL_LAYER_LINE_DISABLE_ALL) addLayerType(std::make_unique<LineJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_CIRCLE_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<CircleJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<CircleLayerFactory>()); #elif !defined(MBGL_LAYER_CIRCLE_DISABLE_ALL) addLayerType(std::make_unique<CircleJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_SYMBOL_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<SymbolJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<SymbolLayerFactory>()); #elif !defined(MBGL_LAYER_SYMBOL_DISABLE_ALL) addLayerType(std::make_unique<SymbolJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_RASTER_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<RasterJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<RasterLayerFactory>()); #elif !defined(MBGL_LAYER_RASTER_DISABLE_ALL) addLayerType(std::make_unique<RasterJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_BACKGROUND_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<BackgroundJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<BackgroundLayerFactory>()); #elif !defined(MBGL_LAYER_BACKGROUND_DISABLE_ALL) addLayerType(std::make_unique<BackgroundJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_HILLSHADE_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<HillshadeJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<HillshadeLayerFactory>()); #elif !defined(MBGL_LAYER_HILLSHADE_DISABLE_ALL) addLayerType(std::make_unique<HillshadeJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_FILL_EXTRUSION_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<FillExtrusionJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<FillExtrusionLayerFactory>()); #elif !defined(MBGL_LAYER_FILL_EXTRUSION_DISABLE_ALL) addLayerType(std::make_unique<FillExtrusionJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_HEATMAP_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<HeatmapJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<HeatmapLayerFactory>()); #elif !defined(MBGL_LAYER_HEATMAP_DISABLE_ALL) addLayerType(std::make_unique<HeatmapJavaLayerPeerFactory>()); #endif #if defined(MBGL_LAYER_CUSTOM_DISABLE_RUNTIME) - addLayerTypeCoreOnly(std::make_unique<CustomJavaLayerPeerFactory>()); + addLayerTypeCoreOnly(std::make_unique<CustomLayerFactory>()); #elif !defined(MBGL_LAYER_CUSTOM_DISABLE_ALL) addLayerType(std::make_unique<CustomJavaLayerPeerFactory>()); #endif |