core: rename mbgl directories to mln (#4511)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
@@ -2,10 +2,10 @@
|
||||
|
||||
#include "value.hpp"
|
||||
|
||||
#include <mbgl/util/feature.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/style/conversion/geojson.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
#include <mln/util/feature.hpp>
|
||||
#include <mln/util/logging.hpp>
|
||||
#include <mln/style/conversion/geojson.hpp>
|
||||
#include <mln/style/conversion_impl.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
#include <optional>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "filter.hpp"
|
||||
#include "../android_conversion.hpp"
|
||||
|
||||
#include <mbgl/style/conversion.hpp>
|
||||
#include <mbgl/style/conversion/filter.hpp>
|
||||
#include <mln/style/conversion.hpp>
|
||||
#include <mln/style/conversion/filter.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/style/filter.hpp>
|
||||
#include <mln/style/filter.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "../../conversion/conversion.hpp"
|
||||
#include "../position.hpp"
|
||||
|
||||
#include <mbgl/style/position.hpp>
|
||||
#include <mln/style/position.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "../../conversion/conversion.hpp"
|
||||
#include "../../gson/json_element.hpp"
|
||||
|
||||
#include <mbgl/style/property_expression.hpp>
|
||||
#include <mln/style/property_expression.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/style/color_ramp_property_value.hpp>
|
||||
#include <mbgl/style/property_value.hpp>
|
||||
#include <mln/style/color_ramp_property_value.hpp>
|
||||
#include <mln/style/property_value.hpp>
|
||||
|
||||
#include "../../conversion/conversion.hpp"
|
||||
#include "../../conversion/constant.hpp"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "../../conversion/conversion.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/transition_options.hpp>
|
||||
#include <mln/style/transition_options.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "url_or_tileset.hpp"
|
||||
#include "../android_conversion.hpp"
|
||||
|
||||
#include <mbgl/style/conversion.hpp>
|
||||
#include <mbgl/style/conversion/tileset.hpp>
|
||||
#include <mln/style/conversion.hpp>
|
||||
#include <mln/style/conversion/tileset.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/variant.hpp>
|
||||
#include <mbgl/util/tileset.hpp>
|
||||
#include <mln/util/variant.hpp>
|
||||
#include <mln/util/tileset.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mln/util/noncopyable.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
#include <mbgl/style/expression/formatted.hpp>
|
||||
#include <mln/style/expression/formatted.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mln/util/noncopyable.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/background_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/background_layer.hpp>
|
||||
#include <mln/layermanager/background_layer_factory.hpp>
|
||||
#include <mln/style/layers/background_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/circle_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/circle_layer.hpp>
|
||||
#include <mln/layermanager/circle_layer_factory.hpp>
|
||||
#include <mln/style/layers/circle_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/color_relief_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/color_relief_layer.hpp>
|
||||
#include <mln/layermanager/color_relief_layer_factory.hpp>
|
||||
#include <mln/style/layers/color_relief_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mln/util/logging.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
#include <mbgl/style/layers/custom_layer.hpp>
|
||||
#include <mbgl/layermanager/custom_layer_factory.hpp>
|
||||
#include <mln/style/layers/custom_layer.hpp>
|
||||
#include <mln/layermanager/custom_layer_factory.hpp>
|
||||
#include "layer.hpp"
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/fill_extrusion_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/fill_extrusion_layer.hpp>
|
||||
#include <mln/layermanager/fill_extrusion_layer_factory.hpp>
|
||||
#include <mln/style/layers/fill_extrusion_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/fill_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/fill_layer.hpp>
|
||||
#include <mln/layermanager/fill_layer_factory.hpp>
|
||||
#include <mln/style/layers/fill_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/heatmap_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/heatmap_layer.hpp>
|
||||
#include <mln/layermanager/heatmap_layer_factory.hpp>
|
||||
#include <mln/style/layers/heatmap_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/hillshade_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/hillshade_layer.hpp>
|
||||
#include <mln/layermanager/hillshade_layer_factory.hpp>
|
||||
#include <mln/style/layers/hillshade_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -3,21 +3,21 @@
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
#include <mbgl/style/style.hpp>
|
||||
#include <mbgl/style/filter.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mln/style/style.hpp>
|
||||
#include <mln/style/filter.hpp>
|
||||
#include <mln/util/logging.hpp>
|
||||
|
||||
// Java -> C++ conversion
|
||||
#include <mbgl/style/conversion/filter.hpp>
|
||||
#include <mbgl/style/conversion/layer.hpp>
|
||||
#include <mbgl/style/conversion/source.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
#include <mln/style/conversion/filter.hpp>
|
||||
#include <mln/style/conversion/layer.hpp>
|
||||
#include <mln/style/conversion/source.hpp>
|
||||
#include <mln/style/conversion_impl.hpp>
|
||||
|
||||
// C++ -> Java conversion
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "custom_layer.hpp"
|
||||
#include "background_layer.hpp"
|
||||
#include <mbgl/style/filter.hpp>
|
||||
#include <mln/style/filter.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/layermanager/layer_factory.hpp>
|
||||
#include <mbgl/style/layer.hpp>
|
||||
#include <mbgl/style/style.hpp>
|
||||
#include <mln/layermanager/layer_factory.hpp>
|
||||
#include <mln/style/layer.hpp>
|
||||
#include <mln/style/style.hpp>
|
||||
#include "../../gson/json_array.hpp"
|
||||
#include "../../gson/json_element.hpp"
|
||||
#include "../value.hpp"
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/<%- type.replace('-', '_') %>_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp>
|
||||
#include <mln/layermanager/<%- type.replace('-', '_') %>_layer_factory.hpp>
|
||||
#include <mln/style/layers/<%- type.replace('-', '_') %>_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "layer_manager.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
#include <mbgl/style/conversion/constant.hpp>
|
||||
#include <mbgl/style/conversion/filter.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
#include <mln/style/conversion/constant.hpp>
|
||||
#include <mln/style/conversion/filter.hpp>
|
||||
#include <mln/style/conversion_impl.hpp>
|
||||
|
||||
#include "background_layer.hpp"
|
||||
#include "circle_layer.hpp"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/layermanager/layer_manager.hpp>
|
||||
#include <mbgl/map/map.hpp>
|
||||
#include <mbgl/style/layer.hpp>
|
||||
#include <mln/layermanager/layer_manager.hpp>
|
||||
#include <mln/map/map.hpp>
|
||||
#include <mln/style/layer.hpp>
|
||||
|
||||
#include "layer.hpp"
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/line_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/line_layer.hpp>
|
||||
#include <mln/layermanager/line_layer_factory.hpp>
|
||||
#include <mln/style/layers/line_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/location_indicator_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/location_indicator_layer.hpp>
|
||||
#include <mln/layermanager/location_indicator_layer_factory.hpp>
|
||||
#include <mln/style/layers/location_indicator_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/raster_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/raster_layer.hpp>
|
||||
#include <mln/layermanager/raster_layer_factory.hpp>
|
||||
#include <mln/style/layers/raster_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "../conversion/property_value.hpp"
|
||||
#include "../conversion/transition_options.hpp"
|
||||
|
||||
#include <mbgl/style/layer_impl.hpp>
|
||||
#include <mln/style/layer_impl.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "layer.hpp"
|
||||
#include "../transition_options.hpp"
|
||||
#include <mbgl/layermanager/symbol_layer_factory.hpp>
|
||||
#include <mbgl/style/layers/symbol_layer.hpp>
|
||||
#include <mln/layermanager/symbol_layer_factory.hpp>
|
||||
#include <mln/style/layers/symbol_layer.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <mbgl/map/map.hpp>
|
||||
#include <mln/map/map.hpp>
|
||||
#include "light.hpp"
|
||||
#include "conversion/transition_options.hpp"
|
||||
#include "conversion/position.hpp"
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mln/util/noncopyable.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
#include <mbgl/style/light.hpp>
|
||||
#include <mln/style/light.hpp>
|
||||
#include "transition_options.hpp"
|
||||
#include "position.hpp"
|
||||
#include <mbgl/style/types.hpp>
|
||||
#include <mbgl/style/property_value.hpp>
|
||||
#include <mln/style/types.hpp>
|
||||
#include <mln/style/property_value.hpp>
|
||||
|
||||
namespace mln {
|
||||
namespace android {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mln/util/noncopyable.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "custom_geometry_source.hpp"
|
||||
#include "attach_env.hpp"
|
||||
|
||||
#include <mbgl/renderer/query.hpp>
|
||||
#include <mln/renderer/query.hpp>
|
||||
|
||||
// Java -> C++ conversion
|
||||
#include "../android_conversion.hpp"
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "../../conversion/conversion.hpp"
|
||||
#include "../../conversion/collection.hpp"
|
||||
#include "../../geojson/feature.hpp"
|
||||
#include <mbgl/style/conversion/custom_geometry_source_options.hpp>
|
||||
#include <mln/style/conversion/custom_geometry_source_options.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include "source.hpp"
|
||||
#include <mbgl/style/sources/custom_geometry_source.hpp>
|
||||
#include <mbgl/util/geojson.hpp>
|
||||
#include <mbgl/tile/tile_id.hpp>
|
||||
#include <mln/style/sources/custom_geometry_source.hpp>
|
||||
#include <mln/util/geojson.hpp>
|
||||
#include <mln/tile/tile_id.hpp>
|
||||
#include "../../geojson/geometry.hpp"
|
||||
#include "../../geojson/feature.hpp"
|
||||
#include "../../geojson/feature_collection.hpp"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "custom_vector_source.hpp"
|
||||
#include "attach_env.hpp"
|
||||
|
||||
#include <mbgl/style/sources/custom_vector_source.hpp>
|
||||
#include <mln/style/sources/custom_vector_source.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "source.hpp"
|
||||
#include <mbgl/style/sources/custom_vector_source.hpp>
|
||||
#include <mbgl/tile/tile_id.hpp>
|
||||
#include <mln/style/sources/custom_vector_source.hpp>
|
||||
#include <mln/tile/tile_id.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
#include "geojson_source.hpp"
|
||||
#include <mbgl/style/sources/geojson_source_impl.hpp>
|
||||
#include <mln/style/sources/geojson_source_impl.hpp>
|
||||
#include "attach_env.hpp"
|
||||
|
||||
#include <mbgl/renderer/query.hpp>
|
||||
#include <mln/renderer/query.hpp>
|
||||
|
||||
// Java -> C++ conversion
|
||||
#include "../android_conversion.hpp"
|
||||
#include "../conversion/filter.hpp"
|
||||
#include <mbgl/style/conversion/geojson.hpp>
|
||||
#include <mbgl/style/conversion/geojson_options.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
#include <mln/style/conversion/geojson.hpp>
|
||||
#include <mln/style/conversion/geojson_options.hpp>
|
||||
#include <mln/style/conversion_impl.hpp>
|
||||
|
||||
// C++ -> Java conversion
|
||||
#include "../../conversion/conversion.hpp"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "source.hpp"
|
||||
#include <mbgl/style/sources/geojson_source.hpp>
|
||||
#include <mbgl/actor/optional_actor.hpp>
|
||||
#include <mln/style/sources/geojson_source.hpp>
|
||||
#include <mln/actor/optional_actor.hpp>
|
||||
#include "../../geojson/geometry.hpp"
|
||||
#include "../../geojson/feature.hpp"
|
||||
#include "../../geojson/feature_collection.hpp"
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
// C++ -> Java conversion
|
||||
#include "../../conversion/conversion.hpp"
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
#include <mbgl/util/premultiply.hpp>
|
||||
#include <mln/style/conversion_impl.hpp>
|
||||
#include <mln/util/premultiply.hpp>
|
||||
|
||||
#include "bitmap.hpp"
|
||||
#include <string>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "source.hpp"
|
||||
#include "../../geometry/lat_lng_quad.hpp"
|
||||
#include <mbgl/style/sources/image_source.hpp>
|
||||
#include <mln/style/sources/image_source.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "../conversion/url_or_tileset.hpp"
|
||||
#include "source.hpp"
|
||||
|
||||
#include <mbgl/util/variant.hpp>
|
||||
#include <mln/util/variant.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "source.hpp"
|
||||
#include <mbgl/style/sources/raster_dem_source.hpp>
|
||||
#include <mln/style/sources/raster_dem_source.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "../value.hpp"
|
||||
#include "../conversion/url_or_tileset.hpp"
|
||||
|
||||
#include <mbgl/util/variant.hpp>
|
||||
#include <mln/util/variant.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "source.hpp"
|
||||
#include <mbgl/style/sources/raster_source.hpp>
|
||||
#include <mln/style/sources/raster_source.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
#include <mbgl/style/style.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mln/style/style.hpp>
|
||||
#include <mln/util/logging.hpp>
|
||||
|
||||
// Java -> C++ conversion
|
||||
#include <mbgl/style/conversion/source.hpp>
|
||||
#include <mbgl/style/conversion_impl.hpp>
|
||||
#include <mln/style/conversion/source.hpp>
|
||||
#include <mln/style/conversion_impl.hpp>
|
||||
|
||||
// C++ -> Java conversion
|
||||
#include "../conversion/property_value.hpp"
|
||||
@@ -17,11 +17,11 @@
|
||||
#include <string>
|
||||
|
||||
// Core Sources
|
||||
#include <mbgl/style/sources/custom_vector_source.hpp>
|
||||
#include <mbgl/style/sources/geojson_source.hpp>
|
||||
#include <mbgl/style/sources/image_source.hpp>
|
||||
#include <mbgl/style/sources/raster_source.hpp>
|
||||
#include <mbgl/style/sources/vector_source.hpp>
|
||||
#include <mln/style/sources/custom_vector_source.hpp>
|
||||
#include <mln/style/sources/geojson_source.hpp>
|
||||
#include <mln/style/sources/image_source.hpp>
|
||||
#include <mln/style/sources/raster_source.hpp>
|
||||
#include <mln/style/sources/vector_source.hpp>
|
||||
|
||||
// Android Source peers
|
||||
#include "geojson_source.hpp"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mbgl/map/map.hpp>
|
||||
#include <mbgl/style/source.hpp>
|
||||
#include <mln/util/noncopyable.hpp>
|
||||
#include <mln/map/map.hpp>
|
||||
#include <mln/style/source.hpp>
|
||||
|
||||
#include "../value.hpp"
|
||||
#include "../../android_renderer_frontend.hpp"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "source.hpp"
|
||||
#include <mbgl/style/source.hpp>
|
||||
#include <mln/style/source.hpp>
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
namespace mln {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "vector_source.hpp"
|
||||
|
||||
#include <mbgl/renderer/query.hpp>
|
||||
#include <mln/renderer/query.hpp>
|
||||
|
||||
// Java -> C++ conversion
|
||||
#include "../android_conversion.hpp"
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "../../geojson/feature.hpp"
|
||||
#include "../conversion/url_or_tileset.hpp"
|
||||
|
||||
#include <mbgl/util/variant.hpp>
|
||||
#include <mln/util/variant.hpp>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "source.hpp"
|
||||
#include <mbgl/style/sources/vector_source.hpp>
|
||||
#include <mln/style/sources/vector_source.hpp>
|
||||
#include "../../geojson/feature.hpp"
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mln/util/noncopyable.hpp>
|
||||
|
||||
#include <jni/jni.hpp>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user