From 550f64be2232e09934ffc660a9acdbacff8b164a Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Fri, 14 Aug 2026 23:25:20 +0200 Subject: [PATCH] core: rename `mbgl` namespace to `mln` (#4487) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- CHANGELOG.md | 16 +- benchmark/api/query.benchmark.cpp | 2 +- benchmark/api/render.benchmark.cpp | 4 +- .../function/camera_function.benchmark.cpp | 4 +- .../function/composite_function.benchmark.cpp | 4 +- .../function/source_function.benchmark.cpp | 4 +- benchmark/include/mbgl/benchmark.hpp | 4 +- benchmark/ios/ios_test_runner.cpp | 8 +- benchmark/parse/filter.benchmark.cpp | 2 +- benchmark/parse/tile_mask.benchmark.cpp | 2 +- benchmark/parse/vector_tile.benchmark.cpp | 2 +- benchmark/renderer/group_layers.benchmark.cpp | 4 +- benchmark/src/mbgl/benchmark/benchmark.cpp | 4 +- .../benchmark/stub_geometry_tile_feature.hpp | 2 +- .../storage/offline_database.benchmark.cpp | 24 +- benchmark/util/color.benchmark.cpp | 2 +- benchmark/util/tilecover.benchmark.cpp | 2 +- bin/cache.cpp | 32 +- bin/offline.cpp | 22 +- bin/render.cpp | 10 +- .../2025-07-05-custom-vector-source.md | 4 +- expression-test/expression_test_logger.cpp | 2 +- expression-test/expression_test_parser.cpp | 8 +- expression-test/expression_test_parser.hpp | 2 +- expression-test/expression_test_runner.cpp | 2 +- expression-test/test_runner_common.cpp | 2 +- expression-test/test_runner_common.hpp | 2 +- include/mbgl/actor/actor.hpp | 4 +- include/mbgl/actor/actor_ref.hpp | 4 +- include/mbgl/actor/aspiring_actor.hpp | 4 +- include/mbgl/actor/established_actor.hpp | 4 +- include/mbgl/actor/mailbox.hpp | 4 +- include/mbgl/actor/message.hpp | 4 +- include/mbgl/actor/optional_actor.hpp | 4 +- include/mbgl/actor/optional_actor_ref.hpp | 4 +- include/mbgl/actor/scheduler.hpp | 6 +- include/mbgl/annotation/annotation.hpp | 4 +- include/mbgl/gfx/backend.hpp | 4 +- include/mbgl/gfx/backend_scope.hpp | 4 +- include/mbgl/gfx/color_mode.hpp | 22 +- include/mbgl/gfx/command_encoder.hpp | 4 +- include/mbgl/gfx/context.hpp | 4 +- include/mbgl/gfx/context_observer.hpp | 4 +- include/mbgl/gfx/debug_group.hpp | 4 +- include/mbgl/gfx/depth_mode.hpp | 4 +- include/mbgl/gfx/draw_mode.hpp | 4 +- include/mbgl/gfx/draw_scope.hpp | 4 +- include/mbgl/gfx/drawable.hpp | 24 +- include/mbgl/gfx/drawable_atlases_tweaker.hpp | 4 +- include/mbgl/gfx/drawable_builder.hpp | 12 +- .../drawable_custom_layer_host_tweaker.hpp | 4 +- include/mbgl/gfx/drawable_data.hpp | 4 +- include/mbgl/gfx/drawable_impl.hpp | 4 +- include/mbgl/gfx/drawable_tweaker.hpp | 4 +- include/mbgl/gfx/dynamic_texture.hpp | 4 +- include/mbgl/gfx/dynamic_texture_atlas.hpp | 4 +- include/mbgl/gfx/fill_generator.hpp | 4 +- include/mbgl/gfx/gfx_types.hpp | 4 +- include/mbgl/gfx/gpu_expression.hpp | 4 +- include/mbgl/gfx/polyline_generator.hpp | 6 +- include/mbgl/gfx/renderable.hpp | 4 +- include/mbgl/gfx/renderbuffer.hpp | 4 +- include/mbgl/gfx/renderer_backend.hpp | 6 +- include/mbgl/gfx/rendering_stats.hpp | 6 +- include/mbgl/gfx/scissor_rect.hpp | 4 +- include/mbgl/gfx/shader.hpp | 4 +- include/mbgl/gfx/shader_group.hpp | 6 +- include/mbgl/gfx/shader_registry.hpp | 4 +- include/mbgl/gfx/stencil_mode.hpp | 4 +- include/mbgl/gfx/texture2d.hpp | 4 +- include/mbgl/gfx/types.hpp | 4 +- include/mbgl/gfx/uniform_buffer.hpp | 4 +- include/mbgl/gfx/vertex_attribute.hpp | 6 +- include/mbgl/gfx/vertex_buffer.hpp | 4 +- include/mbgl/gl/buffer_allocator.hpp | 4 +- include/mbgl/gl/drawable_gl.hpp | 4 +- include/mbgl/gl/drawable_gl_builder.hpp | 4 +- include/mbgl/gl/dynamic_texture.hpp | 4 +- include/mbgl/gl/layer_group_gl.hpp | 4 +- include/mbgl/gl/renderable_resource.hpp | 4 +- include/mbgl/gl/renderer_backend.hpp | 4 +- include/mbgl/gl/texture2d.hpp | 4 +- include/mbgl/gl/uniform_buffer_gl.hpp | 4 +- include/mbgl/gl/vertex_attribute_gl.hpp | 4 +- include/mbgl/i18n/collator.hpp | 4 +- include/mbgl/i18n/number_format.hpp | 4 +- .../layermanager/background_layer_factory.hpp | 4 +- .../layermanager/circle_layer_factory.hpp | 4 +- .../color_relief_layer_factory.hpp | 4 +- .../custom_drawable_layer_factory.hpp | 4 +- .../layermanager/custom_layer_factory.hpp | 4 +- .../fill_extrusion_layer_factory.hpp | 4 +- .../mbgl/layermanager/fill_layer_factory.hpp | 4 +- .../layermanager/heatmap_layer_factory.hpp | 4 +- .../layermanager/hillshade_layer_factory.hpp | 4 +- include/mbgl/layermanager/layer_factory.hpp | 4 +- include/mbgl/layermanager/layer_manager.hpp | 6 +- .../mbgl/layermanager/line_layer_factory.hpp | 4 +- .../location_indicator_layer_factory.hpp | 4 +- .../layermanager/raster_layer_factory.hpp | 4 +- .../layermanager/symbol_layer_factory.hpp | 4 +- include/mbgl/map/bound_options.hpp | 4 +- include/mbgl/map/camera.hpp | 6 +- include/mbgl/map/change.hpp | 4 +- include/mbgl/map/map.hpp | 4 +- include/mbgl/map/map_observer.hpp | 4 +- include/mbgl/map/map_options.hpp | 6 +- include/mbgl/map/map_projection.hpp | 4 +- include/mbgl/map/mode.hpp | 14 +- include/mbgl/map/projection_mode.hpp | 4 +- include/mbgl/math/angles.hpp | 4 +- include/mbgl/math/clamp.hpp | 4 +- include/mbgl/math/log2.hpp | 4 +- include/mbgl/math/minmax.hpp | 4 +- include/mbgl/math/wrap.hpp | 4 +- include/mbgl/mtl/buffer_resource.hpp | 4 +- include/mbgl/mtl/command_encoder.hpp | 8 +- include/mbgl/mtl/context.hpp | 6 +- include/mbgl/mtl/drawable.hpp | 4 +- include/mbgl/mtl/drawable_builder.hpp | 4 +- include/mbgl/mtl/dynamic_texture.hpp | 4 +- include/mbgl/mtl/index_buffer_resource.hpp | 4 +- include/mbgl/mtl/layer_group.hpp | 6 +- include/mbgl/mtl/mtl_fwd.hpp | 4 +- include/mbgl/mtl/offscreen_texture.hpp | 4 +- include/mbgl/mtl/render_pass.hpp | 4 +- include/mbgl/mtl/renderable_resource.hpp | 12 +- include/mbgl/mtl/renderer_backend.hpp | 4 +- include/mbgl/mtl/texture2d.hpp | 4 +- include/mbgl/mtl/tile_layer_group.hpp | 6 +- include/mbgl/mtl/uniform_buffer.hpp | 4 +- include/mbgl/mtl/upload_pass.hpp | 4 +- include/mbgl/mtl/vertex_attribute.hpp | 4 +- include/mbgl/mtl/vertex_buffer_resource.hpp | 4 +- include/mbgl/platform/gl_functions.hpp | 20 +- include/mbgl/platform/settings.hpp | 4 +- include/mbgl/platform/thread.hpp | 4 +- include/mbgl/platform/time.hpp | 4 +- include/mbgl/renderer/change_request.hpp | 4 +- include/mbgl/renderer/layer_group.hpp | 32 +- include/mbgl/renderer/layer_tweaker.hpp | 4 +- include/mbgl/renderer/query.hpp | 4 +- include/mbgl/renderer/render_target.hpp | 4 +- include/mbgl/renderer/renderer.hpp | 4 +- include/mbgl/renderer/renderer_frontend.hpp | 4 +- include/mbgl/renderer/renderer_observer.hpp | 4 +- include/mbgl/renderer/renderer_state.hpp | 4 +- include/mbgl/shaders/background_layer_ubo.hpp | 4 +- include/mbgl/shaders/circle_layer_ubo.hpp | 4 +- include/mbgl/shaders/collision_layer_ubo.hpp | 4 +- .../mbgl/shaders/color_relief_layer_ubo.hpp | 4 +- .../shaders/custom_drawable_layer_ubo.hpp | 4 +- include/mbgl/shaders/custom_geometry_ubo.hpp | 4 +- include/mbgl/shaders/debug_layer_ubo.hpp | 4 +- .../mbgl/shaders/fill_extrusion_layer_ubo.hpp | 4 +- include/mbgl/shaders/fill_layer_ubo.hpp | 4 +- include/mbgl/shaders/gl/background.hpp | 4 +- .../mbgl/shaders/gl/background_pattern.hpp | 4 +- include/mbgl/shaders/gl/circle.hpp | 4 +- include/mbgl/shaders/gl/clipping_mask.hpp | 4 +- include/mbgl/shaders/gl/collision_box.hpp | 4 +- include/mbgl/shaders/gl/collision_circle.hpp | 4 +- include/mbgl/shaders/gl/color_relief.hpp | 4 +- include/mbgl/shaders/gl/custom_geometry.hpp | 4 +- .../mbgl/shaders/gl/custom_symbol_icon.hpp | 4 +- include/mbgl/shaders/gl/debug.hpp | 4 +- include/mbgl/shaders/gl/fill.hpp | 4 +- include/mbgl/shaders/gl/fill_extrusion.hpp | 4 +- .../shaders/gl/fill_extrusion_instanced.hpp | 4 +- .../shaders/gl/fill_extrusion_pattern.hpp | 4 +- .../gl/fill_extrusion_pattern_instanced.hpp | 4 +- include/mbgl/shaders/gl/fill_outline.hpp | 4 +- .../mbgl/shaders/gl/fill_outline_pattern.hpp | 4 +- .../shaders/gl/fill_outline_triangulated.hpp | 4 +- include/mbgl/shaders/gl/fill_pattern.hpp | 4 +- include/mbgl/shaders/gl/heatmap.hpp | 4 +- include/mbgl/shaders/gl/heatmap_texture.hpp | 4 +- include/mbgl/shaders/gl/hillshade.hpp | 4 +- include/mbgl/shaders/gl/hillshade_prepare.hpp | 4 +- include/mbgl/shaders/gl/line.hpp | 4 +- include/mbgl/shaders/gl/line_gradient.hpp | 4 +- include/mbgl/shaders/gl/line_pattern.hpp | 4 +- include/mbgl/shaders/gl/line_sdf.hpp | 4 +- .../mbgl/shaders/gl/location_indicator.hpp | 4 +- .../gl/location_indicator_textured.hpp | 4 +- include/mbgl/shaders/gl/prelude.hpp | 4 +- include/mbgl/shaders/gl/raster.hpp | 4 +- include/mbgl/shaders/gl/shader_group_gl.hpp | 8 +- include/mbgl/shaders/gl/shader_info.hpp | 4 +- include/mbgl/shaders/gl/shader_program_gl.hpp | 4 +- include/mbgl/shaders/gl/symbol_icon.hpp | 4 +- include/mbgl/shaders/gl/symbol_sdf.hpp | 4 +- .../mbgl/shaders/gl/symbol_text_and_icon.hpp | 4 +- include/mbgl/shaders/gl/wide_vector.hpp | 4 +- include/mbgl/shaders/heatmap_layer_ubo.hpp | 4 +- .../shaders/heatmap_texture_layer_ubo.hpp | 4 +- include/mbgl/shaders/hillshade_layer_ubo.hpp | 4 +- .../shaders/hillshade_prepare_layer_ubo.hpp | 4 +- include/mbgl/shaders/layer_ubo.hpp | 4 +- include/mbgl/shaders/line_layer_ubo.hpp | 4 +- .../mbgl/shaders/location_indicator_ubo.hpp | 4 +- include/mbgl/shaders/mtl/background.hpp | 4 +- include/mbgl/shaders/mtl/circle.hpp | 4 +- include/mbgl/shaders/mtl/clipping_mask.hpp | 4 +- include/mbgl/shaders/mtl/collision.hpp | 4 +- include/mbgl/shaders/mtl/color_relief.hpp | 4 +- include/mbgl/shaders/mtl/common.hpp | 4 +- include/mbgl/shaders/mtl/custom_geometry.hpp | 4 +- .../mbgl/shaders/mtl/custom_symbol_icon.hpp | 4 +- include/mbgl/shaders/mtl/debug.hpp | 4 +- include/mbgl/shaders/mtl/fill.hpp | 4 +- include/mbgl/shaders/mtl/fill_extrusion.hpp | 4 +- include/mbgl/shaders/mtl/heatmap.hpp | 4 +- include/mbgl/shaders/mtl/heatmap_texture.hpp | 4 +- include/mbgl/shaders/mtl/hillshade.hpp | 4 +- .../mbgl/shaders/mtl/hillshade_prepare.hpp | 4 +- include/mbgl/shaders/mtl/line.hpp | 4 +- .../mbgl/shaders/mtl/location_indicator.hpp | 4 +- include/mbgl/shaders/mtl/raster.hpp | 4 +- include/mbgl/shaders/mtl/shader_group.hpp | 10 +- include/mbgl/shaders/mtl/shader_program.hpp | 6 +- .../mbgl/shaders/mtl/shader_program_mtl.hpp | 4 +- include/mbgl/shaders/mtl/symbol.hpp | 4 +- include/mbgl/shaders/mtl/widevector.hpp | 4 +- include/mbgl/shaders/program_parameters.hpp | 4 +- include/mbgl/shaders/raster_layer_ubo.hpp | 4 +- include/mbgl/shaders/shader_defines.hpp | 4 +- include/mbgl/shaders/shader_program_base.hpp | 4 +- include/mbgl/shaders/shader_source.hpp | 4 +- include/mbgl/shaders/symbol_layer_ubo.hpp | 4 +- include/mbgl/shaders/vulkan/background.hpp | 4 +- include/mbgl/shaders/vulkan/circle.hpp | 4 +- include/mbgl/shaders/vulkan/clipping_mask.hpp | 4 +- include/mbgl/shaders/vulkan/collision.hpp | 4 +- include/mbgl/shaders/vulkan/color_relief.hpp | 4 +- include/mbgl/shaders/vulkan/common.hpp | 4 +- .../mbgl/shaders/vulkan/custom_geometry.hpp | 4 +- .../shaders/vulkan/custom_symbol_icon.hpp | 4 +- include/mbgl/shaders/vulkan/debug.hpp | 4 +- include/mbgl/shaders/vulkan/fill.hpp | 4 +- .../mbgl/shaders/vulkan/fill_extrusion.hpp | 4 +- include/mbgl/shaders/vulkan/heatmap.hpp | 4 +- .../mbgl/shaders/vulkan/heatmap_texture.hpp | 4 +- include/mbgl/shaders/vulkan/hillshade.hpp | 4 +- .../mbgl/shaders/vulkan/hillshade_prepare.hpp | 4 +- include/mbgl/shaders/vulkan/line.hpp | 4 +- .../shaders/vulkan/location_indicator.hpp | 4 +- include/mbgl/shaders/vulkan/raster.hpp | 4 +- include/mbgl/shaders/vulkan/shader_group.hpp | 10 +- .../mbgl/shaders/vulkan/shader_program.hpp | 6 +- include/mbgl/shaders/vulkan/symbol.hpp | 4 +- include/mbgl/shaders/vulkan/widevector.hpp | 4 +- include/mbgl/shaders/webgpu/background.hpp | 4 +- include/mbgl/shaders/webgpu/circle.hpp | 4 +- include/mbgl/shaders/webgpu/clipping_mask.hpp | 4 +- include/mbgl/shaders/webgpu/collision.hpp | 4 +- include/mbgl/shaders/webgpu/color_relief.hpp | 4 +- include/mbgl/shaders/webgpu/common.hpp | 4 +- .../mbgl/shaders/webgpu/custom_geometry.hpp | 4 +- .../shaders/webgpu/custom_symbol_icon.hpp | 4 +- include/mbgl/shaders/webgpu/debug.hpp | 4 +- include/mbgl/shaders/webgpu/fill.hpp | 4 +- .../mbgl/shaders/webgpu/fill_extrusion.hpp | 4 +- include/mbgl/shaders/webgpu/heatmap.hpp | 4 +- .../mbgl/shaders/webgpu/heatmap_texture.hpp | 4 +- include/mbgl/shaders/webgpu/hillshade.hpp | 4 +- .../mbgl/shaders/webgpu/hillshade_prepare.hpp | 4 +- include/mbgl/shaders/webgpu/line.hpp | 4 +- .../shaders/webgpu/location_indicator.hpp | 4 +- include/mbgl/shaders/webgpu/raster.hpp | 4 +- include/mbgl/shaders/webgpu/shader_group.hpp | 10 +- .../mbgl/shaders/webgpu/shader_program.hpp | 4 +- include/mbgl/shaders/webgpu/symbol.hpp | 4 +- .../mbgl/shaders/webgpu/wgsl_preprocessor.hpp | 4 +- include/mbgl/shaders/webgpu/widevector.hpp | 4 +- include/mbgl/shaders/widevector_ubo.hpp | 4 +- include/mbgl/storage/database_file_source.hpp | 4 +- include/mbgl/storage/file_source.hpp | 4 +- include/mbgl/storage/file_source_manager.hpp | 4 +- include/mbgl/storage/network_status.hpp | 4 +- include/mbgl/storage/offline.hpp | 4 +- include/mbgl/storage/online_file_source.hpp | 4 +- include/mbgl/storage/resource.hpp | 4 +- include/mbgl/storage/resource_options.hpp | 4 +- include/mbgl/storage/resource_transform.hpp | 4 +- include/mbgl/storage/response.hpp | 4 +- .../mbgl/style/color_ramp_property_value.hpp | 4 +- include/mbgl/style/conversion.hpp | 4 +- .../conversion/color_ramp_property_value.hpp | 4 +- include/mbgl/style/conversion/constant.hpp | 4 +- include/mbgl/style/conversion/coordinate.hpp | 4 +- .../custom_geometry_source_options.hpp | 4 +- include/mbgl/style/conversion/filter.hpp | 4 +- include/mbgl/style/conversion/function.hpp | 4 +- include/mbgl/style/conversion/geojson.hpp | 6 +- .../mbgl/style/conversion/geojson_options.hpp | 4 +- .../mbgl/style/conversion/get_json_type.hpp | 4 +- include/mbgl/style/conversion/layer.hpp | 4 +- include/mbgl/style/conversion/light.hpp | 4 +- include/mbgl/style/conversion/position.hpp | 4 +- .../mbgl/style/conversion/property_value.hpp | 4 +- include/mbgl/style/conversion/rotation.hpp | 4 +- include/mbgl/style/conversion/source.hpp | 4 +- .../mbgl/style/conversion/source_options.hpp | 4 +- include/mbgl/style/conversion/tileset.hpp | 4 +- .../style/conversion/transition_options.hpp | 4 +- include/mbgl/style/conversion_impl.hpp | 6 +- include/mbgl/style/expression/assertion.hpp | 8 +- include/mbgl/style/expression/at.hpp | 6 +- .../style/expression/boolean_operator.hpp | 8 +- include/mbgl/style/expression/case.hpp | 6 +- .../mbgl/style/expression/check_subtype.hpp | 4 +- include/mbgl/style/expression/coalesce.hpp | 6 +- include/mbgl/style/expression/coercion.hpp | 8 +- include/mbgl/style/expression/collator.hpp | 4 +- .../style/expression/collator_expression.hpp | 8 +- include/mbgl/style/expression/comparison.hpp | 6 +- .../style/expression/compound_expression.hpp | 8 +- include/mbgl/style/expression/distance.hpp | 8 +- include/mbgl/style/expression/dsl.hpp | 6 +- include/mbgl/style/expression/error.hpp | 4 +- include/mbgl/style/expression/expression.hpp | 20 +- .../mbgl/style/expression/find_zoom_curve.hpp | 4 +- .../style/expression/format_expression.hpp | 8 +- .../expression/format_section_override.hpp | 4 +- include/mbgl/style/expression/formatted.hpp | 6 +- .../style/expression/get_covering_stops.hpp | 4 +- include/mbgl/style/expression/image.hpp | 6 +- .../style/expression/image_expression.hpp | 8 +- include/mbgl/style/expression/in.hpp | 6 +- include/mbgl/style/expression/index_of.hpp | 6 +- include/mbgl/style/expression/interpolate.hpp | 10 +- .../mbgl/style/expression/interpolator.hpp | 4 +- include/mbgl/style/expression/is_constant.hpp | 4 +- .../mbgl/style/expression/is_expression.hpp | 4 +- include/mbgl/style/expression/length.hpp | 6 +- include/mbgl/style/expression/let.hpp | 12 +- include/mbgl/style/expression/literal.hpp | 8 +- include/mbgl/style/expression/match.hpp | 8 +- .../mbgl/style/expression/number_format.hpp | 8 +- .../mbgl/style/expression/parsing_context.hpp | 14 +- include/mbgl/style/expression/slice.hpp | 6 +- include/mbgl/style/expression/step.hpp | 8 +- include/mbgl/style/expression/type.hpp | 4 +- include/mbgl/style/expression/value.hpp | 14 +- include/mbgl/style/expression/within.hpp | 8 +- include/mbgl/style/filter.hpp | 10 +- include/mbgl/style/image.hpp | 4 +- include/mbgl/style/layer.hpp | 6 +- include/mbgl/style/layer_properties.hpp | 6 +- .../mbgl/style/layers/background_layer.hpp | 4 +- include/mbgl/style/layers/circle_layer.hpp | 4 +- .../mbgl/style/layers/color_relief_layer.hpp | 4 +- .../style/layers/custom_drawable_layer.hpp | 6 +- include/mbgl/style/layers/custom_layer.hpp | 4 +- .../mbgl/style/layers/custom_layer_host.hpp | 10 +- .../layers/custom_layer_init_parameters.hpp | 4 +- .../layers/custom_layer_render_parameters.hpp | 4 +- .../style/layers/fill_extrusion_layer.hpp | 4 +- include/mbgl/style/layers/fill_layer.hpp | 4 +- include/mbgl/style/layers/heatmap_layer.hpp | 4 +- include/mbgl/style/layers/hillshade_layer.hpp | 4 +- include/mbgl/style/layers/layer.hpp.ejs | 4 +- include/mbgl/style/layers/line_layer.hpp | 4 +- .../style/layers/location_indicator_layer.hpp | 4 +- .../mtl/custom_layer_render_parameters.hpp | 14 +- include/mbgl/style/layers/raster_layer.hpp | 4 +- include/mbgl/style/layers/symbol_layer.hpp | 4 +- .../vulkan/custom_layer_init_parameters.hpp | 6 +- .../vulkan/custom_layer_render_parameters.hpp | 6 +- include/mbgl/style/light.hpp | 4 +- include/mbgl/style/light.hpp.ejs | 4 +- include/mbgl/style/position.hpp | 4 +- include/mbgl/style/property_expression.hpp | 4 +- include/mbgl/style/property_value.hpp | 4 +- include/mbgl/style/rotation.hpp | 6 +- include/mbgl/style/source.hpp | 6 +- .../style/sources/custom_geometry_source.hpp | 6 +- .../style/sources/custom_vector_source.hpp | 6 +- include/mbgl/style/sources/geojson_source.hpp | 10 +- include/mbgl/style/sources/image_source.hpp | 6 +- .../mbgl/style/sources/raster_dem_source.hpp | 6 +- include/mbgl/style/sources/raster_source.hpp | 6 +- include/mbgl/style/sources/tile_source.hpp | 4 +- include/mbgl/style/sources/vector_source.hpp | 6 +- include/mbgl/style/sprite.hpp | 4 +- include/mbgl/style/style.hpp | 4 +- include/mbgl/style/style_property.hpp | 4 +- include/mbgl/style/transition_options.hpp | 4 +- include/mbgl/style/types.hpp | 4 +- include/mbgl/style/undefined.hpp | 4 +- .../variable_anchor_offset_collection.hpp | 6 +- include/mbgl/text/glyph.hpp | 4 +- include/mbgl/text/glyph_range.hpp | 8 +- include/mbgl/tile/tile_id.hpp | 16 +- include/mbgl/tile/tile_necessity.hpp | 4 +- include/mbgl/tile/tile_operation.hpp | 4 +- include/mbgl/util/action_journal.hpp | 4 +- include/mbgl/util/action_journal_options.hpp | 4 +- include/mbgl/util/async_request.hpp | 4 +- include/mbgl/util/async_task.hpp | 4 +- include/mbgl/util/bitmask_operations.hpp | 10 +- include/mbgl/util/char_array_buffer.hpp | 4 +- include/mbgl/util/chrono.hpp | 4 +- include/mbgl/util/client_options.hpp | 4 +- include/mbgl/util/color.hpp | 8 +- include/mbgl/util/compression.hpp | 4 +- include/mbgl/util/constants.hpp | 4 +- include/mbgl/util/containers.hpp | 4 +- include/mbgl/util/convert.hpp | 8 +- include/mbgl/util/default_style.hpp | 4 +- include/mbgl/util/enum.hpp | 4 +- include/mbgl/util/event.hpp | 4 +- include/mbgl/util/exception.hpp | 4 +- include/mbgl/util/expected.hpp | 4 +- include/mbgl/util/feature.hpp | 4 +- include/mbgl/util/font_stack.hpp | 4 +- include/mbgl/util/geo.hpp | 4 +- include/mbgl/util/geojson.hpp | 4 +- include/mbgl/util/geometry.hpp | 4 +- include/mbgl/util/hash.hpp | 4 +- include/mbgl/util/identity.hpp | 8 +- include/mbgl/util/ignore.hpp | 4 +- include/mbgl/util/image.hpp | 4 +- include/mbgl/util/immutable.hpp | 4 +- include/mbgl/util/indexed_tuple.hpp | 4 +- include/mbgl/util/instrumentation.hpp | 16 +- include/mbgl/util/interpolate.hpp | 4 +- include/mbgl/util/logging.hpp | 4 +- include/mbgl/util/lru_cache.hpp | 4 +- include/mbgl/util/monotonic_timer.hpp | 4 +- include/mbgl/util/noncopyable.hpp | 4 +- include/mbgl/util/padding.hpp | 6 +- include/mbgl/util/platform.hpp | 4 +- include/mbgl/util/premultiply.hpp | 4 +- include/mbgl/util/projection.hpp | 4 +- include/mbgl/util/range.hpp | 4 +- include/mbgl/util/rect.hpp | 4 +- include/mbgl/util/run_loop.hpp | 4 +- include/mbgl/util/scoped.hpp | 4 +- include/mbgl/util/size.hpp | 4 +- include/mbgl/util/string.hpp | 6 +- include/mbgl/util/string_indexer.hpp | 4 +- include/mbgl/util/suppress_copies.hpp | 4 +- include/mbgl/util/symbol_error_observer.hpp | 4 +- include/mbgl/util/thread.hpp | 4 +- include/mbgl/util/tile_server_options.hpp | 8 +- include/mbgl/util/tileset.hpp | 4 +- include/mbgl/util/timer.hpp | 4 +- include/mbgl/util/tiny_unordered_map.hpp | 4 +- include/mbgl/util/traits.hpp | 4 +- include/mbgl/util/type_list.hpp | 4 +- include/mbgl/util/unitbezier.hpp | 4 +- include/mbgl/util/variant.hpp | 4 +- include/mbgl/util/vectors.hpp | 4 +- include/mbgl/util/work_request.hpp | 4 +- include/mbgl/util/work_task.hpp | 4 +- include/mbgl/util/work_task_impl.hpp | 4 +- include/mbgl/vulkan/buffer_resource.hpp | 4 +- include/mbgl/vulkan/command_encoder.hpp | 4 +- include/mbgl/vulkan/context.hpp | 6 +- include/mbgl/vulkan/descriptor_set.hpp | 4 +- include/mbgl/vulkan/drawable.hpp | 4 +- include/mbgl/vulkan/drawable_builder.hpp | 4 +- include/mbgl/vulkan/dynamic_texture.hpp | 4 +- include/mbgl/vulkan/index_buffer_resource.hpp | 4 +- include/mbgl/vulkan/layer_group.hpp | 6 +- include/mbgl/vulkan/offscreen_texture.hpp | 4 +- include/mbgl/vulkan/pipeline.hpp | 4 +- include/mbgl/vulkan/render_pass.hpp | 4 +- include/mbgl/vulkan/renderable_resource.hpp | 4 +- include/mbgl/vulkan/renderer_backend.hpp | 4 +- include/mbgl/vulkan/texture2d.hpp | 4 +- include/mbgl/vulkan/tile_layer_group.hpp | 6 +- include/mbgl/vulkan/uniform_buffer.hpp | 4 +- include/mbgl/vulkan/upload_pass.hpp | 4 +- include/mbgl/vulkan/vertex_attribute.hpp | 4 +- .../mbgl/vulkan/vertex_buffer_resource.hpp | 4 +- include/mbgl/webgpu/buffer_resource.hpp | 4 +- include/mbgl/webgpu/command_encoder.hpp | 8 +- include/mbgl/webgpu/context.hpp | 4 +- include/mbgl/webgpu/draw_scope_resource.hpp | 4 +- include/mbgl/webgpu/drawable.hpp | 4 +- include/mbgl/webgpu/drawable_builder.hpp | 4 +- include/mbgl/webgpu/dynamic_texture.hpp | 4 +- include/mbgl/webgpu/index_buffer_resource.hpp | 4 +- include/mbgl/webgpu/layer_group.hpp | 6 +- include/mbgl/webgpu/offscreen_texture.hpp | 4 +- include/mbgl/webgpu/render_pass.hpp | 4 +- include/mbgl/webgpu/renderable_resource.hpp | 6 +- include/mbgl/webgpu/renderer_backend.hpp | 6 +- include/mbgl/webgpu/texture2d.hpp | 4 +- include/mbgl/webgpu/tile_layer_group.hpp | 6 +- include/mbgl/webgpu/uniform_buffer.hpp | 4 +- include/mbgl/webgpu/upload_pass.hpp | 4 +- include/mbgl/webgpu/vertex_attribute.hpp | 4 +- .../mbgl/webgpu/vertex_buffer_resource.hpp | 4 +- platform/android/CHANGELOG.md | 4 +- .../src/cpp/android_gl_renderer_backend.cpp | 14 +- .../src/cpp/android_gl_renderer_backend.hpp | 16 +- .../src/cpp/android_renderer_backend.cpp | 4 +- .../src/cpp/android_renderer_backend.hpp | 8 +- .../src/cpp/android_renderer_frontend.cpp | 24 +- .../src/cpp/android_renderer_frontend.hpp | 6 +- .../cpp/android_vulkan_renderer_backend.cpp | 14 +- .../cpp/android_vulkan_renderer_backend.hpp | 10 +- .../cpp/android_webgpu_renderer_backend.cpp | 16 +- .../cpp/android_webgpu_renderer_backend.hpp | 10 +- .../src/cpp/annotation/marker.cpp | 6 +- .../src/cpp/annotation/marker.hpp | 8 +- .../src/cpp/annotation/multi_point.hpp | 6 +- .../src/cpp/annotation/polygon.cpp | 16 +- .../src/cpp/annotation/polygon.hpp | 6 +- .../src/cpp/annotation/polyline.cpp | 10 +- .../src/cpp/annotation/polyline.hpp | 6 +- .../MapLibreAndroid/src/cpp/asset_manager.hpp | 4 +- .../src/cpp/asset_manager_file_source.cpp | 8 +- .../src/cpp/asset_manager_file_source.hpp | 4 +- .../src/cpp/connectivity_listener.cpp | 4 +- .../src/cpp/connectivity_listener.hpp | 6 +- .../src/cpp/conversion/collection.cpp | 4 +- .../src/cpp/conversion/collection.hpp | 4 +- .../src/cpp/conversion/color.cpp | 8 +- .../src/cpp/conversion/color.hpp | 8 +- .../src/cpp/conversion/constant.cpp | 8 +- .../src/cpp/conversion/constant.hpp | 8 +- .../src/cpp/conversion/conversion.hpp | 4 +- .../MapLibreAndroid/src/cpp/file_source.cpp | 40 +- .../MapLibreAndroid/src/cpp/file_source.hpp | 18 +- .../src/cpp/geojson/feature.cpp | 33 +- .../src/cpp/geojson/feature.hpp | 10 +- .../src/cpp/geojson/feature_collection.cpp | 9 +- .../src/cpp/geojson/feature_collection.hpp | 6 +- .../src/cpp/geojson/geometry.cpp | 24 +- .../src/cpp/geojson/geometry.hpp | 8 +- .../src/cpp/geojson/geometry_collection.cpp | 4 +- .../src/cpp/geojson/geometry_collection.hpp | 4 +- .../src/cpp/geojson/line_string.cpp | 6 +- .../src/cpp/geojson/line_string.hpp | 6 +- .../src/cpp/geojson/multi_line_string.cpp | 6 +- .../src/cpp/geojson/multi_line_string.hpp | 6 +- .../src/cpp/geojson/multi_point.cpp | 6 +- .../src/cpp/geojson/multi_point.hpp | 6 +- .../src/cpp/geojson/multi_polygon.cpp | 6 +- .../src/cpp/geojson/multi_polygon.hpp | 6 +- .../MapLibreAndroid/src/cpp/geojson/point.cpp | 8 +- .../MapLibreAndroid/src/cpp/geojson/point.hpp | 8 +- .../src/cpp/geojson/polygon.cpp | 6 +- .../src/cpp/geojson/polygon.hpp | 6 +- .../MapLibreAndroid/src/cpp/geojson/util.hpp | 4 +- .../src/cpp/geometry/lat_lng.cpp | 14 +- .../src/cpp/geometry/lat_lng.hpp | 12 +- .../src/cpp/geometry/lat_lng_bounds.cpp | 14 +- .../src/cpp/geometry/lat_lng_bounds.hpp | 10 +- .../src/cpp/geometry/lat_lng_quad.cpp | 16 +- .../src/cpp/geometry/lat_lng_quad.hpp | 10 +- .../src/cpp/geometry/projected_meters.cpp | 4 +- .../src/cpp/geometry/projected_meters.hpp | 6 +- .../src/cpp/graphics/pointf.cpp | 8 +- .../src/cpp/graphics/pointf.hpp | 8 +- .../src/cpp/graphics/rectf.cpp | 4 +- .../src/cpp/graphics/rectf.hpp | 6 +- .../src/cpp/gson/json_array.cpp | 10 +- .../src/cpp/gson/json_array.hpp | 8 +- .../src/cpp/gson/json_element.cpp | 20 +- .../src/cpp/gson/json_element.hpp | 8 +- .../src/cpp/gson/json_object.cpp | 10 +- .../src/cpp/gson/json_object.hpp | 8 +- .../src/cpp/gson/json_primitive.cpp | 4 +- .../src/cpp/gson/json_primitive.hpp | 4 +- .../src/cpp/http_file_source.cpp | 4 +- .../MapLibreAndroid/src/cpp/i18n/collator.cpp | 4 +- .../src/cpp/i18n/collator_jni.hpp | 6 +- .../src/cpp/i18n/number_format.cpp | 4 +- .../src/cpp/i18n/number_format_jni.hpp | 4 +- .../MapLibreAndroid/src/cpp/java/util.cpp | 4 +- .../MapLibreAndroid/src/cpp/java/util.hpp | 14 +- .../MapLibreAndroid/src/cpp/java_types.cpp | 4 +- .../MapLibreAndroid/src/cpp/java_types.hpp | 4 +- .../MapLibreAndroid/src/cpp/jni_native.cpp | 4 +- .../MapLibreAndroid/src/cpp/jni_native.hpp | 4 +- .../MapLibreAndroid/src/cpp/logger.cpp | 4 +- .../MapLibreAndroid/src/cpp/logger.hpp | 4 +- .../src/cpp/logging_android.cpp | 4 +- .../android/MapLibreAndroid/src/cpp/main.cpp | 2 +- .../src/cpp/map/camera_position.cpp | 38 +- .../src/cpp/map/camera_position.hpp | 10 +- .../MapLibreAndroid/src/cpp/map/image.cpp | 26 +- .../MapLibreAndroid/src/cpp/map/image.hpp | 8 +- .../MapLibreAndroid/src/cpp/map_renderer.cpp | 4 +- .../MapLibreAndroid/src/cpp/map_renderer.hpp | 4 +- .../src/cpp/map_renderer_runnable.cpp | 4 +- .../src/cpp/map_renderer_runnable.hpp | 4 +- .../MapLibreAndroid/src/cpp/maplibre.cpp | 4 +- .../MapLibreAndroid/src/cpp/maplibre.hpp | 4 +- .../src/cpp/native_map_options.cpp | 4 +- .../src/cpp/native_map_options.hpp | 4 +- .../src/cpp/native_map_view.cpp | 242 +++++----- .../src/cpp/native_map_view.hpp | 40 +- .../src/cpp/offline/offline_manager.cpp | 48 +- .../src/cpp/offline/offline_manager.hpp | 14 +- .../src/cpp/offline/offline_region.cpp | 60 +-- .../src/cpp/offline/offline_region.hpp | 20 +- .../cpp/offline/offline_region_definition.cpp | 38 +- .../cpp/offline/offline_region_definition.hpp | 18 +- .../src/cpp/offline/offline_region_error.cpp | 18 +- .../src/cpp/offline/offline_region_error.hpp | 6 +- .../src/cpp/offline/offline_region_status.cpp | 10 +- .../src/cpp/offline/offline_region_status.hpp | 6 +- .../src/cpp/rendering_stats.cpp | 4 +- .../src/cpp/rendering_stats.hpp | 4 +- .../src/cpp/snapshotter/map_snapshot.cpp | 8 +- .../src/cpp/snapshotter/map_snapshot.hpp | 12 +- .../src/cpp/snapshotter/map_snapshotter.cpp | 34 +- .../src/cpp/snapshotter/map_snapshotter.hpp | 12 +- .../src/cpp/style/android_conversion.hpp | 40 +- .../src/cpp/style/conversion/filter.cpp | 14 +- .../src/cpp/style/conversion/filter.hpp | 6 +- .../src/cpp/style/conversion/position.cpp | 12 +- .../src/cpp/style/conversion/position.hpp | 12 +- .../style/conversion/property_expression.hpp | 8 +- .../cpp/style/conversion/property_value.hpp | 18 +- .../style/conversion/transition_options.cpp | 12 +- .../style/conversion/transition_options.hpp | 8 +- .../cpp/style/conversion/url_or_tileset.cpp | 8 +- .../cpp/style/conversion/url_or_tileset.hpp | 6 +- .../src/cpp/style/formatted.cpp | 6 +- .../src/cpp/style/formatted.hpp | 6 +- .../src/cpp/style/formatted_section.cpp | 4 +- .../src/cpp/style/formatted_section.hpp | 6 +- .../src/cpp/style/layers/background_layer.cpp | 64 +-- .../src/cpp/style/layers/background_layer.hpp | 14 +- .../src/cpp/style/layers/circle_layer.cpp | 144 +++--- .../src/cpp/style/layers/circle_layer.hpp | 14 +- .../cpp/style/layers/color_relief_layer.cpp | 40 +- .../cpp/style/layers/color_relief_layer.hpp | 14 +- .../src/cpp/style/layers/custom_layer.cpp | 22 +- .../src/cpp/style/layers/custom_layer.hpp | 14 +- .../cpp/style/layers/fill_extrusion_layer.cpp | 114 ++--- .../cpp/style/layers/fill_extrusion_layer.hpp | 14 +- .../src/cpp/style/layers/fill_layer.cpp | 100 ++--- .../src/cpp/style/layers/fill_layer.hpp | 14 +- .../src/cpp/style/layers/heatmap_layer.cpp | 70 +-- .../src/cpp/style/layers/heatmap_layer.hpp | 14 +- .../src/cpp/style/layers/hillshade_layer.cpp | 88 ++-- .../src/cpp/style/layers/hillshade_layer.hpp | 14 +- .../src/cpp/style/layers/layer.cpp | 36 +- .../src/cpp/style/layers/layer.cpp.ejs | 38 +- .../src/cpp/style/layers/layer.hpp | 22 +- .../src/cpp/style/layers/layer.hpp.ejs | 14 +- .../src/cpp/style/layers/layer_manager.cpp | 14 +- .../src/cpp/style/layers/layer_manager.hpp | 24 +- .../src/cpp/style/layers/line_layer.cpp | 164 +++---- .../src/cpp/style/layers/line_layer.hpp | 14 +- .../style/layers/location_indicator_layer.cpp | 144 +++--- .../style/layers/location_indicator_layer.hpp | 14 +- .../src/cpp/style/layers/raster_layer.cpp | 112 ++--- .../src/cpp/style/layers/raster_layer.hpp | 14 +- .../src/cpp/style/layers/symbol_layer.cpp | 282 ++++++------ .../src/cpp/style/layers/symbol_layer.hpp | 14 +- .../MapLibreAndroid/src/cpp/style/light.cpp | 48 +- .../MapLibreAndroid/src/cpp/style/light.hpp | 14 +- .../src/cpp/style/position.cpp | 4 +- .../src/cpp/style/position.hpp | 6 +- .../style/sources/custom_geometry_source.cpp | 34 +- .../style/sources/custom_geometry_source.hpp | 14 +- .../style/sources/custom_vector_source.cpp | 26 +- .../style/sources/custom_vector_source.hpp | 12 +- .../src/cpp/style/sources/geojson_source.cpp | 62 +-- .../src/cpp/style/sources/geojson_source.hpp | 6 +- .../src/cpp/style/sources/image_source.cpp | 18 +- .../src/cpp/style/sources/image_source.hpp | 6 +- .../cpp/style/sources/raster_dem_source.cpp | 10 +- .../cpp/style/sources/raster_dem_source.hpp | 6 +- .../src/cpp/style/sources/raster_source.cpp | 10 +- .../src/cpp/style/sources/raster_source.hpp | 6 +- .../src/cpp/style/sources/source.cpp | 40 +- .../src/cpp/style/sources/source.hpp | 30 +- .../src/cpp/style/sources/unknown_source.cpp | 8 +- .../src/cpp/style/sources/unknown_source.hpp | 6 +- .../src/cpp/style/sources/vector_source.cpp | 18 +- .../src/cpp/style/sources/vector_source.hpp | 6 +- .../src/cpp/style/transition_options.cpp | 6 +- .../src/cpp/style/transition_options.hpp | 6 +- .../MapLibreAndroid/src/cpp/style/value.cpp | 4 +- .../MapLibreAndroid/src/cpp/style/value.hpp | 4 +- .../src/cpp/text/local_glyph_rasterizer.cpp | 10 +- .../cpp/text/local_glyph_rasterizer_jni.hpp | 6 +- .../src/cpp/tile/tile_operation.cpp | 26 +- .../src/cpp/tile/tile_operation.hpp | 6 +- .../src/cpp/util/default_style.cpp | 10 +- .../src/cpp/util/default_style.hpp | 10 +- .../src/cpp/util/tile_server_options.cpp | 32 +- .../src/cpp/util/tile_server_options.hpp | 16 +- .../android/constants/MapLibreConstants.java | 2 +- .../android/http/NativeHttpRequest.java | 2 +- .../org/maplibre/android/maps/MapView.java | 12 +- platform/android/src/async_task.cpp | 4 +- platform/android/src/attach_env.cpp | 4 +- platform/android/src/attach_env.hpp | 4 +- platform/android/src/bitmap.cpp | 6 +- platform/android/src/bitmap.hpp | 4 +- platform/android/src/bitmap_factory.cpp | 4 +- platform/android/src/bitmap_factory.hpp | 4 +- platform/android/src/example_custom_layer.cpp | 6 +- .../src/example_vulkan_custom_layer.cpp | 10 +- platform/android/src/gl_functions.cpp | 4 +- platform/android/src/image.cpp | 4 +- platform/android/src/jni.cpp | 10 +- platform/android/src/jni.hpp | 4 +- platform/android/src/run_loop.cpp | 12 +- platform/android/src/run_loop_impl.hpp | 4 +- platform/android/src/string_util.cpp | 4 +- .../android/src/test/benchmark_runner.cpp | 20 +- .../android/src/test/collator_test_stub.cpp | 4 +- .../src/test/number_format_test_stub.cpp | 4 +- .../android/src/test/render_test_runner.cpp | 28 +- platform/android/src/test/runtime.cpp | 6 +- platform/android/src/test/runtime.hpp | 4 +- platform/android/src/test/test_runner.cpp | 20 +- .../android/src/test/test_runner_common.cpp | 20 +- .../android/src/test/test_runner_common.hpp | 4 +- platform/android/src/thread.cpp | 4 +- platform/android/src/timer.cpp | 4 +- .../app/ExampleCustomDrawableStyleLayer.mm | 20 +- platform/darwin/core/async_task.cpp | 4 +- platform/darwin/core/collator.mm | 4 +- platform/darwin/core/http_file_source.mm | 8 +- platform/darwin/core/image.mm | 10 +- .../darwin/core/local_glyph_rasterizer.mm | 4 +- platform/darwin/core/logging_nslog.mm | 4 +- platform/darwin/core/nsthread.mm | 4 +- platform/darwin/core/number_format.mm | 4 +- platform/darwin/core/run_loop.cpp | 4 +- platform/darwin/core/string_nsstring.mm | 4 +- platform/darwin/core/timer.cpp | 4 +- .../include/mbgl/util/image+MLNAdditions.hpp | 4 +- .../darwin/scripts/generate-style-code.mjs | 54 +-- .../darwin/src/MLNActionJournalOptions.mm | 6 +- .../src/MLNActionJournalOptions_Private.h | 2 +- platform/darwin/src/MLNComputedShapeSource.mm | 51 ++- .../src/MLNComputedShapeSource_Private.h | 2 +- platform/darwin/src/MLNConversion.h | 6 +- .../darwin/src/MLNCustomDrawableStyleLayer.mm | 10 +- .../src/MLNCustomDrawableStyleLayer_Private.h | 6 +- platform/darwin/src/MLNCustomStyleLayer.mm | 35 +- .../darwin/src/MLNCustomStyleLayer_Private.h | 6 +- platform/darwin/src/MLNFeature.mm | 74 ++-- platform/darwin/src/MLNFeature_Private.h | 18 +- platform/darwin/src/MLNFoundation.mm | 2 +- platform/darwin/src/MLNGeometry.mm | 14 +- platform/darwin/src/MLNGeometry_Private.h | 26 +- platform/darwin/src/MLNImageSource.mm | 10 +- platform/darwin/src/MLNLight.mm.ejs | 18 +- platform/darwin/src/MLNLight_Private.h | 10 +- .../darwin/src/MLNLoggingConfiguration.mm | 8 +- platform/darwin/src/MLNMapCamera.mm | 2 +- platform/darwin/src/MLNMapSnapshotter.mm | 104 ++--- platform/darwin/src/MLNMultiPoint.mm | 10 +- platform/darwin/src/MLNMultiPoint_Private.h | 6 +- platform/darwin/src/MLNOfflinePack.mm | 70 +-- platform/darwin/src/MLNOfflinePack_Private.h | 4 +- .../darwin/src/MLNOfflineRegion_Private.h | 2 +- platform/darwin/src/MLNOfflineStorage.mm | 138 +++--- .../darwin/src/MLNOfflineStorage_Private.h | 6 +- platform/darwin/src/MLNPluginStyleLayer.mm | 6 +- .../darwin/src/MLNPluginStyleLayer_Private.h | 20 +- platform/darwin/src/MLNPointAnnotation.mm | 4 +- platform/darwin/src/MLNPointCollection.mm | 12 +- platform/darwin/src/MLNPolygon.mm | 28 +- platform/darwin/src/MLNPolyline.mm | 26 +- platform/darwin/src/MLNRasterDEMSource.mm | 6 +- platform/darwin/src/MLNRasterTileSource.mm | 14 +- .../darwin/src/MLNRasterTileSource_Private.h | 10 +- .../darwin/src/MLNRendererConfiguration.m | 2 +- platform/darwin/src/MLNRendererFrontend.h | 26 +- platform/darwin/src/MLNRenderingStats.mm | 2 +- .../darwin/src/MLNRenderingStats_Private.h | 2 +- platform/darwin/src/MLNSettings.mm | 29 +- platform/darwin/src/MLNSettings_Private.h | 2 +- platform/darwin/src/MLNShape.mm | 6 +- platform/darwin/src/MLNShapeCollection.mm | 2 +- platform/darwin/src/MLNShapeOfflineRegion.mm | 6 +- .../src/MLNShapeOfflineRegion_Private.h | 2 +- platform/darwin/src/MLNShapeSource.mm | 48 +- platform/darwin/src/MLNShapeSource_Private.h | 6 +- platform/darwin/src/MLNShape_Private.h | 8 +- platform/darwin/src/MLNSource.mm | 14 +- platform/darwin/src/MLNSource_Private.h | 22 +- platform/darwin/src/MLNStyle.mm | 30 +- platform/darwin/src/MLNStyleLayer.mm | 20 +- platform/darwin/src/MLNStyleLayer.mm.ejs | 44 +- platform/darwin/src/MLNStyleLayerManager.h | 10 +- platform/darwin/src/MLNStyleLayerManager.mm | 8 +- platform/darwin/src/MLNStyleLayer_Private.h | 22 +- .../darwin/src/MLNStyleLayer_Private.h.ejs | 6 +- platform/darwin/src/MLNStyleValue.mm | 20 +- platform/darwin/src/MLNStyleValue_Private.h | 100 ++--- platform/darwin/src/MLNStyle_Private.h | 8 +- .../darwin/src/MLNTilePyramidOfflineRegion.mm | 6 +- .../src/MLNTilePyramidOfflineRegion_Private.h | 2 +- platform/darwin/src/MLNTileSource.mm | 16 +- platform/darwin/src/MLNTileSource_Private.h | 4 +- platform/darwin/src/MLNValueEvaluator.h | 10 +- platform/darwin/src/MLNVectorTileSource.mm | 20 +- platform/darwin/src/NSArray+MLNAdditions.h | 2 +- platform/darwin/src/NSArray+MLNAdditions.mm | 8 +- .../src/NSComparisonPredicate+MLNAdditions.mm | 12 +- .../src/NSCompoundPredicate+MLNAdditions.mm | 4 +- platform/darwin/src/NSDate+MLNAdditions.h | 4 +- platform/darwin/src/NSDate+MLNAdditions.mm | 7 +- .../darwin/src/NSDictionary+MLNAdditions.h | 2 +- .../darwin/src/NSDictionary+MLNAdditions.mm | 4 +- .../darwin/src/NSExpression+MLNAdditions.mm | 40 +- .../src/NSExpression+MLNPrivateAdditions.h | 12 +- .../darwin/src/NSPredicate+MLNAdditions.mm | 12 +- .../src/NSPredicate+MLNPrivateAdditions.h | 4 +- platform/darwin/src/gl_functions.cpp | 4 +- platform/darwin/src/headless_backend_cgl.mm | 4 +- platform/darwin/src/headless_backend_eagl.mm | 4 +- platform/darwin/test/MLNExpressionTests.mm | 36 +- platform/darwin/test/MLNFeatureTests.mm | 24 +- platform/darwin/test/MLNHeatmapColorTests.mm | 10 +- platform/darwin/test/MLNImageTests.mm | 8 +- platform/darwin/test/MLNLightTest.mm.ejs | 10 +- .../darwin/test/MLNNSDateAdditionsTests.mm | 16 +- .../darwin/test/MLNOfflineStorageTests.mm | 19 +- platform/darwin/test/MLNResourceTests.mm | 8 +- .../darwin/test/MLNStyleLayerTests.mm.ejs | 20 +- platform/darwin/test/MLNTileSetTests.mm | 22 +- .../default/include/jni/string_conversion.hpp | 4 +- .../include/mbgl/gfx/headless_backend.hpp | 4 +- .../include/mbgl/gfx/headless_frontend.hpp | 4 +- .../include/mbgl/gl/headless_backend.hpp | 4 +- .../include/mbgl/map/map_snapshotter.hpp | 8 +- .../include/mbgl/mtl/headless_backend.hpp | 4 +- .../mbgl/storage/file_source_request.hpp | 4 +- .../mbgl/storage/local_file_request.hpp | 4 +- .../include/mbgl/storage/merge_sideloaded.hpp | 4 +- .../include/mbgl/storage/merge_sideloaded.js | 4 +- .../include/mbgl/storage/offline_database.hpp | 4 +- .../include/mbgl/storage/offline_download.hpp | 4 +- .../include/mbgl/storage/offline_schema.hpp | 4 +- .../include/mbgl/storage/offline_schema.js | 4 +- .../default/include/mbgl/text/unaccent.hpp | 4 +- .../include/mbgl/vulkan/headless_backend.hpp | 4 +- .../include/mbgl/webgpu/headless_backend.hpp | 6 +- platform/default/src/mbgl/benchmark/main.cpp | 2 +- .../default/src/mbgl/gfx/headless_backend.cpp | 6 +- .../src/mbgl/gfx/headless_frontend.cpp | 8 +- .../default/src/mbgl/gl/headless_backend.cpp | 8 +- platform/default/src/mbgl/i18n/collator.cpp | 4 +- .../default/src/mbgl/i18n/number_format.cpp | 4 +- .../src/mbgl/layermanager/layer_manager.cpp | 10 +- .../default/src/mbgl/map/map_snapshotter.cpp | 16 +- .../default/src/mbgl/mtl/headless_backend.cpp | 8 +- platform/default/src/mbgl/platform/time.cpp | 4 +- .../default/src/mbgl/render-test/main.cpp | 2 +- .../src/mbgl/storage/asset_file_source.cpp | 8 +- .../src/mbgl/storage/database_file_source.cpp | 8 +- .../src/mbgl/storage/file_source_manager.cpp | 4 +- .../src/mbgl/storage/file_source_request.cpp | 4 +- .../src/mbgl/storage/http_file_source.cpp | 8 +- .../src/mbgl/storage/local_file_request.cpp | 4 +- .../src/mbgl/storage/local_file_source.cpp | 8 +- .../src/mbgl/storage/main_resource_loader.cpp | 4 +- .../src/mbgl/storage/mbtiles_file_source.cpp | 8 +- platform/default/src/mbgl/storage/offline.cpp | 4 +- .../src/mbgl/storage/offline_database.cpp | 4 +- .../src/mbgl/storage/offline_download.cpp | 6 +- .../src/mbgl/storage/online_file_source.cpp | 10 +- .../src/mbgl/storage/pmtiles_file_source.cpp | 12 +- .../mbgl/storage/pmtiles_file_source_stub.cpp | 4 +- platform/default/src/mbgl/storage/sqlite3.cpp | 62 +-- platform/default/src/mbgl/test/main.cpp | 2 +- platform/default/src/mbgl/text/bidi.cpp | 20 +- .../src/mbgl/text/local_glyph_rasterizer.cpp | 4 +- platform/default/src/mbgl/util/async_task.cpp | 4 +- .../default/src/mbgl/util/compression.cpp | 4 +- platform/default/src/mbgl/util/filesystem.cpp | 4 +- platform/default/src/mbgl/util/image.cpp | 4 +- .../default/src/mbgl/util/jpeg_reader.cpp | 4 +- .../default/src/mbgl/util/logging_stderr.cpp | 4 +- .../default/src/mbgl/util/monotonic_timer.cpp | 4 +- platform/default/src/mbgl/util/png_reader.cpp | 4 +- platform/default/src/mbgl/util/png_writer.cpp | 4 +- platform/default/src/mbgl/util/run_loop.cpp | 6 +- .../default/src/mbgl/util/string_stdlib.cpp | 4 +- platform/default/src/mbgl/util/thread.cpp | 4 +- .../default/src/mbgl/util/thread_local.cpp | 4 +- platform/default/src/mbgl/util/timer.cpp | 4 +- platform/default/src/mbgl/util/utf.cpp | 4 +- .../default/src/mbgl/util/webp_reader.cpp | 4 +- .../src/mbgl/vulkan/headless_backend.cpp | 8 +- .../example_custom_drawable_style_layer.cpp | 102 ++--- .../example_custom_drawable_style_layer.hpp | 20 +- platform/glfw/glfw_backend.hpp | 12 +- platform/glfw/glfw_gl_backend.cpp | 20 +- platform/glfw/glfw_gl_backend.hpp | 16 +- platform/glfw/glfw_metal_backend.h | 14 +- platform/glfw/glfw_metal_backend.mm | 6 +- platform/glfw/glfw_renderer_frontend.cpp | 12 +- platform/glfw/glfw_renderer_frontend.hpp | 20 +- platform/glfw/glfw_view.cpp | 403 +++++++++-------- platform/glfw/glfw_view.hpp | 51 +-- platform/glfw/glfw_vulkan_backend.cpp | 32 +- platform/glfw/glfw_vulkan_backend.hpp | 14 +- platform/glfw/glfw_webgpu_backend.hpp | 16 +- platform/glfw/glfw_webgpu_backend_impl.ipp | 50 +-- platform/glfw/main.cpp | 94 ++-- platform/glfw/metal_backend.h | 8 +- platform/glfw/metal_backend.mm | 31 +- platform/glfw/ny_route.hpp | 4 +- platform/glfw/settings_json.cpp | 4 +- platform/glfw/settings_json.hpp | 8 +- platform/glfw/test_writer.cpp | 14 +- platform/glfw/test_writer.hpp | 6 +- .../MLNAnnotationViewIntegrationTests.mm | 6 +- .../MLNCameraTransitionFinishTests.mm | 12 +- .../Integration_Tests/MBGLIntegrationTests.mm | 6 +- .../ios/benchmark/MBXBenchViewController.mm | 62 +-- platform/ios/benchmark/locations.cpp | 4 +- platform/ios/benchmark/locations.hpp | 4 +- platform/ios/src/MLNAnnotationView.mm | 4 +- platform/ios/src/MLNCompassButton.mm | 2 +- platform/ios/src/MLNMapProjection.mm | 26 +- platform/ios/src/MLNMapView+Impl.h | 41 +- platform/ios/src/MLNMapView+Impl.mm | 57 ++- platform/ios/src/MLNMapView+Metal.h | 16 +- platform/ios/src/MLNMapView+Metal.mm | 20 +- platform/ios/src/MLNMapView+OpenGL.h | 18 +- platform/ios/src/MLNMapView+OpenGL.mm | 12 +- platform/ios/src/MLNMapView+WebGPU.h | 12 +- platform/ios/src/MLNMapView+WebGPU.mm | 28 +- platform/ios/src/MLNMapView.mm | 328 +++++++------- platform/ios/src/MLNMapView_Private.h | 12 +- platform/ios/src/UIColor+MLNAdditions.h | 8 +- platform/ios/src/UIColor+MLNAdditions.mm | 14 +- platform/ios/src/UIImage+MLNAdditions.h | 8 +- platform/ios/src/UIImage+MLNAdditions.mm | 20 +- .../ios/test/MLNMapViewCompassViewTests.mm | 2 +- platform/ios/test/MLNMapViewDirectionTests.mm | 6 +- .../test/MLNMapViewGestureRecognizerTests.mm | 24 +- platform/ios/test/MLNMapViewZoomTests.mm | 2 +- platform/ios/test/core/ios_test_runner.cpp | 8 +- platform/linux/src/gl_functions.cpp | 4 +- platform/linux/src/headless_backend_egl.cpp | 10 +- platform/linux/src/headless_backend_glx.cpp | 4 +- platform/macos/src/MLNMapView+Impl.h | 43 +- platform/macos/src/MLNMapView+Impl.mm | 57 ++- platform/macos/src/MLNMapView+Metal.h | 18 +- platform/macos/src/MLNMapView+Metal.mm | 22 +- platform/macos/src/MLNMapView+OpenGL.h | 20 +- platform/macos/src/MLNMapView+OpenGL.mm | 14 +- platform/macos/src/MLNMapView.mm | 204 ++++----- platform/macos/src/MLNMapView_Private.h | 10 +- platform/macos/src/NSColor+MLNAdditions.h | 12 +- platform/macos/src/NSColor+MLNAdditions.mm | 14 +- platform/macos/src/NSImage+MLNAdditions.h | 8 +- platform/macos/src/NSImage+MLNAdditions.mm | 22 +- platform/node/CHANGELOG.md | 8 +- platform/node/src/node_conversion.hpp | 4 +- platform/node/src/node_expression.cpp | 40 +- platform/node/src/node_expression.hpp | 6 +- platform/node/src/node_feature.cpp | 18 +- platform/node/src/node_feature.hpp | 8 +- platform/node/src/node_logging.cpp | 12 +- platform/node/src/node_logging.hpp | 4 +- platform/node/src/node_map.cpp | 200 ++++----- platform/node/src/node_map.hpp | 34 +- platform/node/src/node_mapbox_gl_native.cpp | 18 +- platform/node/src/node_request.cpp | 18 +- platform/node/src/node_request.hpp | 6 +- platform/qt/src/mbgl/async_task.cpp | 4 +- platform/qt/src/mbgl/async_task_impl.hpp | 4 +- platform/qt/src/mbgl/bidi.cpp | 4 +- platform/qt/src/mbgl/gl_functions.cpp | 4 +- platform/qt/src/mbgl/headless_backend_qt.cpp | 4 +- platform/qt/src/mbgl/http_file_source.cpp | 4 +- platform/qt/src/mbgl/http_file_source.hpp | 4 +- platform/qt/src/mbgl/http_request.cpp | 6 +- platform/qt/src/mbgl/http_request.hpp | 4 +- platform/qt/src/mbgl/image.cpp | 4 +- .../qt/src/mbgl/local_glyph_rasterizer.cpp | 4 +- platform/qt/src/mbgl/logging_qt.cpp | 4 +- platform/qt/src/mbgl/number_format.cpp | 4 +- platform/qt/src/mbgl/run_loop.cpp | 6 +- platform/qt/src/mbgl/run_loop_impl.hpp | 4 +- platform/qt/src/mbgl/sqlite3.cpp | 12 +- platform/qt/src/mbgl/string_stdlib.cpp | 4 +- platform/qt/src/mbgl/thread.cpp | 4 +- platform/qt/src/mbgl/thread_local.cpp | 4 +- platform/qt/src/mbgl/timer.cpp | 4 +- platform/qt/src/mbgl/timer_impl.hpp | 4 +- platform/qt/src/mbgl/utf.cpp | 4 +- platform/qt/test/main.cpp | 2 +- platform/windows/include/gl_functions_wgl.h | 4 +- platform/windows/include/thread.h | 4 +- platform/windows/src/gl_functions.cpp | 4 +- platform/windows/src/headless_backend_egl.cpp | 8 +- platform/windows/src/headless_backend_wgl.cpp | 56 +-- platform/windows/src/thread.cpp | 4 +- platform/windows/src/thread_local.cpp | 4 +- render-test/file_source.cpp | 10 +- render-test/file_source.hpp | 4 +- render-test/filesystem.hpp | 4 +- render-test/include/mbgl/render_test.hpp | 4 +- render-test/ios/ios_test_runner.cpp | 24 +- render-test/manifest_parser.cpp | 130 +++--- render-test/metadata.hpp | 38 +- render-test/parser.cpp | 230 +++++----- render-test/parser.hpp | 18 +- render-test/render_test.cpp | 59 ++- render-test/runner.cpp | 105 +++-- render-test/runner.hpp | 20 +- scripts/lldb-types | 20 +- shaders/generate_shader_code.mjs | 12 +- src/mbgl/actor/mailbox.cpp | 4 +- src/mbgl/actor/scheduler.cpp | 4 +- src/mbgl/algorithm/update_renderables.hpp | 4 +- src/mbgl/algorithm/update_tile_masks.hpp | 4 +- src/mbgl/annotation/annotation_manager.cpp | 4 +- src/mbgl/annotation/annotation_manager.hpp | 4 +- src/mbgl/annotation/annotation_source.cpp | 6 +- src/mbgl/annotation/annotation_source.hpp | 6 +- src/mbgl/annotation/annotation_tile.cpp | 4 +- src/mbgl/annotation/annotation_tile.hpp | 4 +- src/mbgl/annotation/fill_annotation_impl.cpp | 4 +- src/mbgl/annotation/fill_annotation_impl.hpp | 4 +- src/mbgl/annotation/line_annotation_impl.cpp | 4 +- src/mbgl/annotation/line_annotation_impl.hpp | 4 +- .../annotation/render_annotation_source.cpp | 4 +- .../annotation/render_annotation_source.hpp | 4 +- src/mbgl/annotation/shape_annotation_impl.cpp | 4 +- src/mbgl/annotation/shape_annotation_impl.hpp | 16 +- .../annotation/symbol_annotation_impl.cpp | 4 +- .../annotation/symbol_annotation_impl.hpp | 52 +-- src/mbgl/geometry/anchor.hpp | 4 +- src/mbgl/geometry/dem_data.cpp | 4 +- src/mbgl/geometry/dem_data.hpp | 4 +- src/mbgl/geometry/feature_index.cpp | 30 +- src/mbgl/geometry/feature_index.hpp | 8 +- src/mbgl/geometry/line_atlas.cpp | 4 +- src/mbgl/geometry/line_atlas.hpp | 4 +- src/mbgl/gfx/attribute.cpp | 4 +- src/mbgl/gfx/attribute.hpp | 16 +- src/mbgl/gfx/collision_drawable_data.hpp | 4 +- src/mbgl/gfx/color_relief_drawable_data.hpp | 4 +- src/mbgl/gfx/cull_face_mode.hpp | 4 +- src/mbgl/gfx/drawable.cpp | 6 +- src/mbgl/gfx/drawable_atlases_tweaker.cpp | 4 +- src/mbgl/gfx/drawable_builder.cpp | 6 +- src/mbgl/gfx/drawable_builder_impl.cpp | 18 +- src/mbgl/gfx/drawable_builder_impl.hpp | 10 +- .../drawable_custom_layer_host_tweaker.cpp | 6 +- src/mbgl/gfx/dynamic_texture.cpp | 4 +- src/mbgl/gfx/dynamic_texture_atlas.cpp | 4 +- src/mbgl/gfx/fill_generator.cpp | 12 +- src/mbgl/gfx/gpu_expression.cpp | 4 +- .../gfx/hillshade_prepare_drawable_data.hpp | 4 +- src/mbgl/gfx/image_drawable_data.hpp | 4 +- src/mbgl/gfx/index_buffer.hpp | 4 +- src/mbgl/gfx/index_vector.hpp | 4 +- src/mbgl/gfx/line_drawable_data.hpp | 4 +- src/mbgl/gfx/offscreen_texture.hpp | 4 +- src/mbgl/gfx/polyline_generator.cpp | 4 +- src/mbgl/gfx/render_pass.hpp | 4 +- src/mbgl/gfx/renderer_backend.cpp | 4 +- src/mbgl/gfx/rendering_stats.cpp | 20 +- src/mbgl/gfx/shader_group.cpp | 4 +- src/mbgl/gfx/shader_registry.cpp | 4 +- src/mbgl/gfx/symbol_drawable_data.hpp | 4 +- src/mbgl/gfx/uniform.hpp | 4 +- src/mbgl/gfx/uniform_buffer.cpp | 4 +- src/mbgl/gfx/upload_pass.hpp | 4 +- src/mbgl/gfx/vertex_attribute.cpp | 4 +- src/mbgl/gfx/vertex_vector.hpp | 4 +- src/mbgl/gl/attribute.cpp | 4 +- src/mbgl/gl/attribute.hpp | 4 +- src/mbgl/gl/buffer_allocator.cpp | 4 +- src/mbgl/gl/command_encoder.cpp | 4 +- src/mbgl/gl/command_encoder.hpp | 4 +- src/mbgl/gl/context.cpp | 6 +- src/mbgl/gl/context.hpp | 6 +- src/mbgl/gl/debugging_extension.cpp | 18 +- src/mbgl/gl/debugging_extension.hpp | 4 +- src/mbgl/gl/draw_scope_resource.hpp | 4 +- src/mbgl/gl/drawable_gl.cpp | 8 +- src/mbgl/gl/drawable_gl_builder.cpp | 4 +- src/mbgl/gl/drawable_gl_impl.hpp | 4 +- src/mbgl/gl/dynamic_texture.cpp | 4 +- src/mbgl/gl/enum.cpp | 4 +- src/mbgl/gl/enum.hpp | 4 +- src/mbgl/gl/extension.hpp | 4 +- src/mbgl/gl/fence.cpp | 4 +- src/mbgl/gl/fence.hpp | 4 +- src/mbgl/gl/framebuffer.hpp | 4 +- src/mbgl/gl/index_buffer_resource.cpp | 4 +- src/mbgl/gl/index_buffer_resource.hpp | 4 +- src/mbgl/gl/layer_group_gl.cpp | 4 +- src/mbgl/gl/object.cpp | 4 +- src/mbgl/gl/object.hpp | 4 +- src/mbgl/gl/offscreen_texture.cpp | 4 +- src/mbgl/gl/offscreen_texture.hpp | 4 +- src/mbgl/gl/render_pass.cpp | 4 +- src/mbgl/gl/render_pass.hpp | 4 +- src/mbgl/gl/renderbuffer_resource.cpp | 4 +- src/mbgl/gl/renderbuffer_resource.hpp | 4 +- src/mbgl/gl/renderer_backend.cpp | 4 +- src/mbgl/gl/resource_pool.cpp | 4 +- src/mbgl/gl/resource_pool.hpp | 4 +- src/mbgl/gl/state.hpp | 4 +- src/mbgl/gl/texture2d.cpp | 6 +- src/mbgl/gl/timestamp_query_extension.cpp | 4 +- src/mbgl/gl/timestamp_query_extension.hpp | 4 +- src/mbgl/gl/types.hpp | 4 +- src/mbgl/gl/uniform.cpp | 4 +- src/mbgl/gl/uniform.hpp | 4 +- src/mbgl/gl/uniform_buffer_gl.cpp | 4 +- src/mbgl/gl/upload_pass.cpp | 4 +- src/mbgl/gl/upload_pass.hpp | 4 +- src/mbgl/gl/value.cpp | 4 +- src/mbgl/gl/value.hpp | 4 +- src/mbgl/gl/vertex_array.cpp | 4 +- src/mbgl/gl/vertex_array.hpp | 4 +- src/mbgl/gl/vertex_attribute_gl.cpp | 4 +- src/mbgl/gl/vertex_buffer_resource.cpp | 4 +- src/mbgl/gl/vertex_buffer_resource.hpp | 4 +- .../layermanager/background_layer_factory.cpp | 4 +- .../layermanager/circle_layer_factory.cpp | 4 +- .../color_relief_layer_factory.cpp | 4 +- .../custom_drawable_layer_factory.cpp | 4 +- .../layermanager/custom_layer_factory.cpp | 4 +- .../fill_extrusion_layer_factory.cpp | 4 +- src/mbgl/layermanager/fill_layer_factory.cpp | 4 +- .../layermanager/heatmap_layer_factory.cpp | 4 +- .../layermanager/hillshade_layer_factory.cpp | 4 +- src/mbgl/layermanager/layer_factory.cpp | 4 +- src/mbgl/layermanager/layer_manager.cpp | 6 +- src/mbgl/layermanager/line_layer_factory.cpp | 4 +- .../location_indicator_layer_factory.cpp | 4 +- .../layermanager/raster_layer_factory.cpp | 4 +- .../layermanager/symbol_layer_factory.cpp | 4 +- src/mbgl/layout/circle_layout.hpp | 6 +- src/mbgl/layout/clip_lines.cpp | 4 +- src/mbgl/layout/clip_lines.hpp | 4 +- src/mbgl/layout/layout.hpp | 6 +- src/mbgl/layout/merge_lines.cpp | 4 +- src/mbgl/layout/merge_lines.hpp | 4 +- src/mbgl/layout/pattern_layout.hpp | 8 +- src/mbgl/layout/symbol_feature.hpp | 4 +- src/mbgl/layout/symbol_instance.cpp | 4 +- src/mbgl/layout/symbol_instance.hpp | 4 +- src/mbgl/layout/symbol_layout.cpp | 14 +- src/mbgl/layout/symbol_layout.hpp | 6 +- src/mbgl/layout/symbol_projection.cpp | 4 +- src/mbgl/layout/symbol_projection.hpp | 4 +- src/mbgl/map/map.cpp | 12 +- src/mbgl/map/map_impl.cpp | 10 +- src/mbgl/map/map_impl.hpp | 4 +- src/mbgl/map/map_options.cpp | 4 +- src/mbgl/map/map_projection.cpp | 6 +- src/mbgl/map/transform.cpp | 10 +- src/mbgl/map/transform.hpp | 4 +- src/mbgl/map/transform_state.cpp | 14 +- src/mbgl/map/transform_state.hpp | 4 +- src/mbgl/map/zoom_history.hpp | 4 +- src/mbgl/math/log2.cpp | 4 +- src/mbgl/mtl/buffer_resource.cpp | 4 +- src/mbgl/mtl/command_encoder.cpp | 4 +- src/mbgl/mtl/context.cpp | 20 +- src/mbgl/mtl/drawable.cpp | 23 +- src/mbgl/mtl/drawable_builder.cpp | 4 +- src/mbgl/mtl/drawable_impl.hpp | 4 +- src/mbgl/mtl/dynamic_texture.cpp | 4 +- src/mbgl/mtl/index_buffer_resource.cpp | 4 +- src/mbgl/mtl/layer_group.cpp | 6 +- src/mbgl/mtl/offscreen_texture.cpp | 4 +- src/mbgl/mtl/render_pass.cpp | 4 +- src/mbgl/mtl/renderer_backend.cpp | 4 +- src/mbgl/mtl/texture2d.cpp | 6 +- src/mbgl/mtl/tile_layer_group.cpp | 6 +- src/mbgl/mtl/uniform_buffer.cpp | 4 +- src/mbgl/mtl/upload_pass.cpp | 4 +- src/mbgl/mtl/vertex_attribute.cpp | 4 +- src/mbgl/mtl/vertex_buffer_resource.cpp | 4 +- src/mbgl/platform/gl_functions.cpp | 4 +- src/mbgl/platform/settings.cpp | 4 +- src/mbgl/plugin/plugin_layer.cpp | 8 +- src/mbgl/plugin/plugin_layer.hpp | 4 +- src/mbgl/plugin/plugin_layer_factory.cpp | 20 +- src/mbgl/plugin/plugin_layer_factory.hpp | 18 +- src/mbgl/plugin/plugin_layer_impl.cpp | 10 +- src/mbgl/plugin/plugin_layer_impl.hpp | 20 +- src/mbgl/plugin/plugin_layer_properties.cpp | 4 +- src/mbgl/plugin/plugin_layer_properties.hpp | 4 +- src/mbgl/plugin/plugin_layer_render.cpp | 22 +- src/mbgl/plugin/plugin_layer_render.hpp | 4 +- src/mbgl/programs/programs.cpp | 4 +- src/mbgl/renderer/backend_scope.cpp | 8 +- src/mbgl/renderer/bucket.hpp | 6 +- src/mbgl/renderer/bucket_parameters.cpp | 2 +- src/mbgl/renderer/bucket_parameters.hpp | 4 +- src/mbgl/renderer/buckets/circle_bucket.cpp | 4 +- src/mbgl/renderer/buckets/circle_bucket.hpp | 4 +- src/mbgl/renderer/buckets/debug_bucket.cpp | 4 +- src/mbgl/renderer/buckets/debug_bucket.hpp | 4 +- src/mbgl/renderer/buckets/fill_bucket.cpp | 4 +- src/mbgl/renderer/buckets/fill_bucket.hpp | 6 +- .../buckets/fill_extrusion_bucket.cpp | 20 +- .../buckets/fill_extrusion_bucket.hpp | 6 +- src/mbgl/renderer/buckets/heatmap_bucket.cpp | 4 +- src/mbgl/renderer/buckets/heatmap_bucket.hpp | 4 +- .../renderer/buckets/hillshade_bucket.cpp | 4 +- .../renderer/buckets/hillshade_bucket.hpp | 4 +- src/mbgl/renderer/buckets/line_bucket.cpp | 4 +- src/mbgl/renderer/buckets/line_bucket.hpp | 6 +- src/mbgl/renderer/buckets/raster_bucket.cpp | 4 +- src/mbgl/renderer/buckets/raster_bucket.hpp | 4 +- src/mbgl/renderer/buckets/symbol_bucket.cpp | 4 +- src/mbgl/renderer/buckets/symbol_bucket.hpp | 4 +- src/mbgl/renderer/change_request.cpp | 4 +- .../cross_faded_property_evaluator.cpp | 4 +- .../cross_faded_property_evaluator.hpp | 4 +- .../data_driven_property_evaluator.hpp | 4 +- src/mbgl/renderer/group_by_layout.cpp | 8 +- src/mbgl/renderer/group_by_layout.hpp | 10 +- src/mbgl/renderer/image_manager.cpp | 4 +- src/mbgl/renderer/image_manager.hpp | 4 +- src/mbgl/renderer/image_manager_observer.hpp | 4 +- src/mbgl/renderer/layer_group.cpp | 4 +- src/mbgl/renderer/layer_tweaker.cpp | 4 +- .../layers/background_layer_tweaker.cpp | 4 +- .../layers/background_layer_tweaker.hpp | 4 +- .../renderer/layers/circle_layer_tweaker.cpp | 4 +- .../renderer/layers/circle_layer_tweaker.hpp | 4 +- .../layers/collision_layer_tweaker.cpp | 4 +- .../layers/collision_layer_tweaker.hpp | 4 +- .../layers/color_relief_layer_tweaker.cpp | 4 +- .../layers/color_relief_layer_tweaker.hpp | 4 +- .../layers/fill_extrusion_layer_tweaker.cpp | 6 +- .../layers/fill_extrusion_layer_tweaker.hpp | 4 +- .../renderer/layers/fill_layer_tweaker.cpp | 6 +- .../renderer/layers/fill_layer_tweaker.hpp | 4 +- .../renderer/layers/heatmap_layer_tweaker.cpp | 4 +- .../renderer/layers/heatmap_layer_tweaker.hpp | 4 +- .../layers/heatmap_texture_layer_tweaker.cpp | 4 +- .../layers/heatmap_texture_layer_tweaker.hpp | 4 +- .../layers/hillshade_layer_tweaker.cpp | 4 +- .../layers/hillshade_layer_tweaker.hpp | 4 +- .../hillshade_prepare_layer_tweaker.cpp | 4 +- .../hillshade_prepare_layer_tweaker.hpp | 4 +- .../renderer/layers/line_layer_tweaker.cpp | 4 +- .../renderer/layers/line_layer_tweaker.hpp | 4 +- .../location_indicator_layer_tweaker.cpp | 4 +- .../location_indicator_layer_tweaker.hpp | 12 +- .../renderer/layers/raster_layer_tweaker.cpp | 4 +- .../renderer/layers/raster_layer_tweaker.hpp | 4 +- .../layers/render_background_layer.cpp | 6 +- .../layers/render_background_layer.hpp | 4 +- .../renderer/layers/render_circle_layer.cpp | 8 +- .../renderer/layers/render_circle_layer.hpp | 4 +- .../layers/render_color_relief_layer.cpp | 22 +- .../layers/render_color_relief_layer.hpp | 8 +- .../layers/render_custom_drawable_layer.cpp | 4 +- .../layers/render_custom_drawable_layer.hpp | 4 +- .../renderer/layers/render_custom_layer.cpp | 6 +- .../renderer/layers/render_custom_layer.hpp | 4 +- .../layers/render_fill_extrusion_layer.cpp | 6 +- .../layers/render_fill_extrusion_layer.hpp | 4 +- .../renderer/layers/render_fill_layer.cpp | 6 +- .../renderer/layers/render_fill_layer.hpp | 4 +- .../renderer/layers/render_heatmap_layer.cpp | 8 +- .../renderer/layers/render_heatmap_layer.hpp | 4 +- .../layers/render_hillshade_layer.cpp | 8 +- .../layers/render_hillshade_layer.hpp | 4 +- .../renderer/layers/render_line_layer.cpp | 10 +- .../renderer/layers/render_line_layer.hpp | 4 +- .../render_location_indicator_layer.cpp | 56 +-- .../render_location_indicator_layer.hpp | 4 +- .../renderer/layers/render_raster_layer.cpp | 6 +- .../renderer/layers/render_raster_layer.hpp | 4 +- .../renderer/layers/render_symbol_layer.cpp | 10 +- .../renderer/layers/render_symbol_layer.hpp | 4 +- .../renderer/layers/symbol_layer_tweaker.cpp | 4 +- .../renderer/layers/symbol_layer_tweaker.hpp | 4 +- src/mbgl/renderer/paint_parameters.cpp | 4 +- src/mbgl/renderer/paint_parameters.hpp | 4 +- src/mbgl/renderer/paint_property_binder.hpp | 4 +- .../renderer/paint_property_statistics.hpp | 4 +- src/mbgl/renderer/pattern_atlas.cpp | 4 +- src/mbgl/renderer/pattern_atlas.hpp | 4 +- .../possibly_evaluated_property_value.hpp | 4 +- .../property_evaluation_parameters.hpp | 4 +- src/mbgl/renderer/property_evaluator.hpp | 4 +- src/mbgl/renderer/render_layer.cpp | 4 +- src/mbgl/renderer/render_layer.hpp | 4 +- src/mbgl/renderer/render_light.cpp | 4 +- src/mbgl/renderer/render_light.hpp | 4 +- src/mbgl/renderer/render_orchestrator.cpp | 6 +- src/mbgl/renderer/render_orchestrator.hpp | 4 +- src/mbgl/renderer/render_pass.hpp | 4 +- src/mbgl/renderer/render_source.cpp | 4 +- src/mbgl/renderer/render_source.hpp | 4 +- src/mbgl/renderer/render_source_observer.hpp | 4 +- src/mbgl/renderer/render_static_data.cpp | 4 +- src/mbgl/renderer/render_static_data.hpp | 4 +- src/mbgl/renderer/render_target.cpp | 4 +- src/mbgl/renderer/render_tile.cpp | 4 +- src/mbgl/renderer/render_tile.hpp | 4 +- src/mbgl/renderer/render_tree.hpp | 4 +- src/mbgl/renderer/renderer.cpp | 4 +- src/mbgl/renderer/renderer_impl.cpp | 4 +- src/mbgl/renderer/renderer_impl.hpp | 4 +- src/mbgl/renderer/renderer_state.cpp | 4 +- src/mbgl/renderer/source_state.cpp | 4 +- src/mbgl/renderer/source_state.hpp | 4 +- .../sources/render_custom_geometry_source.cpp | 4 +- .../sources/render_custom_geometry_source.hpp | 4 +- .../sources/render_custom_vector_source.cpp | 4 +- .../sources/render_custom_vector_source.hpp | 4 +- .../sources/render_geojson_source.cpp | 4 +- .../sources/render_geojson_source.hpp | 4 +- .../renderer/sources/render_image_source.cpp | 4 +- .../renderer/sources/render_image_source.hpp | 4 +- .../sources/render_raster_dem_source.cpp | 4 +- .../sources/render_raster_dem_source.hpp | 4 +- .../renderer/sources/render_raster_source.cpp | 4 +- .../renderer/sources/render_raster_source.hpp | 4 +- .../renderer/sources/render_tile_source.cpp | 6 +- .../renderer/sources/render_tile_source.hpp | 4 +- .../renderer/sources/render_vector_source.cpp | 4 +- .../renderer/sources/render_vector_source.hpp | 4 +- src/mbgl/renderer/style_diff.cpp | 4 +- src/mbgl/renderer/style_diff.hpp | 4 +- src/mbgl/renderer/tile_layer_group.cpp | 10 +- src/mbgl/renderer/tile_mask.hpp | 4 +- src/mbgl/renderer/tile_parameters.hpp | 4 +- src/mbgl/renderer/tile_pyramid.cpp | 10 +- src/mbgl/renderer/tile_pyramid.hpp | 6 +- src/mbgl/renderer/tile_render_data.cpp | 4 +- src/mbgl/renderer/tile_render_data.hpp | 4 +- src/mbgl/renderer/transition_parameters.hpp | 4 +- src/mbgl/renderer/update_parameters.hpp | 4 +- src/mbgl/renderer/upload_parameters.hpp | 4 +- src/mbgl/shaders/attributes.hpp | 4 +- .../gl/legacy/clipping_mask_program.hpp | 4 +- src/mbgl/shaders/gl/legacy/program.hpp | 4 +- src/mbgl/shaders/gl/legacy/program_base.hpp | 4 +- src/mbgl/shaders/gl/legacy/programs.cpp | 4 +- src/mbgl/shaders/gl/legacy/programs.hpp | 4 +- src/mbgl/shaders/gl/shader_info.cpp | 4 +- src/mbgl/shaders/gl/shader_program_gl.cpp | 4 +- src/mbgl/shaders/mtl/background.cpp | 4 +- src/mbgl/shaders/mtl/circle.cpp | 4 +- src/mbgl/shaders/mtl/clipping_mask.cpp | 4 +- src/mbgl/shaders/mtl/collision.cpp | 4 +- src/mbgl/shaders/mtl/color_relief.cpp | 4 +- src/mbgl/shaders/mtl/custom_geometry.cpp | 4 +- src/mbgl/shaders/mtl/custom_symbol_icon.cpp | 4 +- src/mbgl/shaders/mtl/debug.cpp | 4 +- src/mbgl/shaders/mtl/fill.cpp | 4 +- src/mbgl/shaders/mtl/fill_extrusion.cpp | 4 +- src/mbgl/shaders/mtl/heatmap.cpp | 4 +- src/mbgl/shaders/mtl/heatmap_texture.cpp | 4 +- src/mbgl/shaders/mtl/hillshade.cpp | 4 +- src/mbgl/shaders/mtl/hillshade_prepare.cpp | 4 +- src/mbgl/shaders/mtl/line.cpp | 4 +- src/mbgl/shaders/mtl/location_indicator.cpp | 4 +- src/mbgl/shaders/mtl/raster.cpp | 4 +- src/mbgl/shaders/mtl/shader_program.cpp | 4 +- src/mbgl/shaders/mtl/symbol.cpp | 4 +- src/mbgl/shaders/mtl/widevector.cpp | 4 +- src/mbgl/shaders/program_parameters.cpp | 4 +- src/mbgl/shaders/segment.hpp | 4 +- src/mbgl/shaders/shader_source.cpp | 4 +- src/mbgl/shaders/uniforms.hpp | 4 +- src/mbgl/shaders/vulkan/background.cpp | 4 +- src/mbgl/shaders/vulkan/circle.cpp | 4 +- src/mbgl/shaders/vulkan/clipping_mask.cpp | 4 +- src/mbgl/shaders/vulkan/collision.cpp | 4 +- src/mbgl/shaders/vulkan/color_relief.cpp | 4 +- src/mbgl/shaders/vulkan/custom_geometry.cpp | 4 +- .../shaders/vulkan/custom_symbol_icon.cpp | 4 +- src/mbgl/shaders/vulkan/debug.cpp | 4 +- src/mbgl/shaders/vulkan/fill.cpp | 4 +- src/mbgl/shaders/vulkan/fill_extrusion.cpp | 4 +- src/mbgl/shaders/vulkan/heatmap.cpp | 4 +- src/mbgl/shaders/vulkan/heatmap_texture.cpp | 4 +- src/mbgl/shaders/vulkan/hillshade.cpp | 4 +- src/mbgl/shaders/vulkan/hillshade_prepare.cpp | 4 +- src/mbgl/shaders/vulkan/line.cpp | 4 +- .../shaders/vulkan/location_indicator.cpp | 4 +- src/mbgl/shaders/vulkan/raster.cpp | 4 +- src/mbgl/shaders/vulkan/shader_program.cpp | 10 +- src/mbgl/shaders/vulkan/symbol.cpp | 4 +- src/mbgl/shaders/vulkan/widevector.cpp | 4 +- src/mbgl/shaders/webgpu/background.cpp | 4 +- src/mbgl/shaders/webgpu/circle.cpp | 4 +- src/mbgl/shaders/webgpu/clipping_mask.cpp | 4 +- src/mbgl/shaders/webgpu/collision.cpp | 4 +- src/mbgl/shaders/webgpu/color_relief.cpp | 4 +- src/mbgl/shaders/webgpu/custom_geometry.cpp | 4 +- .../shaders/webgpu/custom_symbol_icon.cpp | 4 +- src/mbgl/shaders/webgpu/debug.cpp | 4 +- src/mbgl/shaders/webgpu/fill.cpp | 4 +- src/mbgl/shaders/webgpu/fill_extrusion.cpp | 4 +- src/mbgl/shaders/webgpu/heatmap.cpp | 4 +- src/mbgl/shaders/webgpu/heatmap_texture.cpp | 4 +- src/mbgl/shaders/webgpu/hillshade.cpp | 4 +- src/mbgl/shaders/webgpu/hillshade_prepare.cpp | 4 +- src/mbgl/shaders/webgpu/line.cpp | 4 +- .../shaders/webgpu/location_indicator.cpp | 4 +- src/mbgl/shaders/webgpu/raster.cpp | 4 +- src/mbgl/shaders/webgpu/shader_program.cpp | 4 +- src/mbgl/shaders/webgpu/symbol.cpp | 4 +- src/mbgl/shaders/webgpu/wgsl_preprocessor.cpp | 4 +- src/mbgl/shaders/webgpu/widevector.cpp | 4 +- src/mbgl/sprite/sprite_loader.cpp | 4 +- src/mbgl/sprite/sprite_loader.hpp | 4 +- src/mbgl/sprite/sprite_loader_observer.hpp | 4 +- src/mbgl/sprite/sprite_parser.cpp | 4 +- src/mbgl/sprite/sprite_parser.hpp | 4 +- src/mbgl/storage/asset_file_source.hpp | 4 +- src/mbgl/storage/file_source_manager.cpp | 4 +- src/mbgl/storage/http_file_source.hpp | 4 +- src/mbgl/storage/local_file_source.hpp | 4 +- src/mbgl/storage/main_resource_loader.hpp | 4 +- src/mbgl/storage/mbtiles_file_source.hpp | 4 +- src/mbgl/storage/network_status.cpp | 4 +- src/mbgl/storage/pmtiles_file_source.hpp | 4 +- src/mbgl/storage/resource.cpp | 4 +- src/mbgl/storage/resource_options.cpp | 6 +- src/mbgl/storage/resource_transform.cpp | 4 +- src/mbgl/storage/response.cpp | 4 +- src/mbgl/style/collection.hpp | 4 +- .../conversion/color_ramp_property_value.cpp | 6 +- src/mbgl/style/conversion/constant.cpp | 4 +- src/mbgl/style/conversion/coordinate.cpp | 4 +- .../custom_geometry_source_options.cpp | 4 +- src/mbgl/style/conversion/filter.cpp | 14 +- src/mbgl/style/conversion/function.cpp | 4 +- src/mbgl/style/conversion/geojson.cpp | 4 +- src/mbgl/style/conversion/geojson_options.cpp | 6 +- src/mbgl/style/conversion/get_json_type.cpp | 6 +- .../conversion/hillshade_conversions.cpp | 4 +- src/mbgl/style/conversion/json.hpp | 4 +- src/mbgl/style/conversion/layer.cpp | 4 +- src/mbgl/style/conversion/light.cpp | 4 +- src/mbgl/style/conversion/position.cpp | 4 +- src/mbgl/style/conversion/property_value.cpp | 34 +- src/mbgl/style/conversion/rotation.cpp | 4 +- src/mbgl/style/conversion/source.cpp | 4 +- src/mbgl/style/conversion/source_options.cpp | 4 +- src/mbgl/style/conversion/sprite.cpp | 4 +- src/mbgl/style/conversion/sprite.hpp | 4 +- src/mbgl/style/conversion/stringify.hpp | 10 +- src/mbgl/style/conversion/tileset.cpp | 4 +- .../style/conversion/transition_options.cpp | 4 +- src/mbgl/style/custom_tile_loader.cpp | 4 +- src/mbgl/style/custom_tile_loader.hpp | 4 +- src/mbgl/style/custom_vector_tile_loader.cpp | 4 +- src/mbgl/style/custom_vector_tile_loader.hpp | 4 +- src/mbgl/style/expression/assertion.cpp | 12 +- src/mbgl/style/expression/at.cpp | 6 +- .../style/expression/boolean_operator.cpp | 6 +- src/mbgl/style/expression/case.cpp | 6 +- src/mbgl/style/expression/check_subtype.cpp | 4 +- src/mbgl/style/expression/coalesce.cpp | 6 +- src/mbgl/style/expression/coercion.cpp | 14 +- src/mbgl/style/expression/collator.cpp | 4 +- .../style/expression/collator_expression.cpp | 12 +- src/mbgl/style/expression/comparison.cpp | 6 +- .../style/expression/compound_expression.cpp | 14 +- src/mbgl/style/expression/distance.cpp | 51 ++- src/mbgl/style/expression/dsl.cpp | 8 +- src/mbgl/style/expression/dsl_impl.hpp | 4 +- src/mbgl/style/expression/expression.cpp | 12 +- src/mbgl/style/expression/find_zoom_curve.cpp | 4 +- .../style/expression/format_expression.cpp | 12 +- src/mbgl/style/expression/formatted.cpp | 10 +- .../style/expression/get_covering_stops.cpp | 4 +- src/mbgl/style/expression/image.cpp | 8 +- .../style/expression/image_expression.cpp | 10 +- src/mbgl/style/expression/in.cpp | 6 +- src/mbgl/style/expression/index_of.cpp | 6 +- src/mbgl/style/expression/interpolate.cpp | 18 +- src/mbgl/style/expression/is_constant.cpp | 4 +- src/mbgl/style/expression/is_expression.cpp | 6 +- src/mbgl/style/expression/length.cpp | 6 +- src/mbgl/style/expression/let.cpp | 14 +- src/mbgl/style/expression/literal.cpp | 18 +- src/mbgl/style/expression/match.cpp | 16 +- src/mbgl/style/expression/number_format.cpp | 12 +- src/mbgl/style/expression/parsing_context.cpp | 6 +- src/mbgl/style/expression/slice.cpp | 6 +- src/mbgl/style/expression/step.cpp | 12 +- src/mbgl/style/expression/utf8_op_helpers.cpp | 4 +- src/mbgl/style/expression/utf8_op_helpers.hpp | 4 +- src/mbgl/style/expression/util.cpp | 4 +- src/mbgl/style/expression/util.hpp | 4 +- src/mbgl/style/expression/value.cpp | 62 +-- src/mbgl/style/expression/within.cpp | 54 +-- src/mbgl/style/filter.cpp | 4 +- src/mbgl/style/image.cpp | 4 +- src/mbgl/style/image_impl.cpp | 4 +- src/mbgl/style/image_impl.hpp | 14 +- src/mbgl/style/layer.cpp | 16 +- src/mbgl/style/layer_impl.cpp | 4 +- src/mbgl/style/layer_impl.hpp | 4 +- src/mbgl/style/layer_observer.hpp | 4 +- src/mbgl/style/layers/background_layer.cpp | 6 +- .../style/layers/background_layer_impl.cpp | 4 +- .../style/layers/background_layer_impl.hpp | 4 +- .../layers/background_layer_properties.cpp | 4 +- .../layers/background_layer_properties.hpp | 4 +- src/mbgl/style/layers/circle_layer.cpp | 6 +- src/mbgl/style/layers/circle_layer_impl.cpp | 4 +- src/mbgl/style/layers/circle_layer_impl.hpp | 4 +- .../style/layers/circle_layer_properties.cpp | 4 +- .../style/layers/circle_layer_properties.hpp | 4 +- src/mbgl/style/layers/color_relief_layer.cpp | 6 +- .../style/layers/color_relief_layer_impl.cpp | 4 +- .../style/layers/color_relief_layer_impl.hpp | 4 +- .../layers/color_relief_layer_properties.cpp | 4 +- .../layers/color_relief_layer_properties.hpp | 4 +- .../style/layers/custom_drawable_layer.cpp | 10 +- .../layers/custom_drawable_layer_impl.cpp | 4 +- .../layers/custom_drawable_layer_impl.hpp | 4 +- src/mbgl/style/layers/custom_layer.cpp | 4 +- src/mbgl/style/layers/custom_layer_impl.cpp | 4 +- src/mbgl/style/layers/custom_layer_impl.hpp | 4 +- .../layers/custom_layer_render_parameters.cpp | 6 +- .../style/layers/fill_extrusion_layer.cpp | 6 +- .../layers/fill_extrusion_layer_impl.cpp | 4 +- .../layers/fill_extrusion_layer_impl.hpp | 4 +- .../fill_extrusion_layer_properties.cpp | 4 +- .../fill_extrusion_layer_properties.hpp | 4 +- src/mbgl/style/layers/fill_layer.cpp | 6 +- src/mbgl/style/layers/fill_layer_impl.cpp | 4 +- src/mbgl/style/layers/fill_layer_impl.hpp | 4 +- .../style/layers/fill_layer_properties.cpp | 4 +- .../style/layers/fill_layer_properties.hpp | 4 +- src/mbgl/style/layers/heatmap_layer.cpp | 6 +- src/mbgl/style/layers/heatmap_layer_impl.cpp | 4 +- src/mbgl/style/layers/heatmap_layer_impl.hpp | 4 +- .../style/layers/heatmap_layer_properties.cpp | 4 +- .../style/layers/heatmap_layer_properties.hpp | 4 +- src/mbgl/style/layers/hillshade_layer.cpp | 6 +- .../style/layers/hillshade_layer_impl.cpp | 4 +- .../style/layers/hillshade_layer_impl.hpp | 4 +- .../layers/hillshade_layer_properties.cpp | 4 +- .../layers/hillshade_layer_properties.hpp | 4 +- src/mbgl/style/layers/layer.cpp.ejs | 6 +- .../style/layers/layer_properties.cpp.ejs | 4 +- .../style/layers/layer_properties.hpp.ejs | 4 +- src/mbgl/style/layers/line_layer.cpp | 6 +- src/mbgl/style/layers/line_layer_impl.cpp | 4 +- src/mbgl/style/layers/line_layer_impl.hpp | 4 +- .../style/layers/line_layer_properties.cpp | 4 +- .../style/layers/line_layer_properties.hpp | 4 +- .../style/layers/location_indicator_layer.cpp | 6 +- .../layers/location_indicator_layer_impl.cpp | 4 +- .../layers/location_indicator_layer_impl.hpp | 4 +- .../location_indicator_layer_properties.cpp | 4 +- .../location_indicator_layer_properties.hpp | 4 +- .../mtl/custom_layer_render_parameters.cpp | 16 +- src/mbgl/style/layers/raster_layer.cpp | 6 +- src/mbgl/style/layers/raster_layer_impl.cpp | 4 +- src/mbgl/style/layers/raster_layer_impl.hpp | 4 +- .../style/layers/raster_layer_properties.cpp | 4 +- .../style/layers/raster_layer_properties.hpp | 4 +- src/mbgl/style/layers/symbol_layer.cpp | 6 +- src/mbgl/style/layers/symbol_layer_impl.cpp | 4 +- src/mbgl/style/layers/symbol_layer_impl.hpp | 4 +- .../style/layers/symbol_layer_properties.cpp | 4 +- .../style/layers/symbol_layer_properties.hpp | 4 +- .../vulkan/custom_layer_render_parameters.cpp | 16 +- src/mbgl/style/layout_property.hpp | 4 +- src/mbgl/style/light.cpp | 6 +- src/mbgl/style/light.cpp.ejs | 6 +- src/mbgl/style/light_impl.cpp | 4 +- src/mbgl/style/light_impl.hpp | 4 +- src/mbgl/style/light_observer.hpp | 4 +- src/mbgl/style/observer.hpp | 4 +- src/mbgl/style/paint_property.hpp | 4 +- src/mbgl/style/parser.cpp | 6 +- src/mbgl/style/parser.hpp | 4 +- src/mbgl/style/properties.hpp | 4 +- src/mbgl/style/property_expression.cpp | 4 +- src/mbgl/style/rapidjson_conversion.hpp | 4 +- src/mbgl/style/source.cpp | 4 +- src/mbgl/style/source_impl.cpp | 4 +- src/mbgl/style/source_impl.hpp | 4 +- src/mbgl/style/source_observer.hpp | 4 +- .../style/sources/custom_geometry_source.cpp | 8 +- .../sources/custom_geometry_source_impl.cpp | 4 +- .../sources/custom_geometry_source_impl.hpp | 4 +- .../style/sources/custom_vector_source.cpp | 8 +- .../sources/custom_vector_source_impl.cpp | 4 +- .../sources/custom_vector_source_impl.hpp | 4 +- src/mbgl/style/sources/geojson_source.cpp | 8 +- .../style/sources/geojson_source_impl.cpp | 4 +- .../style/sources/geojson_source_impl.hpp | 4 +- src/mbgl/style/sources/image_source.cpp | 8 +- src/mbgl/style/sources/image_source_impl.cpp | 4 +- src/mbgl/style/sources/image_source_impl.hpp | 4 +- src/mbgl/style/sources/raster_dem_source.cpp | 8 +- src/mbgl/style/sources/raster_source.cpp | 8 +- src/mbgl/style/sources/tile_source.cpp | 4 +- src/mbgl/style/sources/tile_source_impl.cpp | 4 +- src/mbgl/style/sources/tile_source_impl.hpp | 4 +- src/mbgl/style/sources/vector_source.cpp | 8 +- src/mbgl/style/sprite.cpp | 4 +- src/mbgl/style/style.cpp | 4 +- src/mbgl/style/style_impl.cpp | 4 +- src/mbgl/style/style_impl.hpp | 4 +- src/mbgl/style/types.cpp | 4 +- .../variable_anchor_offset_collection.cpp | 10 +- src/mbgl/text/bidi.hpp | 4 +- src/mbgl/text/check_max_angle.cpp | 4 +- src/mbgl/text/check_max_angle.hpp | 4 +- src/mbgl/text/collision_feature.cpp | 4 +- src/mbgl/text/collision_feature.hpp | 4 +- src/mbgl/text/collision_index.cpp | 6 +- src/mbgl/text/collision_index.hpp | 4 +- src/mbgl/text/cross_tile_symbol_index.cpp | 4 +- src/mbgl/text/cross_tile_symbol_index.hpp | 4 +- src/mbgl/text/freetype.cpp | 4 +- src/mbgl/text/freetype.hpp | 4 +- src/mbgl/text/get_anchors.cpp | 4 +- src/mbgl/text/get_anchors.hpp | 4 +- src/mbgl/text/glyph.cpp | 8 +- src/mbgl/text/glyph_manager.cpp | 4 +- src/mbgl/text/glyph_manager.hpp | 4 +- src/mbgl/text/glyph_manager_observer.hpp | 4 +- src/mbgl/text/glyph_pbf.cpp | 4 +- src/mbgl/text/glyph_pbf.hpp | 4 +- src/mbgl/text/harfbuzz.cpp | 4 +- src/mbgl/text/harfbuzz.hpp | 4 +- src/mbgl/text/harfbuzz_impl.cpp | 4 +- src/mbgl/text/harfbuzz_impl.hpp | 4 +- src/mbgl/text/language_tag.cpp | 4 +- src/mbgl/text/language_tag.hpp | 4 +- src/mbgl/text/local_glyph_rasterizer.hpp | 4 +- src/mbgl/text/placement.cpp | 4 +- src/mbgl/text/placement.hpp | 4 +- src/mbgl/text/quads.cpp | 4 +- src/mbgl/text/quads.hpp | 4 +- src/mbgl/text/shaping.cpp | 4 +- src/mbgl/text/shaping.hpp | 4 +- src/mbgl/text/tagged_string.cpp | 4 +- src/mbgl/text/tagged_string.hpp | 4 +- src/mbgl/tile/custom_geometry_tile.cpp | 4 +- src/mbgl/tile/custom_geometry_tile.hpp | 4 +- src/mbgl/tile/custom_vector_tile.cpp | 4 +- src/mbgl/tile/custom_vector_tile.hpp | 4 +- src/mbgl/tile/geojson_tile.cpp | 4 +- src/mbgl/tile/geojson_tile.hpp | 4 +- src/mbgl/tile/geojson_tile_data.hpp | 4 +- src/mbgl/tile/geometry_tile.cpp | 4 +- src/mbgl/tile/geometry_tile.hpp | 8 +- src/mbgl/tile/geometry_tile_data.cpp | 4 +- src/mbgl/tile/geometry_tile_data.hpp | 4 +- src/mbgl/tile/geometry_tile_worker.cpp | 4 +- src/mbgl/tile/geometry_tile_worker.hpp | 6 +- src/mbgl/tile/raster_dem_tile.cpp | 4 +- src/mbgl/tile/raster_dem_tile.hpp | 4 +- src/mbgl/tile/raster_dem_tile_worker.cpp | 4 +- src/mbgl/tile/raster_dem_tile_worker.hpp | 4 +- src/mbgl/tile/raster_tile.cpp | 4 +- src/mbgl/tile/raster_tile.hpp | 4 +- src/mbgl/tile/raster_tile_worker.cpp | 4 +- src/mbgl/tile/raster_tile_worker.hpp | 4 +- src/mbgl/tile/tile.cpp | 4 +- src/mbgl/tile/tile.hpp | 4 +- src/mbgl/tile/tile_cache.cpp | 4 +- src/mbgl/tile/tile_cache.hpp | 4 +- src/mbgl/tile/tile_id_hash.cpp | 20 +- src/mbgl/tile/tile_id_io.cpp | 4 +- src/mbgl/tile/tile_loader.hpp | 4 +- src/mbgl/tile/tile_loader_impl.hpp | 4 +- src/mbgl/tile/tile_loader_observer.hpp | 4 +- src/mbgl/tile/tile_observer.hpp | 4 +- src/mbgl/tile/tile_operation.cpp | 4 +- src/mbgl/tile/vector_mlt_tile.cpp | 4 +- src/mbgl/tile/vector_mlt_tile.hpp | 4 +- src/mbgl/tile/vector_mlt_tile_data.cpp | 4 +- src/mbgl/tile/vector_mlt_tile_data.hpp | 4 +- src/mbgl/tile/vector_mvt_tile.cpp | 4 +- src/mbgl/tile/vector_mvt_tile.hpp | 4 +- src/mbgl/tile/vector_mvt_tile_data.cpp | 4 +- src/mbgl/tile/vector_mvt_tile_data.hpp | 4 +- src/mbgl/tile/vector_tile.cpp | 4 +- src/mbgl/tile/vector_tile.hpp | 4 +- src/mbgl/util/action_journal.cpp | 4 +- src/mbgl/util/action_journal_impl.cpp | 42 +- src/mbgl/util/action_journal_impl.hpp | 4 +- src/mbgl/util/bounding_volumes.cpp | 4 +- src/mbgl/util/bounding_volumes.hpp | 4 +- src/mbgl/util/camera.cpp | 4 +- src/mbgl/util/camera.hpp | 4 +- src/mbgl/util/chrono.cpp | 4 +- src/mbgl/util/client_options.cpp | 4 +- src/mbgl/util/color.cpp | 10 +- src/mbgl/util/color.rs.cpp | 10 +- src/mbgl/util/constants.cpp | 4 +- src/mbgl/util/convert.cpp | 4 +- src/mbgl/util/default_style.cpp | 4 +- src/mbgl/util/error_sink.cpp | 4 +- src/mbgl/util/error_sink.hpp | 4 +- src/mbgl/util/event.cpp | 4 +- src/mbgl/util/filesystem.hpp | 4 +- src/mbgl/util/font_stack.cpp | 4 +- src/mbgl/util/geo.cpp | 4 +- src/mbgl/util/geometry_util.cpp | 4 +- src/mbgl/util/geometry_util.hpp | 4 +- src/mbgl/util/grid_index.cpp | 4 +- src/mbgl/util/grid_index.hpp | 4 +- src/mbgl/util/http_header.cpp | 4 +- src/mbgl/util/http_header.hpp | 4 +- src/mbgl/util/http_timeout.cpp | 4 +- src/mbgl/util/http_timeout.hpp | 4 +- src/mbgl/util/i18n.cpp | 4 +- src/mbgl/util/i18n.hpp | 4 +- src/mbgl/util/identity.cpp | 4 +- src/mbgl/util/instrumentation.cpp | 4 +- src/mbgl/util/interpolate.cpp | 4 +- src/mbgl/util/intersection_tests.cpp | 4 +- src/mbgl/util/intersection_tests.hpp | 4 +- src/mbgl/util/io.cpp | 4 +- src/mbgl/util/io.hpp | 4 +- src/mbgl/util/literal.hpp | 4 +- src/mbgl/util/logging.cpp | 4 +- src/mbgl/util/longest_common_subsequence.hpp | 4 +- src/mbgl/util/mapbox.cpp | 4 +- src/mbgl/util/mapbox.hpp | 4 +- src/mbgl/util/mat2.cpp | 4 +- src/mbgl/util/mat2.hpp | 4 +- src/mbgl/util/mat3.cpp | 4 +- src/mbgl/util/mat3.hpp | 4 +- src/mbgl/util/mat4.cpp | 4 +- src/mbgl/util/mat4.hpp | 4 +- src/mbgl/util/math.hpp | 4 +- src/mbgl/util/padding.cpp | 8 +- src/mbgl/util/premultiply.cpp | 4 +- src/mbgl/util/quaternion.cpp | 4 +- src/mbgl/util/quaternion.hpp | 4 +- src/mbgl/util/rapidjson.cpp | 4 +- src/mbgl/util/rapidjson.hpp | 4 +- src/mbgl/util/source_location.hpp | 8 +- src/mbgl/util/std.hpp | 4 +- src/mbgl/util/stopwatch.cpp | 4 +- src/mbgl/util/stopwatch.hpp | 4 +- src/mbgl/util/string.cpp | 4 +- src/mbgl/util/string_indexer.cpp | 4 +- src/mbgl/util/thread.cpp | 4 +- src/mbgl/util/thread_local.hpp | 4 +- src/mbgl/util/thread_pool.cpp | 4 +- src/mbgl/util/thread_pool.hpp | 8 +- src/mbgl/util/tile_coordinate.hpp | 4 +- src/mbgl/util/tile_cover.cpp | 4 +- src/mbgl/util/tile_cover.hpp | 4 +- src/mbgl/util/tile_cover_impl.cpp | 4 +- src/mbgl/util/tile_cover_impl.hpp | 4 +- src/mbgl/util/tile_range.hpp | 4 +- src/mbgl/util/tile_server_options.cpp | 44 +- src/mbgl/util/tiny_sdf.cpp | 4 +- src/mbgl/util/tiny_sdf.hpp | 4 +- src/mbgl/util/token.hpp | 4 +- src/mbgl/util/url.cpp | 4 +- src/mbgl/util/url.hpp | 4 +- src/mbgl/util/utf.hpp | 4 +- src/mbgl/util/version.cpp | 4 +- src/mbgl/util/version.hpp | 4 +- src/mbgl/util/work_request.cpp | 4 +- src/mbgl/vulkan/buffer_resource.cpp | 6 +- src/mbgl/vulkan/command_encoder.cpp | 4 +- src/mbgl/vulkan/context.cpp | 18 +- src/mbgl/vulkan/descriptor_set.cpp | 4 +- src/mbgl/vulkan/drawable.cpp | 14 +- src/mbgl/vulkan/drawable_builder.cpp | 4 +- src/mbgl/vulkan/drawable_impl.hpp | 4 +- src/mbgl/vulkan/dynamic_texture.cpp | 6 +- src/mbgl/vulkan/index_buffer_resource.cpp | 4 +- src/mbgl/vulkan/layer_group.cpp | 6 +- src/mbgl/vulkan/offscreen_texture.cpp | 4 +- src/mbgl/vulkan/pipeline.cpp | 4 +- src/mbgl/vulkan/render_pass.cpp | 4 +- src/mbgl/vulkan/renderable_resource.cpp | 16 +- src/mbgl/vulkan/renderer_backend.cpp | 34 +- src/mbgl/vulkan/texture2d.cpp | 12 +- src/mbgl/vulkan/tile_layer_group.cpp | 6 +- src/mbgl/vulkan/uniform_buffer.cpp | 4 +- src/mbgl/vulkan/upload_pass.cpp | 4 +- src/mbgl/vulkan/vertex_attribute.cpp | 4 +- src/mbgl/vulkan/vertex_buffer_resource.cpp | 4 +- src/mbgl/webgpu/buffer_resource.cpp | 4 +- src/mbgl/webgpu/command_encoder.cpp | 4 +- src/mbgl/webgpu/context.cpp | 4 +- src/mbgl/webgpu/draw_scope_resource.cpp | 4 +- src/mbgl/webgpu/drawable.cpp | 10 +- src/mbgl/webgpu/drawable_builder.cpp | 8 +- src/mbgl/webgpu/drawable_impl.hpp | 4 +- src/mbgl/webgpu/dynamic_texture.cpp | 4 +- src/mbgl/webgpu/headless_backend.cpp | 8 +- src/mbgl/webgpu/index_buffer_resource.cpp | 4 +- src/mbgl/webgpu/layer_group.cpp | 6 +- src/mbgl/webgpu/offscreen_texture.cpp | 26 +- src/mbgl/webgpu/render_pass.cpp | 14 +- src/mbgl/webgpu/renderer_backend.cpp | 6 +- src/mbgl/webgpu/texture2d.cpp | 6 +- src/mbgl/webgpu/tile_layer_group.cpp | 14 +- src/mbgl/webgpu/uniform_buffer.cpp | 4 +- src/mbgl/webgpu/upload_pass.cpp | 6 +- src/mbgl/webgpu/vertex_attribute.cpp | 4 +- src/mbgl/webgpu/vertex_buffer_resource.cpp | 4 +- test/actor/actor.test.cpp | 2 +- test/actor/actor_ref.test.cpp | 2 +- test/algorithm/update_renderables.test.cpp | 2 +- test/algorithm/update_tile_masks.test.cpp | 2 +- test/api/annotations.test.cpp | 14 +- test/api/api_misuse.test.cpp | 2 +- test/api/custom_drawable_layer.test.cpp | 24 +- test/api/custom_geometry_source.test.cpp | 6 +- test/api/custom_layer.test.cpp | 12 +- test/api/query.test.cpp | 22 +- test/api/recycle_map.cpp | 4 +- test/geometry/dem_data.test.cpp | 2 +- test/geometry/line_atlas.test.cpp | 2 +- test/gl/bucket.test.cpp | 6 +- test/gl/context.test.cpp | 6 +- test/gl/enum.test.cpp | 6 +- test/gl/gl_functions.test.cpp | 2 +- test/gl/object.test.cpp | 2 +- test/gl/resource_pool.test.cpp | 2 +- test/include/mbgl/test.hpp | 4 +- test/include/mbgl/test/util.hpp | 4 +- test/include/mbgl/test/vector_tile_test.hpp | 4 +- test/map/map.test.cpp | 8 +- test/map/map_snapshotter.test.cpp | 50 +-- test/map/prefetch.test.cpp | 4 +- test/map/transform.test.cpp | 8 +- test/math/clamp.test.cpp | 2 +- test/math/minmax.test.cpp | 2 +- test/math/wrap.test.cpp | 2 +- test/platform/settings.test.cpp | 4 +- test/plugin/plugin.test.cpp | 20 +- test/renderer/backend_scope.test.cpp | 2 +- test/renderer/image_manager.test.cpp | 2 +- test/renderer/pattern_atlas.test.cpp | 2 +- test/renderer/shader_registry.test.cpp | 2 +- test/renderer/style_diff.test.cpp | 4 +- test/renderer/wgsl_preprocessor.test.cpp | 4 +- test/sprite/sprite_loader.test.cpp | 4 +- test/sprite/sprite_parser.test.cpp | 2 +- test/src/main.mm | 2 +- test/src/mbgl/test/fake_file_source.hpp | 4 +- test/src/mbgl/test/fixture_log_observer.cpp | 4 +- test/src/mbgl/test/fixture_log_observer.hpp | 4 +- test/src/mbgl/test/getrss.cpp | 4 +- test/src/mbgl/test/getrss.hpp | 4 +- test/src/mbgl/test/http_server.cpp | 4 +- test/src/mbgl/test/map_adapter.hpp | 6 +- test/src/mbgl/test/mock.hpp | 14 +- test/src/mbgl/test/sqlite3_test_fs.cpp | 4 +- test/src/mbgl/test/sqlite3_test_fs.hpp | 4 +- test/src/mbgl/test/stub_file_source.cpp | 4 +- test/src/mbgl/test/stub_file_source.hpp | 4 +- .../mbgl/test/stub_geometry_tile_feature.hpp | 4 +- test/src/mbgl/test/stub_layer_observer.hpp | 4 +- test/src/mbgl/test/stub_map_observer.hpp | 4 +- .../mbgl/test/stub_render_source_observer.hpp | 2 +- test/src/mbgl/test/stub_style_observer.hpp | 4 +- test/src/mbgl/test/stub_tile_observer.hpp | 2 +- test/src/mbgl/test/test.cpp | 4 +- test/src/mbgl/test/util.cpp | 4 +- test/storage/asset_file_source.test.cpp | 16 +- test/storage/database_file_source.test.cpp | 4 +- test/storage/headers.test.cpp | 2 +- test/storage/http_file_source.test.cpp | 2 +- test/storage/local_file_source.test.cpp | 4 +- test/storage/main_resource_loader.test.cpp | 2 +- test/storage/mbtiles_file_source.test.cpp | 2 +- test/storage/offline.test.cpp | 4 +- test/storage/offline_database.test.cpp | 2 +- test/storage/offline_download.test.cpp | 2 +- test/storage/online_file_source.test.cpp | 6 +- test/storage/pmtiles_file_source.test.cpp | 4 +- test/storage/resource.test.cpp | 14 +- test/storage/sqlite.test.cpp | 4 +- test/storage/sync_file_source.test.cpp | 2 +- .../style/conversion/conversion_impl.test.cpp | 12 +- test/style/conversion/function.test.cpp | 12 +- .../style/conversion/geojson_options.test.cpp | 4 +- test/style/conversion/layer.test.cpp | 6 +- test/style/conversion/light.test.cpp | 30 +- test/style/conversion/padding.test.cpp | 6 +- test/style/conversion/property_value.test.cpp | 6 +- test/style/conversion/source_options.test.cpp | 6 +- test/style/conversion/stringify.test.cpp | 12 +- test/style/conversion/tileset.test.cpp | 4 +- test/style/expression/dependency.test.cpp | 10 +- test/style/expression/expression.test.cpp | 4 +- .../style/expression/utf8_op_helpers.test.cpp | 2 +- test/style/expression/util.test.cpp | 4 +- test/style/filter.test.cpp | 4 +- test/style/properties.test.cpp | 6 +- test/style/property_expression.test.cpp | 40 +- test/style/source.test.cpp | 4 +- test/style/style.test.cpp | 4 +- test/style/style_image.test.cpp | 2 +- test/style/style_layer.test.cpp | 10 +- test/style/style_parser.test.cpp | 24 +- ...variable_anchor_offset_collection.test.cpp | 8 +- test/text/bidi.test.cpp | 2 +- test/text/calculate_tile_distances.test.cpp | 2 +- test/text/cross_tile_symbol_index.test.cpp | 2 +- test/text/formatted.test.cpp | 4 +- test/text/get_anchors.test.cpp | 6 +- test/text/glyph_manager.test.cpp | 2 +- test/text/glyph_pbf.test.cpp | 2 +- test/text/language_tag.test.cpp | 2 +- test/text/local_glyph_rasterizer.test.cpp | 2 +- test/text/quads.test.cpp | 4 +- test/text/shaping.test.cpp | 2 +- test/text/tagged_string.test.cpp | 2 +- test/tile/custom_geometry_tile.test.cpp | 4 +- test/tile/geojson_tile.test.cpp | 4 +- test/tile/geometry_tile_data.test.cpp | 2 +- test/tile/raster_dem_tile.test.cpp | 2 +- test/tile/raster_tile.test.cpp | 2 +- test/tile/tile_cache.test.cpp | 2 +- test/tile/tile_coordinate.test.cpp | 4 +- test/tile/tile_id.test.cpp | 2 +- test/tile/tile_lod.test.cpp | 6 +- test/tile/vector_tile.test.cpp | 6 +- test/util/action_journal.test.cpp | 36 +- test/util/async_task.test.cpp | 6 +- test/util/bounding_volumes.test.cpp | 2 +- test/util/camera.test.cpp | 2 +- test/util/color.test.cpp | 2 +- test/util/geo.test.cpp | 2 +- test/util/grid_index.test.cpp | 2 +- test/util/hash.test.cpp | 6 +- test/util/http_timeout.test.cpp | 4 +- test/util/image.test.cpp | 2 +- test/util/lru_cache.test.cpp | 2 +- test/util/mapbox.test.cpp | 414 +++++++++--------- test/util/memory.test.cpp | 14 +- test/util/merge_lines.test.cpp | 22 +- test/util/number_conversions.test.cpp | 2 +- test/util/offscreen_texture.test.cpp | 4 +- test/util/padding.test.cpp | 4 +- test/util/position.test.cpp | 2 +- test/util/projection.test.cpp | 2 +- test/util/rotation.test.cpp | 4 +- test/util/run_loop.test.cpp | 10 +- test/util/string.test.cpp | 2 +- test/util/string_indexer.test.cpp | 4 +- test/util/text_conversions.test.cpp | 2 +- test/util/thread.test.cpp | 6 +- test/util/thread_local.test.cpp | 6 +- test/util/tile_cover.test.cpp | 2 +- test/util/tile_range.test.cpp | 2 +- test/util/tile_server_options.test.cpp | 8 +- test/util/timer.test.cpp | 72 +-- test/util/tiny_map.test.cpp | 4 +- test/util/token.test.cpp | 24 +- test/util/url.test.cpp | 2 +- 1970 files changed, 8931 insertions(+), 8967 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f6ea7745..27436f963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,7 +87,7 @@ - [ios, macos] Allow specifying multiple fonts or font families for local font rendering ([#16253](https://github.com/mapbox/mapbox-gl-native/pull/16253)) - By default, CJK characters are now set in the font specified by the `text-font` layout property. If the named font is not installed on the device or bundled with the application, the characters are set in one of the fallback fonts passed into the `localFontFamily` parameter of `mbgl::Renderer::Renderer()` and `mbgl::MapSnapshotter::MapSnapshotter()`. This parameter can now contain a list of font family names, font display names, and font PostScript names, each name separated by a newline. + By default, CJK characters are now set in the font specified by the `text-font` layout property. If the named font is not installed on the device or bundled with the application, the characters are set in one of the fallback fonts passed into the `localFontFamily` parameter of `mln::Renderer::Renderer()` and `mln::MapSnapshotter::MapSnapshotter()`. This parameter can now contain a list of font family names, font display names, and font PostScript names, each name separated by a newline. ### 🐞 Bug fixes @@ -141,7 +141,7 @@ - [core][tile mode] Fix variable placement for labels with the `icon-text-fit` property set ([#16382](https://github.com/mapbox/mapbox-gl-native/pull/16382)) - The `symbolIntersectsTileEdges()` util in `mbgl::TilePlacement` now considers icon shift for the variable symbols with enabled icon-text-fit setting, thus providing more accurate results. + The `symbolIntersectsTileEdges()` util in `mln::TilePlacement` now considers icon shift for the variable symbols with enabled icon-text-fit setting, thus providing more accurate results. - [core] Correctly log a warning instead of crashing when a non-existent image is attempted to be removed. ([#16391](https://github.com/mapbox/mapbox-gl-native/pull/16391)) @@ -172,7 +172,7 @@ - [android] Add jni binding for styleable snapshotter ([#16286](https://github.com/mapbox/mapbox-gl-native/pull/16286)) - [core] Ability to set generic layer properties using setProperty method ([#16324](https://github.com/mapbox/mapbox-gl-native/pull/16324)) - This change enables the following new keys for the `mbgl::Layer::setProperty()` API: + This change enables the following new keys for the `mln::Layer::setProperty()` API: - "filter" invokes `setFilter()` - "minzoom" invokes `setMinZoom()` - "maxzoom" invokes `setMaxZoom()` @@ -254,7 +254,7 @@ - Fixed using of the `in` expression as a layer filter ([#16272](https://github.com/mapbox/mapbox-gl-native/pull/16272)) - The bug was caused by `mbgl::style::conversion::isExpression()` always returning `false` for the `in` expression. + The bug was caused by `mln::style::conversion::isExpression()` always returning `false` for the `in` expression. ### 🧩 Architectural changes @@ -298,9 +298,9 @@ ##### ⚠️ Breaking changes -- Changes to `mbgl::FileSourceManager::getFileSource()` ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238)) +- Changes to `mln::FileSourceManager::getFileSource()` ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238)) - It returns now `mbgl::PassRefPtr` (previously was `std::shared_ptr`) in order to enforce keeping the strong reference to the returned object. + It returns now `mln::PassRefPtr` (previously was `std::shared_ptr`) in order to enforce keeping the strong reference to the returned object. Breaking code example: `auto fs = FileSourceManager::getFileSource(); fs->..` @@ -308,9 +308,9 @@ Possible fix: `std::shared_ptr fs = `; -- The `mbgl::OnlineFileSource` class cannot be used directly ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238)) +- The `mln::OnlineFileSource` class cannot be used directly ([#16238](https://github.com/mapbox/mapbox-gl-native/pull/16238)) - Clients must use the parent `mbgl::FileSource` interface instead. + Clients must use the parent `mln::FileSource` interface instead. Breaking code example: `std::shared_ptr onlineSource = std::static_pointer_cast(FileSourceManager::get()->getFileSource(..));` diff --git a/benchmark/api/query.benchmark.cpp b/benchmark/api/query.benchmark.cpp index e660be753..9ee1e1abb 100644 --- a/benchmark/api/query.benchmark.cpp +++ b/benchmark/api/query.benchmark.cpp @@ -11,7 +11,7 @@ #include #include -using namespace mbgl; +using namespace mln; namespace { diff --git a/benchmark/api/render.benchmark.cpp b/benchmark/api/render.benchmark.cpp index 79bdef734..c79dcf59b 100644 --- a/benchmark/api/render.benchmark.cpp +++ b/benchmark/api/render.benchmark.cpp @@ -18,7 +18,7 @@ #include #include -using namespace mbgl; +using namespace mln; namespace { @@ -124,7 +124,7 @@ static void API_renderStill_recreate_map_2(::benchmark::State& state) { } static void API_renderStill_multiple_sources(::benchmark::State& state) { - using namespace mbgl::style; + using namespace mln::style; RenderBenchmark bench; HeadlessFrontend frontend{size, pixelRatio}; Map map{frontend, diff --git a/benchmark/function/camera_function.benchmark.cpp b/benchmark/function/camera_function.benchmark.cpp index 74f70b34d..a91256af1 100644 --- a/benchmark/function/camera_function.benchmark.cpp +++ b/benchmark/function/camera_function.benchmark.cpp @@ -5,8 +5,8 @@ #include #include -using namespace mbgl; -using namespace mbgl::style; +using namespace mln; +using namespace mln::style; static std::string createFunctionJSON(size_t stopCount) { std::string stops = "["; diff --git a/benchmark/function/composite_function.benchmark.cpp b/benchmark/function/composite_function.benchmark.cpp index 466defe76..609284511 100644 --- a/benchmark/function/composite_function.benchmark.cpp +++ b/benchmark/function/composite_function.benchmark.cpp @@ -7,8 +7,8 @@ #include #include -using namespace mbgl; -using namespace mbgl::style; +using namespace mln; +using namespace mln::style; static std::string createFunctionJSON(size_t stopCount) { std::string stops = "["; diff --git a/benchmark/function/source_function.benchmark.cpp b/benchmark/function/source_function.benchmark.cpp index a54d75e19..1e68e4075 100644 --- a/benchmark/function/source_function.benchmark.cpp +++ b/benchmark/function/source_function.benchmark.cpp @@ -6,8 +6,8 @@ #include #include -using namespace mbgl; -using namespace mbgl::style; +using namespace mln; +using namespace mln::style; static std::string createFunctionJSON(size_t stopCount) { std::string stops = "["; diff --git a/benchmark/include/mbgl/benchmark.hpp b/benchmark/include/mbgl/benchmark.hpp index 1a9904de5..3354d3daa 100644 --- a/benchmark/include/mbgl/benchmark.hpp +++ b/benchmark/include/mbgl/benchmark.hpp @@ -1,7 +1,7 @@ #pragma once -namespace mbgl { +namespace mln { int runBenchmark(int argc, char* argv[]); -} // namespace mbgl +} // namespace mln diff --git a/benchmark/ios/ios_test_runner.cpp b/benchmark/ios/ios_test_runner.cpp index fb88d3ed7..8448de6d4 100644 --- a/benchmark/ios/ios_test_runner.cpp +++ b/benchmark/ios/ios_test_runner.cpp @@ -22,13 +22,13 @@ bool TestRunner::startTest(const std::string& basePath) { argv.push_back(nullptr); if (chdir(basePath.c_str())) { - mbgl::Log::Error(mbgl::Event::General, "Failed to change the directory to " + basePath); + mln::Log::Error(mln::Event::General, "Failed to change the directory to " + basePath); return false; } - mbgl::Log::Info(mbgl::Event::General, "Start BenchmarkRunner"); - int status = mbgl::runBenchmark(static_cast(argv.size()), argv.data()); - mbgl::Log::Info(mbgl::Event::General, "BenchmarkRunner finished with status: '%d'", status); + mln::Log::Info(mln::Event::General, "Start BenchmarkRunner"); + int status = mln::runBenchmark(static_cast(argv.size()), argv.data()); + mln::Log::Info(mln::Event::General, "BenchmarkRunner finished with status: '%d'", status); return status == 0; } diff --git a/benchmark/parse/filter.benchmark.cpp b/benchmark/parse/filter.benchmark.cpp index fd19d708e..cf7f94124 100644 --- a/benchmark/parse/filter.benchmark.cpp +++ b/benchmark/parse/filter.benchmark.cpp @@ -7,7 +7,7 @@ #include #include -using namespace mbgl; +using namespace mln; style::Filter parse(const char* expression) { style::conversion::Error error; diff --git a/benchmark/parse/tile_mask.benchmark.cpp b/benchmark/parse/tile_mask.benchmark.cpp index 226b1e0e5..9211e9da0 100644 --- a/benchmark/parse/tile_mask.benchmark.cpp +++ b/benchmark/parse/tile_mask.benchmark.cpp @@ -2,7 +2,7 @@ #include -using namespace mbgl; +using namespace mln; class FakeTile { public: diff --git a/benchmark/parse/vector_tile.benchmark.cpp b/benchmark/parse/vector_tile.benchmark.cpp index a7eaa0955..d67373f7e 100644 --- a/benchmark/parse/vector_tile.benchmark.cpp +++ b/benchmark/parse/vector_tile.benchmark.cpp @@ -3,7 +3,7 @@ #include #include -using namespace mbgl; +using namespace mln; static void Parse_VectorTile(benchmark::State& state) { auto data = std::make_shared( diff --git a/benchmark/renderer/group_layers.benchmark.cpp b/benchmark/renderer/group_layers.benchmark.cpp index 6b281ba4b..f9efb44bd 100644 --- a/benchmark/renderer/group_layers.benchmark.cpp +++ b/benchmark/renderer/group_layers.benchmark.cpp @@ -24,8 +24,8 @@ #include #include -using namespace mbgl; -using namespace mbgl::style; +using namespace mln; +using namespace mln::style; // Minimal FileSource stub for benchmark (doesn't actually fetch resources) class StubFileSource : public FileSource { diff --git a/benchmark/src/mbgl/benchmark/benchmark.cpp b/benchmark/src/mbgl/benchmark/benchmark.cpp index d408e7c5e..f971b40d0 100644 --- a/benchmark/src/mbgl/benchmark/benchmark.cpp +++ b/benchmark/src/mbgl/benchmark/benchmark.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { int runBenchmark(int argc, char* argv[]) { ::benchmark::Initialize(&argc, argv); @@ -10,4 +10,4 @@ int runBenchmark(int argc, char* argv[]) { return 0; } -} // namespace mbgl +} // namespace mln diff --git a/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp b/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp index 27edd1f9d..603c68457 100644 --- a/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp +++ b/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp @@ -3,7 +3,7 @@ #include #include -using namespace mbgl; +using namespace mln; class StubGeometryTileFeature : public GeometryTileFeature { public: diff --git a/benchmark/storage/offline_database.benchmark.cpp b/benchmark/storage/offline_database.benchmark.cpp index abede0d0d..4e75d9493 100644 --- a/benchmark/storage/offline_database.benchmark.cpp +++ b/benchmark/storage/offline_database.benchmark.cpp @@ -18,14 +18,14 @@ public: response.data = std::make_shared(50 * 1024, 0); response.mustRevalidate = false; - response.expires = mbgl::util::now() + 1h; + response.expires = mln::util::now() + 1h; resetAmbientTiles(); resetRegion(); } void resetAmbientTiles() { - using namespace mbgl; + using namespace mln; db.clearAmbientCache(); @@ -37,7 +37,7 @@ public: } void resetRegion() { - using namespace mbgl; + using namespace mln; auto regions = db.listRegions().value(); if (!regions.empty()) { @@ -58,8 +58,8 @@ public: } } - mbgl::Response response; - mbgl::OfflineDatabase db{":memory:", mbgl::TileServerOptions::DefaultConfiguration()}; + mln::Response response; + mln::OfflineDatabase db{":memory:", mln::TileServerOptions::DefaultConfiguration()}; const unsigned tileCount = 100; int64_t regionID = 0; @@ -78,7 +78,7 @@ BENCHMARK_F(OfflineDatabase, DeleteRegion)(benchmark::State& state) { } BENCHMARK_F(OfflineDatabase, InsertTileRegion)(benchmark::State& state) { - using namespace mbgl; + using namespace mln; while (state.KeepRunning()) { const Resource offline = Resource::tile( @@ -99,7 +99,7 @@ BENCHMARK_F(OfflineDatabase, ClearAmbientCache)(benchmark::State& state) { } BENCHMARK_F(OfflineDatabase, InsertTileCache)(benchmark::State& state) { - using namespace mbgl; + using namespace mln; while (state.KeepRunning()) { const Resource ambient = Resource::tile( @@ -109,7 +109,7 @@ BENCHMARK_F(OfflineDatabase, InsertTileCache)(benchmark::State& state) { } BENCHMARK_F(OfflineDatabase, InsertBigTileCache)(benchmark::State& state) { - using namespace mbgl; + using namespace mln; Response big; big.data = std::make_shared(util::DEFAULT_MAX_CACHE_SIZE / 100, 0); @@ -122,7 +122,7 @@ BENCHMARK_F(OfflineDatabase, InsertBigTileCache)(benchmark::State& state) { } BENCHMARK_F(OfflineDatabase, GetTile)(benchmark::State& state) { - using namespace mbgl; + using namespace mln; std::random_device rd; std::mt19937 gen(rd()); @@ -136,7 +136,7 @@ BENCHMARK_F(OfflineDatabase, GetTile)(benchmark::State& state) { } BENCHMARK_F(OfflineDatabase, AddTilesToFullDatabase)(benchmark::State& state) { - using namespace mbgl; + using namespace mln; Log::setObserver(std::make_unique()); db.setMaximumAmbientCacheSize(50 * 1024 * 5); @@ -152,7 +152,7 @@ BENCHMARK_F(OfflineDatabase, AddTilesToFullDatabase)(benchmark::State& state) { BENCHMARK_F(OfflineDatabase, AddTilesToDisabledDatabase) (benchmark::State& state) { - using namespace mbgl; + using namespace mln; auto regions = db.listRegions().value(); if (!regions.empty()) { @@ -171,7 +171,7 @@ BENCHMARK_F(OfflineDatabase, AddTilesToDisabledDatabase) BENCHMARK_F(OfflineDatabase, GetTileFromDisabledDatabase) (benchmark::State& state) { - using namespace mbgl; + using namespace mln; auto regions = db.listRegions().value(); if (!regions.empty()) { diff --git a/benchmark/util/color.benchmark.cpp b/benchmark/util/color.benchmark.cpp index a6b90d0eb..4d9eea4c1 100644 --- a/benchmark/util/color.benchmark.cpp +++ b/benchmark/util/color.benchmark.cpp @@ -20,7 +20,7 @@ namespace { void ColorParse(benchmark::State& state) { for (auto _ : state) { for (const auto& str : testStrings) { - auto result = mbgl::Color::parse(str); + auto result = mln::Color::parse(str); benchmark::DoNotOptimize(result); } } diff --git a/benchmark/util/tilecover.benchmark.cpp b/benchmark/util/tilecover.benchmark.cpp index 524fe3a38..d96339556 100644 --- a/benchmark/util/tilecover.benchmark.cpp +++ b/benchmark/util/tilecover.benchmark.cpp @@ -5,7 +5,7 @@ #include #include -using namespace mbgl; +using namespace mln; static const LatLngBounds sanFrancisco = LatLngBounds::hull({37.6609, -122.5744}, {37.8271, -122.3204}); diff --git a/bin/cache.cpp b/bin/cache.cpp index d78ccd212..01978bb7a 100644 --- a/bin/cache.cpp +++ b/bin/cache.cpp @@ -25,20 +25,20 @@ int main(int argc, char* argv[]) { args::ValueFlag expiresValue(p, "expires", "Expires date, will use 'now' otherwise", {'e'}); args::ValueFlag modifiedValue(p, "modified", "Modified date, will use 'now' otherwise", {'m'}); - std::unordered_map typeMap{{"glyphs", mbgl::Resource::Glyphs}, - {"image", mbgl::Resource::Image}, - {"source", mbgl::Resource::Source}, - {"sprite-image", mbgl::Resource::SpriteImage}, - {"sprite-json", mbgl::Resource::SpriteJSON}, - {"style", mbgl::Resource::Style}, - {"tile", mbgl::Resource::Tile}}; + std::unordered_map typeMap{{"glyphs", mln::Resource::Glyphs}, + {"image", mln::Resource::Image}, + {"source", mln::Resource::Source}, + {"sprite-image", mln::Resource::SpriteImage}, + {"sprite-json", mln::Resource::SpriteJSON}, + {"style", mln::Resource::Style}, + {"tile", mln::Resource::Tile}}; std::string typeHelp("One of the following (required):"); for (const auto& key : typeMap) { typeHelp += " " + key.first; } - args::MapFlag typeFlag( + args::MapFlag typeFlag( p, "type", typeHelp, {"type"}, typeMap, args::Options::Required); args::Group tileIdGroup(p, "Coordinates (required for 'tile')", args::Group::Validators::AllOrNone); @@ -67,15 +67,15 @@ int main(int argc, char* argv[]) { exit(3); } - mbgl::Response response; + mln::Response response; response.data = std::make_shared(*file); response.etag = etagValue ? args::get(etagValue) : std::string(); - response.expires = expiresValue ? mbgl::Timestamp(mbgl::Seconds(args::get(expiresValue))) : mbgl::util::now(); - response.modified = modifiedValue ? mbgl::Timestamp(mbgl::Seconds(args::get(modifiedValue))) : mbgl::util::now(); + response.expires = expiresValue ? mln::Timestamp(mln::Seconds(args::get(expiresValue))) : mln::util::now(); + response.modified = modifiedValue ? mln::Timestamp(mln::Seconds(args::get(modifiedValue))) : mln::util::now(); - mbgl::Resource resource(args::get(typeFlag), args::get(urlValue)); + mln::Resource resource(args::get(typeFlag), args::get(urlValue)); - if (args::get(typeFlag) == mbgl::Resource::Tile) { + if (args::get(typeFlag) == mln::Resource::Tile) { if (!xValueFlag || !yValueFlag || !zValueFlag) { std::cerr << "Error: -x, -y and -z must be provided for tiles" << '\n'; exit(1); @@ -88,9 +88,9 @@ int main(int argc, char* argv[]) { .z = static_cast(args::get(zValueFlag))}}; } - mbgl::util::RunLoop loop; - std::shared_ptr dbfs = mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::Database, mbgl::ResourceOptions().withCachePath(args::get(cacheValue))); + mln::util::RunLoop loop; + std::shared_ptr dbfs = mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::Database, mln::ResourceOptions().withCachePath(args::get(cacheValue))); dbfs->forward(resource, response, [&loop] { loop.stop(); }); loop.run(); return 0; diff --git a/bin/offline.cpp b/bin/offline.cpp index eb1930d39..5f9bd0712 100644 --- a/bin/offline.cpp +++ b/bin/offline.cpp @@ -51,19 +51,19 @@ mapbox::geometry::geometry parseGeometry(const std::string& json) { }); } -std::ostream& operator<<(std::ostream& os, mbgl::Response::Error::Reason r) { +std::ostream& operator<<(std::ostream& os, mln::Response::Error::Reason r) { switch (r) { - case mbgl::Response::Error::Reason::Success: + case mln::Response::Error::Reason::Success: return os << "Response::Error::Reason::Success"; - case mbgl::Response::Error::Reason::NotFound: + case mln::Response::Error::Reason::NotFound: return os << "Response::Error::Reason::NotFound"; - case mbgl::Response::Error::Reason::Server: + case mln::Response::Error::Reason::Server: return os << "Response::Error::Reason::Server"; - case mbgl::Response::Error::Reason::Connection: + case mln::Response::Error::Reason::Connection: return os << "Response::Error::Reason::Connection"; - case mbgl::Response::Error::Reason::RateLimit: + case mln::Response::Error::Reason::RateLimit: return os << "Response::Error::Reason::RateLimit"; - case mbgl::Response::Error::Reason::Other: + case mln::Response::Error::Reason::Other: return os << "Response::Error::Reason::Other"; } @@ -122,7 +122,7 @@ int main(int argc, char* argv[]) { exit(2); } - auto mapTilerConfiguration = mbgl::TileServerOptions::MapTilerConfiguration(); + auto mapTilerConfiguration = mln::TileServerOptions::MapTilerConfiguration(); std::string style = styleValue ? args::get(styleValue) : mapTilerConfiguration.defaultStyles().at(0).getUrl(); std::cout << " Style: " << style << std::endl; @@ -138,7 +138,7 @@ int main(int argc, char* argv[]) { const bool includeIdeographs = includeIdeographsValue ? args::get(includeIdeographsValue) : false; const std::string output = outputValue ? args::get(outputValue) : "offline.db"; - using namespace mbgl; + using namespace mln; OfflineRegionDefinition definition = [&]() { if (geometryValue) { @@ -185,7 +185,7 @@ int main(int argc, char* argv[]) { int retCode = 0; std::cout << "Start Merge" << std::endl; inputSource.mergeOfflineRegions( - *mergePath, [&](mbgl::expected, std::exception_ptr> result) { + *mergePath, [&](mln::expected, std::exception_ptr> result) { if (!result) { std::cerr << "Error merging database: " << util::toString(result.error()) << std::endl; retCode = 1; @@ -264,7 +264,7 @@ int main(int argc, char* argv[]) { std::signal(SIGINT, [](int) { stop(); }); fileSource->createOfflineRegion( - definition, metadata, [&](mbgl::expected region_) { + definition, metadata, [&](mln::expected region_) { if (!region_) { std::cerr << "Error creating region: " << util::toString(region_.error()) << std::endl; loop.stop(); diff --git a/bin/render.cpp b/bin/render.cpp index 0af2a340a..66709ba68 100644 --- a/bin/render.cpp +++ b/bin/render.cpp @@ -69,7 +69,7 @@ int main(int argc, char* argv[]) { const double lon = lonValue ? args::get(lonValue) : 0; const double alt = altValue ? args::get(altValue) : 0; const double zoom = zoomValue ? args::get(zoomValue) : 0; - const double fov = fovValue ? args::get(fovValue) : mbgl::util::rad2deg(mbgl::util::DEFAULT_FOV); + const double fov = fovValue ? args::get(fovValue) : mln::util::rad2deg(mln::util::DEFAULT_FOV); const double bearing = bearingValue ? args::get(bearingValue) : 0; const double pitch = pitchValue ? args::get(pitchValue) : 0; const double roll = rollValue ? args::get(rollValue) : 0; @@ -87,9 +87,9 @@ int main(int argc, char* argv[]) { const bool debug = debugFlag ? args::get(debugFlag) : false; - using namespace mbgl; + using namespace mln; - auto mapTilerConfiguration = mbgl::TileServerOptions::MapTilerConfiguration(); + auto mapTilerConfiguration = mln::TileServerOptions::MapTilerConfiguration(); std::string style = styleValue ? args::get(styleValue) : mapTilerConfiguration.defaultStyles().at(0).getUrl(); util::RunLoop loop; @@ -136,8 +136,8 @@ int main(int argc, char* argv[]) { } if (debug) { - map.setDebug(debug ? mbgl::MapDebugOptions::TileBorders | mbgl::MapDebugOptions::ParseStatus - : mbgl::MapDebugOptions::NoDebug); + map.setDebug(debug ? mln::MapDebugOptions::TileBorders | mln::MapDebugOptions::ParseStatus + : mln::MapDebugOptions::NoDebug); } try { diff --git a/design-proposals/2025-07-05-custom-vector-source.md b/design-proposals/2025-07-05-custom-vector-source.md index ce07269b9..a7ec5aa8e 100644 --- a/design-proposals/2025-07-05-custom-vector-source.md +++ b/design-proposals/2025-07-05-custom-vector-source.md @@ -108,7 +108,7 @@ Main thread: Tile ready → render ### Core C++ (public header) ```cpp -namespace mbgl::style { +namespace mln::style { enum class TileDataFormat : uint8_t { MVT = 0 }; @@ -131,7 +131,7 @@ public: void invalidateTile(const CanonicalTileID&); }; -} // namespace mbgl::style +} // namespace mln::style ``` ### Android (Kotlin) diff --git a/expression-test/expression_test_logger.cpp b/expression-test/expression_test_logger.cpp index 1f7aa6187..c3d713d09 100644 --- a/expression-test/expression_test_logger.cpp +++ b/expression-test/expression_test_logger.cpp @@ -7,7 +7,7 @@ #include #include -using namespace mbgl; +using namespace mln; using namespace std::literals; namespace { diff --git a/expression-test/expression_test_parser.cpp b/expression-test/expression_test_parser.cpp index a8fc482e8..da5c6c93f 100644 --- a/expression-test/expression_test_parser.cpp +++ b/expression-test/expression_test_parser.cpp @@ -20,9 +20,9 @@ #include -using namespace mbgl; -using namespace mbgl::style; -using namespace mbgl::style::conversion; +using namespace mln; +using namespace mln::style; +using namespace mln::style::conversion; using namespace std::literals; namespace { @@ -407,7 +407,7 @@ std::optional parseTestData(const std::filesystem::path& path) { TestData data; auto maybeJson = readJson(path.string()); if (!maybeJson.is()) { // NOLINT - mbgl::Log::Error(mbgl::Event::General, "Cannot parse test '" + path.string() + "'."); + mln::Log::Error(mln::Event::General, "Cannot parse test '" + path.string() + "'."); return std::nullopt; } diff --git a/expression-test/expression_test_parser.hpp b/expression-test/expression_test_parser.hpp index a2abe9f85..5da335572 100644 --- a/expression-test/expression_test_parser.hpp +++ b/expression-test/expression_test_parser.hpp @@ -9,7 +9,7 @@ #include #include -using namespace mbgl; +using namespace mln; struct Input { Input(std::optional zoom_, diff --git a/expression-test/expression_test_runner.cpp b/expression-test/expression_test_runner.cpp index 1987b7026..4eaf8f14e 100644 --- a/expression-test/expression_test_runner.cpp +++ b/expression-test/expression_test_runner.cpp @@ -105,7 +105,7 @@ TestRunOutput runExpressionTest(TestData& data, const std::string& rootPath, con std::vector outputs; if (!data.inputs.empty()) { for (const auto& input : data.inputs) { - mbgl::style::expression::EvaluationResult evaluationResult; + mln::style::expression::EvaluationResult evaluationResult; if (input.canonical) { evaluationResult = expression->evaluate( input.zoom, input.feature, input.heatmapDensity, input.availableImages, *input.canonical); diff --git a/expression-test/test_runner_common.cpp b/expression-test/test_runner_common.cpp index 5bc96f6a1..8e5c32737 100644 --- a/expression-test/test_runner_common.cpp +++ b/expression-test/test_runner_common.cpp @@ -3,7 +3,7 @@ #include #include -using namespace mbgl; +using namespace mln; // Strip precision for numbers, so that we can compare evaluated results with // fixtures. Copied from JS expression harness. diff --git a/expression-test/test_runner_common.hpp b/expression-test/test_runner_common.hpp index 8d17427f8..3c946c2c9 100644 --- a/expression-test/test_runner_common.hpp +++ b/expression-test/test_runner_common.hpp @@ -5,7 +5,7 @@ #include #include -using namespace mbgl; +using namespace mln; Value stripPrecision(const Value& value); std::vector tokenize(std::string str); diff --git a/include/mbgl/actor/actor.hpp b/include/mbgl/actor/actor.hpp index 071217e04..7aeda2187 100644 --- a/include/mbgl/actor/actor.hpp +++ b/include/mbgl/actor/actor.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { class TaggedScheduler; @@ -83,4 +83,4 @@ private: EstablishedActor target; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/actor_ref.hpp b/include/mbgl/actor/actor_ref.hpp index 3e0689505..9d9eed60d 100644 --- a/include/mbgl/actor/actor_ref.hpp +++ b/include/mbgl/actor/actor_ref.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { /** An `ActorRef` is a *non*-owning, weak reference to an actor of type `O`. @@ -57,4 +57,4 @@ private: std::weak_ptr weakMailbox; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/aspiring_actor.hpp b/include/mbgl/actor/aspiring_actor.hpp index e29b2e213..ad85a9715 100644 --- a/include/mbgl/actor/aspiring_actor.hpp +++ b/include/mbgl/actor/aspiring_actor.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { template class EstablishedActor; @@ -56,4 +56,4 @@ private: friend class Actor; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/established_actor.hpp b/include/mbgl/actor/established_actor.hpp index 10e951824..6e7370d28 100644 --- a/include/mbgl/actor/established_actor.hpp +++ b/include/mbgl/actor/established_actor.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { /** An `EstablishedActor` is one half of the pair of types that comprise an @@ -107,4 +107,4 @@ private: AspiringActor& parent; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/mailbox.hpp b/include/mbgl/actor/mailbox.hpp index 905d3eba8..2eea2691f 100644 --- a/include/mbgl/actor/mailbox.hpp +++ b/include/mbgl/actor/mailbox.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { class Scheduler; class Message; @@ -61,4 +61,4 @@ private: std::queue> queue; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/message.hpp b/include/mbgl/actor/message.hpp index 0f497557e..ba214b89e 100644 --- a/include/mbgl/actor/message.hpp +++ b/include/mbgl/actor/message.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { // A movable type-erasing function wrapper. This allows to store arbitrary // invocable things (like std::function<>, or the result of a movable-only @@ -100,4 +100,4 @@ std::unique_ptr makeMessage(std::promise&& promise, } } // namespace actor -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/optional_actor.hpp b/include/mbgl/actor/optional_actor.hpp index f458fa932..0365fd625 100644 --- a/include/mbgl/actor/optional_actor.hpp +++ b/include/mbgl/actor/optional_actor.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class TaggedScheduler; @@ -79,4 +79,4 @@ private: OptionalActorRef selfRef; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/optional_actor_ref.hpp b/include/mbgl/actor/optional_actor_ref.hpp index f7133d32b..d00b903c4 100644 --- a/include/mbgl/actor/optional_actor_ref.hpp +++ b/include/mbgl/actor/optional_actor_ref.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class TaggedScheduler; @@ -37,4 +37,4 @@ private: std::optional> actorRef; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/actor/scheduler.hpp b/include/mbgl/actor/scheduler.hpp index 03687a2bd..17595e2b1 100644 --- a/include/mbgl/actor/scheduler.hpp +++ b/include/mbgl/actor/scheduler.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class Mailbox; @@ -147,10 +147,10 @@ public: scheduler->scheduleAndReplyValue(tag, task, reply); } - const mbgl::util::SimpleIdentity tag; + const mln::util::SimpleIdentity tag; private: std::shared_ptr scheduler; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp index 9f8c25113..45f1a65bd 100644 --- a/include/mbgl/annotation/annotation.hpp +++ b/include/mbgl/annotation/annotation.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { using AnnotationID = uint64_t; using AnnotationIDs = std::vector; @@ -63,4 +63,4 @@ public: using Annotation = variant; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/backend.hpp b/include/mbgl/gfx/backend.hpp index 3ff2021e0..a622681d9 100644 --- a/include/mbgl/gfx/backend.hpp +++ b/include/mbgl/gfx/backend.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Backend { @@ -66,4 +66,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/backend_scope.hpp b/include/mbgl/gfx/backend_scope.hpp index 697e923d1..ba5e601ce 100644 --- a/include/mbgl/gfx/backend_scope.hpp +++ b/include/mbgl/gfx/backend_scope.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace gfx { class RendererBackend; @@ -35,4 +35,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/color_mode.hpp b/include/mbgl/gfx/color_mode.hpp index 851af1f2a..8cdb3a6e8 100644 --- a/include/mbgl/gfx/color_mode.hpp +++ b/include/mbgl/gfx/color_mode.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class ColorMode { @@ -69,15 +69,15 @@ public: } std::size_t hash() const { - return mbgl::util::hash(blendFunction.which(), - blendColor.r, - blendColor.g, - blendColor.b, - blendColor.a, - mask.r, - mask.g, - mask.b, - mask.a); + return mln::util::hash(blendFunction.which(), + blendColor.r, + blendColor.g, + blendColor.b, + blendColor.a, + mask.r, + mask.g, + mask.b, + mask.a); } }; @@ -86,4 +86,4 @@ constexpr bool operator!=(const ColorMode::Mask& a, const ColorMode::Mask& b) { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/command_encoder.hpp b/include/mbgl/gfx/command_encoder.hpp index 817e67f42..cc76bfd7b 100644 --- a/include/mbgl/gfx/command_encoder.hpp +++ b/include/mbgl/gfx/command_encoder.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class RenderPassDescriptor; @@ -36,4 +36,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/context.hpp b/include/mbgl/gfx/context.hpp index 01816e0ec..7e7bc560d 100644 --- a/include/mbgl/gfx/context.hpp +++ b/include/mbgl/gfx/context.hpp @@ -16,7 +16,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; class ProgramParameters; @@ -192,4 +192,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/context_observer.hpp b/include/mbgl/gfx/context_observer.hpp index 5c33f7971..4f2072e60 100644 --- a/include/mbgl/gfx/context_observer.hpp +++ b/include/mbgl/gfx/context_observer.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class ContextObserver { @@ -17,4 +17,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/debug_group.hpp b/include/mbgl/gfx/debug_group.hpp index c32658798..0817870c9 100644 --- a/include/mbgl/gfx/debug_group.hpp +++ b/include/mbgl/gfx/debug_group.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace gfx { template @@ -27,4 +27,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/depth_mode.hpp b/include/mbgl/gfx/depth_mode.hpp index 95723f060..fc2c2a2a6 100644 --- a/include/mbgl/gfx/depth_mode.hpp +++ b/include/mbgl/gfx/depth_mode.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class DepthMode { @@ -24,4 +24,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/draw_mode.hpp b/include/mbgl/gfx/draw_mode.hpp index 7db823101..bb9cf512e 100644 --- a/include/mbgl/gfx/draw_mode.hpp +++ b/include/mbgl/gfx/draw_mode.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class DrawMode { @@ -91,4 +91,4 @@ template <> struct PrimitiveTypeOf : std::integral_constant {}; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/draw_scope.hpp b/include/mbgl/gfx/draw_scope.hpp index 009f733f4..2bd5eadc8 100644 --- a/include/mbgl/gfx/draw_scope.hpp +++ b/include/mbgl/gfx/draw_scope.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class DrawScopeResource { @@ -30,4 +30,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/drawable.hpp b/include/mbgl/gfx/drawable.hpp index 947fdccce..f6024baa2 100644 --- a/include/mbgl/gfx/drawable.hpp +++ b/include/mbgl/gfx/drawable.hpp @@ -17,7 +17,7 @@ #include #include -namespace mbgl { +namespace mln { class Bucket; class Color; @@ -83,21 +83,21 @@ public: virtual void setShader(gfx::ShaderProgramBasePtr value) { shader = std::move(value); } /// The pass on which we'll be rendered - mbgl::RenderPass getRenderPass() const { return renderPass; } + mln::RenderPass getRenderPass() const { return renderPass; } /// Sets the render passes - void setRenderPass(mbgl::RenderPass value) { renderPass = value; } + void setRenderPass(mln::RenderPass value) { renderPass = value; } /// Test whether to draw this drawable in a given render pass. - bool hasRenderPass(const mbgl::RenderPass value) const { - return (mbgl::underlying_type(renderPass) & mbgl::underlying_type(value)) != 0; + bool hasRenderPass(const mln::RenderPass value) const { + return (mln::underlying_type(renderPass) & mln::underlying_type(value)) != 0; } /// Test whether to draw this drawable in a given render pass. /// If multiple render pass bits are set, all must be present. - bool hasAllRenderPasses(const mbgl::RenderPass value) const { - const auto underlying_value = mbgl::underlying_type(value); - return (mbgl::underlying_type(renderPass) & underlying_value) == underlying_value; + bool hasAllRenderPasses(const mln::RenderPass value) const { + const auto underlying_value = mln::underlying_type(value); + return (mln::underlying_type(renderPass) & underlying_value) == underlying_value; } /// Width for lines @@ -259,7 +259,7 @@ public: const LayerTweakerPtr& getLayerTweaker() const { return layerTweaker; } /// Get origin point - const std::optional>& getOrigin() const { return origin; } + const std::optional>& getOrigin() const { return origin; } /// Set origin point void setOrigin(std::optional> p) { origin = std::move(p); } @@ -288,7 +288,7 @@ protected: std::string name; const util::SimpleIdentity uniqueID; gfx::ShaderProgramBasePtr shader; - mbgl::RenderPass renderPass; + mln::RenderPass renderPass; std::optional tileID; DrawPriority drawPriority = 0; int32_t lineWidth = 1; @@ -307,7 +307,7 @@ protected: LayerTweakerPtr layerTweaker; std::size_t type = 0; - std::optional> origin; + std::optional> origin; uint32_t uboIndex = 0; }; @@ -340,4 +340,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/drawable_atlases_tweaker.hpp b/include/mbgl/gfx/drawable_atlases_tweaker.hpp index ac83b14f8..1179c1a0a 100644 --- a/include/mbgl/gfx/drawable_atlases_tweaker.hpp +++ b/include/mbgl/gfx/drawable_atlases_tweaker.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { class TileAtlasTextures; using TileAtlasTexturesPtr = std::shared_ptr; @@ -61,4 +61,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/drawable_builder.hpp b/include/mbgl/gfx/drawable_builder.hpp index efdc8bade..99f6da238 100644 --- a/include/mbgl/gfx/drawable_builder.hpp +++ b/include/mbgl/gfx/drawable_builder.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class SegmentBase; @@ -63,10 +63,10 @@ public: void setEnabled(bool value) { enabled = value; } /// The pass on which we'll be rendered - mbgl::RenderPass getRenderPass() const { return renderPass; } + mln::RenderPass getRenderPass() const { return renderPass; } /// Set the pass on which the drawable will render - void setRenderPass(mbgl::RenderPass value) { renderPass = value; } + void setRenderPass(mln::RenderPass value) { renderPass = value; } /// The draw priority assigned to generated drawables DrawPriority getDrawPriority() const; @@ -229,7 +229,7 @@ protected: std::string name; std::string drawableName; std::size_t vertexAttrId; - mbgl::RenderPass renderPass; + mln::RenderPass renderPass; bool enabled = true; bool enableColor = true; bool enableStencil = false; @@ -246,7 +246,7 @@ protected: std::vector tweakers; gfx::VertexAttributeArrayPtr vertexAttrs; gfx::VertexAttributeArrayPtr instanceAttrs; - std::optional> origin; + std::optional> origin; class Impl; std::unique_ptr impl; @@ -255,4 +255,4 @@ protected: using UniqueDrawableBuilder = std::unique_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/drawable_custom_layer_host_tweaker.hpp b/include/mbgl/gfx/drawable_custom_layer_host_tweaker.hpp index ea075358e..961b5d226 100644 --- a/include/mbgl/gfx/drawable_custom_layer_host_tweaker.hpp +++ b/include/mbgl/gfx/drawable_custom_layer_host_tweaker.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -32,4 +32,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/drawable_data.hpp b/include/mbgl/gfx/drawable_data.hpp index d596c5944..ee8d32435 100644 --- a/include/mbgl/gfx/drawable_data.hpp +++ b/include/mbgl/gfx/drawable_data.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { @@ -14,4 +14,4 @@ public: using UniqueDrawableData = std::unique_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/drawable_impl.hpp b/include/mbgl/gfx/drawable_impl.hpp index b01ca246a..bd376fc83 100644 --- a/include/mbgl/gfx/drawable_impl.hpp +++ b/include/mbgl/gfx/drawable_impl.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { struct Drawable::DrawSegment { @@ -25,4 +25,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/drawable_tweaker.hpp b/include/mbgl/gfx/drawable_tweaker.hpp index 60206c7c4..734e34eee 100644 --- a/include/mbgl/gfx/drawable_tweaker.hpp +++ b/include/mbgl/gfx/drawable_tweaker.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -30,4 +30,4 @@ public: using DrawableTweakerPtr = std::shared_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/dynamic_texture.hpp b/include/mbgl/gfx/dynamic_texture.hpp index 2475f3955..8f84ad750 100644 --- a/include/mbgl/gfx/dynamic_texture.hpp +++ b/include/mbgl/gfx/dynamic_texture.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Context; @@ -75,4 +75,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/dynamic_texture_atlas.hpp b/include/mbgl/gfx/dynamic_texture_atlas.hpp index 45cb1f760..48d82fb5f 100644 --- a/include/mbgl/gfx/dynamic_texture_atlas.hpp +++ b/include/mbgl/gfx/dynamic_texture_atlas.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { @@ -47,4 +47,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/fill_generator.hpp b/include/mbgl/gfx/fill_generator.hpp index fed717ca6..9d13eea5a 100644 --- a/include/mbgl/gfx/fill_generator.hpp +++ b/include/mbgl/gfx/fill_generator.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { /// Generate fill buffers, without outline @@ -45,4 +45,4 @@ void generateFillAndOutineBuffers(const GeometryCollection& geometry, SegmentVector& basicLineSegments); } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/gfx_types.hpp b/include/mbgl/gfx/gfx_types.hpp index afb4794b5..37fee7c4f 100644 --- a/include/mbgl/gfx/gfx_types.hpp +++ b/include/mbgl/gfx/gfx_types.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { /// Graphic primitive type enumeration @@ -65,4 +65,4 @@ enum class AttributeDataType : uint8_t { }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/gpu_expression.hpp b/include/mbgl/gfx/gpu_expression.hpp index b7089a60c..f47ead2cc 100644 --- a/include/mbgl/gfx/gpu_expression.hpp +++ b/include/mbgl/gfx/gpu_expression.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { class Expression; @@ -101,4 +101,4 @@ inline auto GPUExpression::evaluate(const float zoom) const { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/polyline_generator.hpp b/include/mbgl/gfx/polyline_generator.hpp index ad8fc6ab0..4d4203db1 100644 --- a/include/mbgl/gfx/polyline_generator.hpp +++ b/include/mbgl/gfx/polyline_generator.hpp @@ -14,7 +14,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class PolylineGeneratorDistances { @@ -52,7 +52,7 @@ public: using LayoutVertexFunc = std::function p, Point e, bool round, bool up, int8_t dir, int32_t linesofar /*= 0*/)>; using CreateSegmentFunc = std::function; - using GetSegmentFunc = std::function; + using GetSegmentFunc = std::function; using Indexes = gfx::IndexVector; public: @@ -100,4 +100,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/renderable.hpp b/include/mbgl/gfx/renderable.hpp index d135db8f2..b3d078e70 100644 --- a/include/mbgl/gfx/renderable.hpp +++ b/include/mbgl/gfx/renderable.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class RenderableResource { @@ -56,4 +56,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/renderbuffer.hpp b/include/mbgl/gfx/renderbuffer.hpp index bbc0c1be6..51117b671 100644 --- a/include/mbgl/gfx/renderbuffer.hpp +++ b/include/mbgl/gfx/renderbuffer.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class RenderbufferResource { @@ -43,4 +43,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/renderer_backend.hpp b/include/mbgl/gfx/renderer_backend.hpp index 53f877945..6e0070203 100644 --- a/include/mbgl/gfx/renderer_backend.hpp +++ b/include/mbgl/gfx/renderer_backend.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { class ProgramParameters; class Map; @@ -52,7 +52,7 @@ public: /// One-time shader initialization virtual void initShaders(gfx::ShaderRegistry&, const ProgramParameters&) = 0; - const mbgl::util::SimpleIdentity uniqueID; + const mln::util::SimpleIdentity uniqueID; protected: virtual std::unique_ptr createContext() = 0; @@ -85,4 +85,4 @@ constexpr bool operator==(const RendererBackend& a, const RendererBackend& b) { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/rendering_stats.hpp b/include/mbgl/gfx/rendering_stats.hpp index d23b6e753..1e19fd02b 100644 --- a/include/mbgl/gfx/rendering_stats.hpp +++ b/include/mbgl/gfx/rendering_stats.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class Style; @@ -113,7 +113,7 @@ public: void create(style::Style& style); void destroy(style::Style& style); - mbgl::style::SymbolLayer* getLayer(style::Style& style); + mln::style::SymbolLayer* getLayer(style::Style& style); void update(style::Style& style, const gfx::RenderingStats& stats); @@ -130,4 +130,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/scissor_rect.hpp b/include/mbgl/gfx/scissor_rect.hpp index a26741ad9..64665922b 100644 --- a/include/mbgl/gfx/scissor_rect.hpp +++ b/include/mbgl/gfx/scissor_rect.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class ScissorRect { @@ -18,4 +18,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/shader.hpp b/include/mbgl/gfx/shader.hpp index 3aa28e7f7..c53b866de 100644 --- a/include/mbgl/gfx/shader.hpp +++ b/include/mbgl/gfx/shader.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Shader; @@ -45,4 +45,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/shader_group.hpp b/include/mbgl/gfx/shader_group.hpp index 5b5843015..81b03b3f9 100644 --- a/include/mbgl/gfx/shader_group.hpp +++ b/include/mbgl/gfx/shader_group.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { using StringIDSetsPair = std::pair, unordered_set>; @@ -176,9 +176,9 @@ protected: } private: - mbgl::unordered_map> programs; + mln::unordered_map> programs; mutable std::shared_mutex programLock; }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/shader_registry.hpp b/include/mbgl/gfx/shader_registry.hpp index 301aa1c1d..1e08ff7b0 100644 --- a/include/mbgl/gfx/shader_registry.hpp +++ b/include/mbgl/gfx/shader_registry.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { using ShaderGroupPtr = std::shared_ptr; @@ -66,4 +66,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/stencil_mode.hpp b/include/mbgl/gfx/stencil_mode.hpp index 599f5e880..68d4cc878 100644 --- a/include/mbgl/gfx/stencil_mode.hpp +++ b/include/mbgl/gfx/stencil_mode.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class StencilMode { @@ -50,4 +50,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/texture2d.hpp b/include/mbgl/gfx/texture2d.hpp index da3b14f9d..6518f9833 100644 --- a/include/mbgl/gfx/texture2d.hpp +++ b/include/mbgl/gfx/texture2d.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { class Size; @@ -125,4 +125,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/types.hpp b/include/mbgl/gfx/types.hpp index 0dabb1619..cd9952bee 100644 --- a/include/mbgl/gfx/types.hpp +++ b/include/mbgl/gfx/types.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { /// Color blending equation type @@ -142,4 +142,4 @@ enum class RenderbufferPixelType : uint8_t { }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/uniform_buffer.hpp b/include/mbgl/gfx/uniform_buffer.hpp index ea803a319..a9af22dcd 100644 --- a/include/mbgl/gfx/uniform_buffer.hpp +++ b/include/mbgl/gfx/uniform_buffer.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Context; @@ -90,4 +90,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/vertex_attribute.hpp b/include/mbgl/gfx/vertex_attribute.hpp index 182be3191..014859228 100644 --- a/include/mbgl/gfx/vertex_attribute.hpp +++ b/include/mbgl/gfx/vertex_attribute.hpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { /// A 2 by 2 matrix using mat2 = std::array; @@ -444,7 +444,7 @@ protected: /// Copy or share the attribute data from a paint property template static void applyPaintProperty(const std::size_t attrIndex, const UniqueVertexAttribute& attrib, TBinder& binder) { - using Type = typename TAttribute::Type; // ::mbgl::gfx::AttributeType + using Type = typename TAttribute::Type; // ::mln::gfx::AttributeType using InterpType = ZoomInterpolatedAttributeType; if (!attrib) { @@ -486,4 +486,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gfx/vertex_buffer.hpp b/include/mbgl/gfx/vertex_buffer.hpp index 4814661f5..d3eda0863 100644 --- a/include/mbgl/gfx/vertex_buffer.hpp +++ b/include/mbgl/gfx/vertex_buffer.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class VertexBufferResource { @@ -39,4 +39,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/buffer_allocator.hpp b/include/mbgl/gl/buffer_allocator.hpp index 390e18398..ccb74be9c 100644 --- a/include/mbgl/gl/buffer_allocator.hpp +++ b/include/mbgl/gl/buffer_allocator.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class Context; @@ -174,4 +174,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/drawable_gl.hpp b/include/mbgl/gl/drawable_gl.hpp index 3c14a1255..979def535 100644 --- a/include/mbgl/gl/drawable_gl.hpp +++ b/include/mbgl/gl/drawable_gl.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { class SegmentBase; class PaintParameters; @@ -71,4 +71,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/drawable_gl_builder.hpp b/include/mbgl/gl/drawable_gl_builder.hpp index 4b7e02e2b..d8fc4723c 100644 --- a/include/mbgl/gl/drawable_gl_builder.hpp +++ b/include/mbgl/gl/drawable_gl_builder.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { /** @@ -26,4 +26,4 @@ protected: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/dynamic_texture.hpp b/include/mbgl/gl/dynamic_texture.hpp index 78479187d..e0d572838 100644 --- a/include/mbgl/gl/dynamic_texture.hpp +++ b/include/mbgl/gl/dynamic_texture.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { class Context; @@ -24,4 +24,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/layer_group_gl.hpp b/include/mbgl/gl/layer_group_gl.hpp index 5a4553d1d..b0d4eff7a 100644 --- a/include/mbgl/gl/layer_group_gl.hpp +++ b/include/mbgl/gl/layer_group_gl.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -48,4 +48,4 @@ protected: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/renderable_resource.hpp b/include/mbgl/gl/renderable_resource.hpp index edf0a2a40..08ebb480b 100644 --- a/include/mbgl/gl/renderable_resource.hpp +++ b/include/mbgl/gl/renderable_resource.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { class RenderableResource : public gfx::RenderableResource { @@ -19,4 +19,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/renderer_backend.hpp b/include/mbgl/gl/renderer_backend.hpp index 494bdae9e..4db6df24f 100644 --- a/include/mbgl/gl/renderer_backend.hpp +++ b/include/mbgl/gl/renderer_backend.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { class ProgramParameters; @@ -59,4 +59,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/texture2d.hpp b/include/mbgl/gl/texture2d.hpp index f1984b45f..6b0ee8117 100644 --- a/include/mbgl/gl/texture2d.hpp +++ b/include/mbgl/gl/texture2d.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { @@ -83,4 +83,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/uniform_buffer_gl.hpp b/include/mbgl/gl/uniform_buffer_gl.hpp index e44907880..4d44d8e93 100644 --- a/include/mbgl/gl/uniform_buffer_gl.hpp +++ b/include/mbgl/gl/uniform_buffer_gl.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class UniformBufferGL final : public gfx::UniformBuffer { @@ -73,4 +73,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/gl/vertex_attribute_gl.hpp b/include/mbgl/gl/vertex_attribute_gl.hpp index c0f2f2365..1f1ee7bb9 100644 --- a/include/mbgl/gl/vertex_attribute_gl.hpp +++ b/include/mbgl/gl/vertex_attribute_gl.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class VertexBufferResource; } // namespace gfx @@ -73,4 +73,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/i18n/collator.hpp b/include/mbgl/i18n/collator.hpp index e520d099a..3dbdc9ee1 100644 --- a/include/mbgl/i18n/collator.hpp +++ b/include/mbgl/i18n/collator.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace platform { class Collator { @@ -22,4 +22,4 @@ private: }; } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/i18n/number_format.hpp b/include/mbgl/i18n/number_format.hpp index dceddfe96..6d1c6aeae 100644 --- a/include/mbgl/i18n/number_format.hpp +++ b/include/mbgl/i18n/number_format.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace platform { std::string formatNumber(double number, @@ -13,4 +13,4 @@ std::string formatNumber(double number, uint8_t maxFractionDigits); } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/background_layer_factory.hpp b/include/mbgl/layermanager/background_layer_factory.hpp index 17528fcde..79af0120b 100644 --- a/include/mbgl/layermanager/background_layer_factory.hpp +++ b/include/mbgl/layermanager/background_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class BackgroundLayerFactory : public LayerFactory { protected: @@ -12,4 +12,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/circle_layer_factory.hpp b/include/mbgl/layermanager/circle_layer_factory.hpp index c0bf921ef..be752cadf 100644 --- a/include/mbgl/layermanager/circle_layer_factory.hpp +++ b/include/mbgl/layermanager/circle_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class CircleLayerFactory : public LayerFactory { protected: @@ -15,4 +15,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/color_relief_layer_factory.hpp b/include/mbgl/layermanager/color_relief_layer_factory.hpp index 4e5222c11..9944733a9 100644 --- a/include/mbgl/layermanager/color_relief_layer_factory.hpp +++ b/include/mbgl/layermanager/color_relief_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class ColorReliefLayerFactory : public LayerFactory { protected: @@ -12,4 +12,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/custom_drawable_layer_factory.hpp b/include/mbgl/layermanager/custom_drawable_layer_factory.hpp index 8b24b0c67..2bd2584ad 100644 --- a/include/mbgl/layermanager/custom_drawable_layer_factory.hpp +++ b/include/mbgl/layermanager/custom_drawable_layer_factory.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { class CustomDrawableLayerFactory : public LayerFactory { protected: @@ -15,4 +15,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/custom_layer_factory.hpp b/include/mbgl/layermanager/custom_layer_factory.hpp index a4e44d0b1..6a660c80d 100644 --- a/include/mbgl/layermanager/custom_layer_factory.hpp +++ b/include/mbgl/layermanager/custom_layer_factory.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { class CustomLayerFactory : public LayerFactory { protected: @@ -15,4 +15,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp b/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp index 4ca4bf985..d8471f456 100644 --- a/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp +++ b/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class FillExtrusionLayerFactory : public LayerFactory { protected: @@ -15,4 +15,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/fill_layer_factory.hpp b/include/mbgl/layermanager/fill_layer_factory.hpp index b02a190fc..2008c34a7 100644 --- a/include/mbgl/layermanager/fill_layer_factory.hpp +++ b/include/mbgl/layermanager/fill_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class FillLayerFactory : public LayerFactory { protected: @@ -15,4 +15,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/heatmap_layer_factory.hpp b/include/mbgl/layermanager/heatmap_layer_factory.hpp index f20c061ab..eafc297c0 100644 --- a/include/mbgl/layermanager/heatmap_layer_factory.hpp +++ b/include/mbgl/layermanager/heatmap_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class HeatmapLayerFactory : public LayerFactory { protected: @@ -14,4 +14,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/hillshade_layer_factory.hpp b/include/mbgl/layermanager/hillshade_layer_factory.hpp index 48a8d8716..ee6cab8b2 100644 --- a/include/mbgl/layermanager/hillshade_layer_factory.hpp +++ b/include/mbgl/layermanager/hillshade_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class HillshadeLayerFactory : public LayerFactory { protected: @@ -12,4 +12,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/layer_factory.hpp b/include/mbgl/layermanager/layer_factory.hpp index 480f74d86..6fce4f582 100644 --- a/include/mbgl/layermanager/layer_factory.hpp +++ b/include/mbgl/layermanager/layer_factory.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace style { class LayerProperties; @@ -44,4 +44,4 @@ protected: std::optional getSource(const style::conversion::Convertible& value) const noexcept; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/layer_manager.hpp b/include/mbgl/layermanager/layer_manager.hpp index e67e06550..f15839ddf 100644 --- a/include/mbgl/layermanager/layer_manager.hpp +++ b/include/mbgl/layermanager/layer_manager.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace style { class LayerProperties; } // namespace style @@ -74,7 +74,7 @@ public: * in order to save binary size (the corresponding SDK layer wrappers * should be excluded from the project build). */ - virtual void addLayerTypeCoreOnly(std::unique_ptr); + virtual void addLayerTypeCoreOnly(std::unique_ptr); protected: virtual ~LayerManager() = default; @@ -82,4 +82,4 @@ protected: virtual LayerFactory* getFactory(const style::LayerTypeInfo*) noexcept = 0; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/line_layer_factory.hpp b/include/mbgl/layermanager/line_layer_factory.hpp index 3daae41bc..0fb1c2b3f 100644 --- a/include/mbgl/layermanager/line_layer_factory.hpp +++ b/include/mbgl/layermanager/line_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class LineLayerFactory : public LayerFactory { protected: @@ -15,4 +15,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/location_indicator_layer_factory.hpp b/include/mbgl/layermanager/location_indicator_layer_factory.hpp index 8d8e3b9a4..ea1ccc365 100644 --- a/include/mbgl/layermanager/location_indicator_layer_factory.hpp +++ b/include/mbgl/layermanager/location_indicator_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class LocationIndicatorLayerFactory : public LayerFactory { protected: @@ -12,4 +12,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/raster_layer_factory.hpp b/include/mbgl/layermanager/raster_layer_factory.hpp index d935c1373..e69b4d740 100644 --- a/include/mbgl/layermanager/raster_layer_factory.hpp +++ b/include/mbgl/layermanager/raster_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class RasterLayerFactory : public LayerFactory { protected: @@ -12,4 +12,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/layermanager/symbol_layer_factory.hpp b/include/mbgl/layermanager/symbol_layer_factory.hpp index 326f9d07a..88ae4f074 100644 --- a/include/mbgl/layermanager/symbol_layer_factory.hpp +++ b/include/mbgl/layermanager/symbol_layer_factory.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class SymbolLayerFactory : public LayerFactory { protected: @@ -15,4 +15,4 @@ protected: std::unique_ptr createRenderLayer(Immutable) noexcept final; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/bound_options.hpp b/include/mbgl/map/bound_options.hpp index 00383af56..9f2f11e3b 100644 --- a/include/mbgl/map/bound_options.hpp +++ b/include/mbgl/map/bound_options.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { /** * @brief Holds options to limit what parts of a map are visible. All fields are @@ -55,4 +55,4 @@ struct BoundOptions { std::optional minPitch; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index 5357647b3..9912a59a7 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { /** Various options for describing the viewpoint of a map. All fields are optional. @@ -115,7 +115,7 @@ struct AnimationOptions { std::optional minZoom; /** The easing timing curve of the transition. */ - std::optional easing; + std::optional easing; /** A function that is called on each frame of the transition, just before a screen update, except on the last frame. The first parameter indicates @@ -177,4 +177,4 @@ struct FreeCameraOptions { void setRollPitchBearing(double roll, double pitch, double bearing) noexcept; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/change.hpp b/include/mbgl/map/change.hpp index 3925d655a..03ee59404 100644 --- a/include/mbgl/map/change.hpp +++ b/include/mbgl/map/change.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { enum MapChange : uint8_t { MapChangeRegionWillChange = 0, @@ -23,4 +23,4 @@ enum MapChange : uint8_t { MapChangeSourceDidChange = 15 }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 464b36f25..be32bd7a3 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -22,7 +22,7 @@ #include #include -namespace mbgl { +namespace mln { class RendererFrontend; class TransformState; @@ -217,4 +217,4 @@ protected: Map(std::unique_ptr, const util::ActionJournalOptions& = {}); }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/map_observer.hpp b/include/mbgl/map/map_observer.hpp index e039020ea..16526c2df 100644 --- a/include/mbgl/map/map_observer.hpp +++ b/include/mbgl/map/map_observer.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class ShaderRegistry; @@ -98,4 +98,4 @@ public: virtual void onSymbolError(const std::string&) {} }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/map_options.hpp b/include/mbgl/map/map_options.hpp index cc8e5bfb2..4b712ed4f 100644 --- a/include/mbgl/map/map_options.hpp +++ b/include/mbgl/map/map_options.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { /** * @brief Holds values for Map options. @@ -33,7 +33,7 @@ public: /** * @brief Gets the previously set (or default) map mode. - * @return Returns a #mbgl::MapMode + * @return Returns a #mln::MapMode */ MapMode mapMode() const; @@ -154,4 +154,4 @@ private: std::unique_ptr impl_; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/map_projection.hpp b/include/mbgl/map/map_projection.hpp index 27c9f4965..d89fcacf5 100644 --- a/include/mbgl/map/map_projection.hpp +++ b/include/mbgl/map/map_projection.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { class Transform; @@ -27,4 +27,4 @@ private: std::unique_ptr transform; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp index 3804f5117..8b0384afd 100644 --- a/include/mbgl/map/mode.hpp +++ b/include/mbgl/map/mode.hpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { using EnumType = uint32_t; @@ -53,26 +53,26 @@ enum class MapDebugOptions : EnumType { constexpr MapDebugOptions operator|(MapDebugOptions lhs, MapDebugOptions rhs) { // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) - return MapDebugOptions(mbgl::underlying_type(lhs) | mbgl::underlying_type(rhs)); + return MapDebugOptions(mln::underlying_type(lhs) | mln::underlying_type(rhs)); } constexpr MapDebugOptions& operator|=(MapDebugOptions& lhs, MapDebugOptions rhs) { // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) - return (lhs = MapDebugOptions(mbgl::underlying_type(lhs) | mbgl::underlying_type(rhs))); + return (lhs = MapDebugOptions(mln::underlying_type(lhs) | mln::underlying_type(rhs))); } constexpr bool operator&(MapDebugOptions lhs, MapDebugOptions rhs) { - return mbgl::underlying_type(lhs) & mbgl::underlying_type(rhs); + return mln::underlying_type(lhs) & mln::underlying_type(rhs); } constexpr MapDebugOptions& operator&=(MapDebugOptions& lhs, MapDebugOptions rhs) { // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) - return (lhs = MapDebugOptions(mbgl::underlying_type(lhs) & mbgl::underlying_type(rhs))); + return (lhs = MapDebugOptions(mln::underlying_type(lhs) & mln::underlying_type(rhs))); } constexpr MapDebugOptions operator~(MapDebugOptions value) { // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) - return MapDebugOptions(~mbgl::underlying_type(value)); + return MapDebugOptions(~mln::underlying_type(value)); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/map/projection_mode.hpp b/include/mbgl/map/projection_mode.hpp index 7809605a3..3c0fe5906 100644 --- a/include/mbgl/map/projection_mode.hpp +++ b/include/mbgl/map/projection_mode.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { /** * @brief Holds values for Axonometric rendering. All fields are @@ -39,4 +39,4 @@ struct ProjectionMode { std::optional ySkew; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/math/angles.hpp b/include/mbgl/math/angles.hpp index 71bb30765..5464bb881 100644 --- a/include/mbgl/math/angles.hpp +++ b/include/mbgl/math/angles.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { /** @@ -46,4 +46,4 @@ constexpr float rad2degf(float rad) noexcept { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/math/clamp.hpp b/include/mbgl/math/clamp.hpp index 563a1a8d4..9b36cf83b 100644 --- a/include/mbgl/math/clamp.hpp +++ b/include/mbgl/math/clamp.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace util { template @@ -13,4 +13,4 @@ auto clamp(std::enable_if_t, T> value, T min_, T max_) noexc } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/math/log2.hpp b/include/mbgl/math/log2.hpp index 9bedfc896..167208a09 100644 --- a/include/mbgl/math/log2.hpp +++ b/include/mbgl/math/log2.hpp @@ -8,7 +8,7 @@ #include #endif -namespace mbgl { +namespace mln { namespace util { /// Computes the log2(x) rounded up to the next integer. @@ -27,7 +27,7 @@ T log2(T x) { } } // namespace util -} // namespace mbgl +} // namespace mln // log2 is not available on Android before API 18. #if defined(__ANDROID__) && defined(__GNUC__) && defined(__ANDROID_API__) && __ANDROID_API__ < 18 diff --git a/include/mbgl/math/minmax.hpp b/include/mbgl/math/minmax.hpp index a60c25dff..7fd2ff6c2 100644 --- a/include/mbgl/math/minmax.hpp +++ b/include/mbgl/math/minmax.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { template @@ -50,4 +50,4 @@ T min(T a, T b, Ts... args) } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/math/wrap.hpp b/include/mbgl/math/wrap.hpp index 9106f03dc..a395c58c1 100644 --- a/include/mbgl/math/wrap.hpp +++ b/include/mbgl/math/wrap.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { /// Constrains n to the given range (including min, excluding max) via modular @@ -21,4 +21,4 @@ T wrap(T value, T min, T max) { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/buffer_resource.hpp b/include/mbgl/mtl/buffer_resource.hpp index 7eed30648..e53e1c092 100644 --- a/include/mbgl/mtl/buffer_resource.hpp +++ b/include/mbgl/mtl/buffer_resource.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class Context; @@ -92,4 +92,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/command_encoder.hpp b/include/mbgl/mtl/command_encoder.hpp index efc841616..3e8ccf568 100644 --- a/include/mbgl/mtl/command_encoder.hpp +++ b/include/mbgl/mtl/command_encoder.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Renderable; } // namespace gfx @@ -69,9 +69,9 @@ protected: std::vector debugGroupNames; std::vector> renderDebugGroups; std::vector> uploadDebugGroups; - mbgl::unordered_set renderPasses; - mbgl::unordered_set uploadPasses; + mln::unordered_set renderPasses; + mln::unordered_set uploadPasses; }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/context.hpp b/include/mbgl/mtl/context.hpp index 3dd2ab322..f85e3fc9c 100644 --- a/include/mbgl/mtl/context.hpp +++ b/include/mbgl/mtl/context.hpp @@ -17,7 +17,7 @@ #include #include -namespace mbgl { +namespace mln { class ProgramParameters; class RenderStaticData; @@ -72,7 +72,7 @@ public: std::string_view vertexName, std::string_view fragmentName, const ProgramParameters& programParameters, - const mbgl::unordered_map& additionalDefines); + const mln::unordered_map& additionalDefines); MTLTexturePtr createMetalTexture(MTLTextureDescriptorPtr textureDescriptor) const; MTLSamplerStatePtr createMetalSamplerState(MTLSamplerDescriptorPtr samplerDescriptor) const; @@ -179,4 +179,4 @@ private: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/drawable.hpp b/include/mbgl/mtl/drawable.hpp index 577f9fbe1..3326b57f2 100644 --- a/include/mbgl/mtl/drawable.hpp +++ b/include/mbgl/mtl/drawable.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { template class Segment; @@ -83,4 +83,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/drawable_builder.hpp b/include/mbgl/mtl/drawable_builder.hpp index ae5fdcfe1..64321f8ee 100644 --- a/include/mbgl/mtl/drawable_builder.hpp +++ b/include/mbgl/mtl/drawable_builder.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace mtl { /** @@ -25,4 +25,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/dynamic_texture.hpp b/include/mbgl/mtl/dynamic_texture.hpp index d7e9e9047..7f84fcf28 100644 --- a/include/mbgl/mtl/dynamic_texture.hpp +++ b/include/mbgl/mtl/dynamic_texture.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace mtl { class Context; @@ -15,4 +15,4 @@ public: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/index_buffer_resource.hpp b/include/mbgl/mtl/index_buffer_resource.hpp index 248d9fdd5..149bb375e 100644 --- a/include/mbgl/mtl/index_buffer_resource.hpp +++ b/include/mbgl/mtl/index_buffer_resource.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class IndexBufferResource : public gfx::IndexBufferResource { @@ -24,4 +24,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/layer_group.hpp b/include/mbgl/mtl/layer_group.hpp index 818ebb533..ccd51da18 100644 --- a/include/mbgl/mtl/layer_group.hpp +++ b/include/mbgl/mtl/layer_group.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -14,7 +14,7 @@ class RenderPass; /** A layer group for non-tile-based drawables */ -class LayerGroup : public mbgl::LayerGroup { +class LayerGroup : public mln::LayerGroup { public: LayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name); ~LayerGroup() override {} @@ -31,4 +31,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/mtl_fwd.hpp b/include/mbgl/mtl/mtl_fwd.hpp index 63a8c8f50..c28ec9b41 100644 --- a/include/mbgl/mtl/mtl_fwd.hpp +++ b/include/mbgl/mtl/mtl_fwd.hpp @@ -38,7 +38,7 @@ class VertexBufferLayoutDescriptor; class VertexDescriptor; } // namespace MTL -namespace mbgl { +namespace mln { namespace mtl { using CAMetalDrawablePtr = NS::SharedPtr; @@ -64,4 +64,4 @@ using MTLVertexAttributeDescriptorPtr = NS::SharedPtr; using MTLVertexDescriptorPtr = NS::SharedPtr; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/offscreen_texture.hpp b/include/mbgl/mtl/offscreen_texture.hpp index f291a7a90..38a810c27 100644 --- a/include/mbgl/mtl/offscreen_texture.hpp +++ b/include/mbgl/mtl/offscreen_texture.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class Context; @@ -20,4 +20,4 @@ public: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/render_pass.hpp b/include/mbgl/mtl/render_pass.hpp index 744969b9b..712198ed2 100644 --- a/include/mbgl/mtl/render_pass.hpp +++ b/include/mbgl/mtl/render_pass.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class BufferResource; @@ -102,4 +102,4 @@ private: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/renderable_resource.hpp b/include/mbgl/mtl/renderable_resource.hpp index d8620d636..c49ef246f 100644 --- a/include/mbgl/mtl/renderable_resource.hpp +++ b/include/mbgl/mtl/renderable_resource.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace mtl { class RendererBackend; @@ -20,11 +20,11 @@ public: // explicitly can override this method. } - virtual const mbgl::mtl::RendererBackend& getBackend() const = 0; - virtual const mbgl::mtl::MTLCommandBufferPtr& getCommandBuffer() const = 0; - virtual mbgl::mtl::MTLBlitPassDescriptorPtr getUploadPassDescriptor() const = 0; - virtual const mbgl::mtl::MTLRenderPassDescriptorPtr& getRenderPassDescriptor() const = 0; + virtual const mln::mtl::RendererBackend& getBackend() const = 0; + virtual const mln::mtl::MTLCommandBufferPtr& getCommandBuffer() const = 0; + virtual mln::mtl::MTLBlitPassDescriptorPtr getUploadPassDescriptor() const = 0; + virtual const mln::mtl::MTLRenderPassDescriptorPtr& getRenderPassDescriptor() const = 0; }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/renderer_backend.hpp b/include/mbgl/mtl/renderer_backend.hpp index 1859de16f..862e632ef 100644 --- a/include/mbgl/mtl/renderer_backend.hpp +++ b/include/mbgl/mtl/renderer_backend.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class ProgramParameters; @@ -66,4 +66,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/texture2d.hpp b/include/mbgl/mtl/texture2d.hpp index ddc9e62d0..b0c7bbf12 100644 --- a/include/mbgl/mtl/texture2d.hpp +++ b/include/mbgl/mtl/texture2d.hpp @@ -10,7 +10,7 @@ #include -namespace mbgl { +namespace mln { namespace mtl { class Context; @@ -84,4 +84,4 @@ private: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/tile_layer_group.hpp b/include/mbgl/mtl/tile_layer_group.hpp index 89b51e804..98adf6fbf 100644 --- a/include/mbgl/mtl/tile_layer_group.hpp +++ b/include/mbgl/mtl/tile_layer_group.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -19,7 +19,7 @@ class RenderPass; /** A layer group for tile-based drawables */ -class TileLayerGroup : public mbgl::TileLayerGroup { +class TileLayerGroup : public mln::TileLayerGroup { public: TileLayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name); ~TileLayerGroup() override {} @@ -41,4 +41,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/uniform_buffer.hpp b/include/mbgl/mtl/uniform_buffer.hpp index 0e0f95f9e..c668453ac 100644 --- a/include/mbgl/mtl/uniform_buffer.hpp +++ b/include/mbgl/mtl/uniform_buffer.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class RenderPass; @@ -52,4 +52,4 @@ private: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/upload_pass.hpp b/include/mbgl/mtl/upload_pass.hpp index 8a994a659..7007e6990 100644 --- a/include/mbgl/mtl/upload_pass.hpp +++ b/include/mbgl/mtl/upload_pass.hpp @@ -10,7 +10,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class CommandEncoder; @@ -84,4 +84,4 @@ private: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/vertex_attribute.hpp b/include/mbgl/mtl/vertex_attribute.hpp index 680b9c7fb..24da97a67 100644 --- a/include/mbgl/mtl/vertex_attribute.hpp +++ b/include/mbgl/mtl/vertex_attribute.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class VertexBufferResource; } // namespace gfx @@ -64,4 +64,4 @@ private: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/mtl/vertex_buffer_resource.hpp b/include/mbgl/mtl/vertex_buffer_resource.hpp index 62d5f47f0..4ca1916a0 100644 --- a/include/mbgl/mtl/vertex_buffer_resource.hpp +++ b/include/mbgl/mtl/vertex_buffer_resource.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace mtl { class VertexBufferResource : public gfx::VertexBufferResource { @@ -32,4 +32,4 @@ protected: using UniqueVertexBufferResource = std::unique_ptr; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/platform/gl_functions.hpp b/include/mbgl/platform/gl_functions.hpp index 9fc3c3f6e..79d8d11e0 100644 --- a/include/mbgl/platform/gl_functions.hpp +++ b/include/mbgl/platform/gl_functions.hpp @@ -7,14 +7,14 @@ // initialized by the platform at linking time. #ifndef NDEBUG -#define MBGL_CHECK_ERROR(cmd) \ - ([&]() { \ - struct __MBGL_CHECK_ERROR { \ - ~__MBGL_CHECK_ERROR() noexcept(false) { \ - mbgl::platform::glCheckError(#cmd, __FILE__, __LINE__); \ - } \ - } __MBGL_CHECK_ERROR; \ - return cmd; \ +#define MBGL_CHECK_ERROR(cmd) \ + ([&]() { \ + struct __MBGL_CHECK_ERROR { \ + ~__MBGL_CHECK_ERROR() noexcept(false) { \ + mln::platform::glCheckError(#cmd, __FILE__, __LINE__); \ + } \ + } __MBGL_CHECK_ERROR; \ + return cmd; \ }()) #else #define MBGL_CHECK_ERROR(cmd) (cmd) @@ -22,7 +22,7 @@ struct __GLsync; -namespace mbgl { +namespace mln { namespace platform { using GLbitfield = unsigned int; @@ -557,4 +557,4 @@ void glCheckError(const char* cmd, const char* file, int line); #endif } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/platform/settings.hpp b/include/mbgl/platform/settings.hpp index d7c15d2d8..93d648a26 100644 --- a/include/mbgl/platform/settings.hpp +++ b/include/mbgl/platform/settings.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { #define DECLARE_MAPLIBRE_SETTING(name, value) constexpr const char* name = "maplibre_" #value @@ -46,4 +46,4 @@ private: }; } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/platform/thread.hpp b/include/mbgl/platform/thread.hpp index 705885ca0..9a5e0eef3 100644 --- a/include/mbgl/platform/thread.hpp +++ b/include/mbgl/platform/thread.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace platform { /// Called when a thread is created @@ -10,4 +10,4 @@ void attachThread(); void detachThread(); } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/platform/time.hpp b/include/mbgl/platform/time.hpp index 876952451..fb5a99955 100644 --- a/include/mbgl/platform/time.hpp +++ b/include/mbgl/platform/time.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { // Returns the current time. Abstracted because some platforms @@ -10,4 +10,4 @@ namespace platform { std::chrono::time_point now(); } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/change_request.hpp b/include/mbgl/renderer/change_request.hpp index bd7837008..db3f2500b 100644 --- a/include/mbgl/renderer/change_request.hpp +++ b/include/mbgl/renderer/change_request.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { class ChangeRequest; class LayerGroupBase; class TileLayerGroup; @@ -116,4 +116,4 @@ protected: RenderTargetPtr renderTarget; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/layer_group.hpp b/include/mbgl/renderer/layer_group.hpp index a5f90a18f..68e9cd369 100644 --- a/include/mbgl/renderer/layer_group.hpp +++ b/include/mbgl/renderer/layer_group.hpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { class LayerGroupBase; class PaintParameters; class RenderOrchestrator; @@ -129,10 +129,10 @@ public: ~TileLayerGroup() override; std::size_t getDrawableCount() const override; - std::size_t getDrawableCount(mbgl::RenderPass, const OverscaledTileID&) const; + std::size_t getDrawableCount(mln::RenderPass, const OverscaledTileID&) const; - std::vector removeDrawables(mbgl::RenderPass, const OverscaledTileID&); - void addDrawable(mbgl::RenderPass, const OverscaledTileID&, gfx::UniqueDrawable&&); + std::vector removeDrawables(mln::RenderPass, const OverscaledTileID&); + void addDrawable(mln::RenderPass, const OverscaledTileID&, gfx::UniqueDrawable&&); template std::size_t visitDrawables(Func f) { @@ -172,7 +172,7 @@ public: /// Call the provided function for each drawable for the given tile template - std::size_t visitDrawables(mbgl::RenderPass pass, const OverscaledTileID& tileID, Func f) { + std::size_t visitDrawables(mln::RenderPass pass, const OverscaledTileID& tileID, Func f) { assert(drawablesByTile.size() == sortedDrawables.size()); unordered_set drawablesFailed; auto range = drawablesByTile.equal_range({pass, tileID}); @@ -203,14 +203,14 @@ protected: RenderTiles stencilTiles; struct TileLayerGroupTileKey { - mbgl::RenderPass renderPass; + mln::RenderPass renderPass; OverscaledTileID tileID; bool operator==(const TileLayerGroupTileKey& other) const { return renderPass == other.renderPass && tileID == other.tileID; } struct hash { size_t operator()(const TileLayerGroupTileKey& k) const { - return (std::hash()(k.renderPass) ^ std::hash()(k.tileID) << 1); + return (std::hash()(k.renderPass) ^ std::hash()(k.tileID) << 1); } }; }; @@ -232,9 +232,9 @@ public: ~LayerGroup() override; std::size_t getDrawableCount() const override; - std::size_t getDrawableCount(mbgl::RenderPass) const; + std::size_t getDrawableCount(mln::RenderPass) const; - std::vector removeDrawables(mbgl::RenderPass); + std::vector removeDrawables(mln::RenderPass); void addDrawable(gfx::UniqueDrawable&&); template @@ -283,7 +283,7 @@ protected: }; template -void visitLayerGroupDrawables(mbgl::LayerGroupBase& layerGroup, Func dg) { +void visitLayerGroupDrawables(mln::LayerGroupBase& layerGroup, Func dg) { switch (layerGroup.getType()) { case LayerGroupBase::Type::LayerGroup: { static_cast(layerGroup).visitDrawables(dg); @@ -295,8 +295,8 @@ void visitLayerGroupDrawables(mbgl::LayerGroupBase& layerGroup, Func dg) { } default: { #ifndef NDEBUG - mbgl::Log::Error(mbgl::Event::Render, - "Unknown layer group type: " + std::to_string(static_cast(layerGroup.getType()))); + mln::Log::Error(mln::Event::Render, + "Unknown layer group type: " + std::to_string(static_cast(layerGroup.getType()))); #endif break; } @@ -304,7 +304,7 @@ void visitLayerGroupDrawables(mbgl::LayerGroupBase& layerGroup, Func dg) { } template -std::size_t removeLayerGroupDrawablesIf(mbgl::LayerGroupBase& layerGroup, Func dg) { +std::size_t removeLayerGroupDrawablesIf(mln::LayerGroupBase& layerGroup, Func dg) { switch (layerGroup.getType()) { case LayerGroupBase::Type::LayerGroup: { return static_cast(layerGroup).removeDrawablesIf(dg); @@ -314,12 +314,12 @@ std::size_t removeLayerGroupDrawablesIf(mbgl::LayerGroupBase& layerGroup, Func d } default: { #ifndef NDEBUG - mbgl::Log::Error(mbgl::Event::Render, - "Unknown layer group type: " + std::to_string(static_cast(layerGroup.getType()))); + mln::Log::Error(mln::Event::Render, + "Unknown layer group type: " + std::to_string(static_cast(layerGroup.getType()))); #endif return 0; } } } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/layer_tweaker.hpp b/include/mbgl/renderer/layer_tweaker.hpp index 485d0b22a..a26ba583f 100644 --- a/include/mbgl/renderer/layer_tweaker.hpp +++ b/include/mbgl/renderer/layer_tweaker.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Drawable; @@ -76,4 +76,4 @@ protected: bool propertiesUpdated = true; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/query.hpp b/include/mbgl/renderer/query.hpp index 097214a87..9df421fb6 100644 --- a/include/mbgl/renderer/query.hpp +++ b/include/mbgl/renderer/query.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { /** * Options for query rendered features. @@ -40,4 +40,4 @@ public: std::optional filter; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/render_target.hpp b/include/mbgl/renderer/render_target.hpp index 45ce5a67e..f3dcc2a8f 100644 --- a/include/mbgl/renderer/render_target.hpp +++ b/include/mbgl/renderer/render_target.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Context; @@ -85,4 +85,4 @@ protected: LayerGroupMap layerGroupsByLayerIndex; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/renderer.hpp b/include/mbgl/renderer/renderer.hpp index 973a857ed..c3df0c84f 100644 --- a/include/mbgl/renderer/renderer.hpp +++ b/include/mbgl/renderer/renderer.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class RendererObserver; class RenderedQueryOptions; @@ -126,4 +126,4 @@ private: std::unique_ptr impl; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/renderer_frontend.hpp b/include/mbgl/renderer/renderer_frontend.hpp index 05cfb69dd..dd672a8e3 100644 --- a/include/mbgl/renderer/renderer_frontend.hpp +++ b/include/mbgl/renderer/renderer_frontend.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { class RendererObserver; class UpdateParameters; @@ -34,4 +34,4 @@ public: protected: }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/renderer_observer.hpp b/include/mbgl/renderer/renderer_observer.hpp index 9d99c3287..31e99d0ef 100644 --- a/include/mbgl/renderer/renderer_observer.hpp +++ b/include/mbgl/renderer/renderer_observer.hpp @@ -14,7 +14,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class ShaderRegistry; @@ -86,4 +86,4 @@ public: virtual void onRenderError(std::exception_ptr) {} }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/renderer/renderer_state.hpp b/include/mbgl/renderer/renderer_state.hpp index 844bcfaca..6de0f4330 100644 --- a/include/mbgl/renderer/renderer_state.hpp +++ b/include/mbgl/renderer/renderer_state.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class UpdateParameters; @@ -32,4 +32,4 @@ public: static LatLng latLngForPixel(const UpdateParameters&, const ScreenCoordinate&); }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/background_layer_ubo.hpp b/include/mbgl/shaders/background_layer_ubo.hpp index 7c0e19aa2..36ec11e44 100644 --- a/include/mbgl/shaders/background_layer_ubo.hpp +++ b/include/mbgl/shaders/background_layer_ubo.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { // @@ -68,4 +68,4 @@ union BackgroundDrawableUnionUBO { #endif } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/circle_layer_ubo.hpp b/include/mbgl/shaders/circle_layer_ubo.hpp index 27a7a5d87..6ef653ba3 100644 --- a/include/mbgl/shaders/circle_layer_ubo.hpp +++ b/include/mbgl/shaders/circle_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) CircleDrawableUBO { @@ -41,4 +41,4 @@ struct alignas(16) CircleEvaluatedPropsUBO { static_assert(sizeof(CircleEvaluatedPropsUBO) == 4 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/collision_layer_ubo.hpp b/include/mbgl/shaders/collision_layer_ubo.hpp index 3bd073c73..4115388d7 100644 --- a/include/mbgl/shaders/collision_layer_ubo.hpp +++ b/include/mbgl/shaders/collision_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) CollisionDrawableUBO { @@ -20,4 +20,4 @@ struct alignas(16) CollisionTilePropsUBO { static_assert(sizeof(CollisionTilePropsUBO) == 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/color_relief_layer_ubo.hpp b/include/mbgl/shaders/color_relief_layer_ubo.hpp index 02a37b9f8..88f1ad82b 100644 --- a/include/mbgl/shaders/color_relief_layer_ubo.hpp +++ b/include/mbgl/shaders/color_relief_layer_ubo.hpp @@ -1,7 +1,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) ColorReliefDrawableUBO { @@ -29,4 +29,4 @@ struct alignas(16) ColorReliefEvaluatedPropsUBO { static_assert(sizeof(ColorReliefEvaluatedPropsUBO) == 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/custom_drawable_layer_ubo.hpp b/include/mbgl/shaders/custom_drawable_layer_ubo.hpp index 81cea47a5..72f869ef9 100644 --- a/include/mbgl/shaders/custom_drawable_layer_ubo.hpp +++ b/include/mbgl/shaders/custom_drawable_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) CustomSymbolIconDrawableUBO { @@ -22,4 +22,4 @@ struct alignas(16) CustomSymbolIconDrawableUBO { static_assert(sizeof(CustomSymbolIconDrawableUBO) == 7 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/custom_geometry_ubo.hpp b/include/mbgl/shaders/custom_geometry_ubo.hpp index 50a9f052d..deb5152c4 100644 --- a/include/mbgl/shaders/custom_geometry_ubo.hpp +++ b/include/mbgl/shaders/custom_geometry_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) CustomGeometryDrawableUBO { @@ -13,4 +13,4 @@ struct alignas(16) CustomGeometryDrawableUBO { static_assert(sizeof(CustomGeometryDrawableUBO) == 5 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/debug_layer_ubo.hpp b/include/mbgl/shaders/debug_layer_ubo.hpp index 577be4c9d..c8354af4e 100644 --- a/include/mbgl/shaders/debug_layer_ubo.hpp +++ b/include/mbgl/shaders/debug_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) DebugUBO { @@ -17,4 +17,4 @@ struct alignas(16) DebugUBO { static_assert(sizeof(DebugUBO) == 6 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/fill_extrusion_layer_ubo.hpp b/include/mbgl/shaders/fill_extrusion_layer_ubo.hpp index a87eddc0d..d72c39403 100644 --- a/include/mbgl/shaders/fill_extrusion_layer_ubo.hpp +++ b/include/mbgl/shaders/fill_extrusion_layer_ubo.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) FillExtrusionDrawableUBO { @@ -55,4 +55,4 @@ struct alignas(16) FillExtrusionPropsUBO { static_assert(sizeof(FillExtrusionPropsUBO) == 5 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/fill_layer_ubo.hpp b/include/mbgl/shaders/fill_layer_ubo.hpp index 959c1aa10..49c0ce1c4 100644 --- a/include/mbgl/shaders/fill_layer_ubo.hpp +++ b/include/mbgl/shaders/fill_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { // @@ -132,4 +132,4 @@ union FillTilePropsUnionUBO { #endif } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/background.hpp b/include/mbgl/shaders/gl/background.hpp index 9e7e233a1..529501ecc 100644 --- a/include/mbgl/shaders/gl/background.hpp +++ b/include/mbgl/shaders/gl/background.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -35,4 +35,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/background_pattern.hpp b/include/mbgl/shaders/gl/background_pattern.hpp index 94cacec93..d0c58ade0 100644 --- a/include/mbgl/shaders/gl/background_pattern.hpp +++ b/include/mbgl/shaders/gl/background_pattern.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -91,4 +91,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/circle.hpp b/include/mbgl/shaders/gl/circle.hpp index 54b0ab20d..3b7f93755 100644 --- a/include/mbgl/shaders/gl/circle.hpp +++ b/include/mbgl/shaders/gl/circle.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -239,4 +239,4 @@ lowp float stroke_opacity = u_stroke_opacity; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/clipping_mask.hpp b/include/mbgl/shaders/gl/clipping_mask.hpp index cd95ae286..4b093b534 100644 --- a/include/mbgl/shaders/gl/clipping_mask.hpp +++ b/include/mbgl/shaders/gl/clipping_mask.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -23,4 +23,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/collision_box.hpp b/include/mbgl/shaders/gl/collision_box.hpp index 00f653e30..b0a7fae03 100644 --- a/include/mbgl/shaders/gl/collision_box.hpp +++ b/include/mbgl/shaders/gl/collision_box.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -78,4 +78,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/collision_circle.hpp b/include/mbgl/shaders/gl/collision_circle.hpp index 437692d80..9364417f9 100644 --- a/include/mbgl/shaders/gl/collision_circle.hpp +++ b/include/mbgl/shaders/gl/collision_circle.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -116,4 +116,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/color_relief.hpp b/include/mbgl/shaders/gl/color_relief.hpp index 20743c10a..495f458df 100644 --- a/include/mbgl/shaders/gl/color_relief.hpp +++ b/include/mbgl/shaders/gl/color_relief.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -116,4 +116,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/custom_geometry.hpp b/include/mbgl/shaders/gl/custom_geometry.hpp index 6c1c8082f..f30b56d00 100644 --- a/include/mbgl/shaders/gl/custom_geometry.hpp +++ b/include/mbgl/shaders/gl/custom_geometry.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -38,4 +38,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/custom_symbol_icon.hpp b/include/mbgl/shaders/gl/custom_symbol_icon.hpp index 05c3c1148..e18463c10 100644 --- a/include/mbgl/shaders/gl/custom_symbol_icon.hpp +++ b/include/mbgl/shaders/gl/custom_symbol_icon.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -88,4 +88,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/debug.hpp b/include/mbgl/shaders/gl/debug.hpp index 0481486e5..3db35c4c9 100644 --- a/include/mbgl/shaders/gl/debug.hpp +++ b/include/mbgl/shaders/gl/debug.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -48,4 +48,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/fill.hpp b/include/mbgl/shaders/gl/fill.hpp index 58e2ab57b..f5ef59ebe 100644 --- a/include/mbgl/shaders/gl/fill.hpp +++ b/include/mbgl/shaders/gl/fill.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -86,4 +86,4 @@ lowp float opacity = u_opacity; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/fill_extrusion.hpp b/include/mbgl/shaders/gl/fill_extrusion.hpp index 8686000c0..82bf69354 100644 --- a/include/mbgl/shaders/gl/fill_extrusion.hpp +++ b/include/mbgl/shaders/gl/fill_extrusion.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -139,4 +139,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/fill_extrusion_instanced.hpp b/include/mbgl/shaders/gl/fill_extrusion_instanced.hpp index 3d7509797..58468ac8c 100644 --- a/include/mbgl/shaders/gl/fill_extrusion_instanced.hpp +++ b/include/mbgl/shaders/gl/fill_extrusion_instanced.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -13,4 +13,4 @@ struct ShaderSource -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -235,4 +235,4 @@ mediump vec4 pattern_to = u_pattern_to; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/fill_extrusion_pattern_instanced.hpp b/include/mbgl/shaders/gl/fill_extrusion_pattern_instanced.hpp index 5695264d0..94d91cdc1 100644 --- a/include/mbgl/shaders/gl/fill_extrusion_pattern_instanced.hpp +++ b/include/mbgl/shaders/gl/fill_extrusion_pattern_instanced.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -13,4 +13,4 @@ struct ShaderSource -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -105,4 +105,4 @@ lowp float opacity = u_opacity; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/fill_outline_pattern.hpp b/include/mbgl/shaders/gl/fill_outline_pattern.hpp index f197a5631..a55382da4 100644 --- a/include/mbgl/shaders/gl/fill_outline_pattern.hpp +++ b/include/mbgl/shaders/gl/fill_outline_pattern.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -178,4 +178,4 @@ mediump vec4 pattern_to = u_pattern_to; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/fill_outline_triangulated.hpp b/include/mbgl/shaders/gl/fill_outline_triangulated.hpp index de59b135b..1c136dd41 100644 --- a/include/mbgl/shaders/gl/fill_outline_triangulated.hpp +++ b/include/mbgl/shaders/gl/fill_outline_triangulated.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -125,4 +125,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/fill_pattern.hpp b/include/mbgl/shaders/gl/fill_pattern.hpp index fecf17eda..dd807215a 100644 --- a/include/mbgl/shaders/gl/fill_pattern.hpp +++ b/include/mbgl/shaders/gl/fill_pattern.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -171,4 +171,4 @@ mediump vec4 pattern_to = u_pattern_to; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/heatmap.hpp b/include/mbgl/shaders/gl/heatmap.hpp index e945df28b..41519e2f9 100644 --- a/include/mbgl/shaders/gl/heatmap.hpp +++ b/include/mbgl/shaders/gl/heatmap.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -120,4 +120,4 @@ highp float weight = u_weight; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/heatmap_texture.hpp b/include/mbgl/shaders/gl/heatmap_texture.hpp index 19317a2d6..9d8e22361 100644 --- a/include/mbgl/shaders/gl/heatmap_texture.hpp +++ b/include/mbgl/shaders/gl/heatmap_texture.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -63,4 +63,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/hillshade.hpp b/include/mbgl/shaders/gl/hillshade.hpp index 6e8e28679..5830ce0fc 100644 --- a/include/mbgl/shaders/gl/hillshade.hpp +++ b/include/mbgl/shaders/gl/hillshade.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -213,4 +213,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/hillshade_prepare.hpp b/include/mbgl/shaders/gl/hillshade_prepare.hpp index 17244aab0..8e50f718c 100644 --- a/include/mbgl/shaders/gl/hillshade_prepare.hpp +++ b/include/mbgl/shaders/gl/hillshade_prepare.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -111,4 +111,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/line.hpp b/include/mbgl/shaders/gl/line.hpp index 1f0935817..804086700 100644 --- a/include/mbgl/shaders/gl/line.hpp +++ b/include/mbgl/shaders/gl/line.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -221,4 +221,4 @@ lowp float opacity = u_opacity; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/line_gradient.hpp b/include/mbgl/shaders/gl/line_gradient.hpp index c77e020c4..b00068769 100644 --- a/include/mbgl/shaders/gl/line_gradient.hpp +++ b/include/mbgl/shaders/gl/line_gradient.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -217,4 +217,4 @@ lowp float opacity = u_opacity; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/line_pattern.hpp b/include/mbgl/shaders/gl/line_pattern.hpp index ea4b8809f..ae2febea6 100644 --- a/include/mbgl/shaders/gl/line_pattern.hpp +++ b/include/mbgl/shaders/gl/line_pattern.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -292,4 +292,4 @@ lowp float opacity = u_opacity; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/line_sdf.hpp b/include/mbgl/shaders/gl/line_sdf.hpp index 7772658f2..cb521e9cb 100644 --- a/include/mbgl/shaders/gl/line_sdf.hpp +++ b/include/mbgl/shaders/gl/line_sdf.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -272,4 +272,4 @@ lowp float floorwidth = u_floorwidth; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/location_indicator.hpp b/include/mbgl/shaders/gl/location_indicator.hpp index 3316f6c90..b5fc3e26a 100644 --- a/include/mbgl/shaders/gl/location_indicator.hpp +++ b/include/mbgl/shaders/gl/location_indicator.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -31,4 +31,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/location_indicator_textured.hpp b/include/mbgl/shaders/gl/location_indicator_textured.hpp index f0dc0cfe9..9fcffd7a8 100644 --- a/include/mbgl/shaders/gl/location_indicator_textured.hpp +++ b/include/mbgl/shaders/gl/location_indicator_textured.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -38,4 +38,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/prelude.hpp b/include/mbgl/shaders/gl/prelude.hpp index 7e82ed6c2..5b3724cb7 100644 --- a/include/mbgl/shaders/gl/prelude.hpp +++ b/include/mbgl/shaders/gl/prelude.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -107,4 +107,4 @@ out highp vec4 fragColor; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/raster.hpp b/include/mbgl/shaders/gl/raster.hpp index ee2865764..3c6acab43 100644 --- a/include/mbgl/shaders/gl/raster.hpp +++ b/include/mbgl/shaders/gl/raster.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -105,4 +105,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/shader_group_gl.hpp b/include/mbgl/shaders/gl/shader_group_gl.hpp index acaf6358f..51b7352da 100644 --- a/include/mbgl/shaders/gl/shader_group_gl.hpp +++ b/include/mbgl/shaders/gl/shader_group_gl.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { template @@ -27,8 +27,8 @@ public: // We could cache these by key here to avoid creating a string key each time, but we // would need another mutex. We could also push string IDs down into `ShaderGroup`. std::size_t seed = 0; - mbgl::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); - mbgl::util::hash_combine(seed, programParameters.getDefinesHash()); + mln::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); + mln::util::hash_combine(seed, programParameters.getDefinesHash()); const std::string shaderName = getShaderName(name, seed); auto shader = get(shaderName); @@ -72,4 +72,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/shader_info.hpp b/include/mbgl/shaders/gl/shader_info.hpp index f8c111ba4..6d9f27bbd 100644 --- a/include/mbgl/shaders/gl/shader_info.hpp +++ b/include/mbgl/shaders/gl/shader_info.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { struct UniformBlockInfo { @@ -241,4 +241,4 @@ struct ShaderInfo }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/shader_program_gl.hpp b/include/mbgl/shaders/gl/shader_program_gl.hpp index df370fa17..01bb3844e 100644 --- a/include/mbgl/shaders/gl/shader_program_gl.hpp +++ b/include/mbgl/shaders/gl/shader_program_gl.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { class ProgramParameters; @@ -53,4 +53,4 @@ protected: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/symbol_icon.hpp b/include/mbgl/shaders/gl/symbol_icon.hpp index 79590f9ff..60908cee1 100644 --- a/include/mbgl/shaders/gl/symbol_icon.hpp +++ b/include/mbgl/shaders/gl/symbol_icon.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -195,4 +195,4 @@ lowp float opacity = u_opacity; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/symbol_sdf.hpp b/include/mbgl/shaders/gl/symbol_sdf.hpp index cf0b7039b..abecd8cee 100644 --- a/include/mbgl/shaders/gl/symbol_sdf.hpp +++ b/include/mbgl/shaders/gl/symbol_sdf.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -309,4 +309,4 @@ lowp float halo_blur = u_halo_blur; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/symbol_text_and_icon.hpp b/include/mbgl/shaders/gl/symbol_text_and_icon.hpp index 88b1142ce..d452fad0f 100644 --- a/include/mbgl/shaders/gl/symbol_text_and_icon.hpp +++ b/include/mbgl/shaders/gl/symbol_text_and_icon.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -326,4 +326,4 @@ lowp float halo_blur = u_halo_blur; }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/gl/wide_vector.hpp b/include/mbgl/shaders/gl/wide_vector.hpp index 2e4fda6b6..1c35b3823 100644 --- a/include/mbgl/shaders/gl/wide_vector.hpp +++ b/include/mbgl/shaders/gl/wide_vector.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -13,4 +13,4 @@ struct ShaderSource { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/heatmap_layer_ubo.hpp b/include/mbgl/shaders/heatmap_layer_ubo.hpp index 16a3704fe..ab5e7571e 100644 --- a/include/mbgl/shaders/heatmap_layer_ubo.hpp +++ b/include/mbgl/shaders/heatmap_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) HeatmapDrawableUBO { @@ -28,4 +28,4 @@ struct alignas(16) HeatmapEvaluatedPropsUBO { static_assert(sizeof(HeatmapEvaluatedPropsUBO) == 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/heatmap_texture_layer_ubo.hpp b/include/mbgl/shaders/heatmap_texture_layer_ubo.hpp index e94351e06..1bfbbc771 100644 --- a/include/mbgl/shaders/heatmap_texture_layer_ubo.hpp +++ b/include/mbgl/shaders/heatmap_texture_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) HeatmapTexturePropsUBO { @@ -16,4 +16,4 @@ struct alignas(16) HeatmapTexturePropsUBO { static_assert(sizeof(HeatmapTexturePropsUBO) == 5 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/hillshade_layer_ubo.hpp b/include/mbgl/shaders/hillshade_layer_ubo.hpp index 53626cb06..183aadfd1 100644 --- a/include/mbgl/shaders/hillshade_layer_ubo.hpp +++ b/include/mbgl/shaders/hillshade_layer_ubo.hpp @@ -1,7 +1,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { // Maximum number of illumination sources supported @@ -45,4 +45,4 @@ struct alignas(16) HillshadeEvaluatedPropsUBO { static_assert(sizeof(HillshadeEvaluatedPropsUBO) == 176); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/hillshade_prepare_layer_ubo.hpp b/include/mbgl/shaders/hillshade_prepare_layer_ubo.hpp index a00cdc6e7..c55788b8d 100644 --- a/include/mbgl/shaders/hillshade_prepare_layer_ubo.hpp +++ b/include/mbgl/shaders/hillshade_prepare_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) HillshadePrepareDrawableUBO { @@ -21,4 +21,4 @@ struct alignas(16) HillshadePrepareTilePropsUBO { static_assert(sizeof(HillshadePrepareTilePropsUBO) == 2 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/layer_ubo.hpp b/include/mbgl/shaders/layer_ubo.hpp index 73a96b8fb..6054e010c 100644 --- a/include/mbgl/shaders/layer_ubo.hpp +++ b/include/mbgl/shaders/layer_ubo.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { enum class AttributeSource : int32_t { @@ -74,4 +74,4 @@ enum { #define MLN_USE_FILL_EXTRUSION_INSTANCING (MLN_RENDER_BACKEND_METAL || MLN_RENDER_BACKEND_VULKAN) } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/line_layer_ubo.hpp b/include/mbgl/shaders/line_layer_ubo.hpp index 998420d21..61041a216 100644 --- a/include/mbgl/shaders/line_layer_ubo.hpp +++ b/include/mbgl/shaders/line_layer_ubo.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { // @@ -165,4 +165,4 @@ union LineTilePropsUnionUBO { #endif } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/location_indicator_ubo.hpp b/include/mbgl/shaders/location_indicator_ubo.hpp index 797550ee7..792120e27 100644 --- a/include/mbgl/shaders/location_indicator_ubo.hpp +++ b/include/mbgl/shaders/location_indicator_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) LocationIndicatorDrawableUBO { @@ -13,4 +13,4 @@ struct alignas(16) LocationIndicatorDrawableUBO { static_assert(sizeof(LocationIndicatorDrawableUBO) == 5 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/background.hpp b/include/mbgl/shaders/mtl/background.hpp index 175eebe4a..6139b4332 100644 --- a/include/mbgl/shaders/mtl/background.hpp +++ b/include/mbgl/shaders/mtl/background.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto backgroundShaderPrelude = R"( @@ -187,4 +187,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/circle.hpp b/include/mbgl/shaders/mtl/circle.hpp index 6ad808366..23682c86c 100644 --- a/include/mbgl/shaders/mtl/circle.hpp +++ b/include/mbgl/shaders/mtl/circle.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto circleShaderPrelude = R"( @@ -256,4 +256,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/clipping_mask.hpp b/include/mbgl/shaders/mtl/clipping_mask.hpp index d97f45a6e..1e1567f0c 100644 --- a/include/mbgl/shaders/mtl/clipping_mask.hpp +++ b/include/mbgl/shaders/mtl/clipping_mask.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) ClipUBO { @@ -73,4 +73,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]]) { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/collision.hpp b/include/mbgl/shaders/mtl/collision.hpp index 00e8dfba2..04fa517b8 100644 --- a/include/mbgl/shaders/mtl/collision.hpp +++ b/include/mbgl/shaders/mtl/collision.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto collisionShaderPrelude = R"( @@ -200,4 +200,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/color_relief.hpp b/include/mbgl/shaders/mtl/color_relief.hpp index 8be00e069..bd5efe958 100644 --- a/include/mbgl/shaders/mtl/color_relief.hpp +++ b/include/mbgl/shaders/mtl/color_relief.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto colorReliefShaderPrelude = R"( @@ -167,4 +167,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/common.hpp b/include/mbgl/shaders/mtl/common.hpp index a333ea301..cc571606e 100644 --- a/include/mbgl/shaders/mtl/common.hpp +++ b/include/mbgl/shaders/mtl/common.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace shaders { constexpr auto prelude = R"( @@ -233,4 +233,4 @@ enum { )"; } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/custom_geometry.hpp b/include/mbgl/shaders/mtl/custom_geometry.hpp index b4bc2666c..f95e1deb5 100644 --- a/include/mbgl/shaders/mtl/custom_geometry.hpp +++ b/include/mbgl/shaders/mtl/custom_geometry.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto customGeometryShaderPrelude = R"( @@ -67,4 +67,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/custom_symbol_icon.hpp b/include/mbgl/shaders/mtl/custom_symbol_icon.hpp index 57535e0d4..367ca2f24 100644 --- a/include/mbgl/shaders/mtl/custom_symbol_icon.hpp +++ b/include/mbgl/shaders/mtl/custom_symbol_icon.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto customSymbolIconShaderPrelude = R"( @@ -112,4 +112,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/debug.hpp b/include/mbgl/shaders/mtl/debug.hpp index 3bbb1ff6e..0076fcdd8 100644 --- a/include/mbgl/shaders/mtl/debug.hpp +++ b/include/mbgl/shaders/mtl/debug.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto debugShaderPrelude = R"( @@ -77,4 +77,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/fill.hpp b/include/mbgl/shaders/mtl/fill.hpp index 5b872dd66..d0d9b4554 100644 --- a/include/mbgl/shaders/mtl/fill.hpp +++ b/include/mbgl/shaders/mtl/fill.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto fillShaderPrelude = R"( @@ -676,4 +676,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/fill_extrusion.hpp b/include/mbgl/shaders/mtl/fill_extrusion.hpp index efddecf20..92fc4d3ff 100644 --- a/include/mbgl/shaders/mtl/fill_extrusion.hpp +++ b/include/mbgl/shaders/mtl/fill_extrusion.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto fillExtrusionShaderPrelude = R"( @@ -734,4 +734,4 @@ fragment FragmentOutput fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/heatmap.hpp b/include/mbgl/shaders/mtl/heatmap.hpp index ac9cdcf33..299701ed4 100644 --- a/include/mbgl/shaders/mtl/heatmap.hpp +++ b/include/mbgl/shaders/mtl/heatmap.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto heatmapShaderPrelude = R"( @@ -145,4 +145,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/heatmap_texture.hpp b/include/mbgl/shaders/mtl/heatmap_texture.hpp index 02ab127a0..c86def0b8 100644 --- a/include/mbgl/shaders/mtl/heatmap_texture.hpp +++ b/include/mbgl/shaders/mtl/heatmap_texture.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto heatmapTextureShaderPrelude = R"( @@ -80,4 +80,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/hillshade.hpp b/include/mbgl/shaders/mtl/hillshade.hpp index a908d73e1..0f31cec38 100644 --- a/include/mbgl/shaders/mtl/hillshade.hpp +++ b/include/mbgl/shaders/mtl/hillshade.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto hillshadeShaderPrelude = R"( @@ -261,4 +261,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/hillshade_prepare.hpp b/include/mbgl/shaders/mtl/hillshade_prepare.hpp index 48fee0f93..9e200ca57 100644 --- a/include/mbgl/shaders/mtl/hillshade_prepare.hpp +++ b/include/mbgl/shaders/mtl/hillshade_prepare.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto hillshadePrepareShaderPrelude = R"( @@ -140,4 +140,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/line.hpp b/include/mbgl/shaders/mtl/line.hpp index 8ef79abb1..479ff0ee2 100644 --- a/include/mbgl/shaders/mtl/line.hpp +++ b/include/mbgl/shaders/mtl/line.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto lineShadePrelude = R"( @@ -978,4 +978,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/location_indicator.hpp b/include/mbgl/shaders/mtl/location_indicator.hpp index 2564dc93a..99dea1d53 100644 --- a/include/mbgl/shaders/mtl/location_indicator.hpp +++ b/include/mbgl/shaders/mtl/location_indicator.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto locationIndicatorShaderPrelude = R"( @@ -104,4 +104,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/raster.hpp b/include/mbgl/shaders/mtl/raster.hpp index 63648bc76..bcafd0bef 100644 --- a/include/mbgl/shaders/mtl/raster.hpp +++ b/include/mbgl/shaders/mtl/raster.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto rasterShaderPrelude = R"( @@ -135,4 +135,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/shader_group.hpp b/include/mbgl/shaders/mtl/shader_group.hpp index bd0b26e5e..cbace0d57 100644 --- a/include/mbgl/shaders/mtl/shader_group.hpp +++ b/include/mbgl/shaders/mtl/shader_group.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class ShaderGroupBase : public gfx::ShaderGroup { @@ -20,7 +20,7 @@ protected: ShaderGroupBase(const ProgramParameters& parameters_) : programParameters(parameters_) {} - using DefinesMap = mbgl::unordered_map; + using DefinesMap = mln::unordered_map; void addAdditionalDefines(const StringIDSetsPair& propertiesAsUniforms, DefinesMap& additionalDefines) { additionalDefines.reserve(propertiesAsUniforms.first.size()); for (const auto name : propertiesAsUniforms.first) { @@ -54,8 +54,8 @@ public: constexpr auto& fragMain = ShaderSource::fragmentMainFunction; std::size_t seed = 0; - mbgl::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); - mbgl::util::hash_combine(seed, programParameters.getDefinesHash()); + mln::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); + mln::util::hash_combine(seed, programParameters.getDefinesHash()); const std::string shaderName = getShaderName(name, seed); auto shader = get(shaderName); @@ -94,4 +94,4 @@ public: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/shader_program.hpp b/include/mbgl/shaders/mtl/shader_program.hpp index 73407922b..b9d00e61e 100644 --- a/include/mbgl/shaders/mtl/shader_program.hpp +++ b/include/mbgl/shaders/mtl/shader_program.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { struct AttributeInfo { @@ -78,8 +78,8 @@ protected: VertexAttributeArray instanceAttributes; std::array, shaders::maxTextureCountPerShader> textureBindings; - mutable mbgl::unordered_map renderPipelineStateCache; + mutable mln::unordered_map renderPipelineStateCache; }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/shader_program_mtl.hpp b/include/mbgl/shaders/mtl/shader_program_mtl.hpp index 28a83100e..2443357d5 100644 --- a/include/mbgl/shaders/mtl/shader_program_mtl.hpp +++ b/include/mbgl/shaders/mtl/shader_program_mtl.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace mtl { class ShaderProgramMTL : public gfx::ShaderProgramBase { @@ -24,4 +24,4 @@ protected: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/symbol.hpp b/include/mbgl/shaders/mtl/symbol.hpp index e3eb31385..f1a06bf84 100644 --- a/include/mbgl/shaders/mtl/symbol.hpp +++ b/include/mbgl/shaders/mtl/symbol.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto symbolShaderPrelude = R"( @@ -714,4 +714,4 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]], }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/mtl/widevector.hpp b/include/mbgl/shaders/mtl/widevector.hpp index 99420868c..426f9d132 100644 --- a/include/mbgl/shaders/mtl/widevector.hpp +++ b/include/mbgl/shaders/mtl/widevector.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto wideVectorShaderPrelude = R"( @@ -582,4 +582,4 @@ fragment float4 fragmentTri_wideVecPerf( }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/program_parameters.hpp b/include/mbgl/shaders/program_parameters.hpp index 3ffcb29a8..886e8df26 100644 --- a/include/mbgl/shaders/program_parameters.hpp +++ b/include/mbgl/shaders/program_parameters.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class ProgramParameters { public: @@ -86,4 +86,4 @@ private: bool overdrawInspector; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/raster_layer_ubo.hpp b/include/mbgl/shaders/raster_layer_ubo.hpp index 0e96d9c47..5f1b38a6c 100644 --- a/include/mbgl/shaders/raster_layer_ubo.hpp +++ b/include/mbgl/shaders/raster_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) RasterDrawableUBO { @@ -30,4 +30,4 @@ struct alignas(16) RasterEvaluatedPropsUBO { static_assert(sizeof(RasterEvaluatedPropsUBO) == 4 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/shader_defines.hpp b/include/mbgl/shaders/shader_defines.hpp index 862085b49..90fc10860 100644 --- a/include/mbgl/shaders/shader_defines.hpp +++ b/include/mbgl/shaders/shader_defines.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { // layer SSBOs @@ -576,4 +576,4 @@ static constexpr uint32_t maxVertexAttributeCountPerShader = std::max({ }); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/shader_program_base.hpp b/include/mbgl/shaders/shader_program_base.hpp index b27160586..78170671c 100644 --- a/include/mbgl/shaders/shader_program_base.hpp +++ b/include/mbgl/shaders/shader_program_base.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class ShaderProgramBase : public gfx::Shader { @@ -44,4 +44,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/shader_source.hpp b/include/mbgl/shaders/shader_source.hpp index 4fdf0c951..83dfb4e5a 100644 --- a/include/mbgl/shaders/shader_source.hpp +++ b/include/mbgl/shaders/shader_source.hpp @@ -2,7 +2,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { /// @brief This enum is used with the ShaderSource template to select @@ -63,4 +63,4 @@ struct ShaderSource { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/symbol_layer_ubo.hpp b/include/mbgl/shaders/symbol_layer_ubo.hpp index 63c4cb84e..28f30aa37 100644 --- a/include/mbgl/shaders/symbol_layer_ubo.hpp +++ b/include/mbgl/shaders/symbol_layer_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) SymbolDrawableUBO { @@ -61,4 +61,4 @@ struct alignas(16) SymbolEvaluatedPropsUBO { static_assert(sizeof(SymbolEvaluatedPropsUBO) == 6 * 16); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/background.hpp b/include/mbgl/shaders/vulkan/background.hpp index e4fb28b4d..88afbaea3 100644 --- a/include/mbgl/shaders/vulkan/background.hpp +++ b/include/mbgl/shaders/vulkan/background.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto backgroundShaderPrelude = R"( @@ -180,4 +180,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/circle.hpp b/include/mbgl/shaders/vulkan/circle.hpp index 88633221d..2d75f12ab 100644 --- a/include/mbgl/shaders/vulkan/circle.hpp +++ b/include/mbgl/shaders/vulkan/circle.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto circleShaderPrelude = R"( @@ -307,4 +307,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/clipping_mask.hpp b/include/mbgl/shaders/vulkan/clipping_mask.hpp index 676e95d9f..09dc34ea8 100644 --- a/include/mbgl/shaders/vulkan/clipping_mask.hpp +++ b/include/mbgl/shaders/vulkan/clipping_mask.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { struct ClipUBO { @@ -44,4 +44,4 @@ struct ShaderSource { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/collision.hpp b/include/mbgl/shaders/vulkan/collision.hpp index 7455d1876..8ba229af9 100644 --- a/include/mbgl/shaders/vulkan/collision.hpp +++ b/include/mbgl/shaders/vulkan/collision.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto collisionShaderPrelude = R"( @@ -191,4 +191,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/color_relief.hpp b/include/mbgl/shaders/vulkan/color_relief.hpp index c5529d25f..59c523a09 100644 --- a/include/mbgl/shaders/vulkan/color_relief.hpp +++ b/include/mbgl/shaders/vulkan/color_relief.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto colorReliefShaderPrelude = R"( @@ -164,4 +164,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/common.hpp b/include/mbgl/shaders/vulkan/common.hpp index dd3d2267b..7bd6d1d5c 100644 --- a/include/mbgl/shaders/vulkan/common.hpp +++ b/include/mbgl/shaders/vulkan/common.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -162,4 +162,4 @@ layout(set = GLOBAL_SET_INDEX, binding = 0) uniform GlobalPaintParamsUBO { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/custom_geometry.hpp b/include/mbgl/shaders/vulkan/custom_geometry.hpp index c08dd782c..badf3e004 100644 --- a/include/mbgl/shaders/vulkan/custom_geometry.hpp +++ b/include/mbgl/shaders/vulkan/custom_geometry.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto customGeometryShaderPrelude = R"(#define idCustomGeometryDrawableUBO drawableUBOStartId)"; @@ -54,4 +54,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/custom_symbol_icon.hpp b/include/mbgl/shaders/vulkan/custom_symbol_icon.hpp index ad7df8fb7..077937772 100644 --- a/include/mbgl/shaders/vulkan/custom_symbol_icon.hpp +++ b/include/mbgl/shaders/vulkan/custom_symbol_icon.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto customSymbolIconShaderPrelude = R"(#define idCustomSymbolDrawableUBO drawableUBOStartId)"; @@ -100,4 +100,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/debug.hpp b/include/mbgl/shaders/vulkan/debug.hpp index a24011052..b75516710 100644 --- a/include/mbgl/shaders/vulkan/debug.hpp +++ b/include/mbgl/shaders/vulkan/debug.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto debugShaderPrelude = R"(#define idDebugUBO drawableUBOStartId)"; @@ -66,4 +66,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/fill.hpp b/include/mbgl/shaders/vulkan/fill.hpp index 2241d74b2..321759564 100644 --- a/include/mbgl/shaders/vulkan/fill.hpp +++ b/include/mbgl/shaders/vulkan/fill.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto fillShaderPrelude = R"( @@ -777,4 +777,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/fill_extrusion.hpp b/include/mbgl/shaders/vulkan/fill_extrusion.hpp index 5038e5167..4e9b5f297 100644 --- a/include/mbgl/shaders/vulkan/fill_extrusion.hpp +++ b/include/mbgl/shaders/vulkan/fill_extrusion.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto fillExtrusionShaderPrelude = R"( @@ -900,4 +900,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/heatmap.hpp b/include/mbgl/shaders/vulkan/heatmap.hpp index 79062e093..631d97d21 100644 --- a/include/mbgl/shaders/vulkan/heatmap.hpp +++ b/include/mbgl/shaders/vulkan/heatmap.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto heatmapShaderPrelude = R"( @@ -151,4 +151,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/heatmap_texture.hpp b/include/mbgl/shaders/vulkan/heatmap_texture.hpp index 1ac432dfd..a7c5a53fb 100644 --- a/include/mbgl/shaders/vulkan/heatmap_texture.hpp +++ b/include/mbgl/shaders/vulkan/heatmap_texture.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto heatmapTextureShaderPrelude = R"(#define idHeatmapTexturePropsUBO layerUBOStartId)"; @@ -71,4 +71,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/hillshade.hpp b/include/mbgl/shaders/vulkan/hillshade.hpp index 495a86c75..18b0b9b3c 100644 --- a/include/mbgl/shaders/vulkan/hillshade.hpp +++ b/include/mbgl/shaders/vulkan/hillshade.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto hillshadeShaderPrelude = R"( @@ -254,4 +254,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/hillshade_prepare.hpp b/include/mbgl/shaders/vulkan/hillshade_prepare.hpp index 23208ebd0..a75edd300 100644 --- a/include/mbgl/shaders/vulkan/hillshade_prepare.hpp +++ b/include/mbgl/shaders/vulkan/hillshade_prepare.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto hillshadePrepareShaderPrelude = R"( @@ -132,4 +132,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/line.hpp b/include/mbgl/shaders/vulkan/line.hpp index 480b4d05d..d669cc3fc 100644 --- a/include/mbgl/shaders/vulkan/line.hpp +++ b/include/mbgl/shaders/vulkan/line.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto lineShadePrelude = R"( @@ -1100,4 +1100,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/location_indicator.hpp b/include/mbgl/shaders/vulkan/location_indicator.hpp index 81acf806b..ffc4fc64d 100644 --- a/include/mbgl/shaders/vulkan/location_indicator.hpp +++ b/include/mbgl/shaders/vulkan/location_indicator.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto locationIndicatorShaderPrelude = R"(#define idLocationIndicatorDrawableUBO drawableUBOStartId)"; @@ -90,4 +90,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/raster.hpp b/include/mbgl/shaders/vulkan/raster.hpp index 9affa974e..b0e1aa079 100644 --- a/include/mbgl/shaders/vulkan/raster.hpp +++ b/include/mbgl/shaders/vulkan/raster.hpp @@ -10,7 +10,7 @@ constexpr auto rasterShaderPrelude = R"( )"; -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -141,4 +141,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/shader_group.hpp b/include/mbgl/shaders/vulkan/shader_group.hpp index 550e6f5cd..e2f152c62 100644 --- a/include/mbgl/shaders/vulkan/shader_group.hpp +++ b/include/mbgl/shaders/vulkan/shader_group.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class ShaderGroupBase : public gfx::ShaderGroup { @@ -19,7 +19,7 @@ protected: ShaderGroupBase(const ProgramParameters& parameters_) : programParameters(parameters_) {} - using DefinesMap = mbgl::unordered_map; + using DefinesMap = mln::unordered_map; void addAdditionalDefines(const StringIDSetsPair& propertiesAsUniforms, DefinesMap& additionalDefines) { additionalDefines.reserve(propertiesAsUniforms.first.size()); for (const auto name : propertiesAsUniforms.first) { @@ -52,8 +52,8 @@ public: constexpr auto& frag = ShaderSource::fragment; std::size_t seed = 0; - mbgl::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); - mbgl::util::hash_combine(seed, programParameters.getDefinesHash()); + mln::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); + mln::util::hash_combine(seed, programParameters.getDefinesHash()); const std::string shaderName = getShaderName(name, seed); auto shader = get(shaderName); @@ -94,4 +94,4 @@ public: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/shader_program.hpp b/include/mbgl/shaders/vulkan/shader_program.hpp index a439401e4..df9dfd0a7 100644 --- a/include/mbgl/shaders/vulkan/shader_program.hpp +++ b/include/mbgl/shaders/vulkan/shader_program.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { struct AttributeInfo { @@ -46,7 +46,7 @@ public: const std::string_view& vertex, const std::string_view& fragment, const ProgramParameters& programParameters, - const mbgl::unordered_map& additionalDefines, + const mln::unordered_map& additionalDefines, RendererBackend& backend, gfx::ContextObserver& observer); ~ShaderProgram() noexcept override; @@ -81,4 +81,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/symbol.hpp b/include/mbgl/shaders/vulkan/symbol.hpp index 9a2c0dfad..20cdeb6c7 100644 --- a/include/mbgl/shaders/vulkan/symbol.hpp +++ b/include/mbgl/shaders/vulkan/symbol.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto symbolShaderPrelude = R"( @@ -837,4 +837,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/vulkan/widevector.hpp b/include/mbgl/shaders/vulkan/widevector.hpp index f5dca1301..99d413a3f 100644 --- a/include/mbgl/shaders/vulkan/widevector.hpp +++ b/include/mbgl/shaders/vulkan/widevector.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto wideVectorShaderPrelude = R"( @@ -185,4 +185,4 @@ void main() { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/background.hpp b/include/mbgl/shaders/webgpu/background.hpp index 977648322..5a113188d 100644 --- a/include/mbgl/shaders/webgpu/background.hpp +++ b/include/mbgl/shaders/webgpu/background.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -227,4 +227,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/circle.hpp b/include/mbgl/shaders/webgpu/circle.hpp index 8461dbcda..1ac3081ba 100644 --- a/include/mbgl/shaders/webgpu/circle.hpp +++ b/include/mbgl/shaders/webgpu/circle.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -208,4 +208,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/clipping_mask.hpp b/include/mbgl/shaders/webgpu/clipping_mask.hpp index 4ba60a72d..85cb443ea 100644 --- a/include/mbgl/shaders/webgpu/clipping_mask.hpp +++ b/include/mbgl/shaders/webgpu/clipping_mask.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) ClipUBO { @@ -62,4 +62,4 @@ fn main() -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/collision.hpp b/include/mbgl/shaders/webgpu/collision.hpp index 2ba6b790d..87db26332 100644 --- a/include/mbgl/shaders/webgpu/collision.hpp +++ b/include/mbgl/shaders/webgpu/collision.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -237,4 +237,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/color_relief.hpp b/include/mbgl/shaders/webgpu/color_relief.hpp index fc354c5e8..9a5f8c7e7 100644 --- a/include/mbgl/shaders/webgpu/color_relief.hpp +++ b/include/mbgl/shaders/webgpu/color_relief.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -160,4 +160,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/common.hpp b/include/mbgl/shaders/webgpu/common.hpp index 4194182bc..4388faef5 100644 --- a/include/mbgl/shaders/webgpu/common.hpp +++ b/include/mbgl/shaders/webgpu/common.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { // The enum values are already defined in layer_ubo.hpp @@ -87,4 +87,4 @@ fn get_pattern_pos(pixel_coord_upper: vec2, pixel_coord_lower: vec2, }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/custom_geometry.hpp b/include/mbgl/shaders/webgpu/custom_geometry.hpp index 6752dd132..bb0a335f5 100644 --- a/include/mbgl/shaders/webgpu/custom_geometry.hpp +++ b/include/mbgl/shaders/webgpu/custom_geometry.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -63,4 +63,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/custom_symbol_icon.hpp b/include/mbgl/shaders/webgpu/custom_symbol_icon.hpp index d8656ccb0..88d4d54d4 100644 --- a/include/mbgl/shaders/webgpu/custom_symbol_icon.hpp +++ b/include/mbgl/shaders/webgpu/custom_symbol_icon.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -65,4 +65,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/debug.hpp b/include/mbgl/shaders/webgpu/debug.hpp index fe6344a4f..471a7ec84 100644 --- a/include/mbgl/shaders/webgpu/debug.hpp +++ b/include/mbgl/shaders/webgpu/debug.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -77,4 +77,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/fill.hpp b/include/mbgl/shaders/webgpu/fill.hpp index 428ae01ae..a670d80ad 100644 --- a/include/mbgl/shaders/webgpu/fill.hpp +++ b/include/mbgl/shaders/webgpu/fill.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -907,4 +907,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/fill_extrusion.hpp b/include/mbgl/shaders/webgpu/fill_extrusion.hpp index 9e546ba43..b7cf1a722 100644 --- a/include/mbgl/shaders/webgpu/fill_extrusion.hpp +++ b/include/mbgl/shaders/webgpu/fill_extrusion.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -413,4 +413,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/heatmap.hpp b/include/mbgl/shaders/webgpu/heatmap.hpp index 8d095befe..01eb7344e 100644 --- a/include/mbgl/shaders/webgpu/heatmap.hpp +++ b/include/mbgl/shaders/webgpu/heatmap.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -124,4 +124,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/heatmap_texture.hpp b/include/mbgl/shaders/webgpu/heatmap_texture.hpp index b225718e3..6ceb0b02e 100644 --- a/include/mbgl/shaders/webgpu/heatmap_texture.hpp +++ b/include/mbgl/shaders/webgpu/heatmap_texture.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -84,4 +84,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/hillshade.hpp b/include/mbgl/shaders/webgpu/hillshade.hpp index aa89223e4..523eec4d7 100644 --- a/include/mbgl/shaders/webgpu/hillshade.hpp +++ b/include/mbgl/shaders/webgpu/hillshade.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -223,4 +223,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/hillshade_prepare.hpp b/include/mbgl/shaders/webgpu/hillshade_prepare.hpp index 3aa0777c7..b669856d5 100644 --- a/include/mbgl/shaders/webgpu/hillshade_prepare.hpp +++ b/include/mbgl/shaders/webgpu/hillshade_prepare.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -119,4 +119,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/line.hpp b/include/mbgl/shaders/webgpu/line.hpp index dbb6115f9..1b8994b62 100644 --- a/include/mbgl/shaders/webgpu/line.hpp +++ b/include/mbgl/shaders/webgpu/line.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -1024,4 +1024,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/location_indicator.hpp b/include/mbgl/shaders/webgpu/location_indicator.hpp index 09786ef3d..45b34a554 100644 --- a/include/mbgl/shaders/webgpu/location_indicator.hpp +++ b/include/mbgl/shaders/webgpu/location_indicator.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -106,4 +106,4 @@ fn main(@location(0) uv: vec2) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/raster.hpp b/include/mbgl/shaders/webgpu/raster.hpp index 1e1d653d8..ce7715949 100644 --- a/include/mbgl/shaders/webgpu/raster.hpp +++ b/include/mbgl/shaders/webgpu/raster.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -131,4 +131,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/shader_group.hpp b/include/mbgl/shaders/webgpu/shader_group.hpp index 1ac121871..41c1ce0c2 100644 --- a/include/mbgl/shaders/webgpu/shader_group.hpp +++ b/include/mbgl/shaders/webgpu/shader_group.hpp @@ -14,7 +14,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { class ShaderGroupBase : public gfx::ShaderGroup { @@ -22,7 +22,7 @@ protected: ShaderGroupBase(const ProgramParameters& parameters_) : programParameters(parameters_) {} - using DefinesMap = mbgl::unordered_map; + using DefinesMap = mln::unordered_map; void addAdditionalDefines(const StringIDSetsPair& propertiesAsUniforms, DefinesMap& additionalDefines) { additionalDefines.reserve(propertiesAsUniforms.first.size()); for (const auto name : propertiesAsUniforms.first) { @@ -54,8 +54,8 @@ public: constexpr auto& frag = ShaderSource::fragment; std::size_t seed = 0; - mbgl::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); - mbgl::util::hash_combine(seed, programParameters.getDefinesHash()); + mln::util::hash_combine(seed, propertyHash(propertiesAsUniforms)); + mln::util::hash_combine(seed, programParameters.getDefinesHash()); const std::string shaderName = getShaderName(name, seed); auto shader = get(shaderName); @@ -106,4 +106,4 @@ public: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/shader_program.hpp b/include/mbgl/shaders/webgpu/shader_program.hpp index ae662dd60..8a2e660ce 100644 --- a/include/mbgl/shaders/webgpu/shader_program.hpp +++ b/include/mbgl/shaders/webgpu/shader_program.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { struct UniformBlockInfo { constexpr UniformBlockInfo(bool vertex_, bool fragment_, std::size_t size_, std::size_t id_) @@ -167,4 +167,4 @@ protected: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/symbol.hpp b/include/mbgl/shaders/webgpu/symbol.hpp index fb0b3a9b0..71dd8e78e 100644 --- a/include/mbgl/shaders/webgpu/symbol.hpp +++ b/include/mbgl/shaders/webgpu/symbol.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace shaders { constexpr auto symbolShaderPrelude = R"( @@ -756,4 +756,4 @@ fn main(in: FragmentInput) -> @location(0) vec4 { }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/webgpu/wgsl_preprocessor.hpp b/include/mbgl/shaders/webgpu/wgsl_preprocessor.hpp index aae915e1c..310f13d74 100644 --- a/include/mbgl/shaders/webgpu/wgsl_preprocessor.hpp +++ b/include/mbgl/shaders/webgpu/wgsl_preprocessor.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { namespace detail { @@ -13,4 +13,4 @@ std::string preprocessWGSL(const std::string& source, const std::unordered_map #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -79,4 +79,4 @@ fn main(@location(0) color: vec4, @location(1) texCoord: vec2) -> @loc }; } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/shaders/widevector_ubo.hpp b/include/mbgl/shaders/widevector_ubo.hpp index 8720dccf7..897be9695 100644 --- a/include/mbgl/shaders/widevector_ubo.hpp +++ b/include/mbgl/shaders/widevector_ubo.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace shaders { struct alignas(16) WideVectorUniformsUBO { @@ -54,4 +54,4 @@ struct VertexTriWideVecInstance { static_assert(sizeof(VertexTriWideVecInstance) == 48); } // namespace shaders -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/database_file_source.hpp b/include/mbgl/storage/database_file_source.hpp index 3c3bcbeea..3d6c7d4bd 100644 --- a/include/mbgl/storage/database_file_source.hpp +++ b/include/mbgl/storage/database_file_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { class ClientOptions; class ResourceOptions; @@ -258,4 +258,4 @@ private: const std::unique_ptr impl; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp index 6a70154df..4fea8f9e0 100644 --- a/include/mbgl/storage/file_source.hpp +++ b/include/mbgl/storage/file_source.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class AsyncRequest; class Resource; @@ -118,4 +118,4 @@ constexpr const char* MAX_CONCURRENT_REQUESTS_KEY = "max-concurrent-requests"; /// database opens in read-write-create mode otherwise. type: bool constexpr const char* READ_ONLY_MODE_KEY = "read-only-mode"; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/file_source_manager.hpp b/include/mbgl/storage/file_source_manager.hpp index b6ef59c09..6ebaf0a3d 100644 --- a/include/mbgl/storage/file_source_manager.hpp +++ b/include/mbgl/storage/file_source_manager.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class ClientOptions; class ResourceOptions; @@ -50,4 +50,4 @@ protected: virtual ~FileSourceManager(); }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/network_status.hpp b/include/mbgl/storage/network_status.hpp index 0d1ae54ec..a836737ec 100644 --- a/include/mbgl/storage/network_status.hpp +++ b/include/mbgl/storage/network_status.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class AsyncTask; @@ -31,4 +31,4 @@ private: static std::unordered_set observers; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp index b136ee7fe..8810a054b 100644 --- a/include/mbgl/storage/offline.hpp +++ b/include/mbgl/storage/offline.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { class TileID; @@ -234,4 +234,4 @@ private: using OfflineRegions = std::vector; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/online_file_source.hpp b/include/mbgl/storage/online_file_source.hpp index 797e40700..1cb38a3a2 100644 --- a/include/mbgl/storage/online_file_source.hpp +++ b/include/mbgl/storage/online_file_source.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { class OnlineFileSource : public FileSource { public: @@ -31,4 +31,4 @@ private: const std::unique_ptr impl; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp index 47591a9a5..7522fd23a 100644 --- a/include/mbgl/storage/resource.hpp +++ b/include/mbgl/storage/resource.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class Resource { public: @@ -109,4 +109,4 @@ inline bool Resource::hasLoadingMethod(Resource::LoadingMethod method) const { return (loadingMethod & method); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/resource_options.hpp b/include/mbgl/storage/resource_options.hpp index 7cf6b9087..0976a16fd 100644 --- a/include/mbgl/storage/resource_options.hpp +++ b/include/mbgl/storage/resource_options.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { /** * @brief Holds values for resource options. @@ -131,4 +131,4 @@ private: std::unique_ptr impl_; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/resource_transform.hpp b/include/mbgl/storage/resource_transform.hpp index 29d19bb4e..13e3b210e 100644 --- a/include/mbgl/storage/resource_transform.hpp +++ b/include/mbgl/storage/resource_transform.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { class ResourceTransform { public: @@ -20,4 +20,4 @@ private: TransformCallback transformCallback; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/storage/response.hpp b/include/mbgl/storage/response.hpp index a8d9bb028..a6a55d58e 100644 --- a/include/mbgl/storage/response.hpp +++ b/include/mbgl/storage/response.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { class Response { public: @@ -65,4 +65,4 @@ public: Error(Reason, std::string = "", std::optional = std::nullopt); }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/color_ramp_property_value.hpp b/include/mbgl/style/color_ramp_property_value.hpp index 187408cce..fdaf748ab 100644 --- a/include/mbgl/style/color_ramp_property_value.hpp +++ b/include/mbgl/style/color_ramp_property_value.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { /** @@ -51,4 +51,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion.hpp b/include/mbgl/style/conversion.hpp index e289d1f78..8371bff30 100644 --- a/include/mbgl/style/conversion.hpp +++ b/include/mbgl/style/conversion.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -28,4 +28,4 @@ struct ValueFactory; } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/color_ramp_property_value.hpp b/include/mbgl/style/conversion/color_ramp_property_value.hpp index aa19f7ca2..8b09262b9 100644 --- a/include/mbgl/style/conversion/color_ramp_property_value.hpp +++ b/include/mbgl/style/conversion/color_ramp_property_value.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -17,4 +17,4 @@ struct Converter { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/constant.hpp b/include/mbgl/style/conversion/constant.hpp index 94da87970..3b3a83cf7 100644 --- a/include/mbgl/style/conversion/constant.hpp +++ b/include/mbgl/style/conversion/constant.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -83,4 +83,4 @@ struct Converter> { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/coordinate.hpp b/include/mbgl/style/conversion/coordinate.hpp index c32e0b38e..fa0c49efb 100644 --- a/include/mbgl/style/conversion/coordinate.hpp +++ b/include/mbgl/style/conversion/coordinate.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -17,4 +17,4 @@ public: } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/custom_geometry_source_options.hpp b/include/mbgl/style/conversion/custom_geometry_source_options.hpp index 5340df36b..f9767bf27 100644 --- a/include/mbgl/style/conversion/custom_geometry_source_options.hpp +++ b/include/mbgl/style/conversion/custom_geometry_source_options.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -14,4 +14,4 @@ struct Converter { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/filter.hpp b/include/mbgl/style/conversion/filter.hpp index 7492b4062..0c268c937 100644 --- a/include/mbgl/style/conversion/filter.hpp +++ b/include/mbgl/style/conversion/filter.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -15,4 +15,4 @@ public: } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/function.hpp b/include/mbgl/style/conversion/function.hpp index 2b707122c..463788a55 100644 --- a/include/mbgl/style/conversion/function.hpp +++ b/include/mbgl/style/conversion/function.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -29,4 +29,4 @@ std::optional> convertFunctionToExpression(const Convertib } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/geojson.hpp b/include/mbgl/style/conversion/geojson.hpp index bacc3342b..fe234ee08 100644 --- a/include/mbgl/style/conversion/geojson.hpp +++ b/include/mbgl/style/conversion/geojson.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -15,7 +15,7 @@ std::optional parseGeoJSON(const std::string&, Error&); // Serialize a GeoJSON value back to a JSON string. This is the public // counterpart to parseGeoJSON: consumers that link the core through the -// amalgam (which exports only mbgl::* symbols) cannot reach the bundled +// amalgam (which exports only mln::* symbols) cannot reach the bundled // mapbox::geojson::stringify directly. std::string stringifyGeoJSON(const GeoJSON&); @@ -27,4 +27,4 @@ public: } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/geojson_options.hpp b/include/mbgl/style/conversion/geojson_options.hpp index 444b5c7ca..aa1658cca 100644 --- a/include/mbgl/style/conversion/geojson_options.hpp +++ b/include/mbgl/style/conversion/geojson_options.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -14,4 +14,4 @@ struct Converter { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/get_json_type.hpp b/include/mbgl/style/conversion/get_json_type.hpp index f7efebccc..26a282f0f 100644 --- a/include/mbgl/style/conversion/get_json_type.hpp +++ b/include/mbgl/style/conversion/get_json_type.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -11,4 +11,4 @@ std::string getJSONType(const Convertible& value); } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/layer.hpp b/include/mbgl/style/conversion/layer.hpp index d1e669940..8b4d9f40c 100644 --- a/include/mbgl/style/conversion/layer.hpp +++ b/include/mbgl/style/conversion/layer.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -20,4 +20,4 @@ std::optional setPaintProperties(Layer& layer, const Convertible& value); } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/light.hpp b/include/mbgl/style/conversion/light.hpp index d1b2c7431..cc5f3ccd9 100644 --- a/include/mbgl/style/conversion/light.hpp +++ b/include/mbgl/style/conversion/light.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -17,4 +17,4 @@ public: } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/position.hpp b/include/mbgl/style/conversion/position.hpp index 7d53d6580..0f728e2d4 100644 --- a/include/mbgl/style/conversion/position.hpp +++ b/include/mbgl/style/conversion/position.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -16,4 +16,4 @@ struct Converter { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/property_value.hpp b/include/mbgl/style/conversion/property_value.hpp index bcc174a91..0fc91f647 100644 --- a/include/mbgl/style/conversion/property_value.hpp +++ b/include/mbgl/style/conversion/property_value.hpp @@ -12,7 +12,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -60,4 +60,4 @@ struct Converter>, void> { }; } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/rotation.hpp b/include/mbgl/style/conversion/rotation.hpp index 9502e854b..0086c4909 100644 --- a/include/mbgl/style/conversion/rotation.hpp +++ b/include/mbgl/style/conversion/rotation.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -16,4 +16,4 @@ struct Converter { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/source.hpp b/include/mbgl/style/conversion/source.hpp index 6e8c81db4..71f0a8557 100644 --- a/include/mbgl/style/conversion/source.hpp +++ b/include/mbgl/style/conversion/source.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -20,4 +20,4 @@ public: } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/source_options.hpp b/include/mbgl/style/conversion/source_options.hpp index 1f91d9b97..edc2ecb3c 100644 --- a/include/mbgl/style/conversion/source_options.hpp +++ b/include/mbgl/style/conversion/source_options.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -14,4 +14,4 @@ struct Converter { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/tileset.hpp b/include/mbgl/style/conversion/tileset.hpp index 5be47b35e..b4f89bc59 100644 --- a/include/mbgl/style/conversion/tileset.hpp +++ b/include/mbgl/style/conversion/tileset.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -17,4 +17,4 @@ public: } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion/transition_options.hpp b/include/mbgl/style/conversion/transition_options.hpp index 987233564..0897b2681 100644 --- a/include/mbgl/style/conversion/transition_options.hpp +++ b/include/mbgl/style/conversion/transition_options.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -17,4 +17,4 @@ public: } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/conversion_impl.hpp b/include/mbgl/style/conversion_impl.hpp index 2fa578839..4189bef92 100644 --- a/include/mbgl/style/conversion_impl.hpp +++ b/include/mbgl/style/conversion_impl.hpp @@ -19,7 +19,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { /** @@ -211,7 +211,7 @@ public: private: #if __ANDROID__ - // Android: JSValue* or mbgl::android::Value + // Android: JSValue* or mln::android::Value using Storage = std::aligned_storage_t<32, 8>; #elif __QT__ // Qt: JSValue* or QVariant @@ -398,4 +398,4 @@ inline StyleProperty makeStyleProperty(const ColorRampPropertyValue& value) { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/assertion.hpp b/include/mbgl/style/expression/assertion.hpp index 888e0e0d4..f99077d63 100644 --- a/include/mbgl/style/expression/assertion.hpp +++ b/include/mbgl/style/expression/assertion.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -15,7 +15,7 @@ class Assertion : public Expression { public: Assertion(type::Type type_, std::vector> inputs_); - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function& visit) const override; @@ -24,7 +24,7 @@ public: std::vector> possibleOutputs() const override; - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override; private: @@ -33,4 +33,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/at.hpp b/include/mbgl/style/expression/at.hpp index dee926036..187cabb1b 100644 --- a/include/mbgl/style/expression/at.hpp +++ b/include/mbgl/style/expression/at.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -15,7 +15,7 @@ public: index(std::move(index_)), input(std::move(input_)) {} - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function&) const override; @@ -39,4 +39,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/boolean_operator.hpp b/include/mbgl/style/expression/boolean_operator.hpp index b01373beb..3c21764a4 100644 --- a/include/mbgl/style/expression/boolean_operator.hpp +++ b/include/mbgl/style/expression/boolean_operator.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -15,7 +15,7 @@ public: : Expression(Kind::Any, type::Boolean, collectDependencies(inputs_)), inputs(std::move(inputs_)) {} - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function& visit) const override; @@ -34,7 +34,7 @@ public: : Expression(Kind::All, type::Boolean, collectDependencies(inputs_)), inputs(std::move(inputs_)) {} - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function& visit) const override; @@ -49,4 +49,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/case.hpp b/include/mbgl/style/expression/case.hpp index 33d255184..60bad3a43 100644 --- a/include/mbgl/style/expression/case.hpp +++ b/include/mbgl/style/expression/case.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -21,7 +21,7 @@ public: branches(std::move(branches_)), otherwise(std::move(otherwise_)) {} - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function& visit) const override; @@ -45,4 +45,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/check_subtype.hpp b/include/mbgl/style/expression/check_subtype.hpp index db6e244ba..dff1acb88 100644 --- a/include/mbgl/style/expression/check_subtype.hpp +++ b/include/mbgl/style/expression/check_subtype.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { namespace type { @@ -13,4 +13,4 @@ std::optional checkSubtype(const Type& expected, const Type& t); } // namespace type } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/coalesce.hpp b/include/mbgl/style/expression/coalesce.hpp index ffb099965..935984d55 100644 --- a/include/mbgl/style/expression/coalesce.hpp +++ b/include/mbgl/style/expression/coalesce.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -18,7 +18,7 @@ public: : Expression(Kind::Coalesce, std::move(type_), collectDependencies(args_)), args(std::move(args_)) {} - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; @@ -40,4 +40,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/coercion.hpp b/include/mbgl/style/expression/coercion.hpp index bc6ad68d7..eb377d167 100644 --- a/include/mbgl/style/expression/coercion.hpp +++ b/include/mbgl/style/expression/coercion.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -14,12 +14,12 @@ class Coercion : public Expression { public: Coercion(const type::Type& type_, std::vector> inputs_); - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function& visit) const override; - mbgl::Value serialize() const override; + mln::Value serialize() const override; bool operator==(const Expression& e) const noexcept override; @@ -34,4 +34,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/collator.hpp b/include/mbgl/style/expression/collator.hpp index 9c94f8109..b6102c502 100644 --- a/include/mbgl/style/expression/collator.hpp +++ b/include/mbgl/style/expression/collator.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -25,4 +25,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/collator_expression.hpp b/include/mbgl/style/expression/collator_expression.hpp index 311b82f0a..c5df90cf6 100644 --- a/include/mbgl/style/expression/collator_expression.hpp +++ b/include/mbgl/style/expression/collator_expression.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -17,7 +17,7 @@ public: std::optional> locale); EvaluationResult evaluate(const EvaluationContext&) const override; - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); void eachChild(const std::function&) const override; @@ -32,7 +32,7 @@ public: return {std::nullopt}; } - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "collator"; } private: @@ -43,4 +43,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/comparison.hpp b/include/mbgl/style/expression/comparison.hpp index e82ff6111..e29d3bd46 100644 --- a/include/mbgl/style/expression/comparison.hpp +++ b/include/mbgl/style/expression/comparison.hpp @@ -7,11 +7,11 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { -ParseResult parseComparison(const mbgl::style::conversion::Convertible&, ParsingContext&); +ParseResult parseComparison(const mln::style::conversion::Convertible&, ParsingContext&); class BasicComparison : public Expression { public: @@ -59,4 +59,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/compound_expression.hpp b/include/mbgl/style/expression/compound_expression.hpp index 5819349d2..dd41fe051 100644 --- a/include/mbgl/style/expression/compound_expression.hpp +++ b/include/mbgl/style/expression/compound_expression.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -22,7 +22,7 @@ struct SignatureBase; CompoundExpression provides a mechanism for implementing an expression simply by providing a list of pure functions of the form (const T0& arg0, const T1& arg1, ...) -> Result where T0, T1, ..., U are - member types of mbgl::style::expression::Value. + member types of mln::style::expression::Value. The majority of expressions specified in the style-spec are implemented in this fashion (see compound_expression.cpp). @@ -47,7 +47,7 @@ protected: }; ParseResult parseCompoundExpression(const std::string& name, - const mbgl::style::conversion::Convertible& value, + const mln::style::conversion::Convertible& value, ParsingContext& ctx); ParseResult createCompoundExpression(const std::string& name, @@ -56,4 +56,4 @@ ParseResult createCompoundExpression(const std::string& name, } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/distance.hpp b/include/mbgl/style/expression/distance.hpp index 280f1fe12..05aa212d4 100644 --- a/include/mbgl/style/expression/distance.hpp +++ b/include/mbgl/style/expression/distance.hpp @@ -15,7 +15,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -26,7 +26,7 @@ public: EvaluationResult evaluate(const EvaluationContext&) const override; - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); void eachChild(const std::function&) const noexcept override {} @@ -34,7 +34,7 @@ public: std::vector> possibleOutputs() const override { return {std::nullopt}; } - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "distance"; } private: @@ -44,4 +44,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/dsl.hpp b/include/mbgl/style/expression/dsl.hpp index a5d371bd7..4cbf91d49 100644 --- a/include/mbgl/style/expression/dsl.hpp +++ b/include/mbgl/style/expression/dsl.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { /// This convenience API does little to no expression validation or @@ -25,7 +25,7 @@ std::vector> vec(Args... args) { } std::unique_ptr createExpression(const char* expr); -std::unique_ptr createExpression(const mbgl::style::conversion::Convertible& expr); +std::unique_ptr createExpression(const mln::style::conversion::Convertible& expr); std::unique_ptr error(std::string); std::unique_ptr literal(const char* value); @@ -101,4 +101,4 @@ std::unique_ptr image(std::unique_ptr); } // namespace dsl } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/error.hpp b/include/mbgl/style/expression/error.hpp index aedcf5e64..5dafaad70 100644 --- a/include/mbgl/style/expression/error.hpp +++ b/include/mbgl/style/expression/error.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -30,4 +30,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp index 468e7e685..a2075409c 100644 --- a/include/mbgl/style/expression/expression.hpp +++ b/include/mbgl/style/expression/expression.hpp @@ -15,7 +15,7 @@ #include #include -namespace mbgl { +namespace mln { class GeometryTileFeature; @@ -37,7 +37,7 @@ public: EvaluationContext(float zoom_, GeometryTileFeature const* feature_) noexcept : zoom(zoom_), feature(feature_) {} - EvaluationContext(std::optional accumulated_, GeometryTileFeature const* feature_) noexcept(false) + EvaluationContext(std::optional accumulated_, GeometryTileFeature const* feature_) noexcept(false) : accumulated(std::move(accumulated_)), feature(feature_) {} EvaluationContext(float zoom_, GeometryTileFeature const* feature_, const FeatureState* state_) noexcept @@ -75,7 +75,7 @@ public: return *this; }; - EvaluationContext& withCanonicalTileID(const mbgl::CanonicalTileID* canonical_) noexcept { + EvaluationContext& withCanonicalTileID(const mln::CanonicalTileID* canonical_) noexcept { canonical = canonical_; return *this; }; @@ -86,7 +86,7 @@ public: }; std::optional zoom; - std::optional accumulated; + std::optional accumulated; GeometryTileFeature const* feature = nullptr; std::optional colorRampParameter; std::optional elevation; @@ -94,7 +94,7 @@ public: const Value* formattedSection = nullptr; const FeatureState* featureState = nullptr; const std::set* availableImages = nullptr; - const mbgl::CanonicalTileID* canonical = nullptr; + const mln::CanonicalTileID* canonical = nullptr; }; template @@ -169,7 +169,7 @@ public: CompoundExpression implements the majority of expressions in the spec by inferring the argument and output from a simple function (const T0& arg0, const T1& arg1, ...) -> Result where T0, T1, ..., U are member types of - mbgl::style::expression::Value. + mln::style::expression::Value. The other Expression subclasses (Let, Curve, Match, etc.) exist in order to implement expressions that need specialized parsing, type checking, or @@ -260,7 +260,7 @@ public: std::optional colorRampParameter, const std::set& availableImages, const CanonicalTileID& canonical) const; - EvaluationResult evaluate(std::optional accumulated, const Feature& feature) const; + EvaluationResult evaluate(std::optional accumulated, const Feature& feature) const; /** * Statically analyze the expression, attempting to enumerate possible @@ -270,8 +270,8 @@ public: */ virtual std::vector> possibleOutputs() const = 0; - virtual mbgl::Value serialize() const { - std::vector serialized; + virtual mln::Value serialize() const { + std::vector serialized; serialized.emplace_back(getOperator()); eachChild([&](const Expression& child) { serialized.emplace_back(child.serialize()); }); return serialized; @@ -385,4 +385,4 @@ std::string toString(style::expression::Dependency); std::ostream& operator<<(std::ostream&, style::expression::Dependency); -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/find_zoom_curve.hpp b/include/mbgl/style/expression/find_zoom_curve.hpp index 2507fe5b1..b718bcf1c 100644 --- a/include/mbgl/style/expression/find_zoom_curve.hpp +++ b/include/mbgl/style/expression/find_zoom_curve.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -26,4 +26,4 @@ ZoomCurvePtr findZoomCurveChecked(const expression::Expression& expr); } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/format_expression.hpp b/include/mbgl/style/expression/format_expression.hpp index b13939e8f..3c28373a0 100644 --- a/include/mbgl/style/expression/format_expression.hpp +++ b/include/mbgl/style/expression/format_expression.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -28,7 +28,7 @@ public: explicit FormatExpression(std::vector sections); EvaluationResult evaluate(const EvaluationContext&) const override; - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); void eachChild(const std::function&) const override; @@ -42,7 +42,7 @@ public: const std::vector& getSections() const noexcept { return sections; } - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "format"; } private: @@ -56,4 +56,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/format_section_override.hpp b/include/mbgl/style/expression/format_section_override.hpp index 5d7969a7f..deeb91ec3 100644 --- a/include/mbgl/style/expression/format_section_override.hpp +++ b/include/mbgl/style/expression/format_section_override.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -73,4 +73,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/formatted.hpp b/include/mbgl/style/expression/formatted.hpp index 75184948c..7f1e76129 100644 --- a/include/mbgl/style/expression/formatted.hpp +++ b/include/mbgl/style/expression/formatted.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -51,7 +51,7 @@ public: bool operator==(const Formatted&) const; std::string toString() const; - mbgl::Value toObject() const; + mln::Value toObject() const; bool empty() const; @@ -76,4 +76,4 @@ struct ValueFactory { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/get_covering_stops.hpp b/include/mbgl/style/expression/get_covering_stops.hpp index 38dd3f726..e8fbf7856 100644 --- a/include/mbgl/style/expression/get_covering_stops.hpp +++ b/include/mbgl/style/expression/get_covering_stops.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -16,4 +16,4 @@ Range getCoveringStops(const std::map } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/image.hpp b/include/mbgl/style/expression/image.hpp index 0555139d8..3041a614f 100644 --- a/include/mbgl/style/expression/image.hpp +++ b/include/mbgl/style/expression/image.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -18,7 +18,7 @@ public: Image(std::string imageID); explicit Image(std::string imageID, bool available); bool operator==(const Image&) const; - mbgl::Value toValue() const; + mln::Value toValue() const; const std::string& id() const; bool isAvailable() const; bool empty() const; @@ -46,4 +46,4 @@ struct ValueFactory { } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/image_expression.hpp b/include/mbgl/style/expression/image_expression.hpp index 899d69880..48d903ff5 100644 --- a/include/mbgl/style/expression/image_expression.hpp +++ b/include/mbgl/style/expression/image_expression.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -13,7 +13,7 @@ public: explicit ImageExpression(std::unique_ptr imageID); EvaluationResult evaluate(const EvaluationContext&) const override; - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); void eachChild(const std::function&) const override; @@ -21,7 +21,7 @@ public: std::vector> possibleOutputs() const override { return {std::nullopt}; } - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "image"; } private: @@ -30,4 +30,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/in.hpp b/include/mbgl/style/expression/in.hpp index ac74e3372..03634987c 100644 --- a/include/mbgl/style/expression/in.hpp +++ b/include/mbgl/style/expression/in.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -12,7 +12,7 @@ class In final : public Expression { public: In(std::unique_ptr needle_, std::unique_ptr haystack_); - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function&) const override; @@ -30,4 +30,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/index_of.hpp b/include/mbgl/style/expression/index_of.hpp index 364b9551e..fd88daa19 100644 --- a/include/mbgl/style/expression/index_of.hpp +++ b/include/mbgl/style/expression/index_of.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -14,7 +14,7 @@ public: std::unique_ptr input_, std::unique_ptr fromIndex_); - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function&) const override; @@ -38,4 +38,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/interpolate.hpp b/include/mbgl/style/expression/interpolate.hpp index 565aa16b4..36c54e3ae 100644 --- a/include/mbgl/style/expression/interpolate.hpp +++ b/include/mbgl/style/expression/interpolate.hpp @@ -11,11 +11,11 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { -ParseResult parseInterpolate(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); +ParseResult parseInterpolate(const mln::style::conversion::Convertible& value, ParsingContext& ctx); class Interpolate : public Expression { public: @@ -44,7 +44,7 @@ public: // Return the smallest range of stops that covers the interval [lower, upper] Range getCoveringStops(const double lower, const double upper) const noexcept { - return ::mbgl::style::expression::getCoveringStops(stops, lower, upper); + return ::mln::style::expression::getCoveringStops(stops, lower, upper); } double interpolationFactor(const Range& inputLevels, const double inputValue) const { @@ -65,7 +65,7 @@ public: } std::vector> possibleOutputs() const override; - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "interpolate"; } protected: @@ -82,4 +82,4 @@ ParseResult createInterpolate(type::Type type, } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/interpolator.hpp b/include/mbgl/style/expression/interpolator.hpp index 37708d601..0c0360ffa 100644 --- a/include/mbgl/style/expression/interpolator.hpp +++ b/include/mbgl/style/expression/interpolator.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -47,4 +47,4 @@ using Interpolator = variant; } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/is_constant.hpp b/include/mbgl/style/expression/is_constant.hpp index f15ea671f..9d476575a 100644 --- a/include/mbgl/style/expression/is_constant.hpp +++ b/include/mbgl/style/expression/is_constant.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -35,4 +35,4 @@ bool isRuntimeConstant(const Expression& e); } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/is_expression.hpp b/include/mbgl/style/expression/is_expression.hpp index 77c489619..5814dda93 100644 --- a/include/mbgl/style/expression/is_expression.hpp +++ b/include/mbgl/style/expression/is_expression.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -10,4 +10,4 @@ bool isExpression(const conversion::Convertible& value); } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/length.hpp b/include/mbgl/style/expression/length.hpp index 29e89415a..2d969d506 100644 --- a/include/mbgl/style/expression/length.hpp +++ b/include/mbgl/style/expression/length.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -15,7 +15,7 @@ class Length : public Expression { public: Length(std::unique_ptr input); - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function& visit) const override; @@ -29,4 +29,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/let.hpp b/include/mbgl/style/expression/let.hpp index 54a97c783..f435b45c9 100644 --- a/include/mbgl/style/expression/let.hpp +++ b/include/mbgl/style/expression/let.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -22,7 +22,7 @@ public: bindings(std::move(bindings_)), result(std::move(result_)) {} - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function&) const override; @@ -39,7 +39,7 @@ public: Expression* getResult() const noexcept { return result.get(); } - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "let"; } private: @@ -54,7 +54,7 @@ public: name(std::move(name_)), value(std::move(value_)) {} - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function&) const override; @@ -69,7 +69,7 @@ public: std::vector> possibleOutputs() const override; - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "var"; } const std::shared_ptr& getBoundExpression() const noexcept { return value; } @@ -81,4 +81,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/literal.hpp b/include/mbgl/style/expression/literal.hpp index 32205039f..f8a445958 100644 --- a/include/mbgl/style/expression/literal.hpp +++ b/include/mbgl/style/expression/literal.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -26,7 +26,7 @@ public: EvaluationResult evaluate(const EvaluationContext&) const override { return value; } - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); void eachChild(const std::function&) const noexcept override {} @@ -42,7 +42,7 @@ public: const Value& getValue() const noexcept { return value; } - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "literal"; } private: @@ -51,4 +51,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/match.hpp b/include/mbgl/style/expression/match.hpp index 24ac90497..50529326d 100644 --- a/include/mbgl/style/expression/match.hpp +++ b/include/mbgl/style/expression/match.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -33,7 +33,7 @@ public: std::vector> possibleOutputs() const override; - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "match"; } private: @@ -42,8 +42,8 @@ private: std::unique_ptr otherwise; }; -ParseResult parseMatch(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); +ParseResult parseMatch(const mln::style::conversion::Convertible& value, ParsingContext& ctx); } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/number_format.hpp b/include/mbgl/style/expression/number_format.hpp index 4fac4ee6f..14e33acb7 100644 --- a/include/mbgl/style/expression/number_format.hpp +++ b/include/mbgl/style/expression/number_format.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -17,14 +17,14 @@ public: ~NumberFormat() override; - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function& visit) const override; bool operator==(const Expression& e) const noexcept override; std::vector> possibleOutputs() const override; - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "number-format"; } private: @@ -37,4 +37,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/parsing_context.hpp b/include/mbgl/style/expression/parsing_context.hpp index d11d7e00e..99aabc349 100644 --- a/include/mbgl/style/expression/parsing_context.hpp +++ b/include/mbgl/style/expression/parsing_context.hpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -97,7 +97,7 @@ public: /** Parse the given style-spec JSON value as an expression. */ - ParseResult parseExpression(const mbgl::style::conversion::Convertible& value, + ParseResult parseExpression(const mln::style::conversion::Convertible& value, const std::optional& = std::nullopt); /** @@ -105,12 +105,12 @@ public: used in a layout or paint property. This entails checking additional constraints that exist in that context but not, e.g., for filters. */ - ParseResult parseLayerPropertyExpression(const mbgl::style::conversion::Convertible& value); + ParseResult parseLayerPropertyExpression(const mln::style::conversion::Convertible& value); /** Parse a child expression. For use by individual Expression::parse() methods. */ - ParseResult parse(const mbgl::style::conversion::Convertible&, + ParseResult parse(const mln::style::conversion::Convertible&, std::size_t, std::optional = std::nullopt, const std::optional& = std::nullopt); @@ -118,7 +118,7 @@ public: /** Parse a child expression. For use by individual Expression::parse() methods. */ - ParseResult parse(const mbgl::style::conversion::Convertible&, + ParseResult parse(const mln::style::conversion::Convertible&, std::size_t index, std::optional, const std::map>&); @@ -168,7 +168,7 @@ private: type (either Literal, or the one named in value[0]) and dispatching to the appropriate ParseXxxx::parse(const V&, ParsingContext) method. */ - ParseResult parse(const mbgl::style::conversion::Convertible& value, + ParseResult parse(const mln::style::conversion::Convertible& value, const std::optional& = std::nullopt); std::string key; @@ -181,4 +181,4 @@ bool isExpression(const std::string&) noexcept; } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/slice.hpp b/include/mbgl/style/expression/slice.hpp index 85d5a8040..83ccf0087 100644 --- a/include/mbgl/style/expression/slice.hpp +++ b/include/mbgl/style/expression/slice.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -14,7 +14,7 @@ public: std::unique_ptr fromIndex_, std::unique_ptr toIndex_); - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); EvaluationResult evaluate(const EvaluationContext& params) const override; void eachChild(const std::function&) const override; @@ -36,4 +36,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/step.hpp b/include/mbgl/style/expression/step.hpp index 7d0ab4945..546b11bac 100644 --- a/include/mbgl/style/expression/step.hpp +++ b/include/mbgl/style/expression/step.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -31,9 +31,9 @@ public: std::vector> possibleOutputs() const override; - static ParseResult parse(const mbgl::style::conversion::Convertible& value, ParsingContext& ctx); + static ParseResult parse(const mln::style::conversion::Convertible& value, ParsingContext& ctx); - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "step"; } private: @@ -43,4 +43,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/type.hpp b/include/mbgl/style/expression/type.hpp index 31883b0ef..a650f48c1 100644 --- a/include/mbgl/style/expression/type.hpp +++ b/include/mbgl/style/expression/type.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { namespace type { @@ -156,4 +156,4 @@ std::string toString(const T& type) { } // namespace type } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/value.hpp b/include/mbgl/style/expression/value.hpp index d7a305ac3..cf9397697 100644 --- a/include/mbgl/style/expression/value.hpp +++ b/include/mbgl/style/expression/value.hpp @@ -18,7 +18,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -95,9 +95,9 @@ struct ValueConverter { }; template <> -struct ValueConverter { - static Value toExpressionValue(const mbgl::Value& value); - static mbgl::Value fromExpressionValue(const Value& value); +struct ValueConverter { + static Value toExpressionValue(const mln::Value& value); + static mln::Value fromExpressionValue(const Value& value); }; template <> @@ -124,7 +124,7 @@ struct ValueConverter> { template <> struct ValueConverter { static type::Type expressionType() { return type::Array(type::Number, 3); } - static Value toExpressionValue(const mbgl::style::Position& value); + static Value toExpressionValue(const mln::style::Position& value); static std::optional fromExpressionValue(const Value& v); }; @@ -158,10 +158,10 @@ std::vector> fromExpressionValues(const std::vector struct ValueConverter { static type::Type expressionType() { return type::Number; } - static Value toExpressionValue(const mbgl::style::Rotation& value); + static Value toExpressionValue(const mln::style::Rotation& value); static std::optional fromExpressionValue(const Value& v); }; } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/expression/within.hpp b/include/mbgl/style/expression/within.hpp index 94c203212..5ed246116 100644 --- a/include/mbgl/style/expression/within.hpp +++ b/include/mbgl/style/expression/within.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace expression { @@ -17,7 +17,7 @@ public: EvaluationResult evaluate(const EvaluationContext&) const override; - static ParseResult parse(const mbgl::style::conversion::Convertible&, ParsingContext&); + static ParseResult parse(const mln::style::conversion::Convertible&, ParsingContext&); void eachChild(const std::function&) const noexcept override {} @@ -25,7 +25,7 @@ public: std::vector> possibleOutputs() const override; - mbgl::Value serialize() const override; + mln::Value serialize() const override; std::string getOperator() const override { return "within"; } private: @@ -35,4 +35,4 @@ private: } // namespace expression } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp index bc6e98ff5..099768f61 100644 --- a/include/mbgl/style/filter.hpp +++ b/include/mbgl/style/filter.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class Filter { @@ -18,12 +18,12 @@ public: std::optional> expression; private: - std::optional legacyFilter; + std::optional legacyFilter; public: Filter() = default; - Filter(expression::ParseResult _expression, std::optional _filter = std::nullopt) + Filter(expression::ParseResult _expression, std::optional _filter = std::nullopt) : expression(std::move(*_expression)), legacyFilter(std::move(_filter)) { assert(!expression || *expression != nullptr); @@ -43,7 +43,7 @@ public: friend bool operator!=(const Filter& lhs, const Filter& rhs) { return !(lhs == rhs); } - mbgl::Value serialize() const { + mln::Value serialize() const { if (legacyFilter) { return *legacyFilter; } else if (expression) { @@ -54,4 +54,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/image.hpp b/include/mbgl/style/image.hpp index 35c42e8a3..757edea27 100644 --- a/include/mbgl/style/image.hpp +++ b/include/mbgl/style/image.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { using ImageStretch = std::pair; @@ -93,4 +93,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index 4db877e11..a0170b0b2 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace expression { enum class Dependency : uint32_t; @@ -91,7 +91,7 @@ struct LayerTypeInfo { // Added this to support plugins and that their LayerTypeInfo isn't the same point // across the board -bool layerTypeInfoEquals(const mbgl::style::LayerTypeInfo* one, const mbgl::style::LayerTypeInfo* other); +bool layerTypeInfoEquals(const mln::style::LayerTypeInfo* one, const mln::style::LayerTypeInfo* other); /** * The runtime representation of a [layer](https://maplibre.org/maplibre-style-spec/#layers) @@ -186,4 +186,4 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layer_properties.hpp b/include/mbgl/style/layer_properties.hpp index cd89ed5ed..31756473d 100644 --- a/include/mbgl/style/layer_properties.hpp +++ b/include/mbgl/style/layer_properties.hpp @@ -1,7 +1,7 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace style { @@ -18,7 +18,7 @@ public: virtual unsigned long constantsMask() const { return 0u; } Immutable baseImpl; - /// Contains render passes used by the renderer, see `mbgl::RenderPass`. + /// Contains render passes used by the renderer, see `mln::RenderPass`. uint8_t renderPasses = 0u; virtual expression::Dependency getDependencies() const noexcept = 0; @@ -39,4 +39,4 @@ inline const auto& getCrossfade(const Immutable& properties) no } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index 8ce029822..230d3c1f7 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -59,6 +59,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index 7e8940c08..4cbf92539 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -113,6 +113,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/color_relief_layer.hpp b/include/mbgl/style/layers/color_relief_layer.hpp index 09c5df93e..c9cbb8c9b 100644 --- a/include/mbgl/style/layers/color_relief_layer.hpp +++ b/include/mbgl/style/layers/color_relief_layer.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -54,6 +54,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/custom_drawable_layer.hpp b/include/mbgl/style/layers/custom_drawable_layer.hpp index ec7c602a7..8777c3af1 100644 --- a/include/mbgl/style/layers/custom_drawable_layer.hpp +++ b/include/mbgl/style/layers/custom_drawable_layer.hpp @@ -14,7 +14,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class CustomDrawableLayerHost { @@ -75,7 +75,7 @@ public: }; template - using TweakerCallback = std::function; + using TweakerCallback = std::function; using LineTweakerCallback = TweakerCallback; using FillTweakerCallback = TweakerCallback; @@ -253,4 +253,4 @@ private: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp index bc4b8c9a1..7f4cac249 100644 --- a/include/mbgl/style/layers/custom_layer.hpp +++ b/include/mbgl/style/layers/custom_layer.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { @@ -28,4 +28,4 @@ private: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/custom_layer_host.hpp b/include/mbgl/style/layers/custom_layer_host.hpp index 4abe092a3..12aa7ef6d 100644 --- a/include/mbgl/style/layers/custom_layer_host.hpp +++ b/include/mbgl/style/layers/custom_layer_host.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Context; @@ -20,7 +20,7 @@ public: * is active but before rendering for the first time. * * The parameters argument provides backend-specific device handles: - * - Vulkan: cast to mbgl::style::vulkan::CustomLayerInitParameters for + * - Vulkan: cast to mln::style::vulkan::CustomLayerInitParameters for * access to vk::Device, vk::PhysicalDevice, and the dispatcher. * - Metal/GL: base CustomLayerInitParameters (no extra handles currently). * @@ -32,7 +32,7 @@ public: /** * Called right before the layers start rendering. */ - virtual void preRender(const mbgl::gfx::Context&, const mbgl::style::CustomLayerRenderParameters&) {}; + virtual void preRender(const mln::gfx::Context&, const mln::style::CustomLayerRenderParameters&) {}; /** * Render the layer. This method is called once per frame. The @@ -44,7 +44,7 @@ public: * advantage of the opaque fragment culling in case there are opaque layers * above your custom layer. */ - virtual void render(const mbgl::style::CustomLayerRenderParameters&) = 0; + virtual void render(const mln::style::CustomLayerRenderParameters&) = 0; /** * Called when the system has destroyed the underlying GL/Metal context. The @@ -66,4 +66,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/custom_layer_init_parameters.hpp b/include/mbgl/style/layers/custom_layer_init_parameters.hpp index 4fc96f71b..53e7c24dd 100644 --- a/include/mbgl/style/layers/custom_layer_init_parameters.hpp +++ b/include/mbgl/style/layers/custom_layer_init_parameters.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace style { /** @@ -13,4 +13,4 @@ struct CustomLayerInitParameters { }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/custom_layer_render_parameters.hpp b/include/mbgl/style/layers/custom_layer_render_parameters.hpp index 226b3b4a0..b78065ac0 100644 --- a/include/mbgl/style/layers/custom_layer_render_parameters.hpp +++ b/include/mbgl/style/layers/custom_layer_render_parameters.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -34,4 +34,4 @@ struct CustomLayerRenderParameters { }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index 08fce59c9..5486d8169 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -95,6 +95,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index bf96114a0..ad7b6d2a0 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -89,6 +89,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp index 751148bad..921b4de60 100644 --- a/include/mbgl/style/layers/heatmap_layer.hpp +++ b/include/mbgl/style/layers/heatmap_layer.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -72,6 +72,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp index 1a1e3a8b2..64957b2ae 100644 --- a/include/mbgl/style/layers/hillshade_layer.hpp +++ b/include/mbgl/style/layers/hillshade_layer.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -89,6 +89,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 46d6b22c7..b978679c5 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -28,7 +28,7 @@ #include <% } -%> -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -82,6 +82,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 1a84b9a98..316ffbd9d 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -12,7 +12,7 @@ #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -132,6 +132,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/location_indicator_layer.hpp b/include/mbgl/style/layers/location_indicator_layer.hpp index 72d79fb86..2608c98d5 100644 --- a/include/mbgl/style/layers/location_indicator_layer.hpp +++ b/include/mbgl/style/layers/location_indicator_layer.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -116,6 +116,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/mtl/custom_layer_render_parameters.hpp b/include/mbgl/style/layers/mtl/custom_layer_render_parameters.hpp index ebb5226d7..ba8e6f1b5 100644 --- a/include/mbgl/style/layers/mtl/custom_layer_render_parameters.hpp +++ b/include/mbgl/style/layers/mtl/custom_layer_render_parameters.hpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -20,15 +20,15 @@ namespace mtl { /** * Metal subclass of CustomLayerRenderParameters */ -struct CustomLayerRenderParameters : mbgl::style::CustomLayerRenderParameters { - const std::unique_ptr &renderPass; - mbgl::mtl::MTLRenderCommandEncoderPtr encoder; - mbgl::mtl::MTLCommandBufferPtr commandBuffer; - mbgl::mtl::MTLRenderPassDescriptorPtr renderPassDesc; +struct CustomLayerRenderParameters : mln::style::CustomLayerRenderParameters { + const std::unique_ptr &renderPass; + mln::mtl::MTLRenderCommandEncoderPtr encoder; + mln::mtl::MTLCommandBufferPtr commandBuffer; + mln::mtl::MTLRenderPassDescriptorPtr renderPassDesc; CustomLayerRenderParameters(const PaintParameters &); }; } // namespace mtl } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index d15faea2c..9bc5f3f55 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -89,6 +89,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 27485c806..127dd0c6d 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -13,7 +13,7 @@ #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions; @@ -303,6 +303,6 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/layers/vulkan/custom_layer_init_parameters.hpp b/include/mbgl/style/layers/vulkan/custom_layer_init_parameters.hpp index e5a2c42e3..1984154b6 100644 --- a/include/mbgl/style/layers/vulkan/custom_layer_init_parameters.hpp +++ b/include/mbgl/style/layers/vulkan/custom_layer_init_parameters.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace style { namespace vulkan { @@ -18,7 +18,7 @@ namespace vulkan { * CustomLayerRenderParameters during the first render() call if needed * for pipeline creation. */ -struct CustomLayerInitParameters : mbgl::style::CustomLayerInitParameters { +struct CustomLayerInitParameters : mln::style::CustomLayerInitParameters { /// Dynamic dispatcher for Vulkan function calls. const vk::detail::DispatchLoaderDynamic& dispatcher; /// Logical device handle. @@ -36,4 +36,4 @@ struct CustomLayerInitParameters : mbgl::style::CustomLayerInitParameters { } // namespace vulkan } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/layers/vulkan/custom_layer_render_parameters.hpp b/include/mbgl/style/layers/vulkan/custom_layer_render_parameters.hpp index 8b5b21a79..344e43010 100644 --- a/include/mbgl/style/layers/vulkan/custom_layer_render_parameters.hpp +++ b/include/mbgl/style/layers/vulkan/custom_layer_render_parameters.hpp @@ -3,14 +3,14 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; namespace style { namespace vulkan { -struct CustomLayerRenderParameters : mbgl::style::CustomLayerRenderParameters { +struct CustomLayerRenderParameters : mln::style::CustomLayerRenderParameters { /// Dynamic dispatcher. const vk::detail::DispatchLoaderDynamic& dispatcher; @@ -45,4 +45,4 @@ struct CustomLayerRenderParameters : mbgl::style::CustomLayerRenderParameters { } // namespace vulkan } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/light.hpp b/include/mbgl/style/light.hpp index 432bc44bf..d70a1c9d7 100644 --- a/include/mbgl/style/light.hpp +++ b/include/mbgl/style/light.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class LightObserver; @@ -59,6 +59,6 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/light.hpp.ejs b/include/mbgl/style/light.hpp.ejs index 227cc031f..c8fba1a09 100644 --- a/include/mbgl/style/light.hpp.ejs +++ b/include/mbgl/style/light.hpp.ejs @@ -14,7 +14,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class LightObserver; @@ -46,6 +46,6 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln // clang-format on diff --git a/include/mbgl/style/position.hpp b/include/mbgl/style/position.hpp index 88d8d2d7c..dc313d5a5 100644 --- a/include/mbgl/style/position.hpp +++ b/include/mbgl/style/position.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace style { class Position { public: @@ -64,4 +64,4 @@ private: }; }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp index 843b80a5d..c0d5f9da5 100644 --- a/include/mbgl/style/property_expression.hpp +++ b/include/mbgl/style/property_expression.hpp @@ -11,7 +11,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class GPUExpression; using UniqueGPUExpression = std::unique_ptr; @@ -176,4 +176,4 @@ private: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/property_value.hpp b/include/mbgl/style/property_value.hpp index fce64f0d7..9669e1fa2 100644 --- a/include/mbgl/style/property_value.hpp +++ b/include/mbgl/style/property_value.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { template @@ -75,4 +75,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/rotation.hpp b/include/mbgl/style/rotation.hpp index d17d89243..1d0663204 100644 --- a/include/mbgl/style/rotation.hpp +++ b/include/mbgl/style/rotation.hpp @@ -1,6 +1,6 @@ #pragma once #include -namespace mbgl { +namespace mln { namespace style { // Could be made a template class if needed @@ -10,7 +10,7 @@ class Rotation { public: Rotation() = default; Rotation(double angle_) - : angle(mbgl::util::wrap(angle_, 0, period())) {} + : angle(mln::util::wrap(angle_, 0, period())) {} constexpr double period() const noexcept { return 360.0; } double getAngle() const noexcept { return angle; } @@ -23,4 +23,4 @@ private: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/source.hpp b/include/mbgl/style/source.hpp index 456cff0ab..577328c22 100644 --- a/include/mbgl/style/source.hpp +++ b/include/mbgl/style/source.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { class FileSource; @@ -118,7 +118,7 @@ public: std::optional getMaxOverscaleFactorForParentTiles() const noexcept; void dumpDebugLogs() const; - virtual bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const = 0; + virtual bool supportsLayerType(const mln::style::LayerTypeInfo*) const = 0; bool loaded = false; @@ -135,4 +135,4 @@ protected: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/custom_geometry_source.hpp b/include/mbgl/style/sources/custom_geometry_source.hpp index 8a7e918ef..34b4443e4 100644 --- a/include/mbgl/style/sources/custom_geometry_source.hpp +++ b/include/mbgl/style/sources/custom_geometry_source.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { class OverscaledTileID; class CanonicalTileID; @@ -48,7 +48,7 @@ public: // Private implementation class Impl; const Impl& impl() const; - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; mapbox::base::WeakPtr makeWeakPtr() override { return weakFactory.makeWeakPtr(); } protected: @@ -67,4 +67,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/custom_vector_source.hpp b/include/mbgl/style/sources/custom_vector_source.hpp index 203a9c91c..990722f6f 100644 --- a/include/mbgl/style/sources/custom_vector_source.hpp +++ b/include/mbgl/style/sources/custom_vector_source.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class OverscaledTileID; class CanonicalTileID; @@ -45,7 +45,7 @@ public: class Impl; const Impl& impl() const; - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; mapbox::base::WeakPtr makeWeakPtr() override { return weakFactory.makeWeakPtr(); } protected: @@ -62,4 +62,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/geojson_source.hpp b/include/mbgl/style/sources/geojson_source.hpp index 46aaaabc2..54bb95776 100644 --- a/include/mbgl/style/sources/geojson_source.hpp +++ b/include/mbgl/style/sources/geojson_source.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class AsyncRequest; class Scheduler; @@ -30,8 +30,8 @@ struct GeoJSONOptions { uint16_t clusterRadius = 50; uint8_t clusterMaxZoom = 17; size_t clusterMinPoints = 2; - using ClusterExpression = std::pair, - std::shared_ptr>; + using ClusterExpression = std::pair, + std::shared_ptr>; using ClusterProperties = std::map; ClusterProperties clusterProperties; @@ -75,7 +75,7 @@ public: void loadDescription(FileSource&) final; - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; mapbox::base::WeakPtr makeWeakPtr() override { return weakFactory.makeWeakPtr(); } @@ -100,4 +100,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/image_source.hpp b/include/mbgl/style/sources/image_source.hpp index 99c7de7bc..0b14a1396 100644 --- a/include/mbgl/style/sources/image_source.hpp +++ b/include/mbgl/style/sources/image_source.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { class LatLng; class AsyncRequest; @@ -30,7 +30,7 @@ public: void loadDescription(FileSource&) final; - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; mapbox::base::WeakPtr makeWeakPtr() override { return weakFactory.makeWeakPtr(); } @@ -50,4 +50,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/raster_dem_source.hpp b/include/mbgl/style/sources/raster_dem_source.hpp index 5e7ee0e2b..f57be0df5 100644 --- a/include/mbgl/style/sources/raster_dem_source.hpp +++ b/include/mbgl/style/sources/raster_dem_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { struct SourceOptions { @@ -20,7 +20,7 @@ public: uint16_t tileSize, std::optional options = std::nullopt); ~RasterDEMSource() override; - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; protected: void setTilesetOverrides(Tileset& tileset) override; @@ -35,4 +35,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/raster_source.hpp b/include/mbgl/style/sources/raster_source.hpp index 42cd8ddd0..bb481af55 100644 --- a/include/mbgl/style/sources/raster_source.hpp +++ b/include/mbgl/style/sources/raster_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { class RasterSource : public TileSource { @@ -14,7 +14,7 @@ public: uint16_t tileSize, SourceType sourceType = SourceType::Raster); - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; mapbox::base::WeakPtr makeWeakPtr() override { return weakFactory.makeWeakPtr(); } @@ -33,4 +33,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/tile_source.hpp b/include/mbgl/style/sources/tile_source.hpp index 3516ee7ef..d29aabb1c 100644 --- a/include/mbgl/style/sources/tile_source.hpp +++ b/include/mbgl/style/sources/tile_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { class AsyncRequest; @@ -40,4 +40,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sources/vector_source.hpp b/include/mbgl/style/sources/vector_source.hpp index 37cdc1917..38805ddf6 100644 --- a/include/mbgl/style/sources/vector_source.hpp +++ b/include/mbgl/style/sources/vector_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { class AsyncRequest; @@ -29,7 +29,7 @@ public: /// @param tiles List of tile urls. void setTiles(const std::vector& tiles); - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; Tileset::VectorEncoding getEncoding() const noexcept { return encoding; } @@ -48,4 +48,4 @@ inline bool Source::is() const { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/sprite.hpp b/include/mbgl/style/sprite.hpp index c08f1e23e..3b6dc2b0c 100644 --- a/include/mbgl/style/sprite.hpp +++ b/include/mbgl/style/sprite.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace style { class Sprite { @@ -15,4 +15,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/style.hpp b/include/mbgl/style/style.hpp index 0d2d45719..ce54e2ed0 100644 --- a/include/mbgl/style/style.hpp +++ b/include/mbgl/style/style.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { class FileSource; @@ -77,4 +77,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/style_property.hpp b/include/mbgl/style/style_property.hpp index d17d99aca..07a458b3f 100644 --- a/include/mbgl/style/style_property.hpp +++ b/include/mbgl/style/style_property.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace style { /** @@ -30,4 +30,4 @@ private: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp index 8dde72ec0..555d30db9 100644 --- a/include/mbgl/style/transition_options.hpp +++ b/include/mbgl/style/transition_options.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace style { class TransitionOptions { @@ -41,4 +41,4 @@ public: }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index f4b0e54c0..9a4e689b7 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace style { @@ -135,4 +135,4 @@ enum class LightAnchorType : bool { }; } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/undefined.hpp b/include/mbgl/style/undefined.hpp index b88f42f99..7ce085d66 100644 --- a/include/mbgl/style/undefined.hpp +++ b/include/mbgl/style/undefined.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace style { class Undefined {}; @@ -13,4 +13,4 @@ inline bool operator!=(const Undefined&, const Undefined&) { } } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/style/variable_anchor_offset_collection.hpp b/include/mbgl/style/variable_anchor_offset_collection.hpp index 5a0948adb..aa8297850 100644 --- a/include/mbgl/style/variable_anchor_offset_collection.hpp +++ b/include/mbgl/style/variable_anchor_offset_collection.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { struct AnchorOffsetPair { style::SymbolAnchorType anchorType; @@ -39,7 +39,7 @@ public: std::string toString() const; - mbgl::Value serialize() const; + mln::Value serialize() const; bool empty() const { return anchorOffsets.size() == 0; } @@ -58,4 +58,4 @@ public: bool operator==(const VariableAnchorOffsetCollection& other) const = default; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/text/glyph.hpp b/include/mbgl/text/glyph.hpp index 7694ca3a2..060e89a85 100644 --- a/include/mbgl/text/glyph.hpp +++ b/include/mbgl/text/glyph.hpp @@ -16,7 +16,7 @@ #include #include -namespace mbgl { +namespace mln { union GlyphID { char32_t hash; @@ -218,4 +218,4 @@ struct GlyphPosition { using GlyphPositionMap = std::map; using GlyphPositions = std::map; -} // end namespace mbgl +} // end namespace mln diff --git a/include/mbgl/text/glyph_range.hpp b/include/mbgl/text/glyph_range.hpp index 6f4f65db4..78a402f59 100644 --- a/include/mbgl/text/glyph_range.hpp +++ b/include/mbgl/text/glyph_range.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { enum GlyphIDType : uint16_t { FontPBF = 0x00, @@ -35,13 +35,13 @@ constexpr uint32_t GLYPH_RANGES_PER_FONT_STACK = 256; // i18n.GlyphRangeLocalGenerationCountMatchesConstant. constexpr uint32_t NON_IDEOGRAPH_GLYPH_RANGES_PER_FONT_STACK = 97; -} // end namespace mbgl +} // end namespace mln namespace std { template <> -struct hash { - std::size_t operator()(const mbgl::GlyphRange &range) const { return mbgl::util::hash(range.first, range.second); } +struct hash { + std::size_t operator()(const mln::GlyphRange &range) const { return mln::util::hash(range.first, range.second); } }; } // namespace std diff --git a/include/mbgl/tile/tile_id.hpp b/include/mbgl/tile/tile_id.hpp index 94df1257e..858539873 100644 --- a/include/mbgl/tile/tile_id.hpp +++ b/include/mbgl/tile/tile_id.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { class OverscaledTileID; class CanonicalTileID; @@ -262,23 +262,23 @@ inline float UnwrappedTileID::pixelsToTileUnits(const float pixelValue, const fl (static_cast(util::tileSize_D) * std::pow(2.f, zoom - canonical.z))); } -} // namespace mbgl +} // namespace mln namespace std { template <> -struct hash { - size_t operator()(const mbgl::CanonicalTileID& id) const noexcept; +struct hash { + size_t operator()(const mln::CanonicalTileID& id) const noexcept; }; template <> -struct hash { - size_t operator()(const mbgl::UnwrappedTileID& id) const noexcept; +struct hash { + size_t operator()(const mln::UnwrappedTileID& id) const noexcept; }; template <> -struct hash { - size_t operator()(const mbgl::OverscaledTileID& id) const noexcept; +struct hash { + size_t operator()(const mln::OverscaledTileID& id) const noexcept; }; } // namespace std diff --git a/include/mbgl/tile/tile_necessity.hpp b/include/mbgl/tile/tile_necessity.hpp index e51bf51d1..db9470bf7 100644 --- a/include/mbgl/tile/tile_necessity.hpp +++ b/include/mbgl/tile/tile_necessity.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { // Tiles can have two states: optional or required. // - optional means that only low-cost actions should be taken to obtain the data @@ -12,4 +12,4 @@ enum class TileNecessity : bool { Required = true, }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/tile/tile_operation.hpp b/include/mbgl/tile/tile_operation.hpp index b98a045cf..e14bb23fc 100644 --- a/include/mbgl/tile/tile_operation.hpp +++ b/include/mbgl/tile/tile_operation.hpp @@ -1,7 +1,7 @@ #pragma once #include -namespace mbgl { +namespace mln { enum class TileOperation : uint8_t { RequestedFromCache, ///< A read request from the cache RequestedFromNetwork, ///< A read request from the online source @@ -13,4 +13,4 @@ enum class TileOperation : uint8_t { Cancelled, ///< Loading of a tile was cancelled NullOp, ///< No operation has taken place }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/action_journal.hpp b/include/mbgl/util/action_journal.hpp index 49dd8ccd2..5af7a6ac5 100644 --- a/include/mbgl/util/action_journal.hpp +++ b/include/mbgl/util/action_journal.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { @@ -65,4 +65,4 @@ public: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/action_journal_options.hpp b/include/mbgl/util/action_journal_options.hpp index e404ab174..49673d57e 100644 --- a/include/mbgl/util/action_journal_options.hpp +++ b/include/mbgl/util/action_journal_options.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { @@ -117,4 +117,4 @@ protected: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/async_request.hpp b/include/mbgl/util/async_request.hpp index 9e8509496..1c0b37297 100644 --- a/include/mbgl/util/async_request.hpp +++ b/include/mbgl/util/async_request.hpp @@ -2,11 +2,11 @@ #include -namespace mbgl { +namespace mln { class AsyncRequest : private util::noncopyable { public: virtual ~AsyncRequest() = default; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/async_task.hpp b/include/mbgl/util/async_task.hpp index 69746c3eb..121da39fb 100644 --- a/include/mbgl/util/async_task.hpp +++ b/include/mbgl/util/async_task.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class AsyncTask : private util::noncopyable { @@ -21,4 +21,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/bitmask_operations.hpp b/include/mbgl/util/bitmask_operations.hpp index 750fd14f6..02b348afc 100644 --- a/include/mbgl/util/bitmask_operations.hpp +++ b/include/mbgl/util/bitmask_operations.hpp @@ -3,13 +3,13 @@ #include #include -namespace mbgl { +namespace mln { template constexpr Enum operator|(Enum a, Enum b) { static_assert(std::is_enum_v, "Enum must be an enum type"); // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) - return Enum(mbgl::underlying_type(a) | mbgl::underlying_type(b)); + return Enum(mln::underlying_type(a) | mln::underlying_type(b)); } template @@ -21,13 +21,13 @@ constexpr Enum& operator|=(Enum& a, Enum b) { template constexpr bool operator&(Enum a, Enum b) { static_assert(std::is_enum_v, "Enum must be an enum type"); - return bool(mbgl::underlying_type(a) & mbgl::underlying_type(b)); + return bool(mln::underlying_type(a) & mln::underlying_type(b)); } template constexpr Enum operator~(Enum value) { static_assert(std::is_enum_v, "Enum must be an enum type"); - return Enum(~mbgl::underlying_type(value)); + return Enum(~mln::underlying_type(value)); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/char_array_buffer.hpp b/include/mbgl/util/char_array_buffer.hpp index 0e84062fe..b95cd9666 100644 --- a/include/mbgl/util/char_array_buffer.hpp +++ b/include/mbgl/util/char_array_buffer.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { // ref https://artofcode.wordpress.com/2010/12/12/deriving-from-stdstreambuf/ @@ -54,4 +54,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/chrono.hpp b/include/mbgl/util/chrono.hpp index 69a13383b..8c1f4273d 100644 --- a/include/mbgl/util/chrono.hpp +++ b/include/mbgl/util/chrono.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { using Clock = std::chrono::steady_clock; @@ -59,4 +59,4 @@ constexpr std::chrono::duration abs(std::chrono::duration #include -namespace mbgl { +namespace mln { /** * @brief Holds values for client options. @@ -59,4 +59,4 @@ private: std::unique_ptr impl_; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/color.hpp b/include/mbgl/util/color.hpp index d9150568f..6034d059f 100644 --- a/include/mbgl/util/color.hpp +++ b/include/mbgl/util/color.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { // Stores a premultiplied color, with all four channels ranging from 0..1 class Color { @@ -46,8 +46,8 @@ public: std::string stringify() const; std::array toArray() const; operator std::array() const { return {r, g, b, a}; } - mbgl::Value toObject() const; - mbgl::Value serialize() const; + mln::Value toObject() const; + mln::Value serialize() const; }; inline bool operator==(const Color& colorA, const Color& colorB) { @@ -64,4 +64,4 @@ inline Color operator*(const Color& color, float alpha) { return {color.r * alpha, color.g * alpha, color.b * alpha, color.a * alpha}; } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/compression.hpp b/include/mbgl/util/compression.hpp index c0cd57b1c..97cacfdbe 100644 --- a/include/mbgl/util/compression.hpp +++ b/include/mbgl/util/compression.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { enum CompressionFormat { @@ -20,4 +20,4 @@ std::string decompress(const std::string& raw, int windowBits = CompressionForma std::uint32_t crc32(const void* raw, size_t size) noexcept; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index 4a95e82ff..234f8dd14 100644 --- a/include/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { @@ -90,4 +90,4 @@ extern const bool shapingWarning; } // namespace debug -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/containers.hpp b/include/mbgl/util/containers.hpp index 5ddbda154..3dfb25dc8 100644 --- a/include/mbgl/util/containers.hpp +++ b/include/mbgl/util/containers.hpp @@ -6,7 +6,7 @@ #include #endif -namespace mbgl { +namespace mln { #if MLN_USE_UNORDERED_DENSE template > using unordered_map = ankerl::unordered_dense::map; @@ -20,4 +20,4 @@ using unordered_map = std::unordered_map; template using unordered_set = std::unordered_set; #endif -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/convert.hpp b/include/mbgl/util/convert.hpp index 2333fa4f1..225417ce2 100644 --- a/include/mbgl/util/convert.hpp +++ b/include/mbgl/util/convert.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { template @@ -44,7 +44,7 @@ template std::enable_if_t, std::optional> parse(std::string_view str, int base = 10) noexcept { static_assert(std::is_same_v || std::is_same_v || std::is_same_v || std::is_same_v, - "Unsupported integral type in mbgl::util::parse."); + "Unsupported integral type in mln::util::parse."); char* end = nullptr; errno = 0; @@ -70,7 +70,7 @@ std::enable_if_t, std::optional> parse(std::string_view template std::enable_if_t, std::optional> parse(std::string_view str) noexcept { static_assert(std::is_same_v || std::is_same_v || std::is_same_v, - "Unsupported floating point type in mbgl::util::parse."); + "Unsupported floating point type in mln::util::parse."); char* end = nullptr; errno = 0; @@ -89,4 +89,4 @@ std::enable_if_t, std::optional> parse(std::strin } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/default_style.hpp b/include/mbgl/util/default_style.hpp index 39b6afd2b..72f583219 100644 --- a/include/mbgl/util/default_style.hpp +++ b/include/mbgl/util/default_style.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { class DefaultStyle { @@ -20,4 +20,4 @@ private: }; } // end namespace util -} // end namespace mbgl +} // end namespace mln diff --git a/include/mbgl/util/enum.hpp b/include/mbgl/util/enum.hpp index 209e07863..1fac2fabc 100644 --- a/include/mbgl/util/enum.hpp +++ b/include/mbgl/util/enum.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { template class Enum { @@ -36,4 +36,4 @@ public: return it == std::end(T##_names) ? std::optional() : it->first; \ } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/event.hpp b/include/mbgl/util/event.hpp index 13c5f8980..1c2c1e180 100644 --- a/include/mbgl/util/event.hpp +++ b/include/mbgl/util/event.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { enum class EventSeverity : uint8_t { Debug, @@ -55,4 +55,4 @@ constexpr Event disabledEvents[] = { constexpr EventPermutation disabledEventPermutations[] = {{.severity = EventSeverity::Debug, .event = Event::Shader}}; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/exception.hpp b/include/mbgl/util/exception.hpp index fb42dd6bc..d647dfd9c 100644 --- a/include/mbgl/util/exception.hpp +++ b/include/mbgl/util/exception.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { struct Exception : std::runtime_error { @@ -48,4 +48,4 @@ struct NotFoundException : Exception { }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/expected.hpp b/include/mbgl/util/expected.hpp index 53c5b6ab4..4d235f5e8 100644 --- a/include/mbgl/util/expected.hpp +++ b/include/mbgl/util/expected.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { template using expected = nonstd::expected; @@ -10,4 +10,4 @@ using expected = nonstd::expected; template using unexpected = nonstd::unexpected_type; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp index 853138655..aa85d2386 100644 --- a/include/mbgl/util/feature.hpp +++ b/include/mbgl/util/feature.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { using Value = mapbox::base::Value; using NullValue = mapbox::base::NullValue; @@ -54,4 +54,4 @@ inline std::optional featureIDtoString(const FeatureIdentifier& id) [](const auto&) -> std::optional { return std::nullopt; }); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/font_stack.hpp b/include/mbgl/util/font_stack.hpp index ccc1a0606..43188d01f 100644 --- a/include/mbgl/util/font_stack.hpp +++ b/include/mbgl/util/font_stack.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { // An array of font names using FontStack = std::vector; @@ -22,4 +22,4 @@ struct FontStackHasher { // Statically evaluate layer properties to determine what font stacks are used. std::set fontStacks(const std::vector>&); -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp index 97d8b933a..282dc9b59 100644 --- a/include/mbgl/util/geo.hpp +++ b/include/mbgl/util/geo.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { class CanonicalTileID; class UnwrappedTileID; @@ -244,4 +244,4 @@ struct LatLngAltitude { double altitude = 0.0; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/geojson.hpp b/include/mbgl/util/geojson.hpp index 2a6569be4..bd60334e1 100644 --- a/include/mbgl/util/geojson.hpp +++ b/include/mbgl/util/geojson.hpp @@ -3,10 +3,10 @@ #include #include -namespace mbgl { +namespace mln { using GeoJSON = mapbox::geojson::geojson; using FeatureCollection = mapbox::geojson::feature_collection; using FeatureExtensionValue = mapbox::util::variant; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp index 3b56d8724..2089b6f44 100644 --- a/include/mbgl/util/geometry.hpp +++ b/include/mbgl/util/geometry.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { enum class FeatureType : uint8_t { Unknown = 0, @@ -83,4 +83,4 @@ auto forEachPoint(const Geometry &g, F f) { mapbox::geometry::for_each_point(g, f); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/hash.hpp b/include/mbgl/util/hash.hpp index 72e4b41d1..ee5265e3c 100644 --- a/include/mbgl/util/hash.hpp +++ b/include/mbgl/util/hash.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { template @@ -47,4 +47,4 @@ TKey order_independent_hash(std::remove_const_t cur, const TIter end) noe } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/identity.hpp b/include/mbgl/util/identity.hpp index f6a64f0c4..09275cc1a 100644 --- a/include/mbgl/util/identity.hpp +++ b/include/mbgl/util/identity.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace util { /** @@ -57,11 +57,11 @@ inline std::string toString(const util::SimpleIdentity& ident) { } } // namespace util -} // namespace mbgl +} // namespace mln template <> -struct std::hash { - std::size_t operator()(const mbgl::util::SimpleIdentity& s) const noexcept { +struct std::hash { + std::size_t operator()(const mln::util::SimpleIdentity& s) const noexcept { return std::hash{}(s.id()); } }; diff --git a/include/mbgl/util/ignore.hpp b/include/mbgl/util/ignore.hpp index 4bbcf83fc..631b78a13 100644 --- a/include/mbgl/util/ignore.hpp +++ b/include/mbgl/util/ignore.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { /// Accept any number of parameters of any types, and do nothing with them. @@ -24,4 +24,4 @@ void ignore(const std::initializer_list&) noexcept {} inline void ignore(const std::initializer_list&) noexcept {} } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index fad8b7ee0..397456469 100644 --- a/include/mbgl/util/image.hpp +++ b/include/mbgl/util/image.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { enum class ImageAlphaMode { Unassociated, @@ -179,4 +179,4 @@ using AlphaImage = Image; PremultipliedImage decodeImage(const std::string&); std::string encodePNG(const PremultipliedImage&); -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/immutable.hpp b/include/mbgl/util/immutable.hpp index 6a2092723..880266eca 100644 --- a/include/mbgl/util/immutable.hpp +++ b/include/mbgl/util/immutable.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { /** * `Mutable` is a non-nullable uniquely owning reference to a `T`. It can be @@ -135,4 +135,4 @@ void mutate(Immutable& immutable, Fn&& fn) { immutable = std::move(mut); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/indexed_tuple.hpp b/include/mbgl/util/indexed_tuple.hpp index 51377d2c7..75b499cc9 100644 --- a/include/mbgl/util/indexed_tuple.hpp +++ b/include/mbgl/util/indexed_tuple.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { template struct TypeIndex; @@ -67,4 +67,4 @@ public: template using ExpandToType = T; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/instrumentation.hpp b/include/mbgl/util/instrumentation.hpp index dfe1f198c..9ca1e029a 100644 --- a/include/mbgl/util/instrumentation.hpp +++ b/include/mbgl/util/instrumentation.hpp @@ -63,13 +63,13 @@ constexpr const char* tracyConstMemoryLabel = "Constant Buffer Memory"; // TracyOpenGL.hpp assumes OpenGL functions are in the global namespace // Temporarily expose the functions to TracyOpenGL.hpp then undef -#define glGenQueries mbgl::gl::extension::glGenQueries -#define glGetQueryiv mbgl::gl::extension::glGetQueryiv -#define glGetQueryObjectiv mbgl::gl::extension::glGetQueryObjectiv -#define glGetInteger64v mbgl::gl::extension::glGetInteger64v -#define glQueryCounter mbgl::gl::extension::glQueryCounter -#define glGetQueryObjectui64v mbgl::gl::extension::glGetQueryObjectui64v -#define GLint mbgl::platform::GLint +#define glGenQueries mln::gl::extension::glGenQueries +#define glGetQueryiv mln::gl::extension::glGetQueryiv +#define glGetQueryObjectiv mln::gl::extension::glGetQueryObjectiv +#define glGetInteger64v mln::gl::extension::glGetInteger64v +#define glQueryCounter mln::gl::extension::glQueryCounter +#define glGetQueryObjectui64v mln::gl::extension::glGetQueryObjectui64v +#define GLint mln::platform::GLint #include "tracy/TracyOpenGL.hpp" @@ -131,6 +131,6 @@ constexpr const char* tracyConstMemoryLabel = "Constant Buffer Memory"; #endif // MLN_TRACY_ENABLE -namespace mbgl::instrumentation { +namespace mln::instrumentation { void setThreadName(const std::string& name); }; diff --git a/include/mbgl/util/interpolate.hpp b/include/mbgl/util/interpolate.hpp index 509d721d4..1cc8e45c9 100644 --- a/include/mbgl/util/interpolate.hpp +++ b/include/mbgl/util/interpolate.hpp @@ -16,7 +16,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { float interpolationFactor(float base, Range range, float z) noexcept; @@ -222,4 +222,4 @@ struct Interpolatable : std::conditional_t>, std::true_type, std::false_type> {}; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/logging.hpp b/include/mbgl/util/logging.hpp index 9eb7e09a7..b76691ff1 100644 --- a/include/mbgl/util/logging.hpp +++ b/include/mbgl/util/logging.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class Log { public: @@ -91,4 +91,4 @@ private: const std::unique_ptr impl; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/lru_cache.hpp b/include/mbgl/util/lru_cache.hpp index 81aa67c89..92e42e5a9 100644 --- a/include/mbgl/util/lru_cache.hpp +++ b/include/mbgl/util/lru_cache.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { // Simple non-thread-safe LRU cache template > @@ -57,4 +57,4 @@ private: std::unordered_map::iterator, Hash> map; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/monotonic_timer.hpp b/include/mbgl/util/monotonic_timer.hpp index 771a35658..2d48b7057 100644 --- a/include/mbgl/util/monotonic_timer.hpp +++ b/include/mbgl/util/monotonic_timer.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class MonotonicTimer { @@ -19,4 +19,4 @@ public: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/noncopyable.hpp b/include/mbgl/util/noncopyable.hpp index 99706056c..a4da69957 100644 --- a/include/mbgl/util/noncopyable.hpp +++ b/include/mbgl/util/noncopyable.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace util { namespace non_copyable_ { @@ -19,4 +19,4 @@ protected: using noncopyable = non_copyable_::noncopyable; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/padding.hpp b/include/mbgl/util/padding.hpp index 79663542a..371d7e29a 100644 --- a/include/mbgl/util/padding.hpp +++ b/include/mbgl/util/padding.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { // A set of four numbers representing padding around a box. struct Padding { @@ -62,11 +62,11 @@ struct Padding { std::array toArray() const; // Used by ValueFactory::make() - mbgl::Value serialize() const; + mln::Value serialize() const; }; inline Padding operator*(const Padding& padding, float scale) { return {padding.top * scale, padding.right * scale, padding.bottom * scale, padding.left * scale}; } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/platform.hpp b/include/mbgl/util/platform.hpp index 96a175ef7..96fea38f9 100644 --- a/include/mbgl/util/platform.hpp +++ b/include/mbgl/util/platform.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { class Request; @@ -27,4 +27,4 @@ void makeThreadLowPriority(); void setCurrentThreadPriority(double priority); } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/premultiply.hpp b/include/mbgl/util/premultiply.hpp index 532c7cb11..f089d3b51 100644 --- a/include/mbgl/util/premultiply.hpp +++ b/include/mbgl/util/premultiply.hpp @@ -2,11 +2,11 @@ #include -namespace mbgl { +namespace mln { namespace util { PremultipliedImage premultiply(UnassociatedImage&&); UnassociatedImage unpremultiply(PremultipliedImage&&); } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp index d1c1b13ab..9a26dc9f8 100644 --- a/include/mbgl/util/projection.hpp +++ b/include/mbgl/util/projection.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { class ProjectedMeters { private: @@ -100,4 +100,4 @@ private: } }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/range.hpp b/include/mbgl/util/range.hpp index dc16b5df4..44ae80020 100644 --- a/include/mbgl/util/range.hpp +++ b/include/mbgl/util/range.hpp @@ -2,7 +2,7 @@ #pragma once -namespace mbgl { +namespace mln { template class Range { @@ -25,4 +25,4 @@ constexpr bool operator!=(const Range& a, const Range& b) { return !(a == b); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/rect.hpp b/include/mbgl/util/rect.hpp index 7e76a9f7a..76dc11636 100644 --- a/include/mbgl/util/rect.hpp +++ b/include/mbgl/util/rect.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { template struct Rect { @@ -25,4 +25,4 @@ struct Rect { bool hasArea() const { return w != 0 && h != 0; } }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/run_loop.hpp b/include/mbgl/util/run_loop.hpp index 88b3a355d..46ff11747 100644 --- a/include/mbgl/util/run_loop.hpp +++ b/include/mbgl/util/run_loop.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { using LOOP_HANDLE = void*; @@ -147,6 +147,6 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln #include diff --git a/include/mbgl/util/scoped.hpp b/include/mbgl/util/scoped.hpp index 92a793638..b6aa6b817 100644 --- a/include/mbgl/util/scoped.hpp +++ b/include/mbgl/util/scoped.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { /// Run a lambda on scope exit template @@ -18,4 +18,4 @@ private: Func cb; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/size.hpp b/include/mbgl/util/size.hpp index ef833fab9..9a2537983 100644 --- a/include/mbgl/util/size.hpp +++ b/include/mbgl/util/size.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class Size { public: @@ -30,4 +30,4 @@ constexpr bool operator!=(const Size& a, const Size& b) noexcept { return !(a == b); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp index ded4df9d0..976425797 100644 --- a/include/mbgl/util/string.hpp +++ b/include/mbgl/util/string.hpp @@ -25,7 +25,7 @@ inline float stof(const std::string &str) { #endif -namespace mbgl { +namespace mln { namespace util { std::string toString(int64_t); @@ -97,7 +97,7 @@ inline float stof(const std::string &str) { } } // namespace util -} // namespace mbgl +} // namespace mln // Android's libstdc++ doesn't have std::to_string() #if defined(__ANDROID__) && defined(__GLIBCXX__) @@ -106,7 +106,7 @@ namespace std { template inline std::string to_string(T value) { - return mbgl::util::toString(value); + return mln::util::toString(value); } } // namespace std diff --git a/include/mbgl/util/string_indexer.hpp b/include/mbgl/util/string_indexer.hpp index de7d88b84..2e71a7768 100644 --- a/include/mbgl/util/string_indexer.hpp +++ b/include/mbgl/util/string_indexer.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { using StringIdentity = std::size_t; @@ -42,4 +42,4 @@ protected: /// StringIndexer singleton StringIndexer& stringIndexer(); -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/suppress_copies.hpp b/include/mbgl/util/suppress_copies.hpp index eddb7d471..4ee86406d 100644 --- a/include/mbgl/util/suppress_copies.hpp +++ b/include/mbgl/util/suppress_copies.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace util { /// Wrapper that doesn't participate in copying. @@ -31,4 +31,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/symbol_error_observer.hpp b/include/mbgl/util/symbol_error_observer.hpp index d6268c41f..a35c29665 100644 --- a/include/mbgl/util/symbol_error_observer.hpp +++ b/include/mbgl/util/symbol_error_observer.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { /// Receives errors detected by the symbol guard checks (see `MLN_SYMBOL_GUARDS`). /// Both `TileObserver` and `RendererObserver` derive from this, so that whichever of them owns @@ -16,4 +16,4 @@ public: virtual void onSymbolError(const std::string&) {} }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/thread.hpp b/include/mbgl/util/thread.hpp index 8e691dd95..b0f54f48b 100644 --- a/include/mbgl/util/thread.hpp +++ b/include/mbgl/util/thread.hpp @@ -16,7 +16,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { /// @brief Manages a thread with `Object`. @@ -165,4 +165,4 @@ private: std::function makeThreadPrioritySetter(std::string threadType); } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/tile_server_options.hpp b/include/mbgl/util/tile_server_options.hpp index 2182f34d9..f0666c179 100644 --- a/include/mbgl/util/tile_server_options.hpp +++ b/include/mbgl/util/tile_server_options.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { /** * @brief Holds values for tile server options. @@ -254,7 +254,7 @@ public: /** * @brief Gets the default styles. */ - const std::vector defaultStyles() const; + const std::vector defaultStyles() const; /** * @brief Sets the collection default styles. @@ -262,7 +262,7 @@ public: * @param styles The style set. * @return TileServerOptions for chaining options together. */ - TileServerOptions& withDefaultStyles(std::vector styles); + TileServerOptions& withDefaultStyles(std::vector styles); /** * @brief Sets the default style by name. The style name must exist in @@ -303,4 +303,4 @@ private: std::unique_ptr impl_; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/tileset.hpp b/include/mbgl/util/tileset.hpp index cf60b366e..6964261bc 100644 --- a/include/mbgl/util/tileset.hpp +++ b/include/mbgl/util/tileset.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class Tileset { public: @@ -54,4 +54,4 @@ public: bool operator!=(const Tileset&) const = default; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/timer.hpp b/include/mbgl/util/timer.hpp index 7d76e3b79..d353fa752 100644 --- a/include/mbgl/util/timer.hpp +++ b/include/mbgl/util/timer.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class Timer : private util::noncopyable { @@ -23,4 +23,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/tiny_unordered_map.hpp b/include/mbgl/util/tiny_unordered_map.hpp index 427f4506e..a6c624ec4 100644 --- a/include/mbgl/util/tiny_unordered_map.hpp +++ b/include/mbgl/util/tiny_unordered_map.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { /// A wrapper around `unordered_map` which uses linear search below some threshold of size. @@ -210,4 +210,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/traits.hpp b/include/mbgl/util/traits.hpp index a2b587758..9d00cf78d 100644 --- a/include/mbgl/util/traits.hpp +++ b/include/mbgl/util/traits.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { template constexpr auto underlying_type(T t) -> typename std::underlying_type_t { @@ -42,4 +42,4 @@ struct is_linear_container> : std::true_type {}; template struct is_linear_container> : std::true_type {}; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/type_list.hpp b/include/mbgl/util/type_list.hpp index ab869bfe3..7c20e2867 100644 --- a/include/mbgl/util/type_list.hpp +++ b/include/mbgl/util/type_list.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { template struct TypeList { @@ -62,4 +62,4 @@ using FilteredTypeList = typename detail::TypeFilter::Type; template using TypeListConcat = typename detail::TypeListConcat::Type; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/unitbezier.hpp b/include/mbgl/util/unitbezier.hpp index 5b821b5a2..814be7f25 100644 --- a/include/mbgl/util/unitbezier.hpp +++ b/include/mbgl/util/unitbezier.hpp @@ -28,7 +28,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { struct UnitBezier { @@ -116,4 +116,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/variant.hpp b/include/mbgl/util/variant.hpp index daa5d9d48..bacbfec30 100644 --- a/include/mbgl/util/variant.hpp +++ b/include/mbgl/util/variant.hpp @@ -11,7 +11,7 @@ #pragma warning(pop) #endif -namespace mbgl { +namespace mln { template using variant = mapbox::util::variant; @@ -25,4 +25,4 @@ struct overloaded : Ts... { template overloaded(Ts...) -> overloaded; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/vectors.hpp b/include/mbgl/util/vectors.hpp index 26f56e639..b6adcda6e 100644 --- a/include/mbgl/util/vectors.hpp +++ b/include/mbgl/util/vectors.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { using vec2 = std::array; using vec3 = std::array; @@ -21,4 +21,4 @@ auto concatenate(const std::array&... arrays) { return result; } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/work_request.hpp b/include/mbgl/util/work_request.hpp index 5b051fc09..bfccf2c42 100644 --- a/include/mbgl/util/work_request.hpp +++ b/include/mbgl/util/work_request.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { class WorkTask; @@ -18,4 +18,4 @@ private: std::shared_ptr task; }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/work_task.hpp b/include/mbgl/util/work_task.hpp index 35784edab..7dc77ea27 100644 --- a/include/mbgl/util/work_task.hpp +++ b/include/mbgl/util/work_task.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { /// A movable type-erasing function wrapper. This allows to store arbitrary /// invocable things (like std::function<>, or the result of a movable-only @@ -21,4 +21,4 @@ public: static std::shared_ptr make(Fn&&, Args&&...); }; -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/util/work_task_impl.hpp b/include/mbgl/util/work_task_impl.hpp index cae055365..fe06e86de 100644 --- a/include/mbgl/util/work_task_impl.hpp +++ b/include/mbgl/util/work_task_impl.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { template class WorkTaskImpl : public WorkTask { @@ -62,4 +62,4 @@ std::shared_ptr WorkTask::make(Fn&& fn, Args&&... args) { std::forward(fn), std::move(tuple), flag); } -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/buffer_resource.hpp b/include/mbgl/vulkan/buffer_resource.hpp index b4860307e..02a30a6f7 100644 --- a/include/mbgl/vulkan/buffer_resource.hpp +++ b/include/mbgl/vulkan/buffer_resource.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class Context; @@ -89,4 +89,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/command_encoder.hpp b/include/mbgl/vulkan/command_encoder.hpp index 81f896837..274340485 100644 --- a/include/mbgl/vulkan/command_encoder.hpp +++ b/include/mbgl/vulkan/command_encoder.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Renderable; } // namespace gfx @@ -43,4 +43,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/context.hpp b/include/mbgl/vulkan/context.hpp index 5dbb21891..548b5feb6 100644 --- a/include/mbgl/vulkan/context.hpp +++ b/include/mbgl/vulkan/context.hpp @@ -20,7 +20,7 @@ #include #include -namespace mbgl { +namespace mln { class ProgramParameters; class RenderStaticData; @@ -71,7 +71,7 @@ public: const std::string_view vertex, const std::string_view fragment, const ProgramParameters& programParameters, - const mbgl::unordered_map& additionalDefines); + const mln::unordered_map& additionalDefines); /// Called at the end of a frame. void performCleanup() override; @@ -220,4 +220,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/descriptor_set.hpp b/include/mbgl/vulkan/descriptor_set.hpp index 2202266db..dbdb34efb 100644 --- a/include/mbgl/vulkan/descriptor_set.hpp +++ b/include/mbgl/vulkan/descriptor_set.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class CommandEncoder; @@ -101,4 +101,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/drawable.hpp b/include/mbgl/vulkan/drawable.hpp index f5bb1a4d8..785a7ebd7 100644 --- a/include/mbgl/vulkan/drawable.hpp +++ b/include/mbgl/vulkan/drawable.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { @@ -70,4 +70,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/drawable_builder.hpp b/include/mbgl/vulkan/drawable_builder.hpp index 3dc69494d..6ef633d79 100644 --- a/include/mbgl/vulkan/drawable_builder.hpp +++ b/include/mbgl/vulkan/drawable_builder.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace vulkan { /** @@ -25,4 +25,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/dynamic_texture.hpp b/include/mbgl/vulkan/dynamic_texture.hpp index 988a25fe2..b4d36e604 100644 --- a/include/mbgl/vulkan/dynamic_texture.hpp +++ b/include/mbgl/vulkan/dynamic_texture.hpp @@ -5,7 +5,7 @@ #define DYNAMIC_TEXTURE_VULKAN_MULTITHREADED_UPLOAD 0 -namespace mbgl { +namespace mln { namespace vulkan { class Context; @@ -41,4 +41,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/index_buffer_resource.hpp b/include/mbgl/vulkan/index_buffer_resource.hpp index 79f3e132b..f52083c08 100644 --- a/include/mbgl/vulkan/index_buffer_resource.hpp +++ b/include/mbgl/vulkan/index_buffer_resource.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class IndexBufferResource : public gfx::IndexBufferResource { @@ -25,4 +25,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/layer_group.hpp b/include/mbgl/vulkan/layer_group.hpp index ba867b81e..31acf3a4f 100644 --- a/include/mbgl/vulkan/layer_group.hpp +++ b/include/mbgl/vulkan/layer_group.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -14,7 +14,7 @@ class Context; /** A layer group for non-tile-based drawables */ -class LayerGroup : public mbgl::LayerGroup { +class LayerGroup : public mln::LayerGroup { public: LayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name); ~LayerGroup() override {} @@ -30,4 +30,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/offscreen_texture.hpp b/include/mbgl/vulkan/offscreen_texture.hpp index 0c466cab7..e29a3d843 100644 --- a/include/mbgl/vulkan/offscreen_texture.hpp +++ b/include/mbgl/vulkan/offscreen_texture.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class Context; @@ -20,4 +20,4 @@ public: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/pipeline.hpp b/include/mbgl/vulkan/pipeline.hpp index cc53b4f1d..7df5b8c95 100644 --- a/include/mbgl/vulkan/pipeline.hpp +++ b/include/mbgl/vulkan/pipeline.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class PipelineInfo final { @@ -95,4 +95,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/render_pass.hpp b/include/mbgl/vulkan/render_pass.hpp index 48805a6aa..b1297e1f1 100644 --- a/include/mbgl/vulkan/render_pass.hpp +++ b/include/mbgl/vulkan/render_pass.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class BufferResource; @@ -35,4 +35,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/renderable_resource.hpp b/include/mbgl/vulkan/renderable_resource.hpp index dc8765469..c180168e3 100644 --- a/include/mbgl/vulkan/renderable_resource.hpp +++ b/include/mbgl/vulkan/renderable_resource.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class Context; @@ -120,4 +120,4 @@ public: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/renderer_backend.hpp b/include/mbgl/vulkan/renderer_backend.hpp index c96e765cd..5569cdebd 100644 --- a/include/mbgl/vulkan/renderer_backend.hpp +++ b/include/mbgl/vulkan/renderer_backend.hpp @@ -25,7 +25,7 @@ // #define ENABLE_VMA_DEBUG #endif -namespace mbgl { +namespace mln { class ProgramParameters; @@ -130,4 +130,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/texture2d.hpp b/include/mbgl/vulkan/texture2d.hpp index 887565719..f5fd1f655 100644 --- a/include/mbgl/vulkan/texture2d.hpp +++ b/include/mbgl/vulkan/texture2d.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace vulkan { class Context; @@ -143,4 +143,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/tile_layer_group.hpp b/include/mbgl/vulkan/tile_layer_group.hpp index d3bde6e92..4f6fa9a5c 100644 --- a/include/mbgl/vulkan/tile_layer_group.hpp +++ b/include/mbgl/vulkan/tile_layer_group.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -16,7 +16,7 @@ class RenderPass; /** A layer group for tile-based drawables */ -class TileLayerGroup : public mbgl::TileLayerGroup { +class TileLayerGroup : public mln::TileLayerGroup { public: TileLayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name); ~TileLayerGroup() override {} @@ -32,4 +32,4 @@ protected: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/uniform_buffer.hpp b/include/mbgl/vulkan/uniform_buffer.hpp index 6446cbf40..7257e60a2 100644 --- a/include/mbgl/vulkan/uniform_buffer.hpp +++ b/include/mbgl/vulkan/uniform_buffer.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class UniformBuffer final : public gfx::UniformBuffer { @@ -85,4 +85,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/upload_pass.hpp b/include/mbgl/vulkan/upload_pass.hpp index 99ed57209..39fbe6785 100644 --- a/include/mbgl/vulkan/upload_pass.hpp +++ b/include/mbgl/vulkan/upload_pass.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class CommandEncoder; @@ -80,4 +80,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/vertex_attribute.hpp b/include/mbgl/vulkan/vertex_attribute.hpp index 699603991..f97caec78 100644 --- a/include/mbgl/vulkan/vertex_attribute.hpp +++ b/include/mbgl/vulkan/vertex_attribute.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class VertexBufferResource; } // namespace gfx @@ -55,4 +55,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/vulkan/vertex_buffer_resource.hpp b/include/mbgl/vulkan/vertex_buffer_resource.hpp index 90380220e..d97b9df03 100644 --- a/include/mbgl/vulkan/vertex_buffer_resource.hpp +++ b/include/mbgl/vulkan/vertex_buffer_resource.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace vulkan { class VertexBufferResource : public gfx::VertexBufferResource { @@ -32,4 +32,4 @@ protected: using UniqueVertexBufferResource = std::unique_ptr; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/buffer_resource.hpp b/include/mbgl/webgpu/buffer_resource.hpp index 3281e3cde..8560e30aa 100644 --- a/include/mbgl/webgpu/buffer_resource.hpp +++ b/include/mbgl/webgpu/buffer_resource.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -62,4 +62,4 @@ protected: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/command_encoder.hpp b/include/mbgl/webgpu/command_encoder.hpp index 125bc0dbf..95b6f177e 100644 --- a/include/mbgl/webgpu/command_encoder.hpp +++ b/include/mbgl/webgpu/command_encoder.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Renderable; } // namespace gfx @@ -75,10 +75,10 @@ protected: std::vector debugGroupNames; std::vector> renderDebugGroups; std::vector> uploadDebugGroups; - mbgl::unordered_set renderPasses; - mbgl::unordered_set uploadPasses; + mln::unordered_set renderPasses; + mln::unordered_set uploadPasses; UploadPass* currentUploadPass = nullptr; }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/context.hpp b/include/mbgl/webgpu/context.hpp index d381cfb32..d4f92d0de 100644 --- a/include/mbgl/webgpu/context.hpp +++ b/include/mbgl/webgpu/context.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class RenderStaticData; namespace gfx { // Forward declaration @@ -130,4 +130,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/draw_scope_resource.hpp b/include/mbgl/webgpu/draw_scope_resource.hpp index 9b0746345..b0b98bf14 100644 --- a/include/mbgl/webgpu/draw_scope_resource.hpp +++ b/include/mbgl/webgpu/draw_scope_resource.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -17,4 +17,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/drawable.hpp b/include/mbgl/webgpu/drawable.hpp index c8a522a51..e93a04a3e 100644 --- a/include/mbgl/webgpu/drawable.hpp +++ b/include/mbgl/webgpu/drawable.hpp @@ -9,7 +9,7 @@ // Forward declare WebGPU types typedef struct WGPUBindGroupLayoutImpl* WGPUBindGroupLayout; -namespace mbgl { +namespace mln { namespace gfx { class UploadPass; class DepthMode; @@ -61,4 +61,4 @@ public: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/drawable_builder.hpp b/include/mbgl/webgpu/drawable_builder.hpp index 415767a3f..82950071f 100644 --- a/include/mbgl/webgpu/drawable_builder.hpp +++ b/include/mbgl/webgpu/drawable_builder.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -26,4 +26,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/dynamic_texture.hpp b/include/mbgl/webgpu/dynamic_texture.hpp index 09234deda..35f261ffe 100644 --- a/include/mbgl/webgpu/dynamic_texture.hpp +++ b/include/mbgl/webgpu/dynamic_texture.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -27,4 +27,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/index_buffer_resource.hpp b/include/mbgl/webgpu/index_buffer_resource.hpp index 58d604d4c..c5c41db43 100644 --- a/include/mbgl/webgpu/index_buffer_resource.hpp +++ b/include/mbgl/webgpu/index_buffer_resource.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { class IndexBufferResource : public gfx::IndexBufferResource { @@ -30,4 +30,4 @@ protected: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/layer_group.hpp b/include/mbgl/webgpu/layer_group.hpp index d67083d62..ec502c252 100644 --- a/include/mbgl/webgpu/layer_group.hpp +++ b/include/mbgl/webgpu/layer_group.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -12,7 +12,7 @@ namespace webgpu { /** * A layer group for non-tile-based drawables */ -class LayerGroup : public mbgl::LayerGroup { +class LayerGroup : public mln::LayerGroup { public: LayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name); ~LayerGroup() override {} @@ -28,4 +28,4 @@ protected: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/offscreen_texture.hpp b/include/mbgl/webgpu/offscreen_texture.hpp index 5a824b974..d3d88142f 100644 --- a/include/mbgl/webgpu/offscreen_texture.hpp +++ b/include/mbgl/webgpu/offscreen_texture.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -20,4 +20,4 @@ public: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/render_pass.hpp b/include/mbgl/webgpu/render_pass.hpp index b78a3aaef..bbe3c6fb4 100644 --- a/include/mbgl/webgpu/render_pass.hpp +++ b/include/mbgl/webgpu/render_pass.hpp @@ -6,7 +6,7 @@ // Forward declare WebGPU types typedef struct WGPURenderPassEncoderImpl* WGPURenderPassEncoder; -namespace mbgl { +namespace mln { namespace gfx { class CommandEncoder; class UniformBufferArray; @@ -49,4 +49,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/renderable_resource.hpp b/include/mbgl/webgpu/renderable_resource.hpp index 5d355e13a..3987056db 100644 --- a/include/mbgl/webgpu/renderable_resource.hpp +++ b/include/mbgl/webgpu/renderable_resource.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { class RendererBackend; @@ -26,7 +26,7 @@ public: // explicitly can override this method. } - virtual const mbgl::webgpu::RendererBackend& getBackend() const = 0; + virtual const mln::webgpu::RendererBackend& getBackend() const = 0; virtual const WGPUCommandEncoder& getCommandEncoder() const = 0; virtual WGPURenderPassEncoder getRenderPassEncoder() const = 0; @@ -51,4 +51,4 @@ public: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/renderer_backend.hpp b/include/mbgl/webgpu/renderer_backend.hpp index 7c8cfa76d..26097f4cc 100644 --- a/include/mbgl/webgpu/renderer_backend.hpp +++ b/include/mbgl/webgpu/renderer_backend.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { class ProgramParameters; @@ -50,7 +50,7 @@ public: // Surface texture access - can be overridden by platform backends virtual void* getCurrentTextureView(); virtual void* getDepthStencilView(); - virtual mbgl::Size getFramebufferSize() const; + virtual mln::Size getFramebufferSize() const; void setDepthStencilFormat(wgpu::TextureFormat); wgpu::TextureFormat getDepthStencilFormat() const; @@ -68,4 +68,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/texture2d.hpp b/include/mbgl/webgpu/texture2d.hpp index ed3f39e34..5b0751db2 100644 --- a/include/mbgl/webgpu/texture2d.hpp +++ b/include/mbgl/webgpu/texture2d.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -60,5 +60,5 @@ protected: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln #include diff --git a/include/mbgl/webgpu/tile_layer_group.hpp b/include/mbgl/webgpu/tile_layer_group.hpp index 10f9e45e4..5adf16d65 100644 --- a/include/mbgl/webgpu/tile_layer_group.hpp +++ b/include/mbgl/webgpu/tile_layer_group.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class PaintParameters; @@ -12,7 +12,7 @@ namespace webgpu { /** * A layer group for tile-based drawables */ -class TileLayerGroup : public mbgl::TileLayerGroup { +class TileLayerGroup : public mln::TileLayerGroup { public: TileLayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name); ~TileLayerGroup() override {} @@ -28,4 +28,4 @@ protected: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/uniform_buffer.hpp b/include/mbgl/webgpu/uniform_buffer.hpp index 7cba1e691..29df30cc5 100644 --- a/include/mbgl/webgpu/uniform_buffer.hpp +++ b/include/mbgl/webgpu/uniform_buffer.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -57,4 +57,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/upload_pass.hpp b/include/mbgl/webgpu/upload_pass.hpp index edfad074d..267199643 100644 --- a/include/mbgl/webgpu/upload_pass.hpp +++ b/include/mbgl/webgpu/upload_pass.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class CommandEncoder; class Renderable; @@ -67,4 +67,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/vertex_attribute.hpp b/include/mbgl/webgpu/vertex_attribute.hpp index d77e472b1..d25741855 100644 --- a/include/mbgl/webgpu/vertex_attribute.hpp +++ b/include/mbgl/webgpu/vertex_attribute.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class VertexBufferResource; } // namespace gfx @@ -49,4 +49,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/include/mbgl/webgpu/vertex_buffer_resource.hpp b/include/mbgl/webgpu/vertex_buffer_resource.hpp index 046bcaa05..3f457adfc 100644 --- a/include/mbgl/webgpu/vertex_buffer_resource.hpp +++ b/include/mbgl/webgpu/vertex_buffer_resource.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace webgpu { class Context; @@ -41,4 +41,4 @@ protected: using UniqueVertexBufferResource = std::unique_ptr; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 6ad3bcee1..25dd04ab4 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -208,7 +208,7 @@ Note: this release has some changes to how icon offsets behave on pitched maps. ### 🐞 Bug fixes -- [vulkan] Prevent member variable shadowing in `mbgl::vulkan::ShaderProgram` ([#3886](https://github.com/maplibre/maplibre-native/pull/3886)). +- [vulkan] Prevent member variable shadowing in `mln::vulkan::ShaderProgram` ([#3886](https://github.com/maplibre/maplibre-native/pull/3886)). - Add padding support to MapSnapshotter Android ([#3882](https://github.com/maplibre/maplibre-native/pull/3882)). - Fix `requestRenderAndNotify` continuous callback ([#3913](https://github.com/maplibre/maplibre-native/pull/3913)). - Add null check to Projection.getContentPadding() ([#3937](https://github.com/maplibre/maplibre-native/pull/3937)). @@ -1911,7 +1911,7 @@ Please see https://github.com/square/okhttp/issues/2679 for more information. - SymbolBucket, use single map for paint properties data [#13724](https://github.com/mapbox/mapbox-gl-native/pull/13724) - Avoid NullPointerException when quickly closing activity for attribution click handling [#13723](https://github.com/mapbox/mapbox-gl-native/pull/13723) - Return constexpr strings from functions to avoid ODR compile failures [#13720](https://github.com/mapbox/mapbox-gl-native/pull/13720) -- Split layer type specific code in mbgl::Programs [#13577](https://github.com/mapbox/mapbox-gl-native/pull/13577) +- Split layer type specific code in mln::Programs [#13577](https://github.com/mapbox/mapbox-gl-native/pull/13577) - Shader program must always match bucket in render symbol layer [#13667](https://github.com/mapbox/mapbox-gl-native/pull/13667) - Implement Google benchmark runner for Android platform [#13628](https://github.com/mapbox/mapbox-gl-native/pull/13628) - Avoid leaking attribution dialog when hosting context is stopped [#13673](https://github.com/mapbox/mapbox-gl-native/pull/13673) diff --git a/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.cpp b/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.cpp index 49aadd27e..03e22a47d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.cpp @@ -8,10 +8,10 @@ #include -namespace mbgl { +namespace mln { namespace android { -class AndroidGLRenderableResource final : public mbgl::gl::RenderableResource { +class AndroidGLRenderableResource final : public mln::gl::RenderableResource { public: AndroidGLRenderableResource(AndroidGLRendererBackend& backend_) : backend(backend_) {} @@ -35,7 +35,7 @@ private: AndroidGLRendererBackend::AndroidGLRendererBackend() : gl::RendererBackend(gfx::ContextMode::Unique), - mbgl::gfx::Renderable({64, 64}, std::make_unique(*this)) {} + mln::gfx::Renderable({64, 64}, std::make_unique(*this)) {} AndroidGLRendererBackend::~AndroidGLRendererBackend() = default; @@ -70,15 +70,15 @@ void AndroidGLRendererBackend::markContextLost() { } } // namespace android -} // namespace mbgl +} // namespace mln -namespace mbgl { +namespace mln { namespace gfx { template <> -std::unique_ptr Backend::Create(ANativeWindow*) { +std::unique_ptr Backend::Create(ANativeWindow*) { return std::make_unique(); } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.hpp b/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.hpp index c27755cc7..b0a1c4e88 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_gl_renderer_backend.hpp @@ -4,17 +4,17 @@ #include #include "android_renderer_backend.hpp" -namespace mbgl { +namespace mln { namespace android { class AndroidGLRendererBackend : public AndroidRendererBackend, public gl::RendererBackend, - public mbgl::gfx::Renderable { + public mln::gfx::Renderable { public: AndroidGLRendererBackend(); ~AndroidGLRendererBackend() override; - mbgl::gfx::RendererBackend& getImpl() override { return *this; } + mln::gfx::RendererBackend& getImpl() override { return *this; } void updateViewPort() override; @@ -24,9 +24,9 @@ public: void resizeFramebuffer(int width, int height) override; PremultipliedImage readFramebuffer() override; - // mbgl::gfx::RendererBackend implementation + // mln::gfx::RendererBackend implementation public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } protected: void activate() override { @@ -36,11 +36,11 @@ protected: // no-op } - // mbgl::gl::RendererBackend implementation + // mln::gl::RendererBackend implementation protected: - mbgl::gl::ProcAddress getExtensionFunctionPointer(const char*) override; + mln::gl::ProcAddress getExtensionFunctionPointer(const char*) override; void updateAssumedState() override; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.cpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.cpp index 06b9c4e4d..e4971c12b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.cpp @@ -1,7 +1,7 @@ #include "android_renderer_backend.hpp" #include -namespace mbgl { +namespace mln { namespace android { void AndroidRendererBackend::updateViewPort() {} @@ -19,4 +19,4 @@ void AndroidRendererBackend::setSwapBehavior(gfx::Renderable::SwapBehaviour swap } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.hpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.hpp index f6925967f..3b4235087 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace android { class AndroidRendererBackend { @@ -18,9 +18,9 @@ public: virtual ~AndroidRendererBackend() = default; static std::unique_ptr Create(ANativeWindow* window) { - return mbgl::gfx::Backend::Create(window); + return mln::gfx::Backend::Create(window); } - virtual mbgl::gfx::RendererBackend& getImpl() = 0; + virtual mln::gfx::RendererBackend& getImpl() = 0; virtual void updateViewPort(); @@ -42,4 +42,4 @@ protected: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.cpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.cpp index 58f4e1319..701abcefa 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.cpp @@ -14,7 +14,7 @@ #include "android_renderer_backend.hpp" #include "attach_env.hpp" -namespace mbgl { +namespace mln { namespace android { // Forwards RendererObserver signals to the given @@ -58,33 +58,33 @@ public: delegate.invoke(&RendererObserver::onSymbolError, message); } - void onPreCompileShader(mbgl::shaders::BuiltIn id, - mbgl::gfx::Backend::Type type, + void onPreCompileShader(mln::shaders::BuiltIn id, + mln::gfx::Backend::Type type, const std::string& additionalDefines) override { delegate.invoke(&RendererObserver::onPreCompileShader, id, type, additionalDefines); } - void onPostCompileShader(mbgl::shaders::BuiltIn id, - mbgl::gfx::Backend::Type type, + void onPostCompileShader(mln::shaders::BuiltIn id, + mln::gfx::Backend::Type type, const std::string& additionalDefines) override { delegate.invoke(&RendererObserver::onPostCompileShader, id, type, additionalDefines); } - void onShaderCompileFailed(mbgl::shaders::BuiltIn id, - mbgl::gfx::Backend::Type type, + void onShaderCompileFailed(mln::shaders::BuiltIn id, + mln::gfx::Backend::Type type, const std::string& additionalDefines) override { delegate.invoke(&RendererObserver::onShaderCompileFailed, id, type, additionalDefines); } - void onGlyphsLoaded(const mbgl::FontStack& stack, const mbgl::GlyphRange& range) override { + void onGlyphsLoaded(const mln::FontStack& stack, const mln::GlyphRange& range) override { delegate.invoke(&RendererObserver::onGlyphsLoaded, stack, range); } - void onGlyphsError(const mbgl::FontStack& stack, const mbgl::GlyphRange& range, std::exception_ptr ex) override { + void onGlyphsError(const mln::FontStack& stack, const mln::GlyphRange& range, std::exception_ptr ex) override { delegate.invoke(&RendererObserver::onGlyphsError, stack, range, ex); } - void onGlyphsRequested(const mbgl::FontStack& stack, const mbgl::GlyphRange& range) override { + void onGlyphsRequested(const mln::FontStack& stack, const mln::GlyphRange& range) override { delegate.invoke(&RendererObserver::onGlyphsRequested, stack, range); } @@ -243,11 +243,11 @@ FeatureExtensionValue AndroidRendererFrontend::queryFeatureExtensions( const Feature& feature, const std::string& extension, const std::string& extensionField, - const std::optional>& args) const { + const std::optional>& args) const { return mapRenderer.actor() .ask(&Renderer::queryFeatureExtensions, sourceID, feature, extension, extensionField, args) .get(); } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.hpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.hpp index 2336cf921..0352fd620 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.hpp @@ -16,7 +16,7 @@ #include -namespace mbgl { +namespace mln { class RenderedQueryOptions; class SourceQueryOptions; @@ -71,7 +71,7 @@ public: const Feature& feature, const std::string& extension, const std::string& extensionField, - const std::optional>& args) const; + const std::optional>& args) const; // Memory void setTileCacheEnabled(bool); @@ -86,4 +86,4 @@ private: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.cpp b/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.cpp index d9fc7e2f5..d72dc654a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.cpp @@ -7,10 +7,10 @@ #include #include -namespace mbgl { +namespace mln { namespace android { -class AndroidVulkanRenderableResource final : public mbgl::vulkan::SurfaceRenderableResource { +class AndroidVulkanRenderableResource final : public mln::vulkan::SurfaceRenderableResource { public: AndroidVulkanRenderableResource(AndroidVulkanRendererBackend& backend_) : SurfaceRenderableResource(backend_) {} @@ -71,7 +71,7 @@ void AndroidVulkanRendererBackend::destroySurface() { } std::vector AndroidVulkanRendererBackend::getInstanceExtensions() { - auto extensions = mbgl::vulkan::RendererBackend::getInstanceExtensions(); + auto extensions = mln::vulkan::RendererBackend::getInstanceExtensions(); extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); return extensions; @@ -104,16 +104,16 @@ PremultipliedImage AndroidVulkanRendererBackend::readFramebuffer() { } } // namespace android -} // namespace mbgl +} // namespace mln -namespace mbgl { +namespace mln { namespace gfx { template <> -std::unique_ptr Backend::Create( +std::unique_ptr Backend::Create( ANativeWindow* window) { return std::make_unique(window); } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.hpp b/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.hpp index 46a196ce5..a897f44e1 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_vulkan_renderer_backend.hpp @@ -5,7 +5,7 @@ #include "android_renderer_backend.hpp" #include -namespace mbgl { +namespace mln { namespace android { class AndroidVulkanRendererBackend : public AndroidRendererBackend, @@ -19,7 +19,7 @@ public: bool createSurface(ANativeWindow* window) override; void destroySurface() override; - mbgl::gfx::RendererBackend& getImpl() override { return *this; } + mln::gfx::RendererBackend& getImpl() override { return *this; } std::vector getInstanceExtensions() override; @@ -27,9 +27,9 @@ public: void enableFramebufferRead(bool value) override; PremultipliedImage readFramebuffer() override; - // mbgl::gfx::RendererBackend implementation + // mln::gfx::RendererBackend implementation public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } protected: void activate() override { @@ -46,4 +46,4 @@ protected: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.cpp b/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.cpp index b3b1831be..fcd5ed340 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.cpp @@ -67,7 +67,7 @@ static void startStderrToLogcat() { } #endif -namespace mbgl { +namespace mln { namespace android { #if MLN_WEBGPU_IMPL_DAWN @@ -113,7 +113,7 @@ public: void swap() override { backend.markNeedsPresent(); } - const mbgl::webgpu::RendererBackend& getBackend() const override { return backend; } + const mln::webgpu::RendererBackend& getBackend() const override { return backend; } const WGPUCommandEncoder& getCommandEncoder() const override { assert(false); @@ -565,7 +565,7 @@ PremultipliedImage AndroidWebGPURendererBackend::readFramebuffer() { return {fbSize, std::move(data)}; } - mbgl::Scoped scopedCleanup([stagingBuffer]() { + mln::Scoped scopedCleanup([stagingBuffer]() { wgpuBufferUnmap(stagingBuffer); wgpuBufferRelease(stagingBuffer); }); @@ -758,21 +758,21 @@ void* AndroidWebGPURendererBackend::getDepthStencilView() { return impl->depthStencilView; } -mbgl::Size AndroidWebGPURendererBackend::getFramebufferSize() const { +mln::Size AndroidWebGPURendererBackend::getFramebufferSize() const { return impl->framebufferSize; } } // namespace android -} // namespace mbgl +} // namespace mln -namespace mbgl { +namespace mln { namespace gfx { template <> -std::unique_ptr Backend::Create( +std::unique_ptr Backend::Create( ANativeWindow* window) { return std::make_unique(window); } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.hpp b/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.hpp index 68ab28ccf..ef27f7890 100644 --- a/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/android_webgpu_renderer_backend.hpp @@ -9,7 +9,7 @@ #include #endif -namespace mbgl { +namespace mln { namespace android { class AndroidWebGPURendererBackend : public AndroidRendererBackend, @@ -20,17 +20,17 @@ public: ~AndroidWebGPURendererBackend() override; ANativeWindow* getWindow() { return window; } - mbgl::gfx::RendererBackend& getImpl() override { return *this; } + mln::gfx::RendererBackend& getImpl() override { return *this; } void resizeFramebuffer(int width, int height) override; PremultipliedImage readFramebuffer() override; public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } void* getCurrentTextureView() override; void* getDepthStencilView() override; - mbgl::Size getFramebufferSize() const override; + mln::Size getFramebufferSize() const override; void presentSurface(); void markNeedsPresent(); @@ -50,4 +50,4 @@ private: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/annotation/marker.cpp b/platform/android/MapLibreAndroid/src/cpp/annotation/marker.cpp index 0f4a41eca..14492cc88 100644 --- a/platform/android/MapLibreAndroid/src/cpp/annotation/marker.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/annotation/marker.cpp @@ -1,9 +1,9 @@ #include "marker.hpp" -namespace mbgl { +namespace mln { namespace android { -mbgl::Point Marker::getPosition(jni::JNIEnv& env, const jni::Object& marker) { +mln::Point Marker::getPosition(jni::JNIEnv& env, const jni::Object& marker) { static auto& javaClass = jni::Class::Singleton(env); static auto positionField = javaClass.GetField>(env, "position"); return LatLng::getGeometry(env, marker.Get(env, positionField)); @@ -20,4 +20,4 @@ void Marker::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/annotation/marker.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/marker.hpp index 5b5fc5d22..ca47e5e7a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/annotation/marker.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/annotation/marker.hpp @@ -7,14 +7,14 @@ #include "../geometry/lat_lng.hpp" -namespace mbgl { +namespace mln { namespace android { -class Marker : private mbgl::util::noncopyable { +class Marker : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/annotations/Marker"; }; - static mbgl::Point getPosition(jni::JNIEnv&, const jni::Object&); + static mln::Point getPosition(jni::JNIEnv&, const jni::Object&); static std::string getIconId(jni::JNIEnv&, const jni::Object&); @@ -22,4 +22,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/annotation/multi_point.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/multi_point.hpp index 373b0eed9..46d45f71e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/annotation/multi_point.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/annotation/multi_point.hpp @@ -6,10 +6,10 @@ #include "../geometry/lat_lng.hpp" #include "../java/util.hpp" -namespace mbgl { +namespace mln { namespace android { -class MultiPoint : protected mbgl::util::noncopyable { +class MultiPoint : protected mln::util::noncopyable { protected: template static Geometry toGeometry(JNIEnv& env, const jni::Object& pointsList) { @@ -29,4 +29,4 @@ protected: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.cpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.cpp index 891c77d9a..97f9e92ce 100644 --- a/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.cpp @@ -2,10 +2,10 @@ #include "../conversion/color.hpp" -namespace mbgl { +namespace mln { namespace android { -mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, const jni::Object& polygon) { +mln::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, const jni::Object& polygon) { static auto& javaClass = jni::Class::Singleton(env); static auto points = javaClass.GetField>(env, "points"); static auto holes = javaClass.GetField>(env, "holes"); @@ -13,19 +13,19 @@ mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, const jni::Object

(env, "fillColor"); static auto strokeColor = javaClass.GetField(env, "strokeColor"); - mbgl::Polygon geometry{MultiPoint::toGeometry>(env, polygon.Get(env, points))}; + mln::Polygon geometry{MultiPoint::toGeometry>(env, polygon.Get(env, points))}; auto jHoleListsArray = java::util::List::toArray(env, polygon.Get(env, holes)); std::size_t jHoleListsSize = jHoleListsArray.Length(env); for (std::size_t i = 0; i < jHoleListsSize; i++) { - geometry.push_back(MultiPoint::toGeometry>(env, jHoleListsArray.Get(env, i))); + geometry.push_back(MultiPoint::toGeometry>(env, jHoleListsArray.Get(env, i))); } - mbgl::FillAnnotation annotation{geometry}; + mln::FillAnnotation annotation{geometry}; annotation.opacity = polygon.Get(env, alpha); - annotation.color = *conversion::convert(env, polygon.Get(env, fillColor)); - annotation.outlineColor = *conversion::convert(env, polygon.Get(env, strokeColor)); + annotation.color = *conversion::convert(env, polygon.Get(env, fillColor)); + annotation.outlineColor = *conversion::convert(env, polygon.Get(env, strokeColor)); return annotation; } @@ -35,4 +35,4 @@ void Polygon::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.hpp index 3f69f9514..efd6800e6 100644 --- a/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.hpp @@ -4,17 +4,17 @@ #include "multi_point.hpp" -namespace mbgl { +namespace mln { namespace android { class Polygon : private MultiPoint { public: static constexpr auto Name() { return "org/maplibre/android/annotations/Polygon"; }; - static mbgl::FillAnnotation toAnnotation(jni::JNIEnv&, const jni::Object&); + static mln::FillAnnotation toAnnotation(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.cpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.cpp index 8c326f4b8..597025413 100644 --- a/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.cpp @@ -2,20 +2,20 @@ #include "../conversion/color.hpp" -namespace mbgl { +namespace mln { namespace android { -mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, const jni::Object& polyline) { +mln::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, const jni::Object& polyline) { static auto& javaClass = jni::Class::Singleton(env); static auto points = javaClass.GetField>(env, "points"); static auto alpha = javaClass.GetField(env, "alpha"); static auto color = javaClass.GetField(env, "color"); static auto width = javaClass.GetField(env, "width"); - mbgl::LineAnnotation annotation{MultiPoint::toGeometry>(env, polyline.Get(env, points))}; + mln::LineAnnotation annotation{MultiPoint::toGeometry>(env, polyline.Get(env, points))}; annotation.opacity = polyline.Get(env, alpha); - annotation.color = *conversion::convert(env, polyline.Get(env, color)); + annotation.color = *conversion::convert(env, polyline.Get(env, color)); annotation.width = polyline.Get(env, width); return annotation; @@ -26,4 +26,4 @@ void Polyline::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.hpp index 1c231b45d..09e5e655a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.hpp @@ -4,17 +4,17 @@ #include "multi_point.hpp" -namespace mbgl { +namespace mln { namespace android { class Polyline : private MultiPoint { public: static constexpr auto Name() { return "org/maplibre/android/annotations/Polyline"; }; - static mbgl::LineAnnotation toAnnotation(jni::JNIEnv&, const jni::Object&); + static mln::LineAnnotation toAnnotation(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/asset_manager.hpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager.hpp index 8a0fc76e7..6e74b8ba0 100644 --- a/platform/android/MapLibreAndroid/src/cpp/asset_manager.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/asset_manager.hpp @@ -1,6 +1,6 @@ #pragma once -namespace mbgl { +namespace mln { namespace android { class AssetManager { @@ -9,4 +9,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp index d7b5b6e96..69e410a36 100644 --- a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { class AssetManagerFileSource::Impl { public: @@ -26,7 +26,7 @@ public: void request(const std::string& url, ActorRef req) { // Note: AssetManager already prepends "assets" to the filename. - const std::string path = mbgl::util::percentDecode(url.substr(8)); + const std::string path = mln::util::percentDecode(url.substr(8)); Response response; @@ -79,7 +79,7 @@ std::unique_ptr AssetManagerFileSource::request(const Resource& re } bool AssetManagerFileSource::canRequest(const Resource& resource) const { - return 0 == resource.url.rfind(mbgl::util::ASSET_PROTOCOL, 0); + return 0 == resource.url.rfind(mln::util::ASSET_PROTOCOL, 0); } void AssetManagerFileSource::setResourceOptions(ResourceOptions options) { @@ -98,4 +98,4 @@ ClientOptions AssetManagerFileSource::getClientOptions() { return impl->actor().ask(&Impl::getClientOptions).get(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp index 166fc0398..0853281fa 100644 --- a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace util { template @@ -39,4 +39,4 @@ private: std::unique_ptr> impl; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.cpp b/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.cpp index f7a06d26d..aee755fad 100644 --- a/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace android { /** @@ -37,4 +37,4 @@ void ConnectivityListener::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.hpp b/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.hpp index 61b45a21c..bf6297814 100644 --- a/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.hpp @@ -4,10 +4,10 @@ #include -namespace mbgl { +namespace mln { namespace android { -class ConnectivityListener : private mbgl::util::noncopyable { +class ConnectivityListener : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/net/NativeConnectivityListener"; }; @@ -24,4 +24,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/conversion/collection.cpp b/platform/android/MapLibreAndroid/src/cpp/conversion/collection.cpp index 3137c832f..275317ab6 100644 --- a/platform/android/MapLibreAndroid/src/cpp/conversion/collection.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/conversion/collection.cpp @@ -1,7 +1,7 @@ #include "collection.hpp" #include "constant.hpp" -namespace mbgl { +namespace mln { namespace android { namespace conversion { @@ -29,4 +29,4 @@ jni::Local> toArray(JNIEnv& env, const std::vector -namespace mbgl { +namespace mln { namespace android { namespace conversion { @@ -15,4 +15,4 @@ jni::Local> toArray(JNIEnv& env, const std::vector Converter::operator()(jni::JNIEnv&, const int& color) const { +Result Converter::operator()(jni::JNIEnv&, const int& color) const { float r = (color >> 16) & 0xFF; float g = (color >> 8) & 0xFF; float b = (color) & 0xFF; float a = (color >> 24) & 0xFF; - return {mbgl::Color(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f)}; + return {mln::Color(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f)}; } } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/conversion/color.hpp b/platform/android/MapLibreAndroid/src/cpp/conversion/color.hpp index aa61dce57..bae81d302 100644 --- a/platform/android/MapLibreAndroid/src/cpp/conversion/color.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/conversion/color.hpp @@ -4,15 +4,15 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { template <> -struct Converter { - Result operator()(jni::JNIEnv&, const int& color) const; +struct Converter { + Result operator()(jni::JNIEnv&, const int& color) const; }; } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/conversion/constant.cpp b/platform/android/MapLibreAndroid/src/cpp/conversion/constant.cpp index 02df39ab3..c575a3b34 100644 --- a/platform/android/MapLibreAndroid/src/cpp/conversion/constant.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/conversion/constant.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { @@ -117,11 +117,11 @@ Result>> Converter>, style::ex return jni::Make(env, value.id()); } -Result>> Converter>, mbgl::style::Rotation>::operator()( - jni::JNIEnv& env, const mbgl::style::Rotation& value) const { +Result>> Converter>, mln::style::Rotation>::operator()( + jni::JNIEnv& env, const mln::style::Rotation& value) const { return jni::Box(env, value.getAngle()); } } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/conversion/constant.hpp b/platform/android/MapLibreAndroid/src/cpp/conversion/constant.hpp index eb474f857..fed59bc75 100644 --- a/platform/android/MapLibreAndroid/src/cpp/conversion/constant.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/conversion/constant.hpp @@ -17,7 +17,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { @@ -140,10 +140,10 @@ struct Converter>, style::expression::Image> { }; template <> -struct Converter>, mbgl::style::Rotation> { - Result>> operator()(jni::JNIEnv& env, const mbgl::style::Rotation& value) const; +struct Converter>, mln::style::Rotation> { + Result>> operator()(jni::JNIEnv& env, const mln::style::Rotation& value) const; }; } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/conversion/conversion.hpp b/platform/android/MapLibreAndroid/src/cpp/conversion/conversion.hpp index d9256c8d8..0b225f416 100644 --- a/platform/android/MapLibreAndroid/src/cpp/conversion/conversion.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/conversion/conversion.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { @@ -47,4 +47,4 @@ Result convert(jni::JNIEnv& env, const V& value, Args&&... args) { } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/file_source.cpp b/platform/android/MapLibreAndroid/src/cpp/file_source.cpp index 6ad4ee95d..bd87526d9 100644 --- a/platform/android/MapLibreAndroid/src/cpp/file_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/file_source.cpp @@ -15,7 +15,7 @@ #include "asset_manager_file_source.hpp" -namespace mbgl { +namespace mln { namespace android { // FileSource // @@ -28,11 +28,11 @@ FileSource::FileSource(jni::JNIEnv& _env, std::string path = jni::Make(_env, _cachePath); mapbox::sqlite::setTempPath(path); - mbgl::FileSourceManager::get()->registerFileSourceFactory( - mbgl::FileSourceType::Asset, - [](const mbgl::ResourceOptions& resourceOptions, const mbgl::ClientOptions& clientOptions) { + mln::FileSourceManager::get()->registerFileSourceFactory( + mln::FileSourceType::Asset, + [](const mln::ResourceOptions& resourceOptions, const mln::ClientOptions& clientOptions) { auto env{android::AttachEnv()}; - std::unique_ptr assetFileSource; + std::unique_ptr assetFileSource; if (android::MapLibre::hasInstance(*env)) { auto assetManager = android::MapLibre::getAssetManager(*env); assetFileSource = std::make_unique( @@ -48,12 +48,12 @@ FileSource::FileSource(jni::JNIEnv& _env, // Create a core file sources // TODO: Split Android FileSource API to smaller interfaces - resourceLoader = mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::ResourceLoader, resourceOptions, clientOptions); - databaseSource = std::static_pointer_cast(std::shared_ptr( - mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Database, resourceOptions, clientOptions))); - onlineSource = mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::Network, resourceOptions, clientOptions); + resourceLoader = mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::ResourceLoader, resourceOptions, clientOptions); + databaseSource = std::static_pointer_cast(std::shared_ptr( + mln::FileSourceManager::get()->getFileSource(mln::FileSourceType::Database, resourceOptions, clientOptions))); + onlineSource = mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::Network, resourceOptions, clientOptions); } FileSource::~FileSource() {} @@ -67,7 +67,7 @@ void FileSource::setTileServerOptions(jni::JNIEnv& _env, const jni::Object FileSource::getApiKey(jni::JNIEnv& env) { - if (auto* token = onlineSource->getProperty(mbgl::API_KEY_KEY).getString()) { + if (auto* token = onlineSource->getProperty(mln::API_KEY_KEY).getString()) { return jni::Make(env, *token); } @@ -77,7 +77,7 @@ jni::Local FileSource::getApiKey(jni::JNIEnv& env) { void FileSource::setApiKey(jni::JNIEnv& env, const jni::String& token) { if (onlineSource) { - onlineSource->setProperty(mbgl::API_KEY_KEY, token ? jni::Make(env, token) : ""); + onlineSource->setProperty(mln::API_KEY_KEY, token ? jni::Make(env, token) : ""); } else { ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Online functionality is disabled."); } @@ -85,14 +85,14 @@ void FileSource::setApiKey(jni::JNIEnv& env, const jni::String& token) { void FileSource::setAPIBaseUrl(jni::JNIEnv& env, const jni::String& url) { if (onlineSource) { - onlineSource->setProperty(mbgl::API_BASE_URL_KEY, jni::Make(env, url)); + onlineSource->setProperty(mln::API_BASE_URL_KEY, jni::Make(env, url)); } else { ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Online functionality is disabled."); } } jni::Local FileSource::getAPIBaseUrl(jni::JNIEnv& env) { - if (auto* url = onlineSource->getProperty(mbgl::API_BASE_URL_KEY).getString()) { + if (auto* url = onlineSource->getProperty(mln::API_BASE_URL_KEY).getString()) { return jni::Make(env, std::string(*url)); } @@ -119,7 +119,7 @@ void FileSource::setResourceTransform(jni::JNIEnv& env, // is converted to a std::function, which requires copyability // of its captured variables. [callback = std::make_shared(std::move(global))]( - mbgl::Resource::Kind kind, const std::string& url_, ResourceTransform::FinishedCallback cb) { + mln::Resource::Kind kind, const std::string& url_, ResourceTransform::FinishedCallback cb) { android::UniqueEnv _env = android::AttachEnv(); cb(FileSource::ResourceTransformCallback::onURL(*_env, *callback, int(kind), url_)); }); @@ -196,8 +196,8 @@ FileSource* FileSource::getNativePeer(jni::JNIEnv& env, const jni::Object(jFileSource.Get(env, field)); } -mbgl::ResourceOptions FileSource::getSharedResourceOptions(jni::JNIEnv& env, - const jni::Object& jFileSource) { +mln::ResourceOptions FileSource::getSharedResourceOptions(jni::JNIEnv& env, + const jni::Object& jFileSource) { FileSource* fileSource = FileSource::getNativePeer(env, jFileSource); // Core could be compiled without support for any sources. if (fileSource) { @@ -207,7 +207,7 @@ mbgl::ResourceOptions FileSource::getSharedResourceOptions(jni::JNIEnv& env, return {}; } -mbgl::ClientOptions FileSource::getSharedClientOptions(jni::JNIEnv& env, const jni::Object& jFileSource) { +mln::ClientOptions FileSource::getSharedClientOptions(jni::JNIEnv& env, const jni::Object& jFileSource) { FileSource* fileSource = FileSource::getNativePeer(env, jFileSource); // Core could be compiled without support for any sources. if (fileSource) { @@ -281,4 +281,4 @@ std::string FileSource::ResourceTransformCallback::onURL( } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/file_source.hpp b/platform/android/MapLibreAndroid/src/cpp/file_source.hpp index 421ef2e46..d365beb8d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/file_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/file_source.hpp @@ -11,7 +11,7 @@ #include "util/tile_server_options.hpp" -namespace mbgl { +namespace mln { template class Actor; @@ -81,23 +81,23 @@ public: static FileSource* getNativePeer(jni::JNIEnv&, const jni::Object&); - static mbgl::ResourceOptions getSharedResourceOptions(jni::JNIEnv&, const jni::Object&); + static mln::ResourceOptions getSharedResourceOptions(jni::JNIEnv&, const jni::Object&); - static mbgl::ClientOptions getSharedClientOptions(jni::JNIEnv&, const jni::Object&); + static mln::ClientOptions getSharedClientOptions(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); private: const std::string DATABASE_FILE = "/mbgl-offline.db"; std::optional activationCounter; - mbgl::ResourceOptions resourceOptions; - mbgl::ClientOptions clientOptions; + mln::ResourceOptions resourceOptions; + mln::ClientOptions clientOptions; std::unique_ptr> resourceTransform; std::function pathChangeCallback; - std::shared_ptr databaseSource; - std::shared_ptr onlineSource; - std::shared_ptr resourceLoader; + std::shared_ptr databaseSource; + std::shared_ptr onlineSource; + std::shared_ptr resourceLoader; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/feature.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.cpp index 308f8914a..32c4ba81f 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/feature.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.cpp @@ -4,13 +4,13 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { using namespace gson; -mbgl::GeoJSONFeature Feature::convert(jni::JNIEnv& env, const jni::Object& jFeature) { +mln::GeoJSONFeature Feature::convert(jni::JNIEnv& env, const jni::Object& jFeature) { static auto& javaClass = jni::Class::Singleton(env); static auto id = javaClass.GetMethod(env, "id"); static auto geometry = javaClass.GetMethod()>(env, "geometry"); @@ -20,9 +20,9 @@ mbgl::GeoJSONFeature Feature::convert(jni::JNIEnv& env, const jni::Object(env, jId)} : mbid{mapbox::feature::null_value}}; + return mln::GeoJSONFeature{Geometry::convert(env, jFeature.Call(env, geometry)), + JsonObject::convert(env, jFeature.Call(env, properties)), + jId ? mbid{jni::Make(env, jId)} : mbid{mapbox::feature::null_value}}; } /** @@ -42,34 +42,33 @@ public: std::string operator()(const mapbox::feature::null_value_t&) const { return {}; } }; -jni::Local> convertFeature(jni::JNIEnv& env, const mbgl::GeoJSONFeature& value) { +jni::Local> convertFeature(jni::JNIEnv& env, const mln::GeoJSONFeature& value) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetStaticMethod(jni::Object, jni::Object, jni::String)>( env, "fromGeometry"); - return javaClass.Call( - env, - method, - Geometry::New(env, value.geometry), - JsonObject::New(env, value.properties), - jni::Make(env, - value.id.is() ? std::string{} : value.id.match(FeatureIdVisitor()))); + return javaClass.Call(env, + method, + Geometry::New(env, value.geometry), + JsonObject::New(env, value.properties), + jni::Make( + env, value.id.is() ? std::string{} : value.id.match(FeatureIdVisitor()))); } jni::Local>> Feature::convert(jni::JNIEnv& env, - const std::vector& value) { + const std::vector& value) { auto features = jni::Array>::New(env, value.size()); for (size_t i = 0; i < value.size(); ++i) { - features.Set(env, i, convertFeature(env, static_cast(value.at(i)))); + features.Set(env, i, convertFeature(env, static_cast(value.at(i)))); } return features; } jni::Local>> Feature::convert(jni::JNIEnv& env, - const std::vector& value) { + const std::vector& value) { auto features = jni::Array>::New(env, value.size()); for (size_t i = 0; i < value.size(); ++i) { @@ -85,4 +84,4 @@ void Feature::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp index a6879ebdf..d6658d2c4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -12,13 +12,13 @@ class Feature { public: static constexpr auto Name() { return "org/maplibre/geojson/Feature"; }; - static mbgl::GeoJSONFeature convert(jni::JNIEnv&, const jni::Object&); - static jni::Local>> convert(jni::JNIEnv&, const std::vector&); - static jni::Local>> convert(jni::JNIEnv&, const std::vector&); + static mln::GeoJSONFeature convert(jni::JNIEnv&, const jni::Object&); + static jni::Local>> convert(jni::JNIEnv&, const std::vector&); + static jni::Local>> convert(jni::JNIEnv&, const std::vector&); static void registerNative(jni::JNIEnv&); }; } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.cpp index 7fa3bd386..14718c785 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.cpp @@ -2,13 +2,12 @@ #include "feature.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { -mbgl::FeatureCollection FeatureCollection::convert(jni::JNIEnv& env, - const jni::Object& jCollection) { - auto collection = mbgl::FeatureCollection(); +mln::FeatureCollection FeatureCollection::convert(jni::JNIEnv& env, const jni::Object& jCollection) { + auto collection = mln::FeatureCollection(); if (jCollection) { auto jFeatureList = FeatureCollection::features(env, jCollection); @@ -36,4 +35,4 @@ void FeatureCollection::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp index 7c9274e22..3d39261f3 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -14,7 +14,7 @@ class FeatureCollection { public: static constexpr auto Name() { return "org/maplibre/geojson/FeatureCollection"; }; - static mbgl::FeatureCollection convert(jni::JNIEnv&, const jni::Object&); + static mln::FeatureCollection convert(jni::JNIEnv&, const jni::Object&); static jni::Local> features(jni::JNIEnv&, const jni::Object&); @@ -23,4 +23,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.cpp index 48eb8c4ad..b42fab7a2 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.cpp @@ -10,7 +10,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -21,32 +21,32 @@ class GeometryEvaluator { public: jni::JNIEnv &env; - jni::Local> operator()(const mbgl::EmptyGeometry &) const { + jni::Local> operator()(const mln::EmptyGeometry &) const { // FIXME: mapbox-java needs to have its own Empty type. return GeometryCollection::New(env, {}); } - jni::Local> operator()(const mbgl::Point &geometry) const { + jni::Local> operator()(const mln::Point &geometry) const { return Point::New(env, geometry); } - jni::Local> operator()(const mbgl::LineString &geometry) const { + jni::Local> operator()(const mln::LineString &geometry) const { return LineString::New(env, geometry); } - jni::Local> operator()(const mbgl::MultiLineString &geometry) const { + jni::Local> operator()(const mln::MultiLineString &geometry) const { return MultiLineString::New(env, geometry); } - jni::Local> operator()(const mbgl::MultiPoint &geometry) const { + jni::Local> operator()(const mln::MultiPoint &geometry) const { return MultiPoint::New(env, geometry); } - jni::Local> operator()(const mbgl::Polygon &geometry) const { + jni::Local> operator()(const mln::Polygon &geometry) const { return Polygon::New(env, geometry); } - jni::Local> operator()(const mbgl::MultiPolygon &geometry) const { + jni::Local> operator()(const mln::MultiPolygon &geometry) const { return MultiPolygon::New(env, geometry); } @@ -55,12 +55,12 @@ public: } }; -jni::Local> Geometry::New(jni::JNIEnv &env, mbgl::Geometry geometry) { +jni::Local> Geometry::New(jni::JNIEnv &env, mln::Geometry geometry) { GeometryEvaluator evaluator{env}; - return mbgl::Geometry::visit(geometry, evaluator); + return mln::Geometry::visit(geometry, evaluator); } -mbgl::Geometry Geometry::convert(jni::JNIEnv &env, const jni::Object &jGeometry) { +mln::Geometry Geometry::convert(jni::JNIEnv &env, const jni::Object &jGeometry) { auto type = Geometry::getType(env, jGeometry); if (type == Point::Type()) { return {Point::convert(env, jni::Cast(env, jni::Class::Singleton(env), jGeometry))}; @@ -94,4 +94,4 @@ void Geometry::registerNative(jni::JNIEnv &env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp index c593ae642..abc7305a7 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -14,9 +14,9 @@ class Geometry { public: static constexpr auto Name() { return "org/maplibre/geojson/Geometry"; }; - static jni::Local> New(jni::JNIEnv&, mbgl::Geometry); + static jni::Local> New(jni::JNIEnv&, mln::Geometry); - static mbgl::Geometry convert(jni::JNIEnv&, const jni::Object&); + static mln::Geometry convert(jni::JNIEnv&, const jni::Object&); static std::string getType(jni::JNIEnv&, const jni::Object&); @@ -25,4 +25,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.cpp index 27d71ea1e..4b969e8ee 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.cpp @@ -1,7 +1,7 @@ #include "geometry_collection.hpp" #include "../java/util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -47,4 +47,4 @@ void GeometryCollection::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp index 22c65eeb5..383071f12 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -24,4 +24,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.cpp index 03467b57e..60715f6b3 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.cpp @@ -3,11 +3,11 @@ #include "util.hpp" #include "../java/util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { -jni::Local> LineString::New(jni::JNIEnv& env, const mbgl::LineString& lineString) { +jni::Local> LineString::New(jni::JNIEnv& env, const mln::LineString& lineString) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetStaticMethod(jni::Object)>( env, "fromLngLats"); @@ -55,4 +55,4 @@ void LineString::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp index b97e7c9a5..2c7543744 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -19,7 +19,7 @@ public: static constexpr auto Name() { return "org/maplibre/geojson/LineString"; }; static constexpr auto Type() { return "LineString"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::LineString&); + static jni::Local> New(jni::JNIEnv&, const mln::LineString&); static mapbox::geojson::line_string convert(jni::JNIEnv&, const jni::Object&); @@ -32,4 +32,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.cpp index b4b05d4f6..335a0bd34 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.cpp @@ -3,12 +3,12 @@ #include "line_string.hpp" #include "util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { jni::Local> MultiLineString::New(jni::JNIEnv& env, - const mbgl::MultiLineString& multiLineString) { + const mln::MultiLineString& multiLineString) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetStaticMethod(jni::Object)>( env, "fromLngLats"); @@ -58,4 +58,4 @@ void MultiLineString::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp index 70c26a872..c33670b19 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -18,7 +18,7 @@ public: static constexpr auto Name() { return "org/maplibre/geojson/MultiLineString"; }; static constexpr auto Type() { return "MultiLineString"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::MultiLineString&); + static jni::Local> New(jni::JNIEnv&, const mln::MultiLineString&); static mapbox::geojson::multi_line_string convert(jni::JNIEnv&, const jni::Object&); @@ -32,4 +32,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.cpp index 15ce5547e..5b25f57ed 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.cpp @@ -4,11 +4,11 @@ #include "util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { -jni::Local> MultiPoint::New(JNIEnv& env, const mbgl::MultiPoint& multiPoint) { +jni::Local> MultiPoint::New(JNIEnv& env, const mln::MultiPoint& multiPoint) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetStaticMethod(jni::Object)>( env, "fromLngLats"); @@ -40,4 +40,4 @@ void MultiPoint::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp index 5f48d0aa9..23ef37dae 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -19,7 +19,7 @@ public: static constexpr auto Name() { return "org/maplibre/geojson/MultiPoint"; }; static constexpr auto Type() { return "MultiPoint"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::MultiPoint&); + static jni::Local> New(jni::JNIEnv&, const mln::MultiPoint&); static mapbox::geojson::multi_point convert(jni::JNIEnv&, const jni::Object&); @@ -30,4 +30,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.cpp index e050c8830..d5be25b2a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.cpp @@ -3,11 +3,11 @@ #include "polygon.hpp" #include "util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { -jni::Local> MultiPolygon::New(JNIEnv& env, const mbgl::MultiPolygon& multiPolygon) { +jni::Local> MultiPolygon::New(JNIEnv& env, const mln::MultiPolygon& multiPolygon) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetStaticMethod(jni::Object)>( env, "fromLngLats"); @@ -52,4 +52,4 @@ void MultiPolygon::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp index ce816098d..348de5dc2 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -18,7 +18,7 @@ public: static constexpr auto Name() { return "org/maplibre/geojson/MultiPolygon"; }; static constexpr auto Type() { return "MultiPolygon"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::MultiPolygon&); + static jni::Local> New(jni::JNIEnv&, const mln::MultiPolygon&); static mapbox::geojson::multi_polygon convert(jni::JNIEnv&, const jni::Object&); @@ -29,4 +29,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/point.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/point.cpp index 020d62385..b8e075f69 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/point.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/point.cpp @@ -1,16 +1,16 @@ #include "point.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { -jni::Local> Point::New(jni::JNIEnv& env, const mbgl::Point& point) { +jni::Local> Point::New(jni::JNIEnv& env, const mln::Point& point) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetStaticMethod(jni::jdouble, jni::jdouble)>(env, "fromLngLat"); return javaClass.Call(env, method, point.x, point.y); } -mbgl::Point Point::convert(jni::JNIEnv& env, const jni::Object& jPoint) { +mln::Point Point::convert(jni::JNIEnv& env, const jni::Object& jPoint) { static auto& javaClass = jni::Class::Singleton(env); static auto longitude = javaClass.GetMethod(env, "longitude"); static auto latitude = javaClass.GetMethod(env, "latitude"); @@ -28,4 +28,4 @@ void Point::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp index 17459e702..370400731 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -16,12 +16,12 @@ public: static constexpr auto Name() { return "org/maplibre/geojson/Point"; }; static constexpr auto Type() { return "Point"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::Point&); - static mbgl::Point convert(jni::JNIEnv&, const jni::Object&); + static jni::Local> New(jni::JNIEnv&, const mln::Point&); + static mln::Point convert(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.cpp index 24401a036..802a6640d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.cpp @@ -4,11 +4,11 @@ #include "util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace geojson { -jni::Local> Polygon::New(jni::JNIEnv& env, const mbgl::Polygon& polygon) { +jni::Local> Polygon::New(jni::JNIEnv& env, const mln::Polygon& polygon) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetStaticMethod(jni::Object)>(env, "fromLngLats"); @@ -53,4 +53,4 @@ void Polygon::registerNative(jni::JNIEnv& env) { } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp index c09aaf554..c6dee8f49 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -18,7 +18,7 @@ public: static constexpr auto Name() { return "org/maplibre/geojson/Polygon"; }; static constexpr auto Type() { return "Polygon"; }; - static jni::Local> New(jni::JNIEnv &, const mbgl::Polygon &); + static jni::Local> New(jni::JNIEnv &, const mln::Polygon &); static mapbox::geojson::polygon convert(jni::JNIEnv &, const jni::Object &); @@ -32,4 +32,4 @@ public: } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geojson/util.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/util.hpp index 1e2190c4a..918c2bc1b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geojson/util.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geojson/util.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace geojson { @@ -47,4 +47,4 @@ static jni::Local> asPointsListsList(JNIEnv& env, } // namespace geojson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.cpp index 399837ea2..c53039c4d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.cpp @@ -1,24 +1,24 @@ #include "lat_lng.hpp" -namespace mbgl { +namespace mln { namespace android { -jni::Local> LatLng::New(jni::JNIEnv& env, const mbgl::LatLng& latLng) { +jni::Local> LatLng::New(jni::JNIEnv& env, const mln::LatLng& latLng) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor(env); return javaClass.New(env, constructor, latLng.latitude(), latLng.longitude()); } -mbgl::Point LatLng::getGeometry(jni::JNIEnv& env, const jni::Object& latLng) { +mln::Point LatLng::getGeometry(jni::JNIEnv& env, const jni::Object& latLng) { static auto& javaClass = jni::Class::Singleton(env); static auto latitudeField = javaClass.GetField(env, "latitude"); static auto longitudeField = javaClass.GetField(env, "longitude"); - return mbgl::Point(latLng.Get(env, longitudeField), latLng.Get(env, latitudeField)); + return mln::Point(latLng.Get(env, longitudeField), latLng.Get(env, latitudeField)); } -mbgl::LatLng LatLng::getLatLng(jni::JNIEnv& env, const jni::Object& latLng) { +mln::LatLng LatLng::getLatLng(jni::JNIEnv& env, const jni::Object& latLng) { auto point = LatLng::getGeometry(env, latLng); - return mbgl::LatLng(point.y, point.x); + return mln::LatLng(point.y, point.x); } void LatLng::registerNative(jni::JNIEnv& env) { @@ -26,4 +26,4 @@ void LatLng::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.hpp index 206cc470e..8c43875d5 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.hpp @@ -6,21 +6,21 @@ #include -namespace mbgl { +namespace mln { namespace android { -class LatLng : private mbgl::util::noncopyable { +class LatLng : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/geometry/LatLng"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::LatLng&); + static jni::Local> New(jni::JNIEnv&, const mln::LatLng&); - static mbgl::Point getGeometry(jni::JNIEnv&, const jni::Object&); + static mln::Point getGeometry(jni::JNIEnv&, const jni::Object&); - static mbgl::LatLng getLatLng(jni::JNIEnv&, const jni::Object&); + static mln::LatLng getLatLng(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.cpp index 15e099c2d..0678a903e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.cpp @@ -1,25 +1,25 @@ #include "lat_lng_bounds.hpp" -namespace mbgl { +namespace mln { namespace android { -jni::Local> LatLngBounds::New(jni::JNIEnv& env, mbgl::LatLngBounds bounds) { +jni::Local> LatLngBounds::New(jni::JNIEnv& env, mln::LatLngBounds bounds) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor(env); return javaClass.New(env, constructor, bounds.north(), bounds.east(), bounds.south(), bounds.west()); } -mbgl::LatLngBounds LatLngBounds::getLatLngBounds(jni::JNIEnv& env, const jni::Object& bounds) { +mln::LatLngBounds LatLngBounds::getLatLngBounds(jni::JNIEnv& env, const jni::Object& bounds) { static auto& javaClass = jni::Class::Singleton(env); static auto swLatField = javaClass.GetField(env, "latitudeSouth"); static auto swLonField = javaClass.GetField(env, "longitudeWest"); static auto neLatField = javaClass.GetField(env, "latitudeNorth"); static auto neLonField = javaClass.GetField(env, "longitudeEast"); - mbgl::LatLng sw = {bounds.Get(env, swLatField), bounds.Get(env, swLonField)}; - mbgl::LatLng ne = {bounds.Get(env, neLatField), bounds.Get(env, neLonField)}; + mln::LatLng sw = {bounds.Get(env, swLatField), bounds.Get(env, swLonField)}; + mln::LatLng ne = {bounds.Get(env, neLatField), bounds.Get(env, neLonField)}; - return mbgl::LatLngBounds::hull(sw, ne); + return mln::LatLngBounds::hull(sw, ne); } void LatLngBounds::registerNative(jni::JNIEnv& env) { @@ -27,4 +27,4 @@ void LatLngBounds::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.hpp index 0dad494d2..2d164167b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.hpp @@ -6,19 +6,19 @@ #include -namespace mbgl { +namespace mln { namespace android { -class LatLngBounds : private mbgl::util::noncopyable { +class LatLngBounds : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/geometry/LatLngBounds"; }; - static jni::Local> New(jni::JNIEnv&, mbgl::LatLngBounds); + static jni::Local> New(jni::JNIEnv&, mln::LatLngBounds); - static mbgl::LatLngBounds getLatLngBounds(jni::JNIEnv&, const jni::Object&); + static mln::LatLngBounds getLatLngBounds(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.cpp index c4fa39789..dab9acc7f 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.cpp @@ -1,10 +1,10 @@ #include "lat_lng_quad.hpp" #include "lat_lng.hpp" -namespace mbgl { +namespace mln { namespace android { -jni::Local> LatLngQuad::New(jni::JNIEnv& env, std::array coordinates) { +jni::Local> LatLngQuad::New(jni::JNIEnv& env, std::array coordinates) { static auto& javaClass = jni::Class::Singleton(env); static auto quadConstructor = javaClass.GetConstructor, jni::Object, jni::Object, jni::Object>( @@ -17,17 +17,17 @@ jni::Local> LatLngQuad::New(jni::JNIEnv& env, std::array LatLng::New(env, coordinates[3])); } -std::array LatLngQuad::getLatLngArray(jni::JNIEnv& env, const jni::Object& quad) { +std::array LatLngQuad::getLatLngArray(jni::JNIEnv& env, const jni::Object& quad) { static auto& javaClass = jni::Class::Singleton(env); static auto topLeftField = javaClass.GetField>(env, "topLeft"); static auto topRightField = javaClass.GetField>(env, "topRight"); static auto bottomRightField = javaClass.GetField>(env, "bottomRight"); static auto bottomLeftField = javaClass.GetField>(env, "bottomLeft"); - return std::array{{LatLng::getLatLng(env, quad.Get(env, topLeftField)), - LatLng::getLatLng(env, quad.Get(env, topRightField)), - LatLng::getLatLng(env, quad.Get(env, bottomRightField)), - LatLng::getLatLng(env, quad.Get(env, bottomLeftField))}}; + return std::array{{LatLng::getLatLng(env, quad.Get(env, topLeftField)), + LatLng::getLatLng(env, quad.Get(env, topRightField)), + LatLng::getLatLng(env, quad.Get(env, bottomRightField)), + LatLng::getLatLng(env, quad.Get(env, bottomLeftField))}}; } void LatLngQuad::registerNative(jni::JNIEnv& env) { @@ -35,4 +35,4 @@ void LatLngQuad::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.hpp index 4bdf1b3e7..2c6774984 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.hpp @@ -7,19 +7,19 @@ #include #include -namespace mbgl { +namespace mln { namespace android { -class LatLngQuad : private mbgl::util::noncopyable { +class LatLngQuad : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/geometry/LatLngQuad"; }; - static jni::Local> New(jni::JNIEnv&, std::array); + static jni::Local> New(jni::JNIEnv&, std::array); - static std::array getLatLngArray(jni::JNIEnv&, const jni::Object&); + static std::array getLatLngArray(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.cpp index fa7d70b0e..58727150e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.cpp @@ -1,6 +1,6 @@ #include "projected_meters.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> ProjectedMeters::New(jni::JNIEnv& env, double northing, double easting) { @@ -14,4 +14,4 @@ void ProjectedMeters::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.hpp index 68cb1e06d..87c9c5fd1 100644 --- a/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.hpp @@ -5,10 +5,10 @@ #include -namespace mbgl { +namespace mln { namespace android { -class ProjectedMeters : private mbgl::util::noncopyable { +class ProjectedMeters : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/geometry/ProjectedMeters"; }; @@ -18,4 +18,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.cpp b/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.cpp index 9e33f072f..9b4b76f9c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.cpp @@ -1,7 +1,7 @@ #include #include "pointf.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> PointF::New(jni::JNIEnv& env, float x, float y) { @@ -10,11 +10,11 @@ jni::Local> PointF::New(jni::JNIEnv& env, float x, float y) return javaClass.New(env, constructor, x, y); } -mbgl::ScreenCoordinate PointF::getScreenCoordinate(jni::JNIEnv& env, const jni::Object& point) { +mln::ScreenCoordinate PointF::getScreenCoordinate(jni::JNIEnv& env, const jni::Object& point) { static auto& javaClass = jni::Class::Singleton(env); static auto xField = javaClass.GetField(env, "x"); static auto yField = javaClass.GetField(env, "y"); - return mbgl::ScreenCoordinate{point.Get(env, xField), point.Get(env, yField)}; + return mln::ScreenCoordinate{point.Get(env, xField), point.Get(env, yField)}; } void PointF::registerNative(jni::JNIEnv& env) { @@ -22,4 +22,4 @@ void PointF::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.hpp b/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.hpp index c849dfc54..7dc1a0c9e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.hpp @@ -4,19 +4,19 @@ #include -namespace mbgl { +namespace mln { namespace android { -class PointF : private mbgl::util::noncopyable { +class PointF : private mln::util::noncopyable { public: static constexpr auto Name() { return "android/graphics/PointF"; }; static jni::Local> New(jni::JNIEnv&, float, float); - static mbgl::ScreenCoordinate getScreenCoordinate(jni::JNIEnv&, const jni::Object&); + static mln::ScreenCoordinate getScreenCoordinate(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.cpp b/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.cpp index d4c9967cf..c3618aba7 100644 --- a/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.cpp @@ -1,6 +1,6 @@ #include "rectf.hpp" -namespace mbgl { +namespace mln { namespace android { float RectF::getLeft(jni::JNIEnv& env, const jni::Object& rectf) { @@ -32,4 +32,4 @@ void RectF::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.hpp b/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.hpp index 371cdc85b..310681b71 100644 --- a/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.hpp @@ -4,10 +4,10 @@ #include -namespace mbgl { +namespace mln { namespace android { -class RectF : private mbgl::util::noncopyable { +class RectF : private mln::util::noncopyable { public: static constexpr auto Name() { return "android/graphics/RectF"; }; @@ -23,4 +23,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_array.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_array.cpp index 51a732a01..c2a000f70 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_array.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_array.cpp @@ -1,11 +1,11 @@ #include "json_array.hpp" #include "json_element.hpp" -namespace mbgl { +namespace mln { namespace android { namespace gson { -jni::Local> JsonArray::New(jni::JNIEnv& env, const std::vector& values) { +jni::Local> JsonArray::New(jni::JNIEnv& env, const std::vector& values) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor(env); static auto addMethod = javaClass.GetMethod)>(env, "add"); @@ -19,8 +19,8 @@ jni::Local> JsonArray::New(jni::JNIEnv& env, const std::v return jsonArray; } -std::vector JsonArray::convert(jni::JNIEnv& env, const jni::Object& jsonArray) { - std::vector values; +std::vector JsonArray::convert(jni::JNIEnv& env, const jni::Object& jsonArray) { + std::vector values; if (jsonArray) { static auto& javaClass = jni::Class::Singleton(env); @@ -47,4 +47,4 @@ void JsonArray::registerNative(jni::JNIEnv& env) { } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_array.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_array.hpp index e5942f4b5..16be50da3 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_array.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_array.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace gson { @@ -13,12 +13,12 @@ public: using SuperTag = JsonElement; static constexpr auto Name() { return "com/google/gson/JsonArray"; }; - static jni::Local> New(jni::JNIEnv&, const std::vector&); - static std::vector convert(JNIEnv&, const jni::Object&); + static jni::Local> New(jni::JNIEnv&, const std::vector&); + static std::vector convert(JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_element.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_element.cpp index 0cf2730a0..62f603154 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_element.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_element.cpp @@ -3,18 +3,18 @@ #include "json_object.hpp" #include "json_primitive.hpp" -namespace mbgl { +namespace mln { namespace android { namespace gson { -jni::Local> JsonElement::New(jni::JNIEnv& env, const mbgl::Value& value) { +jni::Local> JsonElement::New(jni::JNIEnv& env, const mln::Value& value) { static auto& primitive = jni::Class::Singleton(env); static auto stringConstructor = primitive.GetConstructor(env); static auto numberConstructor = primitive.GetConstructor(env); static auto booleanConstructor = primitive.GetConstructor(env); return value.match( - [&](const mbgl::NullValue&) { return jni::Local>(); }, + [&](const mln::NullValue&) { return jni::Local>(); }, [&](const std::string& value) { return primitive.New(env, stringConstructor, jni::Make(env, value)); }, @@ -26,13 +26,13 @@ jni::Local> JsonElement::New(jni::JNIEnv& env, const mb [&](const bool value) { return primitive.New(env, booleanConstructor, jni::Box(env, value ? jni::jni_true : jni::jni_false)); }, - [&](const std::vector& values) { return JsonArray::New(env, values); }, - [&](const mbgl::PropertyMap& values) { return JsonObject::New(env, values); }); + [&](const std::vector& values) { return JsonArray::New(env, values); }, + [&](const mln::PropertyMap& values) { return JsonObject::New(env, values); }); } -mbgl::Value JsonElement::convert(jni::JNIEnv& env, const jni::Object& jsonElement) { +mln::Value JsonElement::convert(jni::JNIEnv& env, const jni::Object& jsonElement) { if (!jsonElement) { - return mbgl::NullValue(); + return mln::NullValue(); } static auto& elementClass = jni::Class::Singleton(env); @@ -57,14 +57,14 @@ mbgl::Value JsonElement::convert(jni::JNIEnv& env, const jni::Object(env, primitive.Call(env, getAsString)); } else { - return mbgl::NullValue(); + return mln::NullValue(); } } else if (jsonElement.Call(env, isJsonObject)) { return JsonObject::convert(env, jni::Cast(env, jni::Class::Singleton(env), jsonElement)); } else if (jsonElement.Call(env, isJsonArray)) { return JsonArray::convert(env, jni::Cast(env, jni::Class::Singleton(env), jsonElement)); } else { - return mbgl::NullValue(); + return mln::NullValue(); } } @@ -74,4 +74,4 @@ void JsonElement::registerNative(jni::JNIEnv& env) { } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_element.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_element.hpp index bd2912be2..02bdeac0e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_element.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_element.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace gson { @@ -13,12 +13,12 @@ public: using SuperTag = jni::ObjectTag; static constexpr auto Name() { return "com/google/gson/JsonElement"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::Value&); - static mbgl::Value convert(JNIEnv&, const jni::Object&); + static jni::Local> New(jni::JNIEnv&, const mln::Value&); + static mln::Value convert(JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_object.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_object.cpp index 512932f4f..0ba50c663 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_object.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_object.cpp @@ -4,11 +4,11 @@ #include "../java/util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace gson { -jni::Local> JsonObject::New(jni::JNIEnv& env, const mbgl::PropertyMap& values) { +jni::Local> JsonObject::New(jni::JNIEnv& env, const mln::PropertyMap& values) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor(env); static auto addMethod = javaClass.GetMethod)>(env, "add"); @@ -40,8 +40,8 @@ static void iterateEntrySet(jni::JNIEnv& env, const jni::Object& jso } } -mbgl::PropertyMap JsonObject::convert(jni::JNIEnv& env, const jni::Object& jsonObject) { - mbgl::PropertyMap map; +mln::PropertyMap JsonObject::convert(jni::JNIEnv& env, const jni::Object& jsonObject) { + mln::PropertyMap map; if (jsonObject) { iterateEntrySet( @@ -59,4 +59,4 @@ void JsonObject::registerNative(jni::JNIEnv& env) { } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_object.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_object.hpp index 8c1fdebf6..e03c80e64 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_object.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_object.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace gson { @@ -13,12 +13,12 @@ public: using SuperTag = JsonElement; static constexpr auto Name() { return "com/google/gson/JsonObject"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::PropertyMap&); - static mbgl::PropertyMap convert(JNIEnv&, const jni::Object&); + static jni::Local> New(jni::JNIEnv&, const mln::PropertyMap&); + static mln::PropertyMap convert(JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.cpp index ca90922fa..77822a923 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.cpp @@ -1,6 +1,6 @@ #include "json_primitive.hpp" -namespace mbgl { +namespace mln { namespace android { namespace gson { @@ -10,4 +10,4 @@ void JsonPrimitive::registerNative(jni::JNIEnv &env) { } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.hpp index fa229f3a8..2a017fb1b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace gson { @@ -18,4 +18,4 @@ public: } // namespace gson } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp b/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp index 13bc72a8b..2f3ead276 100644 --- a/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp @@ -14,7 +14,7 @@ #include #include "attach_env.hpp" -namespace mbgl { +namespace mln { class HTTPFileSource::Impl { public: @@ -241,4 +241,4 @@ ClientOptions HTTPFileSource::getClientOptions() { return impl->getClientOptions(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/i18n/collator.cpp b/platform/android/MapLibreAndroid/src/cpp/i18n/collator.cpp index c45d3d6f0..fdb22de75 100644 --- a/platform/android/MapLibreAndroid/src/cpp/i18n/collator.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/i18n/collator.cpp @@ -6,7 +6,7 @@ #include "attach_env.hpp" #include "collator_jni.hpp" -namespace mbgl { +namespace mln { namespace android { void Collator::registerNative(jni::JNIEnv& env) { @@ -192,4 +192,4 @@ std::string Collator::resolvedLocale() const { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/i18n/collator_jni.hpp b/platform/android/MapLibreAndroid/src/cpp/i18n/collator_jni.hpp index 62b018ddd..af8ca8edc 100644 --- a/platform/android/MapLibreAndroid/src/cpp/i18n/collator_jni.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/i18n/collator_jni.hpp @@ -7,11 +7,11 @@ the JNI wrappers of java/text/Collator and java/util/Locale - mbgl::Collator is the portable interface + mln::Collator is the portable interface Both implementations are in collator.cpp */ -namespace mbgl { +namespace mln { namespace android { class Locale { @@ -55,4 +55,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/i18n/number_format.cpp b/platform/android/MapLibreAndroid/src/cpp/i18n/number_format.cpp index 662d01512..7db107521 100644 --- a/platform/android/MapLibreAndroid/src/cpp/i18n/number_format.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/i18n/number_format.cpp @@ -6,7 +6,7 @@ #include "attach_env.hpp" #include "number_format_jni.hpp" -namespace mbgl { +namespace mln { namespace android { void NumberFormat::registerNative(jni::JNIEnv& env) { @@ -85,4 +85,4 @@ std::string formatNumber(double number, } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/i18n/number_format_jni.hpp b/platform/android/MapLibreAndroid/src/cpp/i18n/number_format_jni.hpp index 172003892..b4dd2836b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/i18n/number_format_jni.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/i18n/number_format_jni.hpp @@ -9,7 +9,7 @@ of java/text/NumberFormat. */ -namespace mbgl { +namespace mln { namespace android { class NumberFormat { @@ -26,4 +26,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/java/util.cpp b/platform/android/MapLibreAndroid/src/cpp/java/util.cpp index c58d03c1a..b0333f5a1 100644 --- a/platform/android/MapLibreAndroid/src/cpp/java/util.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/java/util.cpp @@ -1,6 +1,6 @@ #include "util.hpp" -namespace mbgl { +namespace mln { namespace android { namespace java { namespace util { @@ -16,4 +16,4 @@ void registerNative(jni::JNIEnv& env) { } // namespace util } // namespace java } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/java/util.hpp b/platform/android/MapLibreAndroid/src/cpp/java/util.hpp index c6fa43f4b..3892e4b2a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/java/util.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/java/util.hpp @@ -4,12 +4,12 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace java { namespace util { -class List : private mbgl::util::noncopyable { +class List : private mln::util::noncopyable { public: static constexpr auto Name() { return "java/util/List"; }; @@ -22,7 +22,7 @@ public: }; }; -class Arrays : private mbgl::util::noncopyable { +class Arrays : private mln::util::noncopyable { public: static constexpr auto Name() { return "java/util/Arrays"; }; @@ -36,7 +36,7 @@ public: } }; -class Set : private mbgl::util::noncopyable { +class Set : private mln::util::noncopyable { public: static constexpr auto Name() { return "java/util/Set"; }; @@ -49,11 +49,11 @@ public: }; }; -class Map : private mbgl::util::noncopyable { +class Map : private mln::util::noncopyable { public: static constexpr auto Name() { return "java/util/Map"; }; - class Entry : private mbgl::util::noncopyable { + class Entry : private mln::util::noncopyable { public: static constexpr auto Name() { return "java/util/Map$Entry"; }; @@ -78,4 +78,4 @@ void registerNative(jni::JNIEnv&); } // namespace util } // namespace java } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/java_types.cpp b/platform/android/MapLibreAndroid/src/cpp/java_types.cpp index e004544ee..a415fd1a7 100644 --- a/platform/android/MapLibreAndroid/src/cpp/java_types.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/java_types.cpp @@ -1,6 +1,6 @@ #include "java_types.hpp" -namespace mbgl { +namespace mln { namespace android { namespace java { @@ -46,4 +46,4 @@ void registerNatives(JNIEnv& env) { } // namespace java } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/java_types.hpp b/platform/android/MapLibreAndroid/src/cpp/java_types.hpp index 0540fdb94..a9bfbaf6c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/java_types.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/java_types.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace java { @@ -40,4 +40,4 @@ struct Set { void registerNatives(JNIEnv&); } // namespace java } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/jni_native.cpp b/platform/android/MapLibreAndroid/src/cpp/jni_native.cpp index b0a29b677..4149c0e3e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/jni_native.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/jni_native.cpp @@ -60,7 +60,7 @@ #include "text/local_glyph_rasterizer_jni.hpp" #include "tile/tile_operation.hpp" -namespace mbgl { +namespace mln { namespace android { void RegisterNativeHTTPRequest(JNIEnv&); @@ -176,4 +176,4 @@ void registerNatives(JavaVM* vm) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/jni_native.hpp b/platform/android/MapLibreAndroid/src/cpp/jni_native.hpp index 1cc9a7e81..eab05888b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/jni_native.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/jni_native.hpp @@ -4,10 +4,10 @@ #include "jni.hpp" -namespace mbgl { +namespace mln { namespace android { MBGL_EXPORT void registerNatives(JavaVM* vm); } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/logger.cpp b/platform/android/MapLibreAndroid/src/cpp/logger.cpp index 74bf92833..fe9f1aa1e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/logger.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/logger.cpp @@ -1,7 +1,7 @@ #include "logger.hpp" #include "java_types.hpp" -namespace mbgl { +namespace mln { namespace android { void Logger::registerNative(jni::JNIEnv& env) { @@ -31,4 +31,4 @@ void Logger::log(jni::JNIEnv& env, EventSeverity severity, const std::string& ms } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/logger.hpp b/platform/android/MapLibreAndroid/src/cpp/logger.hpp index 481ee03ac..db69b35f2 100644 --- a/platform/android/MapLibreAndroid/src/cpp/logger.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/logger.hpp @@ -4,7 +4,7 @@ #include #include "bitmap.hpp" -namespace mbgl { +namespace mln { namespace android { class Logger { @@ -16,4 +16,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/logging_android.cpp b/platform/android/MapLibreAndroid/src/cpp/logging_android.cpp index 9523406a1..f0ce134f6 100644 --- a/platform/android/MapLibreAndroid/src/cpp/logging_android.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/logging_android.cpp @@ -3,11 +3,11 @@ #include "logger.hpp" #include "attach_env.hpp" -namespace mbgl { +namespace mln { void Log::platformRecord(EventSeverity severity, const std::string &msg) { auto env{android::AttachEnv()}; android::Logger::log(*env, severity, msg); } -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/main.cpp b/platform/android/MapLibreAndroid/src/cpp/main.cpp index 9b5c6c197..469759376 100644 --- a/platform/android/MapLibreAndroid/src/cpp/main.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/main.cpp @@ -4,6 +4,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *) { assert(vm != nullptr); - mbgl::android::registerNatives(vm); + mln::android::registerNatives(vm); return JNI_VERSION_1_6; } diff --git a/platform/android/MapLibreAndroid/src/cpp/map/camera_position.cpp b/platform/android/MapLibreAndroid/src/cpp/map/camera_position.cpp index b0e3bcce8..937f409c0 100644 --- a/platform/android/MapLibreAndroid/src/cpp/map/camera_position.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/map/camera_position.cpp @@ -3,11 +3,11 @@ #include #include -namespace mbgl { +namespace mln { namespace android { jni::Local> CameraPosition::New(jni::JNIEnv& env, - mbgl::CameraOptions options, + mln::CameraOptions options, float pixelRatio) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor, @@ -60,9 +60,9 @@ jni::Local> CameraPosition::New(jni::JNIEnv& env, padding); } -mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, - const jni::Object& position, - float pixelRatio) { +mln::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, + const jni::Object& position, + float pixelRatio) { static auto& javaClass = jni::Class::Singleton(env); static auto bearing = javaClass.GetField(env, "bearing"); static auto target = javaClass.GetField>(env, "target"); @@ -76,19 +76,19 @@ mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, auto padding = position.Get(env, paddingField); auto center = LatLng::getLatLng(env, position.Get(env, target)); - return mbgl::CameraOptions{center, - position.Get(env, centerAltitude), - padding && padding.Length(env) == 4 ? EdgeInsets{padding.Get(env, 1) * pixelRatio, - padding.Get(env, 0) * pixelRatio, - padding.Get(env, 3) * pixelRatio, - padding.Get(env, 2) * pixelRatio} - : (EdgeInsets){}, - {}, - position.Get(env, zoom), - position.Get(env, bearing), - position.Get(env, tilt), - position.Get(env, roll), - position.Get(env, fov)}; + return mln::CameraOptions{center, + position.Get(env, centerAltitude), + padding && padding.Length(env) == 4 ? EdgeInsets{padding.Get(env, 1) * pixelRatio, + padding.Get(env, 0) * pixelRatio, + padding.Get(env, 3) * pixelRatio, + padding.Get(env, 2) * pixelRatio} + : (EdgeInsets){}, + {}, + position.Get(env, zoom), + position.Get(env, bearing), + position.Get(env, tilt), + position.Get(env, roll), + position.Get(env, fov)}; } void CameraPosition::registerNative(jni::JNIEnv& env) { @@ -96,4 +96,4 @@ void CameraPosition::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/map/camera_position.hpp b/platform/android/MapLibreAndroid/src/cpp/map/camera_position.hpp index cd605e213..df3313611 100644 --- a/platform/android/MapLibreAndroid/src/cpp/map/camera_position.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/map/camera_position.hpp @@ -5,19 +5,19 @@ #include -namespace mbgl { +namespace mln { namespace android { -class CameraPosition : private mbgl::util::noncopyable { +class CameraPosition : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/camera/CameraPosition"; }; - static jni::Local> New(jni::JNIEnv&, mbgl::CameraOptions, float pixelRatio); + static jni::Local> New(jni::JNIEnv&, mln::CameraOptions, float pixelRatio); - static mbgl::CameraOptions getCameraOptions(jni::JNIEnv&, const jni::Object&, float pixelRatio); + static mln::CameraOptions getCameraOptions(jni::JNIEnv&, const jni::Object&, float pixelRatio); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/map/image.cpp b/platform/android/MapLibreAndroid/src/cpp/map/image.cpp index 17c98f361..077836efa 100644 --- a/platform/android/MapLibreAndroid/src/cpp/map/image.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/map/image.cpp @@ -2,10 +2,10 @@ #include #include "image.hpp" -namespace mbgl { +namespace mln { namespace android { -mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object& image) { +mln::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object& image) { static auto& javaClass = jni::Class::Singleton(env); static auto widthField = javaClass.GetField(env, "width"); static auto heightField = javaClass.GetField(env, "height"); @@ -29,9 +29,9 @@ mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object& i jni::NullCheck(env, pixels.get()); std::size_t size = pixels.Length(env); - mbgl::PremultipliedImage premultipliedImage({static_cast(width), static_cast(height)}); + mln::PremultipliedImage premultipliedImage({static_cast(width), static_cast(height)}); if (premultipliedImage.bytes() != uint32_t(size)) { - throw mbgl::util::StyleImageException("Image pixel count mismatch"); + throw mln::util::StyleImageException("Image pixel count mismatch"); } jni::GetArrayRegion(env, *pixels, 0, size, reinterpret_cast(premultipliedImage.data.get())); @@ -54,16 +54,16 @@ mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object& i if (content) { const style::ImageContent imageContent = style::ImageContent{ content.Get(env, 0), content.Get(env, 1), content.Get(env, 2), content.Get(env, 3)}; - return mbgl::style::Image{name, - std::move(premultipliedImage), - pixelRatio, - sdf, - imageStretchesX, - imageStretchesY, - std::move(imageContent)}; + return mln::style::Image{name, + std::move(premultipliedImage), + pixelRatio, + sdf, + imageStretchesX, + imageStretchesY, + std::move(imageContent)}; } - return mbgl::style::Image{name, std::move(premultipliedImage), pixelRatio, sdf, imageStretchesX, imageStretchesY}; + return mln::style::Image{name, std::move(premultipliedImage), pixelRatio, sdf, imageStretchesX, imageStretchesY}; } void Image::registerNative(jni::JNIEnv& env) { @@ -71,4 +71,4 @@ void Image::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/map/image.hpp b/platform/android/MapLibreAndroid/src/cpp/map/image.hpp index 4961daecf..53314ebac 100644 --- a/platform/android/MapLibreAndroid/src/cpp/map/image.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/map/image.hpp @@ -5,17 +5,17 @@ #include #include -namespace mbgl { +namespace mln { namespace android { -class Image : private mbgl::util::noncopyable { +class Image : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/maps/Image"; }; - static mbgl::style::Image getImage(jni::JNIEnv&, const jni::Object&); + static mln::style::Image getImage(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/map_renderer.cpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer.cpp index e5887b4f1..2a3a95fdc 100644 --- a/platform/android/MapLibreAndroid/src/cpp/map_renderer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/map_renderer.cpp @@ -34,7 +34,7 @@ bool inEmulator() { } // namespace #endif -namespace mbgl { +namespace mln { namespace android { MapRenderer::MapRenderer(jni::JNIEnv& _env, @@ -378,4 +378,4 @@ MapRenderer& MapRenderer::getNativePeer(JNIEnv& env, const jni::Object #include -namespace mbgl { +namespace mln { template class ActorRef; @@ -167,4 +167,4 @@ private: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.cpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.cpp index 805bcac8f..04fb8cf3e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace android { MapRendererRunnable::MapRendererRunnable(jni::JNIEnv& env, std::function function_) @@ -45,4 +45,4 @@ void MapRendererRunnable::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.hpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.hpp index 392e8a002..ebb5a566c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.hpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace android { /** @@ -41,4 +41,4 @@ private: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/maplibre.cpp b/platform/android/MapLibreAndroid/src/cpp/maplibre.cpp index 29583e2a8..8555153ef 100644 --- a/platform/android/MapLibreAndroid/src/cpp/maplibre.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/maplibre.cpp @@ -1,6 +1,6 @@ #include "maplibre.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> MapLibre::getAssetManager(jni::JNIEnv& env) { @@ -20,4 +20,4 @@ void MapLibre::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/maplibre.hpp b/platform/android/MapLibreAndroid/src/cpp/maplibre.hpp index 54475b50d..a2d7f57bf 100644 --- a/platform/android/MapLibreAndroid/src/cpp/maplibre.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/maplibre.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { class MapLibre { @@ -16,4 +16,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/native_map_options.cpp b/platform/android/MapLibreAndroid/src/cpp/native_map_options.cpp index cb7ca732c..b8ee02f17 100644 --- a/platform/android/MapLibreAndroid/src/cpp/native_map_options.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/native_map_options.cpp @@ -1,6 +1,6 @@ #include "native_map_options.hpp" -namespace mbgl { +namespace mln { namespace android { void NativeMapOptions::registerNative(jni::JNIEnv &env) { @@ -54,4 +54,4 @@ bool NativeMapOptions::fastPFOREnabled(jni::JNIEnv &env, const jni::Object #include -namespace mbgl { +namespace mln { namespace android { class NativeMapOptions { @@ -24,4 +24,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/native_map_view.cpp b/platform/android/MapLibreAndroid/src/cpp/native_map_view.cpp index fed861621..6c0561cc4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/native_map_view.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/native_map_view.cpp @@ -58,7 +58,7 @@ #include "style/light.hpp" #include "tile/tile_operation.hpp" -namespace mbgl { +namespace mln { namespace android { NativeMapView::NativeMapView(jni::JNIEnv& _env, @@ -83,7 +83,7 @@ NativeMapView::NativeMapView(jni::JNIEnv& _env, // Create Map options MapOptions options; options.withMapMode(MapMode::Continuous) - .withSize(mbgl::Size{static_cast(width), static_cast(height)}) + .withSize(mln::Size{static_cast(width), static_cast(height)}) .withPixelRatio(pixelRatio) .withConstrainMode(ConstrainMode::HeightOnly) .withViewportMode(ViewportMode::Default) @@ -91,13 +91,12 @@ NativeMapView::NativeMapView(jni::JNIEnv& _env, .withFastPFOREnabled(NativeMapOptions::fastPFOREnabled(_env, jNativeMapOptions)); // Create the core map - map = std::make_unique( - *rendererFrontend, - *this, - options, - mbgl::android::FileSource::getSharedResourceOptions(_env, jFileSource), - mbgl::android::FileSource::getSharedClientOptions(_env, jFileSource), - mbgl::android::NativeMapOptions::getActionJournalOptions(_env, jNativeMapOptions)); + map = std::make_unique(*rendererFrontend, + *this, + options, + mln::android::FileSource::getSharedResourceOptions(_env, jFileSource), + mln::android::FileSource::getSharedClientOptions(_env, jFileSource), + mln::android::NativeMapOptions::getActionJournalOptions(_env, jNativeMapOptions)); } /** @@ -262,7 +261,7 @@ void NativeMapView::onDidFinishLoadingStyle() { } } -void NativeMapView::onSourceChanged(mbgl::style::Source& source) { +void NativeMapView::onSourceChanged(mln::style::Source& source) { assert(vm != nullptr); android::UniqueEnv _env = android::AttachEnv(); @@ -326,12 +325,12 @@ void NativeMapView::setStyleJson(jni::JNIEnv& env, const jni::String& json) { map->getStyle().loadJSON(jni::Make(env, json)); } -void NativeMapView::setLatLngBounds(jni::JNIEnv& env, const jni::Object& jBounds) { - mbgl::BoundOptions bounds; +void NativeMapView::setLatLngBounds(jni::JNIEnv& env, const jni::Object& jBounds) { + mln::BoundOptions bounds; if (jBounds) { - bounds.withLatLngBounds(mbgl::android::LatLngBounds::getLatLngBounds(env, jBounds)); + bounds.withLatLngBounds(mln::android::LatLngBounds::getLatLngBounds(env, jBounds)); } else { - bounds.withLatLngBounds(mbgl::LatLngBounds()); + bounds.withLatLngBounds(mln::LatLngBounds()); } map->setBounds(bounds); } @@ -345,10 +344,10 @@ void NativeMapView::setGestureInProgress(jni::JNIEnv&, jni::jboolean inProgress) } void NativeMapView::moveBy(jni::JNIEnv&, jni::jdouble dx, jni::jdouble dy, jni::jlong duration) { - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration > 0) { - animationOptions.duration.emplace(mbgl::Milliseconds(duration)); - animationOptions.easing.emplace(mbgl::util::UnitBezier{0.1, 0.4, 0.35, 1.0}); + animationOptions.duration.emplace(mln::Milliseconds(duration)); + animationOptions.easing.emplace(mln::util::UnitBezier{0.1, 0.4, 0.35, 1.0}); } map->moveBy({dx, dy}, animationOptions); } @@ -360,14 +359,14 @@ void NativeMapView::jumpTo(jni::JNIEnv& env, jni::jdouble pitch, jni::jdouble zoom, const jni::Array& padding) { - mbgl::CameraOptions options; + mln::CameraOptions options; if (bearing != -1) { options.bearing = bearing; } - options.center = mbgl::LatLng(latitude, longitude); + options.center = mln::LatLng(latitude, longitude); if (padding) { assert(padding.Length(env) == 4); - options.padding = mbgl::EdgeInsets{ + options.padding = mln::EdgeInsets{ padding.Get(env, 0), padding.Get(env, 1), padding.Get(env, 2), padding.Get(env, 3)}; } if (pitch != -1) { @@ -389,14 +388,14 @@ void NativeMapView::easeTo(jni::JNIEnv& env, jni::jdouble zoom, const jni::Array& padding, jni::jboolean easing) { - mbgl::CameraOptions cameraOptions; + mln::CameraOptions cameraOptions; if (bearing != -1) { cameraOptions.bearing = bearing; } - cameraOptions.center = mbgl::LatLng(latitude, longitude); + cameraOptions.center = mln::LatLng(latitude, longitude); if (padding) { assert(padding.Length(env) == 4); - cameraOptions.padding = mbgl::EdgeInsets{ + cameraOptions.padding = mln::EdgeInsets{ padding.Get(env, 0), padding.Get(env, 1), padding.Get(env, 2), padding.Get(env, 3)}; } if (pitch != -1) { @@ -406,11 +405,11 @@ void NativeMapView::easeTo(jni::JNIEnv& env, cameraOptions.zoom = zoom; } - mbgl::AnimationOptions animationOptions; - animationOptions.duration.emplace(mbgl::Milliseconds(duration)); + mln::AnimationOptions animationOptions; + animationOptions.duration.emplace(mln::Milliseconds(duration)); if (!easing) { // add a linear interpolator instead of easing - animationOptions.easing.emplace(mbgl::util::UnitBezier{0, 0, 1, 1}); + animationOptions.easing.emplace(mln::util::UnitBezier{0, 0, 1, 1}); } map->easeTo(cameraOptions, animationOptions); @@ -424,14 +423,14 @@ void NativeMapView::flyTo(jni::JNIEnv& env, jni::jdouble pitch, jni::jdouble zoom, const jni::Array& padding) { - mbgl::CameraOptions cameraOptions; + mln::CameraOptions cameraOptions; if (bearing != -1) { cameraOptions.bearing = bearing; } - cameraOptions.center = mbgl::LatLng(latitude, longitude); + cameraOptions.center = mln::LatLng(latitude, longitude); if (padding) { assert(padding.Length(env) == 4); - cameraOptions.padding = mbgl::EdgeInsets{ + cameraOptions.padding = mln::EdgeInsets{ padding.Get(env, 0), padding.Get(env, 1), padding.Get(env, 2), padding.Get(env, 3)}; } if (pitch != -1) { @@ -441,8 +440,8 @@ void NativeMapView::flyTo(jni::JNIEnv& env, cameraOptions.zoom = zoom; } - mbgl::AnimationOptions animationOptions; - animationOptions.duration.emplace(mbgl::Milliseconds(duration)); + mln::AnimationOptions animationOptions; + animationOptions.duration.emplace(mln::Milliseconds(duration)); map->flyTo(cameraOptions, animationOptions); } @@ -455,14 +454,14 @@ void NativeMapView::setLatLng(jni::JNIEnv& env, jni::jdouble longitude, const jni::Array& padding, jni::jlong duration) { - mbgl::CameraOptions cameraOptions; - cameraOptions.center = mbgl::LatLng(latitude, longitude); + mln::CameraOptions cameraOptions; + cameraOptions.center = mln::LatLng(latitude, longitude); if (padding) { assert(padding.Length(env) == 4); - cameraOptions.padding = mbgl::EdgeInsets{ + cameraOptions.padding = mln::EdgeInsets{ padding.Get(env, 0), padding.Get(env, 1), padding.Get(env, 2), padding.Get(env, 3)}; } - map->easeTo(cameraOptions, mbgl::AnimationOptions{mbgl::Milliseconds(duration)}); + map->easeTo(cameraOptions, mln::AnimationOptions{mln::Milliseconds(duration)}); } jni::Local> NativeMapView::getCameraForLatLngBounds( @@ -474,10 +473,10 @@ jni::Local> NativeMapView::getCameraForLatLngBounds( double right, double bearing, double tilt) { - mbgl::EdgeInsets padding = {top, left, bottom, right}; + mln::EdgeInsets padding = {top, left, bottom, right}; return CameraPosition::New( env, - map->cameraForLatLngBounds(mbgl::android::LatLngBounds::getLatLngBounds(env, jBounds), padding, bearing, tilt), + map->cameraForLatLngBounds(mln::android::LatLngBounds::getLatLngBounds(env, jBounds), padding, bearing, tilt), pixelRatio); } @@ -491,18 +490,18 @@ jni::Local> NativeMapView::getCameraForGeometry( double bearing, double tilt) { auto geometry = geojson::Geometry::convert(env, jGeometry); - mbgl::EdgeInsets padding = {top, left, bottom, right}; + mln::EdgeInsets padding = {top, left, bottom, right}; return CameraPosition::New(env, map->cameraForGeometry(geometry, padding, bearing, tilt), pixelRatio); } void NativeMapView::setReachability(jni::JNIEnv&, jni::jboolean reachable) { if (reachable) { - mbgl::NetworkStatus::Reachable(); + mln::NetworkStatus::Reachable(); } } void NativeMapView::resetPosition(jni::JNIEnv&) { - map->jumpTo(mbgl::CameraOptions().withCenter(mbgl::LatLng{}).withZoom(0.0).withBearing(0.0).withPitch(0.0)); + map->jumpTo(mln::CameraOptions().withCenter(mln::LatLng{}).withZoom(0.0).withBearing(0.0).withPitch(0.0)); } jni::jdouble NativeMapView::getPitch(jni::JNIEnv&) { @@ -510,12 +509,12 @@ jni::jdouble NativeMapView::getPitch(jni::JNIEnv&) { } void NativeMapView::setPitch(jni::JNIEnv&, jni::jdouble pitch, jni::jlong duration) { - map->easeTo(mbgl::CameraOptions().withPitch(pitch), mbgl::AnimationOptions{mbgl::Milliseconds(duration)}); + map->easeTo(mln::CameraOptions().withPitch(pitch), mln::AnimationOptions{mln::Milliseconds(duration)}); } void NativeMapView::setZoom(jni::JNIEnv&, jni::jdouble zoom, jni::jdouble x, jni::jdouble y, jni::jlong duration) { - map->easeTo(mbgl::CameraOptions().withZoom(zoom).withAnchor(mbgl::ScreenCoordinate{x, y}), - mbgl::AnimationOptions{mbgl::Milliseconds(duration)}); + map->easeTo(mln::CameraOptions().withZoom(zoom).withAnchor(mln::ScreenCoordinate{x, y}), + mln::AnimationOptions{mln::Milliseconds(duration)}); } jni::jdouble NativeMapView::getZoom(jni::JNIEnv&) { @@ -523,7 +522,7 @@ jni::jdouble NativeMapView::getZoom(jni::JNIEnv&) { } void NativeMapView::resetZoom(jni::JNIEnv&) { - map->jumpTo(mbgl::CameraOptions().withZoom(0.0)); + map->jumpTo(mln::CameraOptions().withZoom(0.0)); } void NativeMapView::setMinZoom(jni::JNIEnv&, jni::jdouble zoom) { @@ -560,20 +559,20 @@ jni::jdouble NativeMapView::getMaxPitch(jni::JNIEnv&) { void NativeMapView::rotateBy( jni::JNIEnv&, jni::jdouble sx, jni::jdouble sy, jni::jdouble ex, jni::jdouble ey, jni::jlong duration) { - mbgl::ScreenCoordinate first(sx, sy); - mbgl::ScreenCoordinate second(ex, ey); - map->rotateBy(first, second, mbgl::AnimationOptions{mbgl::Milliseconds(duration)}); + mln::ScreenCoordinate first(sx, sy); + mln::ScreenCoordinate second(ex, ey); + map->rotateBy(first, second, mln::AnimationOptions{mln::Milliseconds(duration)}); } void NativeMapView::setBearing(jni::JNIEnv&, jni::jdouble degrees, jni::jlong duration) { - map->easeTo(mbgl::CameraOptions().withBearing(degrees), mbgl::AnimationOptions{mbgl::Milliseconds(duration)}); + map->easeTo(mln::CameraOptions().withBearing(degrees), mln::AnimationOptions{mln::Milliseconds(duration)}); } void NativeMapView::setBearingXY( jni::JNIEnv&, jni::jdouble degrees, jni::jdouble cx, jni::jdouble cy, jni::jlong duration) { - mbgl::ScreenCoordinate anchor(cx, cy); - map->easeTo(mbgl::CameraOptions().withBearing(degrees).withAnchor(anchor), - mbgl::AnimationOptions{mbgl::Milliseconds(duration)}); + mln::ScreenCoordinate anchor(cx, cy); + map->easeTo(mln::CameraOptions().withBearing(degrees).withAnchor(anchor), + mln::AnimationOptions{mln::Milliseconds(duration)}); } jni::jdouble NativeMapView::getBearing(jni::JNIEnv&) { @@ -581,7 +580,7 @@ jni::jdouble NativeMapView::getBearing(jni::JNIEnv&) { } void NativeMapView::resetNorth(jni::JNIEnv&) { - map->easeTo(mbgl::CameraOptions().withBearing(0.0), mbgl::AnimationOptions{{mbgl::Milliseconds(500)}}); + map->easeTo(mln::CameraOptions().withBearing(0.0), mln::AnimationOptions{{mln::Milliseconds(500)}}); } void NativeMapView::setVisibleCoordinateBounds(JNIEnv& env, @@ -592,27 +591,27 @@ void NativeMapView::setVisibleCoordinateBounds(JNIEnv& env, NullCheck(env, &coordinates); std::size_t count = coordinates.Length(env); - std::vector latLngs; + std::vector latLngs; latLngs.reserve(count); for (std::size_t i = 0; i < count; i++) { latLngs.push_back(LatLng::getLatLng(env, coordinates.Get(env, i))); } - mbgl::EdgeInsets mbglInsets = {RectF::getTop(env, padding), - RectF::getLeft(env, padding), - RectF::getBottom(env, padding), - RectF::getRight(env, padding)}; - mbgl::CameraOptions cameraOptions = map->cameraForLatLngs(latLngs, mbglInsets); + mln::EdgeInsets mbglInsets = {RectF::getTop(env, padding), + RectF::getLeft(env, padding), + RectF::getBottom(env, padding), + RectF::getRight(env, padding)}; + mln::CameraOptions cameraOptions = map->cameraForLatLngs(latLngs, mbglInsets); if (direction >= 0) { cameraOptions.bearing = direction; } - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration > 0) { - animationOptions.duration.emplace(mbgl::Milliseconds(duration)); + animationOptions.duration.emplace(mln::Milliseconds(duration)); // equivalent to kCAMediaTimingFunctionDefault in iOS - animationOptions.easing.emplace(mbgl::util::UnitBezier{0.25, 0.1, 0.25, 0.1}); + animationOptions.easing.emplace(mln::util::UnitBezier{0.25, 0.1, 0.25, 0.1}); } map->easeTo(cameraOptions, animationOptions); @@ -666,7 +665,7 @@ void NativeMapView::updateMarker( std::string iconId = jni::Make(env, jid); // Because Java only has int, not unsigned int, we need to bump the annotation id up to a long. - map->updateAnnotation(markerId, mbgl::SymbolAnnotation{mbgl::Point(lon, lat), iconId}); + map->updateAnnotation(markerId, mln::SymbolAnnotation{mln::Point(lon, lat), iconId}); } jni::Local> NativeMapView::addMarkers(jni::JNIEnv& env, @@ -680,7 +679,7 @@ jni::Local> NativeMapView::addMarkers(jni::JNIEnv& env, for (std::size_t i = 0; i < len; i++) { auto marker = jmarkers.Get(env, i); ids.push_back(map->addAnnotation( - mbgl::SymbolAnnotation{Marker::getPosition(env, marker), Marker::getIconId(env, marker)})); + mln::SymbolAnnotation{Marker::getPosition(env, marker), Marker::getIconId(env, marker)})); } auto result = jni::Array::New(env, len); @@ -693,7 +692,7 @@ void NativeMapView::onLowMemory(JNIEnv&) { rendererFrontend->reduceMemoryUse(); } -using DebugOptions = mbgl::MapDebugOptions; +using DebugOptions = mln::MapDebugOptions; void NativeMapView::setDebug(JNIEnv&, jni::jboolean debug) { DebugOptions debugOptions = debug ? DebugOptions::TileBorders | DebugOptions::ParseStatus | DebugOptions::Collision @@ -751,25 +750,24 @@ jni::jboolean NativeMapView::isFullyLoaded(JNIEnv&) { } jni::jdouble NativeMapView::getMetersPerPixelAtLatitude(JNIEnv&, jni::jdouble lat, jni::jdouble zoom) { - return mbgl::Projection::getMetersPerPixelAtLatitude(lat, zoom); + return mln::Projection::getMetersPerPixelAtLatitude(lat, zoom); } jni::Local> NativeMapView::projectedMetersForLatLng(JNIEnv& env, jni::jdouble latitude, jni::jdouble longitude) { - mbgl::ProjectedMeters projectedMeters = mbgl::Projection::projectedMetersForLatLng( - mbgl::LatLng(latitude, longitude)); + mln::ProjectedMeters projectedMeters = mln::Projection::projectedMetersForLatLng(mln::LatLng(latitude, longitude)); return ProjectedMeters::New(env, projectedMeters.northing(), projectedMeters.easting()); } jni::Local> NativeMapView::latLngForProjectedMeters(JNIEnv& env, jdouble northing, jdouble easting) { - return LatLng::New(env, mbgl::Projection::latLngForProjectedMeters(mbgl::ProjectedMeters(northing, easting))); + return LatLng::New(env, mln::Projection::latLngForProjectedMeters(mln::ProjectedMeters(northing, easting))); } jni::Local> NativeMapView::pixelForLatLng(JNIEnv& env, jdouble latitude, jdouble longitude) { - mbgl::ScreenCoordinate pixel = map->pixelForLatLng(mbgl::LatLng(latitude, longitude)); + mln::ScreenCoordinate pixel = map->pixelForLatLng(mln::LatLng(latitude, longitude)); return PointF::New(env, static_cast(pixel.x), static_cast(pixel.y)); } @@ -780,11 +778,11 @@ void NativeMapView::pixelsForLatLngs(JNIEnv& env, jni::NullCheck(env, &input); std::size_t len = input.Length(env); - std::vector latLngs; + std::vector latLngs; latLngs.reserve(len); for (std::size_t i = 0; i < len; i += 2) { - auto latLng = mbgl::LatLng(input.Get(env, i), input.Get(env, i + 1)); + auto latLng = mln::LatLng(input.Get(env, i), input.Get(env, i + 1)); latLngs.push_back(latLng); } @@ -800,7 +798,7 @@ void NativeMapView::pixelsForLatLngs(JNIEnv& env, } jni::Local> NativeMapView::latLngForPixel(JNIEnv& env, jfloat x, jfloat y) { - return LatLng::New(env, map->latLngForPixel(mbgl::ScreenCoordinate(x, y))); + return LatLng::New(env, map->latLngForPixel(mln::ScreenCoordinate(x, y))); } void NativeMapView::latLngsForPixels(JNIEnv& env, @@ -810,17 +808,17 @@ void NativeMapView::latLngsForPixels(JNIEnv& env, jni::NullCheck(env, &input); std::size_t len = input.Length(env); - std::vector coordinates; + std::vector coordinates; coordinates.reserve(len); for (std::size_t i = 0; i < len; i += 2) { - auto coordinate = mbgl::ScreenCoordinate(input.Get(env, i) / pixelRatio_, input.Get(env, i + 1) / pixelRatio_); + auto coordinate = mln::ScreenCoordinate(input.Get(env, i) / pixelRatio_, input.Get(env, i + 1) / pixelRatio_); coordinates.push_back(coordinate); } std::vector buffer; buffer.reserve(len); - std::vector latLngs = map->latLngsForPixels(coordinates); + std::vector latLngs = map->latLngsForPixels(coordinates); for (std::size_t i = 0; i < len / 2; i++) { buffer.push_back(latLngs[i].latitude()); buffer.push_back(latLngs[i].longitude()); @@ -838,7 +836,7 @@ jni::Local> NativeMapView::addPolylines(JNIEnv& env, ids.reserve(len); for (std::size_t i = 0; i < len; i++) { - mbgl::LineAnnotation annotation = Polyline::toAnnotation(env, polylines.Get(env, i)); + mln::LineAnnotation annotation = Polyline::toAnnotation(env, polylines.Get(env, i)); ids.push_back(map->addAnnotation(annotation)); } @@ -857,7 +855,7 @@ jni::Local> NativeMapView::addPolygons(JNIEnv& env, ids.reserve(len); for (std::size_t i = 0; i < len; i++) { - mbgl::FillAnnotation annotation = Polygon::toAnnotation(env, polygons.Get(env, i)); + mln::FillAnnotation annotation = Polygon::toAnnotation(env, polygons.Get(env, i)); ids.push_back(map->addAnnotation(annotation)); } @@ -868,12 +866,12 @@ jni::Local> NativeMapView::addPolygons(JNIEnv& env, } void NativeMapView::updatePolyline(JNIEnv& env, jlong polylineId, const jni::Object& polyline) { - mbgl::LineAnnotation annotation = Polyline::toAnnotation(env, polyline); + mln::LineAnnotation annotation = Polyline::toAnnotation(env, polyline); map->updateAnnotation(polylineId, annotation); } void NativeMapView::updatePolygon(JNIEnv& env, jlong polygonId, const jni::Object& polygon) { - mbgl::FillAnnotation annotation = Polygon::toAnnotation(env, polygon); + mln::FillAnnotation annotation = Polygon::toAnnotation(env, polygon); map->updateAnnotation(polygonId, annotation); } @@ -898,14 +896,14 @@ void NativeMapView::addAnnotationIcon( NullCheck(env, &jpixels); std::size_t size = jpixels.Length(env); - mbgl::PremultipliedImage premultipliedImage({static_cast(w), static_cast(h)}); + mln::PremultipliedImage premultipliedImage({static_cast(w), static_cast(h)}); if (premultipliedImage.bytes() != uint32_t(size)) { - throw mbgl::util::StyleImageException("Annotation icon image pixel count mismatch"); + throw mln::util::StyleImageException("Annotation icon image pixel count mismatch"); } jni::GetArrayRegion(env, *jpixels, 0, size, reinterpret_cast(premultipliedImage.data.get())); map->addAnnotationImage( - std::make_unique(symbolName, std::move(premultipliedImage), static_cast(scale))); + std::make_unique(symbolName, std::move(premultipliedImage), static_cast(scale))); } void NativeMapView::removeAnnotationIcon(JNIEnv& env, const jni::String& symbol) { @@ -920,35 +918,35 @@ jdouble NativeMapView::getTopOffsetPixelsForAnnotationSymbol(JNIEnv& env, const jni::Local> NativeMapView::getTransitionOptions(JNIEnv& env) { const auto transitionOptions = map->getStyle().getTransitionOptions(); const auto duration = std::chrono::duration_cast( - transitionOptions.duration.value_or(mbgl::Duration::zero())) + transitionOptions.duration.value_or(mln::Duration::zero())) .count(); const auto delay = std::chrono::duration_cast( - transitionOptions.delay.value_or(mbgl::Duration::zero())) + transitionOptions.delay.value_or(mln::Duration::zero())) .count(); const auto enablePlacementTransitions = (jboolean)transitionOptions.enablePlacementTransitions; return TransitionOptions::fromTransitionOptions(env, duration, delay, enablePlacementTransitions); } void NativeMapView::setTransitionOptions(JNIEnv& env, const jni::Object& options) { - const mbgl::style::TransitionOptions transitionOptions( - Duration(mbgl::Milliseconds(TransitionOptions::getDuration(env, options))), - Duration(mbgl::Milliseconds(TransitionOptions::getDelay(env, options))), + const mln::style::TransitionOptions transitionOptions( + Duration(mln::Milliseconds(TransitionOptions::getDuration(env, options))), + Duration(mln::Milliseconds(TransitionOptions::getDelay(env, options))), TransitionOptions::isEnablePlacementTransitions(env, options)); map->getStyle().setTransitionOptions(transitionOptions); } jni::Local> NativeMapView::queryPointAnnotations(JNIEnv& env, const jni::Object& rect) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; // Convert input - mbgl::ScreenBox box = { + mln::ScreenBox box = { {RectF::getLeft(env, rect), RectF::getTop(env, rect)}, {RectF::getRight(env, rect), RectF::getBottom(env, rect)}, }; // Assume only points for now - mbgl::AnnotationIDs ids = rendererFrontend->queryPointAnnotations(box, annotationRequestTimeout); + mln::AnnotationIDs ids = rendererFrontend->queryPointAnnotations(box, annotationRequestTimeout); // Convert result std::vector longIds(ids.begin(), ids.end()); @@ -959,16 +957,16 @@ jni::Local> NativeMapView::queryPointAnnotations(JNIEnv& env, } jni::Local> NativeMapView::queryShapeAnnotations(JNIEnv& env, const jni::Object& rect) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; // Convert input - mbgl::ScreenBox box = { + mln::ScreenBox box = { {RectF::getLeft(env, rect), RectF::getTop(env, rect)}, {RectF::getRight(env, rect), RectF::getBottom(env, rect)}, }; - mbgl::AnnotationIDs ids = rendererFrontend->queryShapeAnnotations(box, annotationRequestTimeout); + mln::AnnotationIDs ids = rendererFrontend->queryShapeAnnotations(box, annotationRequestTimeout); // Convert result std::vector longIds(ids.begin(), ids.end()); @@ -984,8 +982,8 @@ jni::Local>> NativeMapView::queryRender jni::jfloat y, const jni::Array& layerIds, const jni::Array>& jfilter) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; std::optional> layers; if (layerIds && layerIds.Length(env) > 0) { @@ -1004,8 +1002,8 @@ jni::Local>> NativeMapView::queryRender jni::jfloat bottom, const jni::Array& layerIds, const jni::Array>& jfilter) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; std::optional> layers; if (layerIds && layerIds.Length(env) > 0) { @@ -1071,7 +1069,7 @@ void NativeMapView::removeFeatureState(JNIEnv& env, } jni::Local> NativeMapView::getLight(JNIEnv& env) { - mbgl::style::Light* light = map->getStyle().getLight(); + mln::style::Light* light = map->getStyle().getLight(); if (light) { return Light::createJavaLightPeer(env, *map, *light); } else { @@ -1096,9 +1094,9 @@ jni::Local>> NativeMapView::getLayers(JNIEnv& env) jni::Local> NativeMapView::getLayer(JNIEnv& env, const jni::String& layerId) { // Find the layer - mbgl::style::Layer* coreLayer = map->getStyle().getLayer(jni::Make(env, layerId)); + mln::style::Layer* coreLayer = map->getStyle().getLayer(jni::Make(env, layerId)); if (!coreLayer) { - mbgl::Log::Debug(mbgl::Event::JNI, "No layer found"); + mln::Log::Debug(mln::Event::JNI, "No layer found"); return jni::Local>(); } @@ -1197,7 +1195,7 @@ jni::jboolean NativeMapView::removeLayerAt(JNIEnv& env, jni::jint index) { return jni::jni_false; } - std::unique_ptr coreLayer = map->getStyle().removeLayer(layers.at(index)->getID()); + std::unique_ptr coreLayer = map->getStyle().removeLayer(layers.at(index)->getID()); if (coreLayer) { jni::Local> layerObj = LayerManagerAndroid::get()->createJavaLayerPeer(env, std::move(coreLayer)); @@ -1215,14 +1213,14 @@ jni::jboolean NativeMapView::removeLayer(JNIEnv& env, jlong layerPtr) { return jni::jni_false; } - mbgl::android::Layer* layer = reinterpret_cast(layerPtr); + mln::android::Layer* layer = reinterpret_cast(layerPtr); const auto layerId = jni::Make(env, layer->getId(env)); if (layerId.empty()) { Log::Warning(Event::JNI, "Cannot remove layer: layer reference is detached or invalid"); return jni::jni_false; } - std::unique_ptr coreLayer = map->getStyle().removeLayer(layerId); + std::unique_ptr coreLayer = map->getStyle().removeLayer(layerId); if (coreLayer) { layer->setLayer(std::move(coreLayer)); return jni::jni_true; @@ -1247,9 +1245,9 @@ jni::Local>> NativeMapView::getSources(JNIEnv& en jni::Local> NativeMapView::getSource(JNIEnv& env, const jni::String& sourceId) { // Find the source - mbgl::style::Source* coreSource = map->getStyle().getSource(jni::Make(env, sourceId)); + mln::style::Source* coreSource = map->getStyle().getSource(jni::Make(env, sourceId)); if (!coreSource) { - mbgl::Log::Debug(mbgl::Event::JNI, "No source found"); + mln::Log::Debug(mln::Event::JNI, "No source found"); return jni::Local>(); } @@ -1272,7 +1270,7 @@ void NativeMapView::addSource(JNIEnv& env, const jni::Object& obj, jlong jni::jboolean NativeMapView::removeSource(JNIEnv& env, const jni::Object& obj, jlong sourcePtr) { assert(sourcePtr != 0); - mbgl::android::Source* source = reinterpret_cast(sourcePtr); + mln::android::Source* source = reinterpret_cast(sourcePtr); if (source->removeFromMap(env, obj, *map)) { source->releaseJavaPeer(); return jni::jni_true; @@ -1284,19 +1282,19 @@ jni::jboolean NativeMapView::removeSource(JNIEnv& env, const jni::Object void NativeMapView::addImage( JNIEnv& env, const jni::String& name, const jni::Object& bitmap, jni::jfloat scale, jni::jboolean sdf) { jni::NullCheck(env, &bitmap); - mbgl::PremultipliedImage premultipliedImage = Bitmap::GetImage(env, bitmap); + mln::PremultipliedImage premultipliedImage = Bitmap::GetImage(env, bitmap); - map->getStyle().addImage(std::make_unique( + map->getStyle().addImage(std::make_unique( jni::Make(env, name), std::move(premultipliedImage), static_cast(scale), sdf)); } -void NativeMapView::addImages(JNIEnv& env, const jni::Array>& jimages) { +void NativeMapView::addImages(JNIEnv& env, const jni::Array>& jimages) { jni::NullCheck(env, &jimages); std::size_t len = jimages.Length(env); for (std::size_t i = 0; i < len; i++) { - auto image = mbgl::android::Image::getImage(env, jimages.Get(env, i)); - map->getStyle().addImage(std::make_unique(image)); + auto image = mln::android::Image::getImage(env, jimages.Get(env, i)); + map->getStyle().addImage(std::make_unique(image)); } } @@ -1367,7 +1365,7 @@ jni::jdouble NativeMapView::getTileLodZoomShift(JNIEnv&) { return jni::jdouble(map->getTileLodZoomShift()); } -mbgl::Map& NativeMapView::getMap() { +mln::Map& NativeMapView::getMap() { return *map; } @@ -1387,10 +1385,10 @@ void NativeMapView::enableRenderingStatsView(JNIEnv&, jni::jboolean value) { } void NativeMapView::setFrustumOffset(JNIEnv& env, const jni::Object& padding) { - mbgl::EdgeInsets offset = {RectF::getTop(env, padding), - RectF::getLeft(env, padding), - RectF::getBottom(env, padding), - RectF::getRight(env, padding)}; + mln::EdgeInsets offset = {RectF::getTop(env, padding), + RectF::getLeft(env, padding), + RectF::getBottom(env, padding), + RectF::getRight(env, padding)}; map->setFrustumOffset(offset); } @@ -1642,19 +1640,19 @@ void NativeMapView::onGlyphsRequested(const FontStack& stack, const GlyphRange& } // Tile requests -void NativeMapView::onTileAction(mbgl::TileOperation op, const OverscaledTileID& id, const std::string& sourceID) { +void NativeMapView::onTileAction(mln::TileOperation op, const OverscaledTileID& id, const std::string& sourceID) { assert(vm != nullptr); android::UniqueEnv _env = android::AttachEnv(); static auto& javaClass = jni::Class::Singleton(*_env); static auto onTileAction = javaClass.GetMethod, jni::jint, jni::jint, jni::jint, jni::jint, jni::jint, jni::String)>( + jni::Object, jni::jint, jni::jint, jni::jint, jni::jint, jni::jint, jni::String)>( *_env, "onTileAction"); auto weakReference = javaPeer.get(*_env); if (weakReference) { weakReference.Call(*_env, onTileAction, - mbgl::android::TileOperation::Create(*_env, op), + mln::android::TileOperation::Create(*_env, op), static_cast(id.canonical.x), static_cast(id.canonical.y), static_cast(id.canonical.z), @@ -1750,4 +1748,4 @@ void NativeMapView::onSymbolError(const std::string& message) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/native_map_view.hpp b/platform/android/MapLibreAndroid/src/cpp/native_map_view.hpp index 33a332869..19df3d330 100644 --- a/platform/android/MapLibreAndroid/src/cpp/native_map_view.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/native_map_view.hpp @@ -34,7 +34,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class AndroidRendererFrontend; @@ -56,7 +56,7 @@ public: virtual ~NativeMapView(); - // mbgl::RendererBackend (mbgl::MapObserver) // + // mln::RendererBackend (mln::MapObserver) // void onCameraWillChange(MapObserver::CameraChangeMode) override; void onCameraIsChanging() override; void onCameraDidChange(MapObserver::CameraChangeMode) override; @@ -69,7 +69,7 @@ public: void onDidFinishRenderingMap(MapObserver::RenderMode) override; void onDidBecomeIdle() override; void onDidFinishLoadingStyle() override; - void onSourceChanged(mbgl::style::Source&) override; + void onSourceChanged(mln::style::Source&) override; void onStyleImageMissing(const std::string&) override; bool onCanRemoveUnusedStyleImage(const std::string&) override; @@ -85,7 +85,7 @@ public: void setStyleJson(jni::JNIEnv&, const jni::String&); - void setLatLngBounds(jni::JNIEnv&, const jni::Object&); + void setLatLngBounds(jni::JNIEnv&, const jni::Object&); void cancelTransitions(jni::JNIEnv&); @@ -125,7 +125,7 @@ public: void setLatLng(jni::JNIEnv&, jni::jdouble, jni::jdouble, const jni::Array&, jni::jlong); jni::Local> getCameraForLatLngBounds(jni::JNIEnv&, - const jni::Object&, + const jni::Object&, double top, double left, double bottom, @@ -302,7 +302,7 @@ public: void addImage(JNIEnv&, const jni::String&, const jni::Object& bitmap, jni::jfloat, jni::jboolean); - void addImages(JNIEnv&, const jni::Array>&); + void addImages(JNIEnv&, const jni::Array>&); void removeImage(JNIEnv&, const jni::String&); @@ -336,7 +336,7 @@ public: jni::jdouble getTileLodZoomShift(JNIEnv&); - mbgl::Map& getMap(); + mln::Map& getMap(); void triggerRepaint(JNIEnv&); @@ -346,23 +346,23 @@ public: void setFrustumOffset(JNIEnv&, const jni::Object&); // Shader compilation - void onRegisterShaders(mbgl::gfx::ShaderRegistry&) override; - void onPreCompileShader(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, const std::string&) override; - void onPostCompileShader(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, const std::string&) override; - void onShaderCompileFailed(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, const std::string&) override; + void onRegisterShaders(mln::gfx::ShaderRegistry&) override; + void onPreCompileShader(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; + void onPostCompileShader(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; + void onShaderCompileFailed(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; // Glyph requests - void onGlyphsLoaded(const mbgl::FontStack&, const mbgl::GlyphRange&) override; - void onGlyphsError(const mbgl::FontStack&, const mbgl::GlyphRange&, std::exception_ptr) override; - void onGlyphsRequested(const mbgl::FontStack&, const mbgl::GlyphRange&) override; + void onGlyphsLoaded(const mln::FontStack&, const mln::GlyphRange&) override; + void onGlyphsError(const mln::FontStack&, const mln::GlyphRange&, std::exception_ptr) override; + void onGlyphsRequested(const mln::FontStack&, const mln::GlyphRange&) override; // Tile requests - void onTileAction(mbgl::TileOperation, const mbgl::OverscaledTileID&, const std::string&) override; + void onTileAction(mln::TileOperation, const mln::OverscaledTileID&, const std::string&) override; // Sprite requests - void onSpriteLoaded(const std::optional&) override; - void onSpriteError(const std::optional&, std::exception_ptr) override; - void onSpriteRequested(const std::optional&) override; + void onSpriteLoaded(const std::optional&) override; + void onSpriteError(const std::optional&, std::exception_ptr) override; + void onSpriteRequested(const std::optional&) override; // Renderer void onRenderError(std::exception_ptr) override; @@ -390,8 +390,8 @@ private: static constexpr auto annotationRequestTimeout = std::chrono::milliseconds(200); // Ensure these are initialised last - std::unique_ptr map; + std::unique_ptr map; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.cpp index f008f3815..364a4976a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.cpp @@ -6,7 +6,7 @@ #include "attach_env.hpp" -namespace mbgl { +namespace mln { namespace android { namespace { @@ -16,7 +16,7 @@ void handleException(std::exception_ptr exception, android::UniqueEnv env = android::AttachEnv()) { if (exception) { OfflineManager::FileSourceCallback::onError( - *env, callback, jni::Make(*env, mbgl::util::toString(exception))); + *env, callback, jni::Make(*env, mln::util::toString(exception))); } else { OfflineManager::FileSourceCallback::onSuccess(*env, callback); } @@ -25,10 +25,10 @@ void handleException(std::exception_ptr exception, // OfflineManager // OfflineManager::OfflineManager(jni::JNIEnv& env, const jni::Object& jFileSource) - : fileSource(std::static_pointer_cast(std::shared_ptr( - mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Database, - FileSource::getSharedResourceOptions(env, jFileSource), - FileSource::getSharedClientOptions(env, jFileSource))))) { + : fileSource(std::static_pointer_cast(std::shared_ptr( + mln::FileSourceManager::get()->getFileSource(mln::FileSourceType::Database, + FileSource::getSharedResourceOptions(env, jFileSource), + FileSource::getSharedClientOptions(env, jFileSource))))) { if (!fileSource) { ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Offline functionality is disabled."); } @@ -52,7 +52,7 @@ void OfflineManager::listOfflineRegions(jni::JNIEnv& env_, // source so they are not GC'd in the meanwhile callback = std::make_shared(std::move(globalCallback)), jFileSource = std::make_shared(std::move(globalFilesource))]( - mbgl::expected regions) mutable { + mln::expected regions) mutable { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); @@ -77,7 +77,7 @@ void OfflineManager::getOfflineRegion(jni::JNIEnv& env_, // source so they are not GC'd in the meanwhile callback = std::make_shared(std::move(globalCallback)), jFileSource = std::make_shared(std::move(globalFilesource)), - regionID](mbgl::expected, std::exception_ptr> result) mutable { + regionID](mln::expected, std::exception_ptr> result) mutable { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); @@ -102,7 +102,7 @@ void OfflineManager::createOfflineRegion(jni::JNIEnv& env_, // Convert auto definition = OfflineRegionDefinition::getDefinition(env_, definition_); - mbgl::OfflineRegionMetadata metadata; + mln::OfflineRegionMetadata metadata; if (metadata_) { metadata = OfflineRegion::metadata(env_, metadata_); } @@ -119,7 +119,7 @@ void OfflineManager::createOfflineRegion(jni::JNIEnv& env_, // source so they are not GC'd in the meanwhile callback = std::make_shared(std::move(globalCallback)), jFileSource = std::make_shared(std::move(globalFilesource))]( - mbgl::expected region) mutable { + mln::expected region) mutable { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); @@ -146,7 +146,7 @@ void OfflineManager::mergeOfflineRegions(jni::JNIEnv& env_, // source so they are not GC'd in the meanwhile callback = std::make_shared(std::move(globalCallback)), jFileSource = std::make_shared(std::move(globalFilesource))]( - mbgl::expected regions) mutable { + mln::expected regions) mutable { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); @@ -275,14 +275,14 @@ void OfflineManager::ListOfflineRegionsCallback::onError( static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineManager::ListOfflineRegionsCallback::onList( jni::JNIEnv& env, const jni::Object& jFileSource, const jni::Object& callback, - mbgl::OfflineRegions& regions) { + mln::OfflineRegions& regions) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod>)>(env, "onList"); @@ -303,7 +303,7 @@ void OfflineManager::GetOfflineRegionCallback::onError( static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineManager::GetOfflineRegionCallback::onRegionNotFound( @@ -320,7 +320,7 @@ void OfflineManager::GetOfflineRegionCallback::onRegion( jni::JNIEnv& env, const jni::Object& jFileSource, const jni::Object& callback, - mbgl::OfflineRegion& region) { + mln::OfflineRegion& region) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod)>(env, "onRegion"); @@ -336,14 +336,14 @@ void OfflineManager::CreateOfflineRegionCallback::onError( static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineManager::CreateOfflineRegionCallback::onCreate( jni::JNIEnv& env, const jni::Object& jFileSource, const jni::Object& callback, - mbgl::OfflineRegion& region) { + mln::OfflineRegion& region) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod)>(env, "onCreate"); @@ -359,13 +359,13 @@ void OfflineManager::MergeOfflineRegionsCallback::onError( static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineManager::MergeOfflineRegionsCallback::onMerge(jni::JNIEnv& env, const jni::Object& jFileSource, const jni::Object& callback, - mbgl::OfflineRegions& regions) { + mln::OfflineRegions& regions) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod>)>(env, "onMerge"); @@ -389,22 +389,22 @@ void OfflineManager::putResourceWithUrl(jni::JNIEnv& env, auto url = jni::Make(env, url_); auto data = std::make_shared(arr.Length(env), char()); jni::GetArrayRegion(env, *arr, 0, data->size(), reinterpret_cast(&(*data)[0])); - mbgl::Resource resource(mbgl::Resource::Kind::Unknown, url); - mbgl::Response response; + mln::Resource resource(mln::Resource::Kind::Unknown, url); + mln::Response response; response.data = data; response.mustRevalidate = mustRevalidate; if (eTag_) { response.etag = jni::Make(env, eTag_); } if (modified > 0) { - response.modified = Timestamp(mbgl::Seconds(modified)); + response.modified = Timestamp(mln::Seconds(modified)); } if (expires > 0) { - response.expires = Timestamp(mbgl::Seconds(expires)); + response.expires = Timestamp(mln::Seconds(expires)); } fileSource->put(resource, response); } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.hpp index 9b5f5299f..879e8a14a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.hpp @@ -10,7 +10,7 @@ #include -namespace mbgl { +namespace mln { namespace android { @@ -30,7 +30,7 @@ public: static void onList(jni::JNIEnv&, const jni::Object&, const jni::Object&, - mbgl::OfflineRegions&); + mln::OfflineRegions&); }; class GetOfflineRegionCallback { public: @@ -50,7 +50,7 @@ public: static void onRegion(jni::JNIEnv&, const jni::Object&, const jni::Object&, - mbgl::OfflineRegion&); + mln::OfflineRegion&); }; class CreateOfflineRegionCallback { @@ -67,7 +67,7 @@ public: static void onCreate(jni::JNIEnv&, const jni::Object&, const jni::Object&, - mbgl::OfflineRegion&); + mln::OfflineRegion&); }; class MergeOfflineRegionsCallback { @@ -84,7 +84,7 @@ public: static void onMerge(jni::JNIEnv&, const jni::Object&, const jni::Object&, - mbgl::OfflineRegions&); + mln::OfflineRegions&); }; struct FileSourceCallback { @@ -150,8 +150,8 @@ public: void runPackDatabaseAutomatically(jni::JNIEnv&, jboolean autopack); private: - std::shared_ptr fileSource; + std::shared_ptr fileSource; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.cpp index 20fa12ee8..803633287 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.cpp @@ -12,17 +12,17 @@ #include "offline_region_status.hpp" #include "attach_env.hpp" -namespace mbgl { +namespace mln { namespace android { // OfflineRegion // OfflineRegion::OfflineRegion(jni::JNIEnv& env, jni::jlong offlineRegionPtr, const jni::Object& jFileSource) - : region(reinterpret_cast(offlineRegionPtr)), - fileSource(std::static_pointer_cast(std::shared_ptr( - mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Database, - FileSource::getSharedResourceOptions(env, jFileSource), - FileSource::getSharedClientOptions(env, jFileSource))))) { + : region(reinterpret_cast(offlineRegionPtr)), + fileSource(std::static_pointer_cast(std::shared_ptr( + mln::FileSourceManager::get()->getFileSource(mln::FileSourceType::Database, + FileSource::getSharedResourceOptions(env, jFileSource), + FileSource::getSharedClientOptions(env, jFileSource))))) { if (!fileSource) { ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Offline functionality is disabled."); } @@ -33,12 +33,12 @@ OfflineRegion::~OfflineRegion() {} void OfflineRegion::setOfflineRegionObserver(jni::JNIEnv& env_, const jni::Object& callback) { // Define the observer - class Observer : public mbgl::OfflineRegionObserver { + class Observer : public mln::OfflineRegionObserver { public: Observer(jni::Global, jni::EnvAttachingDeleter> callback_) : callback(std::move(callback_)) {} - void statusChanged(mbgl::OfflineRegionStatus status) override { + void statusChanged(mln::OfflineRegionStatus status) override { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); @@ -48,13 +48,13 @@ void OfflineRegion::setOfflineRegionObserver(jni::JNIEnv& env_, callback.Call(*env, method, OfflineRegionStatus::New(*env, status)); } - void responseError(mbgl::Response::Error error) override { + void responseError(mln::Response::Error error) override { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); static auto& javaClass = jni::Class::Singleton(*env); - static auto method = javaClass.GetMethod)>(*env, - "onError"); + static auto method = javaClass.GetMethod)>(*env, + "onError"); callback.Call(*env, method, OfflineRegionError::New(*env, error)); } @@ -79,16 +79,16 @@ void OfflineRegion::setOfflineRegionObserver(jni::JNIEnv& env_, void OfflineRegion::setOfflineRegionDownloadState(jni::JNIEnv&, jni::jint jState) { // State - mbgl::OfflineRegionDownloadState state; + mln::OfflineRegionDownloadState state; switch (jState) { case 0: - state = mbgl::OfflineRegionDownloadState::Inactive; + state = mln::OfflineRegionDownloadState::Inactive; break; case 1: - state = mbgl::OfflineRegionDownloadState::Active; + state = mln::OfflineRegionDownloadState::Active; break; default: - mbgl::Log::Error(mbgl::Event::JNI, "State can only be 0 (inactive) or 1 (active)."); + mln::Log::Error(mln::Event::JNI, "State can only be 0 (inactive) or 1 (active)."); return; } @@ -104,7 +104,7 @@ void OfflineRegion::getOfflineRegionStatus(jni::JNIEnv& env_, [ // Ensure the object is not gc'd in the meanwhile callback = std::make_shared(std::move(globalCallback))]( - mbgl::expected status) mutable { + mln::expected status) mutable { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); @@ -167,7 +167,7 @@ void OfflineRegion::updateOfflineRegionMetadata(jni::JNIEnv& env_, [ // Ensure the object is not gc'd in the meanwhile callback = std::make_shared(std::move(globalCallback))]( - mbgl::expected data) mutable { + mln::expected data) mutable { // Reattach, the callback comes from a different thread android::UniqueEnv env = android::AttachEnv(); @@ -181,12 +181,12 @@ void OfflineRegion::updateOfflineRegionMetadata(jni::JNIEnv& env_, jni::Local> OfflineRegion::New(jni::JNIEnv& env, const jni::Object& jFileSource, - mbgl::OfflineRegion region) { + mln::OfflineRegion region) { // Definition - auto definition = std::visit(overloaded{[&](const mbgl::OfflineTilePyramidRegionDefinition def) { + auto definition = std::visit(overloaded{[&](const mln::OfflineTilePyramidRegionDefinition def) { return OfflineTilePyramidRegionDefinition::New(env, def); }, - [&](const mbgl::OfflineGeometryRegionDefinition def) { + [&](const mln::OfflineGeometryRegionDefinition def) { return OfflineGeometryRegionDefinition::New(env, def); }}, region.getDefinition()); @@ -202,14 +202,14 @@ jni::Local> OfflineRegion::New(jni::JNIEnv& env, return javaClass.New( env, constructor, - reinterpret_cast(new mbgl::OfflineRegion(std::move(region))), // Copy a region to the heap + reinterpret_cast(new mln::OfflineRegion(std::move(region))), // Copy a region to the heap jFileSource, jni::jlong(region.getID()), definition, OfflineRegion::metadata(env, region.getMetadata())); } -jni::Local> OfflineRegion::metadata(jni::JNIEnv& env, mbgl::OfflineRegionMetadata metadata_) { +jni::Local> OfflineRegion::metadata(jni::JNIEnv& env, mln::OfflineRegionMetadata metadata_) { std::vector convertedMetadata(metadata_.begin(), metadata_.end()); std::size_t length = static_cast(convertedMetadata.size()); auto metadata = jni::Array::New(env, length); @@ -217,7 +217,7 @@ jni::Local> OfflineRegion::metadata(jni::JNIEnv& env, mbg return metadata; } -mbgl::OfflineRegionMetadata OfflineRegion::metadata(jni::JNIEnv& env, const jni::Array& metadata_) { +mln::OfflineRegionMetadata OfflineRegion::metadata(jni::JNIEnv& env, const jni::Array& metadata_) { std::size_t length = metadata_.Length(env); auto metadata_tmp = std::vector(); metadata_tmp.resize(length); @@ -263,13 +263,13 @@ void OfflineRegion::OfflineRegionStatusCallback::onError( static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineRegion::OfflineRegionStatusCallback::onStatus( jni::JNIEnv& env, const jni::Object& callback, - std::optional status) { + std::optional status) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod)>(env, "onStatus"); @@ -285,7 +285,7 @@ void OfflineRegion::OfflineRegionDeleteCallback::onError( static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineRegion::OfflineRegionDeleteCallback::onDelete( @@ -306,13 +306,13 @@ void OfflineRegion::OfflineRegionUpdateMetadataCallback::onError( static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineRegion::OfflineRegionUpdateMetadataCallback::onUpdate( jni::JNIEnv& env, const jni::Object& callback, - std::optional metadata) { + std::optional metadata) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod)>(env, "onUpdate"); @@ -327,7 +327,7 @@ void OfflineRegion::OfflineRegionInvalidateCallback::onError( std::exception_ptr error) { static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onError"); - callback.Call(env, method, jni::Make(env, mbgl::util::toString(error))); + callback.Call(env, method, jni::Make(env, mln::util::toString(error))); } void OfflineRegion::OfflineRegionInvalidateCallback::onInvalidate( @@ -338,4 +338,4 @@ void OfflineRegion::OfflineRegionInvalidateCallback::onInvalidate( } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.hpp index 592a0e217..3e6f0c929 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace android { class OfflineRegion { @@ -31,7 +31,7 @@ public: static void onStatus(jni::JNIEnv&, const jni::Object&, - std::optional); + std::optional); }; class OfflineRegionDeleteCallback { @@ -69,7 +69,7 @@ public: static void onUpdate(jni::JNIEnv&, const jni::Object&, - std::optional); + std::optional); }; static constexpr auto Name() { return "org/maplibre/android/offline/OfflineRegion"; }; @@ -92,20 +92,18 @@ public: const jni::Array&, const jni::Object&); - static jni::Local> New(jni::JNIEnv&, - const jni::Object&, - mbgl::OfflineRegion); + static jni::Local> New(jni::JNIEnv&, const jni::Object&, mln::OfflineRegion); - static jni::Local> metadata(jni::JNIEnv&, mbgl::OfflineRegionMetadata); + static jni::Local> metadata(jni::JNIEnv&, mln::OfflineRegionMetadata); - static mbgl::OfflineRegionMetadata metadata(jni::JNIEnv&, const jni::Array&); + static mln::OfflineRegionMetadata metadata(jni::JNIEnv&, const jni::Array&); static void registerNative(jni::JNIEnv&); private: - std::unique_ptr region; - std::shared_ptr fileSource; + std::unique_ptr region; + std::shared_ptr fileSource; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.cpp index ef310d0f6..6f37b87f8 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace android { // OfflineRegionDefinition // @@ -14,7 +14,7 @@ void OfflineRegionDefinition::registerNative(jni::JNIEnv& env) { jni::Class::Singleton(env); } -mbgl::OfflineRegionDefinition OfflineRegionDefinition::getDefinition( +mln::OfflineRegionDefinition OfflineRegionDefinition::getDefinition( JNIEnv& env, const jni::Object& jDefinition) { if (jDefinition.IsInstanceOf(env, jni::Class::Singleton(env))) { return OfflineTilePyramidRegionDefinition::getDefinition( @@ -30,7 +30,7 @@ mbgl::OfflineRegionDefinition OfflineRegionDefinition::getDefinition( // OfflineTilePyramidRegionDefinition // jni::Local> OfflineTilePyramidRegionDefinition::New( - jni::JNIEnv& env, const mbgl::OfflineTilePyramidRegionDefinition& definition) { + jni::JNIEnv& env, const mln::OfflineTilePyramidRegionDefinition& definition) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor, @@ -49,7 +49,7 @@ jni::Local> OfflineTilePyramidRegionDefinit jni::jboolean(definition.includeIdeographs)); } -mbgl::OfflineTilePyramidRegionDefinition OfflineTilePyramidRegionDefinition::getDefinition( +mln::OfflineTilePyramidRegionDefinition OfflineTilePyramidRegionDefinition::getDefinition( jni::JNIEnv& env, const jni::Object& jDefinition) { // Field references static auto& javaClass = jni::Class::Singleton(env); @@ -60,12 +60,12 @@ mbgl::OfflineTilePyramidRegionDefinition OfflineTilePyramidRegionDefinition::get static auto pixelRatioF = javaClass.GetField(env, "pixelRatio"); static auto includeIdeographsF = javaClass.GetField(env, "includeIdeographs"); - return mbgl::OfflineTilePyramidRegionDefinition(jni::Make(env, jDefinition.Get(env, styleURLF)), - LatLngBounds::getLatLngBounds(env, jDefinition.Get(env, boundsF)), - jDefinition.Get(env, minZoomF), - jDefinition.Get(env, maxZoomF), - jDefinition.Get(env, pixelRatioF), - jDefinition.Get(env, includeIdeographsF)); + return mln::OfflineTilePyramidRegionDefinition(jni::Make(env, jDefinition.Get(env, styleURLF)), + LatLngBounds::getLatLngBounds(env, jDefinition.Get(env, boundsF)), + jDefinition.Get(env, minZoomF), + jDefinition.Get(env, maxZoomF), + jDefinition.Get(env, pixelRatioF), + jDefinition.Get(env, includeIdeographsF)); } void OfflineTilePyramidRegionDefinition::registerNative(jni::JNIEnv& env) { @@ -75,7 +75,7 @@ void OfflineTilePyramidRegionDefinition::registerNative(jni::JNIEnv& env) { // OfflineGeometryRegionDefinition // jni::Local> OfflineGeometryRegionDefinition::New( - jni::JNIEnv& env, const mbgl::OfflineGeometryRegionDefinition& definition) { + jni::JNIEnv& env, const mln::OfflineGeometryRegionDefinition& definition) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor, @@ -94,7 +94,7 @@ jni::Local> OfflineGeometryRegionDefinition jni::jboolean(definition.includeIdeographs)); } -mbgl::OfflineGeometryRegionDefinition OfflineGeometryRegionDefinition::getDefinition( +mln::OfflineGeometryRegionDefinition OfflineGeometryRegionDefinition::getDefinition( jni::JNIEnv& env, const jni::Object& jDefinition) { // Field references static auto& javaClass = jni::Class::Singleton(env); @@ -105,12 +105,12 @@ mbgl::OfflineGeometryRegionDefinition OfflineGeometryRegionDefinition::getDefini static auto pixelRatioF = javaClass.GetField(env, "pixelRatio"); static auto includeIdeographsF = javaClass.GetField(env, "includeIdeographs"); - return mbgl::OfflineGeometryRegionDefinition(jni::Make(env, jDefinition.Get(env, styleURLF)), - geojson::Geometry::convert(env, jDefinition.Get(env, geometryF)), - jDefinition.Get(env, minZoomF), - jDefinition.Get(env, maxZoomF), - jDefinition.Get(env, pixelRatioF), - jDefinition.Get(env, includeIdeographsF)); + return mln::OfflineGeometryRegionDefinition(jni::Make(env, jDefinition.Get(env, styleURLF)), + geojson::Geometry::convert(env, jDefinition.Get(env, geometryF)), + jDefinition.Get(env, minZoomF), + jDefinition.Get(env, maxZoomF), + jDefinition.Get(env, pixelRatioF), + jDefinition.Get(env, includeIdeographsF)); } void OfflineGeometryRegionDefinition::registerNative(jni::JNIEnv& env) { @@ -118,4 +118,4 @@ void OfflineGeometryRegionDefinition::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.hpp index 83673ee4d..e0f99d855 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class OfflineRegionDefinition { @@ -12,8 +12,8 @@ public: static void registerNative(jni::JNIEnv&); - static mbgl::OfflineRegionDefinition getDefinition(JNIEnv& env, - const jni::Object& jDefinition); + static mln::OfflineRegionDefinition getDefinition(JNIEnv& env, + const jni::Object& jDefinition); }; class OfflineTilePyramidRegionDefinition { @@ -25,9 +25,9 @@ public: }; static jni::Local> New(jni::JNIEnv&, - const mbgl::OfflineTilePyramidRegionDefinition&); + const mln::OfflineTilePyramidRegionDefinition&); - static mbgl::OfflineTilePyramidRegionDefinition getDefinition( + static mln::OfflineTilePyramidRegionDefinition getDefinition( jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); @@ -39,13 +39,13 @@ public: static constexpr auto Name() { return "org/maplibre/android/offline/OfflineGeometryRegionDefinition"; }; static jni::Local> New(jni::JNIEnv&, - const mbgl::OfflineGeometryRegionDefinition&); + const mln::OfflineGeometryRegionDefinition&); - static mbgl::OfflineGeometryRegionDefinition getDefinition(jni::JNIEnv&, - const jni::Object&); + static mln::OfflineGeometryRegionDefinition getDefinition(jni::JNIEnv&, + const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.cpp index 40ce67838..71c23a628 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.cpp @@ -1,28 +1,28 @@ #include "offline_region_error.hpp" -namespace mbgl { +namespace mln { namespace android { -jni::Local> OfflineRegionError::New(jni::JNIEnv& env, mbgl::Response::Error error) { +jni::Local> OfflineRegionError::New(jni::JNIEnv& env, mln::Response::Error error) { // Handle the value of reason independently of the underlying int value std::string reason; switch (error.reason) { - case mbgl::Response::Error::Reason::Success: + case mln::Response::Error::Reason::Success: reason = "REASON_SUCCESS"; break; - case mbgl::Response::Error::Reason::NotFound: + case mln::Response::Error::Reason::NotFound: reason = "REASON_NOT_FOUND"; break; - case mbgl::Response::Error::Reason::Server: + case mln::Response::Error::Reason::Server: reason = "REASON_SERVER"; break; - case mbgl::Response::Error::Reason::Connection: + case mln::Response::Error::Reason::Connection: reason = "REASON_CONNECTION"; break; - case mbgl::Response::Error::Reason::RateLimit: + case mln::Response::Error::Reason::RateLimit: reason = "REASON_RATE_LIMIT"; break; - case mbgl::Response::Error::Reason::Other: + case mln::Response::Error::Reason::Other: reason = "REASON_OTHER"; break; } @@ -39,4 +39,4 @@ void OfflineRegionError::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.hpp index 9c547a30f..def9083d0 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.hpp @@ -3,17 +3,17 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class OfflineRegionError { public: static constexpr auto Name() { return "org/maplibre/android/offline/OfflineRegionError"; }; - static jni::Local> New(jni::JNIEnv&, mbgl::Response::Error); + static jni::Local> New(jni::JNIEnv&, mln::Response::Error); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.cpp index bdba871f6..2c208ca93 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.cpp @@ -1,17 +1,17 @@ #include "offline_region_status.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> OfflineRegionStatus::New(jni::JNIEnv& env, - mbgl::OfflineRegionStatus status) { + mln::OfflineRegionStatus status) { // Convert to jint jint downloadState; switch (status.downloadState) { - case mbgl::OfflineRegionDownloadState::Inactive: + case mln::OfflineRegionDownloadState::Inactive: downloadState = 0; break; - case mbgl::OfflineRegionDownloadState::Active: + case mln::OfflineRegionDownloadState::Active: downloadState = 1; break; } @@ -35,4 +35,4 @@ void OfflineRegionStatus::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.hpp index 835720442..c472b9aa5 100644 --- a/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.hpp @@ -3,17 +3,17 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class OfflineRegionStatus { public: static constexpr auto Name() { return "org/maplibre/android/offline/OfflineRegionStatus"; }; - static jni::Local> New(jni::JNIEnv&, mbgl::OfflineRegionStatus status); + static jni::Local> New(jni::JNIEnv&, mln::OfflineRegionStatus status); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/rendering_stats.cpp b/platform/android/MapLibreAndroid/src/cpp/rendering_stats.cpp index 2cca9d4f1..e4fec0526 100644 --- a/platform/android/MapLibreAndroid/src/cpp/rendering_stats.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/rendering_stats.cpp @@ -1,6 +1,6 @@ #include "rendering_stats.hpp" -namespace mbgl { +namespace mln { namespace android { void RenderingStats::registerNative(jni::JNIEnv& env) { @@ -58,4 +58,4 @@ void RenderingStats::Update(jni::JNIEnv& env, } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/rendering_stats.hpp b/platform/android/MapLibreAndroid/src/cpp/rendering_stats.hpp index 6c452fa26..c40ac514c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/rendering_stats.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/rendering_stats.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class RenderingStats { @@ -19,4 +19,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.cpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.cpp index 10acbd950..425ef7735 100644 --- a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace android { MapSnapshot::MapSnapshot(float pixelRatio_, MapSnapshot::PointForFn pointForFn_, MapSnapshot::LatLngForFn latLngForFn_) @@ -32,8 +32,8 @@ jni::Local> MapSnapshot::New(JNIEnv& env, std::vector attributions, bool showLogo, bool showAttribution, - mbgl::MapSnapshotter::PointForFn pointForFn, - mbgl::MapSnapshotter::LatLngForFn latLngForFn) { + mln::MapSnapshotter::PointForFn pointForFn, + mln::MapSnapshotter::LatLngForFn latLngForFn) { // Create the bitmap auto bitmap = Bitmap::CreateBitmap(env, std::move(image)); @@ -71,4 +71,4 @@ void MapSnapshot::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.hpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.hpp index 5c74ed9d0..e1da3b149 100644 --- a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.hpp @@ -10,13 +10,13 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class MapSnapshot { public: - using PointForFn = mbgl::MapSnapshotter::PointForFn; - using LatLngForFn = mbgl::MapSnapshotter::LatLngForFn; + using PointForFn = mln::MapSnapshotter::PointForFn; + using LatLngForFn = mln::MapSnapshotter::LatLngForFn; static constexpr auto Name() { return "org/maplibre/android/snapshotter/MapSnapshot"; }; @@ -40,9 +40,9 @@ public: private: float pixelRatio; - mbgl::MapSnapshotter::PointForFn pointForFn; - mbgl::MapSnapshotter::LatLngForFn latLngForFn; + mln::MapSnapshotter::PointForFn pointForFn; + mln::MapSnapshotter::LatLngForFn latLngForFn; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.cpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.cpp index 6f38135a5..2bcf141d4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.cpp @@ -10,7 +10,7 @@ #include "../style/layers/layer_manager.hpp" #include "map_snapshot.hpp" -namespace mbgl { +namespace mln { namespace android { MapSnapshotter::MapSnapshotter(jni::JNIEnv& _env, @@ -38,20 +38,20 @@ MapSnapshotter::MapSnapshotter(jni::JNIEnv& _env, return; } - weakScheduler = mbgl::Scheduler::GetCurrent()->makeWeakPtr(); + weakScheduler = mln::Scheduler::GetCurrent()->makeWeakPtr(); jFileSource = FileSource::getNativePeer(_env, _jFileSource); - auto size = mbgl::Size{static_cast(width), static_cast(height)}; + auto size = mln::Size{static_cast(width), static_cast(height)}; showLogo = _showLogo; showAttribution = _showAttribution; // Create the core snapshotter - snapshotter = std::make_unique( + snapshotter = std::make_unique( size, pixelRatio, - mbgl::android::FileSource::getSharedResourceOptions(_env, _jFileSource), - mbgl::android::FileSource::getSharedClientOptions(_env, _jFileSource), + mln::android::FileSource::getSharedResourceOptions(_env, _jFileSource), + mln::android::FileSource::getSharedClientOptions(_env, _jFileSource), *this, _localIdeographFontFamily ? jni::Make(_env, _localIdeographFontFamily) : std::optional{}); @@ -88,8 +88,8 @@ void MapSnapshotter::start(JNIEnv& env) { snapshotter->snapshot([this](std::exception_ptr err, PremultipliedImage image, std::vector attributions, - mbgl::MapSnapshotter::PointForFn pointForFn, - mbgl::MapSnapshotter::LatLngForFn latLngForFn) { + mln::MapSnapshotter::PointForFn pointForFn, + mln::MapSnapshotter::LatLngForFn latLngForFn) { MBGL_VERIFY_THREAD(tid); android::UniqueEnv _env = android::AttachEnv(); static auto& javaClass = jni::Class::Singleton(*_env); @@ -133,7 +133,7 @@ void MapSnapshotter::setStyleJson(JNIEnv& env, const jni::String& styleJSON) { } void MapSnapshotter::setSize(JNIEnv&, jni::jint width, jni::jint height) { - auto size = mbgl::Size{static_cast(width), static_cast(height)}; + auto size = mln::Size{static_cast(width), static_cast(height)}; snapshotter->setSize(size); } @@ -285,21 +285,21 @@ void MapSnapshotter::addSource(JNIEnv& env, const jni::Object& obj, jlon } } -void MapSnapshotter::addImages(JNIEnv& env, const jni::Array>& jimages) { +void MapSnapshotter::addImages(JNIEnv& env, const jni::Array>& jimages) { jni::NullCheck(env, &jimages); std::size_t len = jimages.Length(env); for (std::size_t i = 0; i < len; ++i) { - auto image = mbgl::android::Image::getImage(env, jimages.Get(env, i)); - snapshotter->getStyle().addImage(std::make_unique(image)); + auto image = mln::android::Image::getImage(env, jimages.Get(env, i)); + snapshotter->getStyle().addImage(std::make_unique(image)); } } jni::Local> MapSnapshotter::getLayer(JNIEnv& env, const jni::String& layerId) { // Find the layer - mbgl::style::Layer* coreLayer = snapshotter->getStyle().getLayer(jni::Make(env, layerId)); + mln::style::Layer* coreLayer = snapshotter->getStyle().getLayer(jni::Make(env, layerId)); if (!coreLayer) { - mbgl::Log::Debug(mbgl::Event::JNI, "No layer found"); + mln::Log::Debug(mln::Event::JNI, "No layer found"); return jni::Local>(); } @@ -309,9 +309,9 @@ jni::Local> MapSnapshotter::getLayer(JNIEnv& env, const jni:: jni::Local> MapSnapshotter::getSource(JNIEnv& env, const jni::String& sourceId) { // Find the source - mbgl::style::Source* coreSource = snapshotter->getStyle().getSource(jni::Make(env, sourceId)); + mln::style::Source* coreSource = snapshotter->getStyle().getSource(jni::Make(env, sourceId)); if (!coreSource) { - mbgl::Log::Debug(mbgl::Event::JNI, "No source found"); + mln::Log::Debug(mln::Event::JNI, "No source found"); return jni::Local>(); } @@ -368,4 +368,4 @@ void MapSnapshotter::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.hpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.hpp index b5d5d0e1d..76aa50c17 100644 --- a/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.hpp @@ -14,10 +14,10 @@ #include "../style/layers/layer.hpp" #include "../style/sources/source.hpp" -namespace mbgl { +namespace mln { namespace android { -class MapSnapshotter final : public mbgl::MapSnapshotterObserver { +class MapSnapshotter final : public mln::MapSnapshotterObserver { public: static constexpr auto Name() { return "org/maplibre/android/snapshotter/MapSnapshotter"; }; @@ -63,7 +63,7 @@ public: void addLayerBelow(JNIEnv&, jlong, const jni::String&); void addLayerAbove(JNIEnv&, jlong, const jni::String&); void addSource(JNIEnv&, const jni::Object&, jlong nativePtr); - void addImages(JNIEnv&, const jni::Array>&); + void addImages(JNIEnv&, const jni::Array>&); jni::Local> getLayer(JNIEnv&, const jni::String&); jni::Local> getSource(JNIEnv&, const jni::String&); @@ -86,9 +86,9 @@ private: void activateFilesource(JNIEnv&); void deactivateFilesource(JNIEnv&); bool activatedFilesource = false; - mapbox::base::WeakPtr weakScheduler; - std::unique_ptr snapshotter; + mapbox::base::WeakPtr weakScheduler; + std::unique_ptr snapshotter; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/android_conversion.hpp b/platform/android/MapLibreAndroid/src/cpp/style/android_conversion.hpp index 4ecf05722..b70922562 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/android_conversion.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/android_conversion.hpp @@ -10,28 +10,28 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { template <> -class ConversionTraits { +class ConversionTraits { public: - static bool isUndefined(const mbgl::android::Value& value) { return value.isNull(); } + static bool isUndefined(const mln::android::Value& value) { return value.isNull(); } - static bool isArray(const mbgl::android::Value& value) { return value.isArray(); } + static bool isArray(const mln::android::Value& value) { return value.isArray(); } - static bool isObject(const mbgl::android::Value& value) { return value.isObject(); } + static bool isObject(const mln::android::Value& value) { return value.isObject(); } - static std::size_t arrayLength(const mbgl::android::Value& value) { + static std::size_t arrayLength(const mln::android::Value& value) { return value.getLength(); ; } - static mbgl::android::Value arrayMember(const mbgl::android::Value& value, std::size_t i) { return value.get(i); } + static mln::android::Value arrayMember(const mln::android::Value& value, std::size_t i) { return value.get(i); } - static std::optional objectMember(const mbgl::android::Value& value, const char* key) { - mbgl::android::Value member = value.get(key); + static std::optional objectMember(const mln::android::Value& value, const char* key) { + mln::android::Value member = value.get(key); if (!member.isNull()) { return member; } else { @@ -40,9 +40,9 @@ public: } template - static std::optional eachMember(const mbgl::android::Value& value, Fn&& fn) { + static std::optional eachMember(const mln::android::Value& value, Fn&& fn) { assert(value.isObject()); - mbgl::android::Value keys = value.keyArray(); + mln::android::Value keys = value.keyArray(); std::size_t length = arrayLength(keys); for (std::size_t i = 0; i < length; ++i) { const auto k = keys.get(i).toString(); @@ -55,7 +55,7 @@ public: return {}; } - static std::optional toBool(const mbgl::android::Value& value) { + static std::optional toBool(const mln::android::Value& value) { if (value.isBool()) { return value.toBool(); } else { @@ -63,7 +63,7 @@ public: } } - static std::optional toNumber(const mbgl::android::Value& value) { + static std::optional toNumber(const mln::android::Value& value) { if (value.isNumber()) { auto num = value.toFloat(); return num; @@ -72,7 +72,7 @@ public: } } - static std::optional toDouble(const mbgl::android::Value& value) { + static std::optional toDouble(const mln::android::Value& value) { if (value.isNumber()) { return value.toDouble(); } else { @@ -80,7 +80,7 @@ public: } } - static std::optional toString(const mbgl::android::Value& value) { + static std::optional toString(const mln::android::Value& value) { if (value.isString()) { return value.toString(); } else { @@ -88,7 +88,7 @@ public: } } - static std::optional toValue(const mbgl::android::Value& value) { + static std::optional toValue(const mln::android::Value& value) { if (value.isNull()) { return {}; } else if (value.isBool()) { @@ -102,7 +102,7 @@ public: } } - static std::optional toGeoJSON(const mbgl::android::Value& value, Error& error) { + static std::optional toGeoJSON(const mln::android::Value& value, Error& error) { if (value.isNull()) { error = {"no json data found"}; return {}; @@ -113,7 +113,7 @@ public: } if (value.isObject()) { - mbgl::android::Value keys = value.keyArray(); + mln::android::Value keys = value.keyArray(); std::size_t length = arrayLength(keys); for (std::size_t i = 0; i < length; ++i) { if (keys.get(i).toString() == "json") { @@ -132,10 +132,10 @@ public: }; template -std::optional convert(mbgl::android::Value&& value, Error& error, Args&&... args) { +std::optional convert(mln::android::Value&& value, Error& error, Args&&... args) { return convert(Convertible(std::move(value)), error, std::forward(args)...); } } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.cpp index 6d87caac5..87a653d33 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.cpp @@ -4,17 +4,17 @@ #include #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { -std::optional toFilter(jni::JNIEnv& env, const jni::Array>& jfilter) { - std::optional filter; +std::optional toFilter(jni::JNIEnv& env, const jni::Array>& jfilter) { + std::optional filter; if (jfilter) { - mbgl::style::conversion::Error error; - auto converted = mbgl::style::conversion::convert(Value(env, jfilter), error); + mln::style::conversion::Error error; + auto converted = mln::style::conversion::convert(Value(env, jfilter), error); if (!converted) { - mbgl::Log::Error(mbgl::Event::JNI, "Error converting filter: " + error.message); + mln::Log::Error(mln::Event::JNI, "Error converting filter: " + error.message); } filter = std::move(*converted); } @@ -23,4 +23,4 @@ std::optional toFilter(jni::JNIEnv& env, const jni::Array -namespace mbgl { +namespace mln { namespace android { namespace conversion { -std::optional toFilter(jni::JNIEnv&, const jni::Array>&); +std::optional toFilter(jni::JNIEnv&, const jni::Array>&); } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.cpp index f315a09ba..3b5a400ef 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.cpp @@ -1,27 +1,27 @@ #include "position.hpp" -namespace mbgl { +namespace mln { namespace android { namespace conversion { Result>> -Converter>, mbgl::style::Position>::operator()( - jni::JNIEnv &env, const mbgl::style::Position &value) const { +Converter>, mln::style::Position>::operator()( + jni::JNIEnv &env, const mln::style::Position &value) const { std::array cartPosition = value.getSpherical(); return Position::fromPosition(env, cartPosition[0], cartPosition[1], cartPosition[2]); } -Result Converter>::operator()( +Result Converter>::operator()( jni::JNIEnv &env, const jni::Object &value) const { float radialCoordinate = Position::getRadialCoordinate(env, value); float azimuthalAngle = Position::getAzimuthalAngle(env, value); float polarAngle = Position::getPolarAngle(env, value); std::array cartPosition{{radialCoordinate, azimuthalAngle, polarAngle}}; - mbgl::style::Position position{}; + mln::style::Position position{}; position.set(cartPosition); return position; } } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.hpp index 66afb5451..b2dad5d09 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.hpp @@ -6,20 +6,20 @@ #include #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { template <> -struct Converter>, mbgl::style::Position> { - Result>> operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const; +struct Converter>, mln::style::Position> { + Result>> operator()(jni::JNIEnv &env, const mln::style::Position &value) const; }; template <> -struct Converter> { - Result operator()(jni::JNIEnv &env, const jni::Object &value) const; +struct Converter> { + Result operator()(jni::JNIEnv &env, const jni::Object &value) const; }; } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_expression.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_expression.hpp index fbe4db2df..185067762 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_expression.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_expression.hpp @@ -7,18 +7,18 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { template -struct Converter>, mbgl::style::PropertyExpression> { +struct Converter>, mln::style::PropertyExpression> { Result>> operator()( - jni::JNIEnv& env, const mbgl::style::PropertyExpression& value) const { + jni::JNIEnv& env, const mln::style::PropertyExpression& value) const { return gson::JsonElement::New(env, value.getExpression().serialize()); } }; } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_value.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_value.hpp index 5d527de33..cd7b41e91 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_value.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_value.hpp @@ -7,7 +7,7 @@ #include "../../conversion/constant.hpp" #include "property_expression.hpp" -namespace mbgl { +namespace mln { namespace android { namespace conversion { @@ -20,7 +20,7 @@ public: PropertyValueEvaluator(jni::JNIEnv& _env) : env(_env) {} - jni::Local> operator()(const mbgl::style::Undefined) const { + jni::Local> operator()(const mln::style::Undefined) const { return jni::Local>(env, nullptr); } @@ -28,7 +28,7 @@ public: return std::move(*convert>>(env, value)); } - jni::Local> operator()(const mbgl::style::PropertyExpression& value) const { + jni::Local> operator()(const mln::style::PropertyExpression& value) const { return std::move(*convert>>(env, value)); } @@ -40,8 +40,8 @@ private: * Convert core property values to java */ template -struct Converter>, mbgl::style::PropertyValue> { - Result>> operator()(jni::JNIEnv& env, const mbgl::style::PropertyValue& value) const { +struct Converter>, mln::style::PropertyValue> { + Result>> operator()(jni::JNIEnv& env, const mln::style::PropertyValue& value) const { PropertyValueEvaluator evaluator(env); return value.evaluate(evaluator); } @@ -51,14 +51,14 @@ struct Converter>, mbgl::style::PropertyValue> { * Convert core heat map color property value to java */ template <> -struct Converter>, mbgl::style::ColorRampPropertyValue> { +struct Converter>, mln::style::ColorRampPropertyValue> { Result>> operator()(jni::JNIEnv& env, - const mbgl::style::ColorRampPropertyValue& value) const { - PropertyValueEvaluator evaluator(env); + const mln::style::ColorRampPropertyValue& value) const { + PropertyValueEvaluator evaluator(env); return std::move(*convert>>(env, value.evaluate(evaluator))); } }; } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.cpp index b37719c58..d3d64e56d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.cpp @@ -1,19 +1,19 @@ #include "transition_options.hpp" -namespace mbgl { +namespace mln { namespace android { namespace conversion { Result>> -Converter>, mbgl::style::TransitionOptions>::operator()( - jni::JNIEnv& env, const mbgl::style::TransitionOptions& value) const { +Converter>, mln::style::TransitionOptions>::operator()( + jni::JNIEnv& env, const mln::style::TransitionOptions& value) const { return TransitionOptions::fromTransitionOptions( env, - std::chrono::duration_cast(value.duration.value_or(mbgl::Duration::zero())).count(), - std::chrono::duration_cast(value.delay.value_or(mbgl::Duration::zero())).count(), + std::chrono::duration_cast(value.duration.value_or(mln::Duration::zero())).count(), + std::chrono::duration_cast(value.delay.value_or(mln::Duration::zero())).count(), (jboolean)value.enablePlacementTransitions); } } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.hpp index 39c0b7b87..562b3d259 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.hpp @@ -7,16 +7,16 @@ #include -namespace mbgl { +namespace mln { namespace android { namespace conversion { template <> -struct Converter>, mbgl::style::TransitionOptions> { +struct Converter>, mln::style::TransitionOptions> { Result>> operator()(jni::JNIEnv&, - const mbgl::style::TransitionOptions&) const; + const mln::style::TransitionOptions&) const; }; } // namespace conversion } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.cpp index be6b66524..df1812491 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.cpp @@ -4,14 +4,14 @@ #include #include -namespace mbgl { +namespace mln { namespace android { // This conversion is expected not to fail because it's used only in contexts where // the value was originally a String or TileSet object on the Java side. If it fails // to convert, it's a bug in our serialization or Java-side static typing. -variant convertURLOrTileset(mbgl::android::Value&& value) { - using namespace mbgl::style::conversion; +variant convertURLOrTileset(mln::android::Value&& value) { + using namespace mln::style::conversion; const Convertible convertible(std::move(value)); if (isObject(convertible)) { @@ -27,4 +27,4 @@ variant convertURLOrTileset(mbgl::android::Value&& value) } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.hpp index 63c617eb8..8bbe32b7d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.hpp @@ -7,10 +7,10 @@ #include "../value.hpp" -namespace mbgl { +namespace mln { namespace android { -variant convertURLOrTileset(mbgl::android::Value&& value); +variant convertURLOrTileset(mln::android::Value&& value); } -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/formatted.cpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted.cpp index 866f6f89e..f000d7a1a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/formatted.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/formatted.cpp @@ -3,7 +3,7 @@ #include "../conversion/conversion.hpp" #include "../conversion/constant.hpp" -namespace mbgl { +namespace mln { namespace android { void Formatted::registerNative(jni::JNIEnv& env) { @@ -38,7 +38,7 @@ jni::Local> Formatted::New(jni::JNIEnv& env, const style: } if (section.textColor) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto textColor = std::move(*convert>>(env, *section.textColor)); static auto method = formattedSectionClass.GetMethod)>(env, "setTextColor"); formattedSection.Call(env, method, textColor); @@ -51,4 +51,4 @@ jni::Local> Formatted::New(jni::JNIEnv& env, const style: } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/formatted.hpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted.hpp index 2a3d288dd..a02c1f3db 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/formatted.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/formatted.hpp @@ -5,11 +5,11 @@ #include #include -namespace mbgl { +namespace mln { namespace android { using SuperTag = jni::ObjectTag; -class Formatted : private mbgl::util::noncopyable { +class Formatted : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/style/types/Formatted"; }; @@ -19,4 +19,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.cpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.cpp index 3d63a466b..8eff6d866 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.cpp @@ -1,6 +1,6 @@ #include "formatted_section.hpp" -namespace mbgl { +namespace mln { namespace android { void FormattedSection::registerNative(jni::JNIEnv& env) { @@ -8,4 +8,4 @@ void FormattedSection::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.hpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.hpp index c79bd198b..0a5ed76e3 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.hpp @@ -4,10 +4,10 @@ #include -namespace mbgl { +namespace mln { namespace android { -class FormattedSection : private mbgl::util::noncopyable { +class FormattedSection : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/style/types/FormattedSection"; }; @@ -15,4 +15,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.cpp index 5dbf4aa92..e24bf262b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.cpp @@ -9,29 +9,29 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::BackgroundLayer& toBackgroundLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::BackgroundLayer& toBackgroundLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ BackgroundLayer::BackgroundLayer(jni::JNIEnv& env, jni::String& layerId) - : Layer(std::make_unique(jni::Make(env, layerId))) {} + : Layer(std::make_unique(jni::Make(env, layerId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -BackgroundLayer::BackgroundLayer(mbgl::style::BackgroundLayer& coreLayer) +BackgroundLayer::BackgroundLayer(mln::style::BackgroundLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -BackgroundLayer::BackgroundLayer(std::unique_ptr coreLayer) +BackgroundLayer::BackgroundLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} BackgroundLayer::~BackgroundLayer() = default; @@ -39,7 +39,7 @@ BackgroundLayer::~BackgroundLayer() = default; // Property getters jni::Local> BackgroundLayer::getBackgroundColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::BackgroundLayer::getDefaultBackgroundColor())); @@ -48,12 +48,12 @@ jni::Local> BackgroundLayer::getBackgroundColor(jni::JNIEnv& env) } jni::Local> BackgroundLayer::getBackgroundColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundColorTransition(); + mln::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundColorTransition(); return std::move(*convert>>(env, options)); } @@ -62,14 +62,14 @@ void BackgroundLayer::setBackgroundColorTransition(jni::JNIEnv&, jlong duration, if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toBackgroundLayer(*layer).setBackgroundColorTransition(options); } jni::Local> BackgroundLayer::getBackgroundPattern(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -79,12 +79,12 @@ jni::Local> BackgroundLayer::getBackgroundPattern(jni::JNIEnv& env } jni::Local> BackgroundLayer::getBackgroundPatternTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundPatternTransition(); + mln::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundPatternTransition(); return std::move(*convert>>(env, options)); } @@ -93,14 +93,14 @@ void BackgroundLayer::setBackgroundPatternTransition(jni::JNIEnv&, jlong duratio if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toBackgroundLayer(*layer).setBackgroundPatternTransition(options); } jni::Local> BackgroundLayer::getBackgroundOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -110,12 +110,12 @@ jni::Local> BackgroundLayer::getBackgroundOpacity(jni::JNIEnv& env } jni::Local> BackgroundLayer::getBackgroundOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundOpacityTransition(); + mln::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -124,9 +124,9 @@ void BackgroundLayer::setBackgroundOpacityTransition(jni::JNIEnv&, jlong duratio if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toBackgroundLayer(*layer).setBackgroundOpacityTransition(options); } @@ -143,17 +143,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new BackgroundLayer(toBackgroundLayer(layer))); } jni::Local> BackgroundJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new BackgroundLayer(std::unique_ptr( - static_cast(layer.release())))); + new BackgroundLayer(std::unique_ptr( + static_cast(layer.release())))); } void BackgroundJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -182,4 +182,4 @@ void BackgroundJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.hpp index 43d0ad017..efdeb0b00 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class BackgroundLayer : public Layer { @@ -18,9 +18,9 @@ public: BackgroundLayer(jni::JNIEnv&, jni::String&); - BackgroundLayer(mbgl::style::BackgroundLayer&); + BackgroundLayer(mln::style::BackgroundLayer&); - BackgroundLayer(std::unique_ptr); + BackgroundLayer(std::unique_ptr); ~BackgroundLayer(); @@ -40,13 +40,13 @@ public: }; // class BackgroundLayer -class BackgroundJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::BackgroundLayerFactory { +class BackgroundJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::BackgroundLayerFactory { public: ~BackgroundJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -55,4 +55,4 @@ public: }; // class BackgroundJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.cpp index a0789e934..a9643d625 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::CircleLayer& toCircleLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::CircleLayer& toCircleLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ CircleLayer::CircleLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -CircleLayer::CircleLayer(mbgl::style::CircleLayer& coreLayer) +CircleLayer::CircleLayer(mln::style::CircleLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -CircleLayer::CircleLayer(std::unique_ptr coreLayer) +CircleLayer::CircleLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} CircleLayer::~CircleLayer() = default; @@ -40,7 +40,7 @@ CircleLayer::~CircleLayer() = default; // Property getters jni::Local> CircleLayer::getCircleSortKey(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleSortKey())); @@ -49,7 +49,7 @@ jni::Local> CircleLayer::getCircleSortKey(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleRadius(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleRadius())); @@ -58,12 +58,12 @@ jni::Local> CircleLayer::getCircleRadius(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleRadiusTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleRadiusTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleRadiusTransition(); return std::move(*convert>>(env, options)); } @@ -72,14 +72,14 @@ void CircleLayer::setCircleRadiusTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleRadiusTransition(options); } jni::Local> CircleLayer::getCircleColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleColor())); @@ -88,12 +88,12 @@ jni::Local> CircleLayer::getCircleColor(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleColorTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleColorTransition(); return std::move(*convert>>(env, options)); } @@ -102,14 +102,14 @@ void CircleLayer::setCircleColorTransition(jni::JNIEnv&, jlong duration, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleColorTransition(options); } jni::Local> CircleLayer::getCircleBlur(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleBlur())); @@ -118,12 +118,12 @@ jni::Local> CircleLayer::getCircleBlur(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleBlurTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleBlurTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleBlurTransition(); return std::move(*convert>>(env, options)); } @@ -132,14 +132,14 @@ void CircleLayer::setCircleBlurTransition(jni::JNIEnv&, jlong duration, jlong de if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleBlurTransition(options); } jni::Local> CircleLayer::getCircleOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleOpacity())); @@ -148,12 +148,12 @@ jni::Local> CircleLayer::getCircleOpacity(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleOpacityTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -162,14 +162,14 @@ void CircleLayer::setCircleOpacityTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleOpacityTransition(options); } jni::Local> CircleLayer::getCircleTranslate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleTranslate())); @@ -178,12 +178,12 @@ jni::Local> CircleLayer::getCircleTranslate(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleTranslateTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleTranslateTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleTranslateTransition(); return std::move(*convert>>(env, options)); } @@ -192,14 +192,14 @@ void CircleLayer::setCircleTranslateTransition(jni::JNIEnv&, jlong duration, jlo if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleTranslateTransition(options); } jni::Local> CircleLayer::getCircleTranslateAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -209,7 +209,7 @@ jni::Local> CircleLayer::getCircleTranslateAnchor(jni::JNIEnv& env } jni::Local> CircleLayer::getCirclePitchScale(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCirclePitchScale())); @@ -218,7 +218,7 @@ jni::Local> CircleLayer::getCirclePitchScale(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCirclePitchAlignment(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -228,7 +228,7 @@ jni::Local> CircleLayer::getCirclePitchAlignment(jni::JNIEnv& env) } jni::Local> CircleLayer::getCircleStrokeWidth(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleStrokeWidth())); @@ -237,12 +237,12 @@ jni::Local> CircleLayer::getCircleStrokeWidth(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleStrokeWidthTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeWidthTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeWidthTransition(); return std::move(*convert>>(env, options)); } @@ -251,14 +251,14 @@ void CircleLayer::setCircleStrokeWidthTransition(jni::JNIEnv&, jlong duration, j if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleStrokeWidthTransition(options); } jni::Local> CircleLayer::getCircleStrokeColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleStrokeColor())); @@ -267,12 +267,12 @@ jni::Local> CircleLayer::getCircleStrokeColor(jni::JNIEnv& env) { } jni::Local> CircleLayer::getCircleStrokeColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeColorTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeColorTransition(); return std::move(*convert>>(env, options)); } @@ -281,14 +281,14 @@ void CircleLayer::setCircleStrokeColorTransition(jni::JNIEnv&, jlong duration, j if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleStrokeColorTransition(options); } jni::Local> CircleLayer::getCircleStrokeOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::CircleLayer::getDefaultCircleStrokeOpacity())); @@ -297,12 +297,12 @@ jni::Local> CircleLayer::getCircleStrokeOpacity(jni::JNIEnv& env) } jni::Local> CircleLayer::getCircleStrokeOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeOpacityTransition(); + mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -311,9 +311,9 @@ void CircleLayer::setCircleStrokeOpacityTransition(jni::JNIEnv&, jlong duration, if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toCircleLayer(*layer).setCircleStrokeOpacityTransition(options); } @@ -330,17 +330,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> CircleJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new CircleLayer(toCircleLayer(layer))); } jni::Local> CircleJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new CircleLayer(std::unique_ptr( - static_cast(layer.release())))); + new CircleLayer(std::unique_ptr( + static_cast(layer.release())))); } void CircleJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -388,4 +388,4 @@ void CircleJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.hpp index 0eac16810..670cb4659 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class CircleLayer : public Layer { @@ -18,9 +18,9 @@ public: CircleLayer(jni::JNIEnv&, jni::String&, jni::String&); - CircleLayer(mbgl::style::CircleLayer&); + CircleLayer(mln::style::CircleLayer&); - CircleLayer(std::unique_ptr); + CircleLayer(std::unique_ptr); ~CircleLayer(); @@ -68,13 +68,13 @@ public: }; // class CircleLayer -class CircleJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::CircleLayerFactory { +class CircleJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::CircleLayerFactory { public: ~CircleJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -83,4 +83,4 @@ public: }; // class CircleJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.cpp index b245f59ea..fdf55b499 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::ColorReliefLayer& toColorReliefLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::ColorReliefLayer& toColorReliefLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ ColorReliefLayer::ColorReliefLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -ColorReliefLayer::ColorReliefLayer(mbgl::style::ColorReliefLayer& coreLayer) +ColorReliefLayer::ColorReliefLayer(mln::style::ColorReliefLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -ColorReliefLayer::ColorReliefLayer(std::unique_ptr coreLayer) +ColorReliefLayer::ColorReliefLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} ColorReliefLayer::~ColorReliefLayer() = default; @@ -40,7 +40,7 @@ ColorReliefLayer::~ColorReliefLayer() = default; // Property getters jni::Local> ColorReliefLayer::getColorReliefOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -50,12 +50,12 @@ jni::Local> ColorReliefLayer::getColorReliefOpacity(jni::JNIEnv& e } jni::Local> ColorReliefLayer::getColorReliefOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toColorReliefLayer(*layer).getColorReliefOpacityTransition(); + mln::style::TransitionOptions options = toColorReliefLayer(*layer).getColorReliefOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -64,14 +64,14 @@ void ColorReliefLayer::setColorReliefOpacityTransition(jni::JNIEnv&, jlong durat if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toColorReliefLayer(*layer).setColorReliefOpacityTransition(options); } jni::Local> ColorReliefLayer::getColorReliefColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -93,17 +93,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> ColorReliefJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new ColorReliefLayer(toColorReliefLayer(layer))); } jni::Local> ColorReliefJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new ColorReliefLayer(std::unique_ptr( - static_cast(layer.release())))); + new ColorReliefLayer(std::unique_ptr( + static_cast(layer.release())))); } void ColorReliefJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -127,4 +127,4 @@ void ColorReliefJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.hpp index 8c4279ea7..1b6c666db 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class ColorReliefLayer : public Layer { @@ -18,9 +18,9 @@ public: ColorReliefLayer(jni::JNIEnv&, jni::String&, jni::String&); - ColorReliefLayer(mbgl::style::ColorReliefLayer&); + ColorReliefLayer(mln::style::ColorReliefLayer&); - ColorReliefLayer(std::unique_ptr); + ColorReliefLayer(std::unique_ptr); ~ColorReliefLayer(); @@ -34,13 +34,13 @@ public: }; // class ColorReliefLayer -class ColorReliefJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::ColorReliefLayerFactory { +class ColorReliefJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::ColorReliefLayerFactory { public: ~ColorReliefJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -49,4 +49,4 @@ public: }; // class ColorReliefJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.cpp index 12c63fb1c..0bfba9d91 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.cpp @@ -4,18 +4,18 @@ #include -namespace mbgl { +namespace mln { namespace android { CustomLayer::CustomLayer(jni::JNIEnv& env, const jni::String& layerId, jni::jlong host) - : Layer(std::make_unique( + : Layer(std::make_unique( jni::Make(env, layerId), - std::unique_ptr(reinterpret_cast(host)))) {} + std::unique_ptr(reinterpret_cast(host)))) {} -CustomLayer::CustomLayer(mbgl::style::CustomLayer& coreLayer) +CustomLayer::CustomLayer(mln::style::CustomLayer& coreLayer) : Layer(coreLayer) {} -CustomLayer::CustomLayer(std::unique_ptr coreLayer) +CustomLayer::CustomLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} CustomLayer::~CustomLayer() = default; @@ -31,15 +31,15 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { CustomJavaLayerPeerFactory::~CustomJavaLayerPeerFactory() = default; jni::Local> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { - return createJavaPeer(env, new CustomLayer(static_cast(layer))); + mln::style::Layer& layer) { + return createJavaPeer(env, new CustomLayer(static_cast(layer))); } jni::Local> CustomJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { return createJavaPeer(env, - new CustomLayer(std::unique_ptr( - static_cast(layer.release())))); + new CustomLayer(std::unique_ptr( + static_cast(layer.release())))); } void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -58,4 +58,4 @@ void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.hpp index 5540aec87..e7bc0f3e2 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.hpp @@ -5,7 +5,7 @@ #include #include "layer.hpp" -namespace mbgl { +namespace mln { namespace android { class CustomLayer : public Layer { @@ -16,20 +16,20 @@ public: static void registerNative(jni::JNIEnv&); CustomLayer(jni::JNIEnv&, const jni::String&, jni::jlong); - CustomLayer(mbgl::style::CustomLayer&); - CustomLayer(std::unique_ptr); + CustomLayer(mln::style::CustomLayer&); + CustomLayer(std::unique_ptr); ~CustomLayer(); jni::Local> createJavaPeer(jni::JNIEnv&); }; // class CustomLayer -class CustomJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::CustomLayerFactory { +class CustomJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::CustomLayerFactory { public: ~CustomJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -38,4 +38,4 @@ public: }; // class CustomJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.cpp index 471862cb9..9f47698a1 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::FillExtrusionLayer& toFillExtrusionLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::FillExtrusionLayer& toFillExtrusionLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ FillExtrusionLayer::FillExtrusionLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -FillExtrusionLayer::FillExtrusionLayer(mbgl::style::FillExtrusionLayer& coreLayer) +FillExtrusionLayer::FillExtrusionLayer(mln::style::FillExtrusionLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -FillExtrusionLayer::FillExtrusionLayer(std::unique_ptr coreLayer) +FillExtrusionLayer::FillExtrusionLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} FillExtrusionLayer::~FillExtrusionLayer() = default; @@ -40,7 +40,7 @@ FillExtrusionLayer::~FillExtrusionLayer() = default; // Property getters jni::Local> FillExtrusionLayer::getFillExtrusionRoundedCornerDistance(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>( @@ -51,7 +51,7 @@ jni::Local> FillExtrusionLayer::getFillExtrusionRoundedCornerDista } jni::Local> FillExtrusionLayer::getFillExtrusionOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -61,12 +61,12 @@ jni::Local> FillExtrusionLayer::getFillExtrusionOpacity(jni::JNIEn } jni::Local> FillExtrusionLayer::getFillExtrusionOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionOpacityTransition(); + mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -75,14 +75,14 @@ void FillExtrusionLayer::setFillExtrusionOpacityTransition(jni::JNIEnv&, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillExtrusionLayer(*layer).setFillExtrusionOpacityTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -92,12 +92,12 @@ jni::Local> FillExtrusionLayer::getFillExtrusionColor(jni::JNIEnv& } jni::Local> FillExtrusionLayer::getFillExtrusionColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionColorTransition(); + mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionColorTransition(); return std::move(*convert>>(env, options)); } @@ -106,14 +106,14 @@ void FillExtrusionLayer::setFillExtrusionColorTransition(jni::JNIEnv&, jlong dur if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillExtrusionLayer(*layer).setFillExtrusionColorTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionTranslate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -124,12 +124,12 @@ jni::Local> FillExtrusionLayer::getFillExtrusionTranslate(jni::JNI } jni::Local> FillExtrusionLayer::getFillExtrusionTranslateTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionTranslateTransition(); + mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionTranslateTransition(); return std::move(*convert>>(env, options)); } @@ -138,14 +138,14 @@ void FillExtrusionLayer::setFillExtrusionTranslateTransition(jni::JNIEnv&, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillExtrusionLayer(*layer).setFillExtrusionTranslateTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionTranslateAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>( @@ -156,7 +156,7 @@ jni::Local> FillExtrusionLayer::getFillExtrusionTranslateAnchor(jn } jni::Local> FillExtrusionLayer::getFillExtrusionPattern(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -166,12 +166,12 @@ jni::Local> FillExtrusionLayer::getFillExtrusionPattern(jni::JNIEn } jni::Local> FillExtrusionLayer::getFillExtrusionPatternTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionPatternTransition(); + mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionPatternTransition(); return std::move(*convert>>(env, options)); } @@ -180,14 +180,14 @@ void FillExtrusionLayer::setFillExtrusionPatternTransition(jni::JNIEnv&, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillExtrusionLayer(*layer).setFillExtrusionPatternTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionHeight(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -197,12 +197,12 @@ jni::Local> FillExtrusionLayer::getFillExtrusionHeight(jni::JNIEnv } jni::Local> FillExtrusionLayer::getFillExtrusionHeightTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionHeightTransition(); + mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionHeightTransition(); return std::move(*convert>>(env, options)); } @@ -211,14 +211,14 @@ void FillExtrusionLayer::setFillExtrusionHeightTransition(jni::JNIEnv&, jlong du if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillExtrusionLayer(*layer).setFillExtrusionHeightTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionBase(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -228,12 +228,12 @@ jni::Local> FillExtrusionLayer::getFillExtrusionBase(jni::JNIEnv& } jni::Local> FillExtrusionLayer::getFillExtrusionBaseTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionBaseTransition(); + mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionBaseTransition(); return std::move(*convert>>(env, options)); } @@ -242,14 +242,14 @@ void FillExtrusionLayer::setFillExtrusionBaseTransition(jni::JNIEnv&, jlong dura if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillExtrusionLayer(*layer).setFillExtrusionBaseTransition(options); } jni::Local> FillExtrusionLayer::getFillExtrusionVerticalGradient(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>( @@ -272,17 +272,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new FillExtrusionLayer(toFillExtrusionLayer(layer))); } jni::Local> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new FillExtrusionLayer(std::unique_ptr( - static_cast(layer.release())))); + new FillExtrusionLayer(std::unique_ptr( + static_cast(layer.release())))); } void FillExtrusionJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -324,4 +324,4 @@ void FillExtrusionJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.hpp index 2266e0cfc..75a2886e7 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class FillExtrusionLayer : public Layer { @@ -18,9 +18,9 @@ public: FillExtrusionLayer(jni::JNIEnv&, jni::String&, jni::String&); - FillExtrusionLayer(mbgl::style::FillExtrusionLayer&); + FillExtrusionLayer(mln::style::FillExtrusionLayer&); - FillExtrusionLayer(std::unique_ptr); + FillExtrusionLayer(std::unique_ptr); ~FillExtrusionLayer(); @@ -58,13 +58,13 @@ public: }; // class FillExtrusionLayer -class FillExtrusionJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::FillExtrusionLayerFactory { +class FillExtrusionJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::FillExtrusionLayerFactory { public: ~FillExtrusionJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -73,4 +73,4 @@ public: }; // class FillExtrusionJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.cpp index 39699cddf..410be92e8 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::FillLayer& toFillLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::FillLayer& toFillLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ FillLayer::FillLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -FillLayer::FillLayer(mbgl::style::FillLayer& coreLayer) +FillLayer::FillLayer(mln::style::FillLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -FillLayer::FillLayer(std::unique_ptr coreLayer) +FillLayer::FillLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} FillLayer::~FillLayer() = default; @@ -40,7 +40,7 @@ FillLayer::~FillLayer() = default; // Property getters jni::Local> FillLayer::getFillSortKey(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillSortKey())); @@ -49,7 +49,7 @@ jni::Local> FillLayer::getFillSortKey(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillAntialias(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillAntialias())); @@ -58,7 +58,7 @@ jni::Local> FillLayer::getFillAntialias(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillOpacity())); @@ -67,12 +67,12 @@ jni::Local> FillLayer::getFillOpacity(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillOpacityTransition(); + mln::style::TransitionOptions options = toFillLayer(*layer).getFillOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -81,14 +81,14 @@ void FillLayer::setFillOpacityTransition(jni::JNIEnv&, jlong duration, jlong del if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillLayer(*layer).setFillOpacityTransition(options); } jni::Local> FillLayer::getFillColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillColor())); @@ -97,12 +97,12 @@ jni::Local> FillLayer::getFillColor(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillColorTransition(); + mln::style::TransitionOptions options = toFillLayer(*layer).getFillColorTransition(); return std::move(*convert>>(env, options)); } @@ -111,14 +111,14 @@ void FillLayer::setFillColorTransition(jni::JNIEnv&, jlong duration, jlong delay if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillLayer(*layer).setFillColorTransition(options); } jni::Local> FillLayer::getFillOutlineColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillOutlineColor())); @@ -127,12 +127,12 @@ jni::Local> FillLayer::getFillOutlineColor(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillOutlineColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillOutlineColorTransition(); + mln::style::TransitionOptions options = toFillLayer(*layer).getFillOutlineColorTransition(); return std::move(*convert>>(env, options)); } @@ -141,14 +141,14 @@ void FillLayer::setFillOutlineColorTransition(jni::JNIEnv&, jlong duration, jlon if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillLayer(*layer).setFillOutlineColorTransition(options); } jni::Local> FillLayer::getFillTranslate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillTranslate())); @@ -157,12 +157,12 @@ jni::Local> FillLayer::getFillTranslate(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillTranslateTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillTranslateTransition(); + mln::style::TransitionOptions options = toFillLayer(*layer).getFillTranslateTransition(); return std::move(*convert>>(env, options)); } @@ -171,14 +171,14 @@ void FillLayer::setFillTranslateTransition(jni::JNIEnv&, jlong duration, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillLayer(*layer).setFillTranslateTransition(options); } jni::Local> FillLayer::getFillTranslateAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillTranslateAnchor())); @@ -187,7 +187,7 @@ jni::Local> FillLayer::getFillTranslateAnchor(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillPattern(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::FillLayer::getDefaultFillPattern())); @@ -196,12 +196,12 @@ jni::Local> FillLayer::getFillPattern(jni::JNIEnv& env) { } jni::Local> FillLayer::getFillPatternTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillPatternTransition(); + mln::style::TransitionOptions options = toFillLayer(*layer).getFillPatternTransition(); return std::move(*convert>>(env, options)); } @@ -210,9 +210,9 @@ void FillLayer::setFillPatternTransition(jni::JNIEnv&, jlong duration, jlong del if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toFillLayer(*layer).setFillPatternTransition(options); } @@ -229,17 +229,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new FillLayer(toFillLayer(layer))); } -jni::Local> FillJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { +jni::Local> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, + std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer( env, - new FillLayer(std::unique_ptr(static_cast(layer.release())))); + new FillLayer(std::unique_ptr(static_cast(layer.release())))); } void FillJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -277,4 +277,4 @@ void FillJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.hpp index 1ad9ef808..680134944 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class FillLayer : public Layer { @@ -18,9 +18,9 @@ public: FillLayer(jni::JNIEnv&, jni::String&, jni::String&); - FillLayer(mbgl::style::FillLayer&); + FillLayer(mln::style::FillLayer&); - FillLayer(std::unique_ptr); + FillLayer(std::unique_ptr); ~FillLayer(); @@ -54,13 +54,13 @@ public: }; // class FillLayer -class FillJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::FillLayerFactory { +class FillJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::FillLayerFactory { public: ~FillJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -69,4 +69,4 @@ public: }; // class FillJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.cpp index 1435579fa..fce944068 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::HeatmapLayer& toHeatmapLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::HeatmapLayer& toHeatmapLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ HeatmapLayer::HeatmapLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -HeatmapLayer::HeatmapLayer(mbgl::style::HeatmapLayer& coreLayer) +HeatmapLayer::HeatmapLayer(mln::style::HeatmapLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -HeatmapLayer::HeatmapLayer(std::unique_ptr coreLayer) +HeatmapLayer::HeatmapLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} HeatmapLayer::~HeatmapLayer() = default; @@ -40,7 +40,7 @@ HeatmapLayer::~HeatmapLayer() = default; // Property getters jni::Local> HeatmapLayer::getHeatmapRadius(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::HeatmapLayer::getDefaultHeatmapRadius())); @@ -49,12 +49,12 @@ jni::Local> HeatmapLayer::getHeatmapRadius(jni::JNIEnv& env) { } jni::Local> HeatmapLayer::getHeatmapRadiusTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapRadiusTransition(); + mln::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapRadiusTransition(); return std::move(*convert>>(env, options)); } @@ -63,14 +63,14 @@ void HeatmapLayer::setHeatmapRadiusTransition(jni::JNIEnv&, jlong duration, jlon if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toHeatmapLayer(*layer).setHeatmapRadiusTransition(options); } jni::Local> HeatmapLayer::getHeatmapWeight(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::HeatmapLayer::getDefaultHeatmapWeight())); @@ -79,7 +79,7 @@ jni::Local> HeatmapLayer::getHeatmapWeight(jni::JNIEnv& env) { } jni::Local> HeatmapLayer::getHeatmapIntensity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::HeatmapLayer::getDefaultHeatmapIntensity())); @@ -88,12 +88,12 @@ jni::Local> HeatmapLayer::getHeatmapIntensity(jni::JNIEnv& env) { } jni::Local> HeatmapLayer::getHeatmapIntensityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapIntensityTransition(); + mln::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapIntensityTransition(); return std::move(*convert>>(env, options)); } @@ -102,14 +102,14 @@ void HeatmapLayer::setHeatmapIntensityTransition(jni::JNIEnv&, jlong duration, j if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toHeatmapLayer(*layer).setHeatmapIntensityTransition(options); } jni::Local> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::HeatmapLayer::getDefaultHeatmapColor())); @@ -123,7 +123,7 @@ jni::Local> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) { } jni::Local> HeatmapLayer::getHeatmapOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::HeatmapLayer::getDefaultHeatmapOpacity())); @@ -132,12 +132,12 @@ jni::Local> HeatmapLayer::getHeatmapOpacity(jni::JNIEnv& env) { } jni::Local> HeatmapLayer::getHeatmapOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapOpacityTransition(); + mln::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -146,9 +146,9 @@ void HeatmapLayer::setHeatmapOpacityTransition(jni::JNIEnv&, jlong duration, jlo if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toHeatmapLayer(*layer).setHeatmapOpacityTransition(options); } @@ -165,17 +165,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new HeatmapLayer(toHeatmapLayer(layer))); } jni::Local> HeatmapJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new HeatmapLayer(std::unique_ptr( - static_cast(layer.release())))); + new HeatmapLayer(std::unique_ptr( + static_cast(layer.release())))); } void HeatmapJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -206,4 +206,4 @@ void HeatmapJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.hpp index 94f64362c..3d2f2b2c9 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class HeatmapLayer : public Layer { @@ -18,9 +18,9 @@ public: HeatmapLayer(jni::JNIEnv&, jni::String&, jni::String&); - HeatmapLayer(mbgl::style::HeatmapLayer&); + HeatmapLayer(mln::style::HeatmapLayer&); - HeatmapLayer(std::unique_ptr); + HeatmapLayer(std::unique_ptr); ~HeatmapLayer(); @@ -44,13 +44,13 @@ public: }; // class HeatmapLayer -class HeatmapJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::HeatmapLayerFactory { +class HeatmapJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::HeatmapLayerFactory { public: ~HeatmapJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -59,4 +59,4 @@ public: }; // class HeatmapJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.cpp index bb354ad8e..f9efc6754 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::HillshadeLayer& toHillshadeLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::HillshadeLayer& toHillshadeLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ HillshadeLayer::HillshadeLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -HillshadeLayer::HillshadeLayer(mbgl::style::HillshadeLayer& coreLayer) +HillshadeLayer::HillshadeLayer(mln::style::HillshadeLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -HillshadeLayer::HillshadeLayer(std::unique_ptr coreLayer) +HillshadeLayer::HillshadeLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} HillshadeLayer::~HillshadeLayer() = default; @@ -40,7 +40,7 @@ HillshadeLayer::~HillshadeLayer() = default; // Property getters jni::Local> HillshadeLayer::getHillshadeIlluminationDirection(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>( @@ -51,7 +51,7 @@ jni::Local> HillshadeLayer::getHillshadeIlluminationDirection(jni: } jni::Local> HillshadeLayer::getHillshadeIlluminationAltitude(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -62,7 +62,7 @@ jni::Local> HillshadeLayer::getHillshadeIlluminationAltitude(jni:: } jni::Local> HillshadeLayer::getHillshadeIlluminationAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -73,7 +73,7 @@ jni::Local> HillshadeLayer::getHillshadeIlluminationAnchor(jni::JN } jni::Local> HillshadeLayer::getHillshadeExaggeration(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -83,12 +83,12 @@ jni::Local> HillshadeLayer::getHillshadeExaggeration(jni::JNIEnv& } jni::Local> HillshadeLayer::getHillshadeExaggerationTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeExaggerationTransition(); + mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeExaggerationTransition(); return std::move(*convert>>(env, options)); } @@ -97,14 +97,14 @@ void HillshadeLayer::setHillshadeExaggerationTransition(jni::JNIEnv&, jlong dura if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toHillshadeLayer(*layer).setHillshadeExaggerationTransition(options); } jni::Local> HillshadeLayer::getHillshadeShadowColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -114,12 +114,12 @@ jni::Local> HillshadeLayer::getHillshadeShadowColor(jni::JNIEnv& e } jni::Local> HillshadeLayer::getHillshadeShadowColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeShadowColorTransition(); + mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeShadowColorTransition(); return std::move(*convert>>(env, options)); } @@ -128,14 +128,14 @@ void HillshadeLayer::setHillshadeShadowColorTransition(jni::JNIEnv&, jlong durat if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toHillshadeLayer(*layer).setHillshadeShadowColorTransition(options); } jni::Local> HillshadeLayer::getHillshadeHighlightColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -145,12 +145,12 @@ jni::Local> HillshadeLayer::getHillshadeHighlightColor(jni::JNIEnv } jni::Local> HillshadeLayer::getHillshadeHighlightColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeHighlightColorTransition(); + mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeHighlightColorTransition(); return std::move(*convert>>(env, options)); } @@ -159,14 +159,14 @@ void HillshadeLayer::setHillshadeHighlightColorTransition(jni::JNIEnv&, jlong du if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toHillshadeLayer(*layer).setHillshadeHighlightColorTransition(options); } jni::Local> HillshadeLayer::getHillshadeAccentColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -176,12 +176,12 @@ jni::Local> HillshadeLayer::getHillshadeAccentColor(jni::JNIEnv& e } jni::Local> HillshadeLayer::getHillshadeAccentColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeAccentColorTransition(); + mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeAccentColorTransition(); return std::move(*convert>>(env, options)); } @@ -190,14 +190,14 @@ void HillshadeLayer::setHillshadeAccentColorTransition(jni::JNIEnv&, jlong durat if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toHillshadeLayer(*layer).setHillshadeAccentColorTransition(options); } jni::Local> HillshadeLayer::getHillshadeMethod(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::HillshadeLayer::getDefaultHillshadeMethod())); @@ -218,17 +218,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new HillshadeLayer(toHillshadeLayer(layer))); } jni::Local> HillshadeJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new HillshadeLayer(std::unique_ptr( - static_cast(layer.release())))); + new HillshadeLayer(std::unique_ptr( + static_cast(layer.release())))); } void HillshadeJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -264,4 +264,4 @@ void HillshadeJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.hpp index 354d7ffa4..b1d5945a1 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class HillshadeLayer : public Layer { @@ -18,9 +18,9 @@ public: HillshadeLayer(jni::JNIEnv&, jni::String&, jni::String&); - HillshadeLayer(mbgl::style::HillshadeLayer&); + HillshadeLayer(mln::style::HillshadeLayer&); - HillshadeLayer(std::unique_ptr); + HillshadeLayer(std::unique_ptr); ~HillshadeLayer(); @@ -52,13 +52,13 @@ public: }; // class HillshadeLayer -class HillshadeJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::HillshadeLayerFactory { +class HillshadeJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::HillshadeLayerFactory { public: ~HillshadeJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -67,4 +67,4 @@ public: }; // class HillshadeJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp index bbde61c55..26ef3731c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp @@ -21,25 +21,25 @@ #include -namespace mbgl { +namespace mln { namespace android { /** * Invoked when the construction is initiated from the jvm through a subclass */ -Layer::Layer(std::unique_ptr coreLayer) +Layer::Layer(std::unique_ptr coreLayer) : ownedLayer(std::move(coreLayer)), layerPtr(ownedLayer->makeWeakPtr()) {} /** * Takes a non-owning reference. For lookup methods */ -Layer::Layer(mbgl::style::Layer& coreLayer) +Layer::Layer(mln::style::Layer& coreLayer) : layerPtr(coreLayer.makeWeakPtr()) {} Layer::~Layer() {} -void Layer::addToStyle(mbgl::style::Style& style, std::optional before) { +void Layer::addToStyle(mln::style::Style& style, std::optional before) { // Check to see if we own the layer first if (!ownedLayer) { throw std::runtime_error("Cannot add layer twice"); @@ -49,11 +49,11 @@ void Layer::addToStyle(mbgl::style::Style& style, std::optional bef style.addLayer(releaseCoreLayer(), before); } -void Layer::setLayer(std::unique_ptr sourceLayer) { +void Layer::setLayer(std::unique_ptr sourceLayer) { this->ownedLayer = std::move(sourceLayer); } -std::unique_ptr Layer::releaseCoreLayer() { +std::unique_ptr Layer::releaseCoreLayer() { assert(ownedLayer != nullptr); return std::move(ownedLayer); } @@ -78,18 +78,18 @@ void Layer::setProperty(jni::JNIEnv& env, const jni::String& jname, const jni::O } // Convert and set property - std::optional error = layer->setProperty(jni::Make(env, jname), - Value(env, jvalue)); + std::optional error = layer->setProperty(jni::Make(env, jname), + Value(env, jvalue)); if (error) { - mbgl::Log::Error(mbgl::Event::JNI, - "Error setting property: " + jni::Make(env, jname) + " " + error->message); + mln::Log::Error(mln::Event::JNI, + "Error setting property: " + jni::Make(env, jname) + " " + error->message); return; } } void Layer::setFilter(jni::JNIEnv& env, const jni::Array>& jfilter) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto layer = layerPtr.get(); if (!layer) { @@ -99,7 +99,7 @@ void Layer::setFilter(jni::JNIEnv& env, const jni::Array>& jfilter Error error; std::optional converted = convert(Value(env, jfilter), error); if (!converted) { - mbgl::Log::Error(mbgl::Event::JNI, "Error setting filter: " + error.message); + mln::Log::Error(mln::Event::JNI, "Error setting filter: " + error.message); return; } @@ -107,8 +107,8 @@ void Layer::setFilter(jni::JNIEnv& env, const jni::Array>& jfilter } jni::Local> Layer::getFilter(jni::JNIEnv& env) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto layer = layerPtr.get(); if (!layer) { @@ -117,7 +117,7 @@ jni::Local> Layer::getFilter(jni::JNIEnv& env) { Filter filter = layer->getFilter(); if (filter.expression) { - mbgl::Value expressionValue = (*filter.expression)->serialize(); + mln::Value expressionValue = (*filter.expression)->serialize(); return gson::JsonElement::New(env, expressionValue); } else { return jni::Local>(env, nullptr); @@ -188,7 +188,7 @@ void Layer::setMaxZoom(jni::JNIEnv&, jni::jfloat zoom) { } jni::Local> Layer::getVisibility(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { @@ -226,4 +226,4 @@ void Layer::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs index 3f3a15267..c8a9f836e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs @@ -13,11 +13,11 @@ #include -namespace mbgl { +namespace mln { namespace android { - inline mbgl::style::<%- camelize(type) %>Layer& to<%- camelize(type) %>Layer(mbgl::style::Layer& layer) { - return static_castLayer&>(layer); + inline mln::style::<%- camelize(type) %>Layer& to<%- camelize(type) %>Layer(mln::style::Layer& layer) { + return static_castLayer&>(layer); } <% if (type === 'background' || type === 'location-indicator') { -%> @@ -25,27 +25,27 @@ namespace android { * Creates an owning peer object (for layers not attached to the map) from the JVM side */ <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String& layerId) - : Layer(std::make_uniqueLayer>(jni::Make(env, layerId))) { + : Layer(std::make_uniqueLayer>(jni::Make(env, layerId))) { <% } else { -%> /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_uniqueLayer>(jni::Make(env, layerId), jni::Make(env, sourceId))) { + : Layer(std::make_uniqueLayer>(jni::Make(env, layerId), jni::Make(env, sourceId))) { <% } -%> } /** * Creates a non-owning peer object (for layers currently attached to the map) */ - <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(mbgl::style::<%- camelize(type) %>Layer& coreLayer) + <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(mln::style::<%- camelize(type) %>Layer& coreLayer) : Layer(coreLayer) { } /** * Creates an owning peer object (for layers not attached to the map) */ - <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(std::unique_ptrLayer> coreLayer) + <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(std::unique_ptrLayer> coreLayer) : Layer(std::move(coreLayer)) { } @@ -56,7 +56,7 @@ namespace android { <% for (const property of properties) { -%> <% if (property.name != 'heatmap-color') { -%> jni::Local> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::<%- camelize(type) %>Layer::getDefault<%- camelize(property.name) %>())); @@ -66,7 +66,7 @@ namespace android { <% } else { -%> jni::Local> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::<%- camelize(type) %>Layer::getDefaultHeatmapColor())); @@ -82,12 +82,12 @@ namespace android { <% } -%> <% if (property.transition) { -%> jni::Local> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>Transition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = to<%- camelize(type) %>Layer(*layer).get<%- camelize(property.name) %>Transition(); + mln::style::TransitionOptions options = to<%- camelize(type) %>Layer(*layer).get<%- camelize(property.name) %>Transition(); return std::move(*convert>>(env, options)); } @@ -96,9 +96,9 @@ namespace android { if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); to<%- camelize(type) %>Layer(*layer).set<%- camelize(property.name) %>Transition(options); } @@ -117,14 +117,14 @@ namespace android { } } // namespace - jni::Local> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) { + jni::Local> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new <%- camelize(type) %>Layer(to<%- camelize(type) %>Layer(layer))); } - jni::Local> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr layer) { + jni::Local> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); - return createJavaPeer(env, new <%- camelize(type) %>Layer(std::unique_ptrLayer>(static_castLayer*>(layer.release())))); + return createJavaPeer(env, new <%- camelize(type) %>Layer(std::unique_ptrLayer>(static_castLayer*>(layer.release())))); } void <%- camelize(type) %>JavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -153,4 +153,4 @@ namespace android { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp index 533a344b3..79815bfb7 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { namespace android { @@ -24,12 +24,12 @@ public: /** * Set core layer (ie return ownership after remove) */ - void setLayer(std::unique_ptr); + void setLayer(std::unique_ptr); - void addToStyle(mbgl::style::Style&, std::optional); + void addToStyle(mln::style::Style&, std::optional); // Release the owned view and return it - std::unique_ptr releaseCoreLayer(); + std::unique_ptr releaseCoreLayer(); jni::Local getId(jni::JNIEnv&); @@ -67,18 +67,18 @@ protected: /* * Called when a non-owning peer object is created on the c++ side */ - Layer(mbgl::style::Layer&); + Layer(mln::style::Layer&); /* * Called when a owning peer object is created on the c++ side */ - Layer(std::unique_ptr); + Layer(std::unique_ptr); // Owned layer is set when creating a new layer, before adding it to the map - std::unique_ptr ownedLayer; + std::unique_ptr ownedLayer; // Raw reference to the layer - mapbox::base::WeakPtr layerPtr; + mapbox::base::WeakPtr layerPtr; }; /** @@ -90,13 +90,13 @@ public: /** * @brief Create a non-owning peer. */ - virtual jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) = 0; + virtual jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) = 0; /** * @brief Create an owning peer. */ virtual jni::Local> createJavaLayerPeer(jni::JNIEnv& env, - std::unique_ptr) = 0; + std::unique_ptr) = 0; /** * @brief Register peer methods. @@ -112,4 +112,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs index 580942270..ae9e120d9 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs @@ -12,7 +12,7 @@ #include _layer.hpp> #include -namespace mbgl { +namespace mln { namespace android { class <%- camelize(type) %>Layer : public Layer { @@ -30,9 +30,9 @@ public: <%- camelize(type) %>Layer(jni::JNIEnv&, jni::String&, jni::String&); <% } -%> - <%- camelize(type) %>Layer(mbgl::style::<%- camelize(type) %>Layer&); + <%- camelize(type) %>Layer(mln::style::<%- camelize(type) %>Layer&); - <%- camelize(type) %>Layer(std::unique_ptrLayer>); + <%- camelize(type) %>Layer(std::unique_ptrLayer>); ~<%- camelize(type) %>Layer(); @@ -48,13 +48,13 @@ public: }; // class <%- camelize(type) %>Layer -class <%- camelize(type) %>JavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::<%- camelize(type) %>LayerFactory { +class <%- camelize(type) %>JavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::<%- camelize(type) %>LayerFactory { public: ~<%- camelize(type) %>JavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -63,4 +63,4 @@ public: }; // class <%- camelize(type) %>JavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.cpp index 85f39dc11..05eea918d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.cpp @@ -20,7 +20,7 @@ #include "fill_extrusion_layer.hpp" #include "location_indicator_layer.hpp" -namespace mbgl { +namespace mln { namespace android { @@ -87,7 +87,7 @@ LayerManagerAndroid::LayerManagerAndroid() { LayerManagerAndroid::~LayerManagerAndroid() = default; -jni::Local> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) { +jni::Local> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env, mln::style::Layer& layer) { if (JavaLayerPeerFactory* factory = getPeerFactory(layer.getTypeInfo())) { return factory->createJavaLayerPeer(env, layer); } @@ -95,7 +95,7 @@ jni::Local> LayerManagerAndroid::createJavaLayerPeer(jni::JNI } jni::Local> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env, - std::unique_ptr layer) { + std::unique_ptr layer) { if (JavaLayerPeerFactory* factory = getPeerFactory(layer->getTypeInfo())) { return factory->createJavaLayerPeer(env, std::move(layer)); } @@ -125,7 +125,7 @@ void LayerManagerAndroid::addLayerTypeCoreOnly(std::unique_ptr fac coreFactories.emplace_back(std::move(factory)); } -void LayerManagerAndroid::registerCoreFactory(mbgl::LayerFactory* factory) { +void LayerManagerAndroid::registerCoreFactory(mln::LayerFactory* factory) { std::string type{factory->getTypeInfo()->type}; if (!type.empty()) { assert(typeToFactory.find(type) == typeToFactory.end()); @@ -133,7 +133,7 @@ void LayerManagerAndroid::registerCoreFactory(mbgl::LayerFactory* factory) { } } -JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(const mbgl::style::LayerTypeInfo* typeInfo) { +JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(const mln::style::LayerTypeInfo* typeInfo) { assert(typeInfo); for (const auto& factory : peerFactories) { if (factory->getLayerFactory()->getTypeInfo() == typeInfo) { @@ -148,7 +148,7 @@ LayerFactory* LayerManagerAndroid::getFactory(const std::string& type) noexcept return (search != typeToFactory.end()) ? search->second : nullptr; } -LayerFactory* LayerManagerAndroid::getFactory(const mbgl::style::LayerTypeInfo* info) noexcept { +LayerFactory* LayerManagerAndroid::getFactory(const mln::style::LayerTypeInfo* info) noexcept { if (JavaLayerPeerFactory* peerFactory = getPeerFactory(info)) { return peerFactory->getLayerFactory(); } @@ -181,4 +181,4 @@ const bool LayerManager::annotationsEnabled = false; const bool LayerManager::annotationsEnabled = true; #endif -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.hpp index 900da8c92..312871dad 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.hpp @@ -11,20 +11,20 @@ #include #include -namespace mbgl { +namespace mln { namespace android { /** * @brief A singleton class forwarding calls to the corresponding \c * JavaLayerPeerFactory instance. */ -class LayerManagerAndroid final : public mbgl::LayerManager { +class LayerManagerAndroid final : public mln::LayerManager { public: ~LayerManagerAndroid() final; static LayerManagerAndroid* get() noexcept; - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&); - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr); + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&); + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr); void registerNative(jni::JNIEnv&); @@ -41,18 +41,18 @@ private: * in order to save binary size - JNI glue code for these layer types * won't be added to the binary. */ - void addLayerTypeCoreOnly(std::unique_ptr); + void addLayerTypeCoreOnly(std::unique_ptr); - void registerCoreFactory(mbgl::LayerFactory*); - JavaLayerPeerFactory* getPeerFactory(const mbgl::style::LayerTypeInfo*); - // mbgl::LayerManager overrides. + void registerCoreFactory(mln::LayerFactory*); + JavaLayerPeerFactory* getPeerFactory(const mln::style::LayerTypeInfo*); + // mln::LayerManager overrides. LayerFactory* getFactory(const std::string& type) noexcept final; - LayerFactory* getFactory(const mbgl::style::LayerTypeInfo* info) noexcept final; + LayerFactory* getFactory(const mln::style::LayerTypeInfo* info) noexcept final; std::vector> peerFactories; - std::vector> coreFactories; - std::map typeToFactory; + std::vector> coreFactories; + std::map typeToFactory; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.cpp index da0228a61..f0794375f 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::LineLayer& toLineLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::LineLayer& toLineLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ LineLayer::LineLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -LineLayer::LineLayer(mbgl::style::LineLayer& coreLayer) +LineLayer::LineLayer(mln::style::LineLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -LineLayer::LineLayer(std::unique_ptr coreLayer) +LineLayer::LineLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} LineLayer::~LineLayer() = default; @@ -40,7 +40,7 @@ LineLayer::~LineLayer() = default; // Property getters jni::Local> LineLayer::getLineCap(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineCap())); @@ -49,7 +49,7 @@ jni::Local> LineLayer::getLineCap(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineJoin(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineJoin())); @@ -58,7 +58,7 @@ jni::Local> LineLayer::getLineJoin(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineMiterLimit(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineMiterLimit())); @@ -67,7 +67,7 @@ jni::Local> LineLayer::getLineMiterLimit(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineRoundLimit(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineRoundLimit())); @@ -76,7 +76,7 @@ jni::Local> LineLayer::getLineRoundLimit(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineSortKey(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineSortKey())); @@ -85,7 +85,7 @@ jni::Local> LineLayer::getLineSortKey(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineOpacity())); @@ -94,12 +94,12 @@ jni::Local> LineLayer::getLineOpacity(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineOpacityTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -108,14 +108,14 @@ void LineLayer::setLineOpacityTransition(jni::JNIEnv&, jlong duration, jlong del if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineOpacityTransition(options); } jni::Local> LineLayer::getLineColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineColor())); @@ -124,12 +124,12 @@ jni::Local> LineLayer::getLineColor(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineColorTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineColorTransition(); return std::move(*convert>>(env, options)); } @@ -138,14 +138,14 @@ void LineLayer::setLineColorTransition(jni::JNIEnv&, jlong duration, jlong delay if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineColorTransition(options); } jni::Local> LineLayer::getLineTranslate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineTranslate())); @@ -154,12 +154,12 @@ jni::Local> LineLayer::getLineTranslate(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineTranslateTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineTranslateTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineTranslateTransition(); return std::move(*convert>>(env, options)); } @@ -168,14 +168,14 @@ void LineLayer::setLineTranslateTransition(jni::JNIEnv&, jlong duration, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineTranslateTransition(options); } jni::Local> LineLayer::getLineTranslateAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineTranslateAnchor())); @@ -184,7 +184,7 @@ jni::Local> LineLayer::getLineTranslateAnchor(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineWidth(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineWidth())); @@ -193,12 +193,12 @@ jni::Local> LineLayer::getLineWidth(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineWidthTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineWidthTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineWidthTransition(); return std::move(*convert>>(env, options)); } @@ -207,14 +207,14 @@ void LineLayer::setLineWidthTransition(jni::JNIEnv&, jlong duration, jlong delay if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineWidthTransition(options); } jni::Local> LineLayer::getLineGapWidth(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineGapWidth())); @@ -223,12 +223,12 @@ jni::Local> LineLayer::getLineGapWidth(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineGapWidthTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineGapWidthTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineGapWidthTransition(); return std::move(*convert>>(env, options)); } @@ -237,14 +237,14 @@ void LineLayer::setLineGapWidthTransition(jni::JNIEnv&, jlong duration, jlong de if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineGapWidthTransition(options); } jni::Local> LineLayer::getLineOffset(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineOffset())); @@ -253,12 +253,12 @@ jni::Local> LineLayer::getLineOffset(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineOffsetTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineOffsetTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineOffsetTransition(); return std::move(*convert>>(env, options)); } @@ -267,14 +267,14 @@ void LineLayer::setLineOffsetTransition(jni::JNIEnv&, jlong duration, jlong dela if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineOffsetTransition(options); } jni::Local> LineLayer::getLineBlur(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineBlur())); @@ -283,12 +283,12 @@ jni::Local> LineLayer::getLineBlur(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineBlurTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineBlurTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineBlurTransition(); return std::move(*convert>>(env, options)); } @@ -297,14 +297,14 @@ void LineLayer::setLineBlurTransition(jni::JNIEnv&, jlong duration, jlong delay) if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineBlurTransition(options); } jni::Local> LineLayer::getLineDasharray(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineDasharray())); @@ -313,12 +313,12 @@ jni::Local> LineLayer::getLineDasharray(jni::JNIEnv& env) { } jni::Local> LineLayer::getLineDasharrayTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineDasharrayTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLineDasharrayTransition(); return std::move(*convert>>(env, options)); } @@ -327,14 +327,14 @@ void LineLayer::setLineDasharrayTransition(jni::JNIEnv&, jlong duration, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLineDasharrayTransition(options); } jni::Local> LineLayer::getLinePattern(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLinePattern())); @@ -343,12 +343,12 @@ jni::Local> LineLayer::getLinePattern(jni::JNIEnv& env) { } jni::Local> LineLayer::getLinePatternTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLineLayer(*layer).getLinePatternTransition(); + mln::style::TransitionOptions options = toLineLayer(*layer).getLinePatternTransition(); return std::move(*convert>>(env, options)); } @@ -357,14 +357,14 @@ void LineLayer::setLinePatternTransition(jni::JNIEnv&, jlong duration, jlong del if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLineLayer(*layer).setLinePatternTransition(options); } jni::Local> LineLayer::getLineGradient(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LineLayer::getDefaultLineGradient())); @@ -385,17 +385,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new LineLayer(toLineLayer(layer))); } -jni::Local> LineJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { +jni::Local> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, + std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer( env, - new LineLayer(std::unique_ptr(static_cast(layer.release())))); + new LineLayer(std::unique_ptr(static_cast(layer.release())))); } void LineJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -449,4 +449,4 @@ void LineJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.hpp index ed40f78f2..ec63dde24 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class LineLayer : public Layer { @@ -18,9 +18,9 @@ public: LineLayer(jni::JNIEnv&, jni::String&, jni::String&); - LineLayer(mbgl::style::LineLayer&); + LineLayer(mln::style::LineLayer&); - LineLayer(std::unique_ptr); + LineLayer(std::unique_ptr); ~LineLayer(); @@ -78,13 +78,13 @@ public: }; // class LineLayer -class LineJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::LineLayerFactory { +class LineJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::LineLayerFactory { public: ~LineJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -93,4 +93,4 @@ public: }; // class LineJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.cpp index b4788b120..445cd7a1b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.cpp @@ -9,29 +9,29 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::LocationIndicatorLayer& toLocationIndicatorLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::LocationIndicatorLayer& toLocationIndicatorLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ LocationIndicatorLayer::LocationIndicatorLayer(jni::JNIEnv& env, jni::String& layerId) - : Layer(std::make_unique(jni::Make(env, layerId))) {} + : Layer(std::make_unique(jni::Make(env, layerId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -LocationIndicatorLayer::LocationIndicatorLayer(mbgl::style::LocationIndicatorLayer& coreLayer) +LocationIndicatorLayer::LocationIndicatorLayer(mln::style::LocationIndicatorLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -LocationIndicatorLayer::LocationIndicatorLayer(std::unique_ptr coreLayer) +LocationIndicatorLayer::LocationIndicatorLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} LocationIndicatorLayer::~LocationIndicatorLayer() = default; @@ -39,7 +39,7 @@ LocationIndicatorLayer::~LocationIndicatorLayer() = default; // Property getters jni::Local> LocationIndicatorLayer::getTopImage(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LocationIndicatorLayer::getDefaultTopImage())); @@ -48,7 +48,7 @@ jni::Local> LocationIndicatorLayer::getTopImage(jni::JNIEnv& env) } jni::Local> LocationIndicatorLayer::getBearingImage(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -58,7 +58,7 @@ jni::Local> LocationIndicatorLayer::getBearingImage(jni::JNIEnv& e } jni::Local> LocationIndicatorLayer::getShadowImage(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -68,7 +68,7 @@ jni::Local> LocationIndicatorLayer::getShadowImage(jni::JNIEnv& en } jni::Local> LocationIndicatorLayer::getPerspectiveCompensation(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>( @@ -79,7 +79,7 @@ jni::Local> LocationIndicatorLayer::getPerspectiveCompensation(jni } jni::Local> LocationIndicatorLayer::getImageTiltDisplacement(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -90,7 +90,7 @@ jni::Local> LocationIndicatorLayer::getImageTiltDisplacement(jni:: } jni::Local> LocationIndicatorLayer::getBearing(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LocationIndicatorLayer::getDefaultBearing())); @@ -99,12 +99,12 @@ jni::Local> LocationIndicatorLayer::getBearing(jni::JNIEnv& env) { } jni::Local> LocationIndicatorLayer::getBearingTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingTransition(); return std::move(*convert>>(env, options)); } @@ -113,14 +113,14 @@ void LocationIndicatorLayer::setBearingTransition(jni::JNIEnv&, jlong duration, if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setBearingTransition(options); } jni::Local> LocationIndicatorLayer::getLocation(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::LocationIndicatorLayer::getDefaultLocation())); @@ -129,12 +129,12 @@ jni::Local> LocationIndicatorLayer::getLocation(jni::JNIEnv& env) } jni::Local> LocationIndicatorLayer::getLocationTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getLocationTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getLocationTransition(); return std::move(*convert>>(env, options)); } @@ -143,14 +143,14 @@ void LocationIndicatorLayer::setLocationTransition(jni::JNIEnv&, jlong duration, if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setLocationTransition(options); } jni::Local> LocationIndicatorLayer::getAccuracyRadius(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -160,12 +160,12 @@ jni::Local> LocationIndicatorLayer::getAccuracyRadius(jni::JNIEnv& } jni::Local> LocationIndicatorLayer::getAccuracyRadiusTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusTransition(); return std::move(*convert>>(env, options)); } @@ -174,14 +174,14 @@ void LocationIndicatorLayer::setAccuracyRadiusTransition(jni::JNIEnv&, jlong dur if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setAccuracyRadiusTransition(options); } jni::Local> LocationIndicatorLayer::getTopImageSize(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -191,12 +191,12 @@ jni::Local> LocationIndicatorLayer::getTopImageSize(jni::JNIEnv& e } jni::Local> LocationIndicatorLayer::getTopImageSizeTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getTopImageSizeTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getTopImageSizeTransition(); return std::move(*convert>>(env, options)); } @@ -205,14 +205,14 @@ void LocationIndicatorLayer::setTopImageSizeTransition(jni::JNIEnv&, jlong durat if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setTopImageSizeTransition(options); } jni::Local> LocationIndicatorLayer::getBearingImageSize(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -222,12 +222,12 @@ jni::Local> LocationIndicatorLayer::getBearingImageSize(jni::JNIEn } jni::Local> LocationIndicatorLayer::getBearingImageSizeTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingImageSizeTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingImageSizeTransition(); return std::move(*convert>>(env, options)); } @@ -236,14 +236,14 @@ void LocationIndicatorLayer::setBearingImageSizeTransition(jni::JNIEnv&, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setBearingImageSizeTransition(options); } jni::Local> LocationIndicatorLayer::getShadowImageSize(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -253,12 +253,12 @@ jni::Local> LocationIndicatorLayer::getShadowImageSize(jni::JNIEnv } jni::Local> LocationIndicatorLayer::getShadowImageSizeTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getShadowImageSizeTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getShadowImageSizeTransition(); return std::move(*convert>>(env, options)); } @@ -267,14 +267,14 @@ void LocationIndicatorLayer::setShadowImageSizeTransition(jni::JNIEnv&, jlong du if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setShadowImageSizeTransition(options); } jni::Local> LocationIndicatorLayer::getAccuracyRadiusColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -285,12 +285,12 @@ jni::Local> LocationIndicatorLayer::getAccuracyRadiusColor(jni::JN } jni::Local> LocationIndicatorLayer::getAccuracyRadiusColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusColorTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusColorTransition(); return std::move(*convert>>(env, options)); } @@ -299,14 +299,14 @@ void LocationIndicatorLayer::setAccuracyRadiusColorTransition(jni::JNIEnv&, jlon if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setAccuracyRadiusColorTransition(options); } jni::Local> LocationIndicatorLayer::getAccuracyRadiusBorderColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>( @@ -318,12 +318,12 @@ jni::Local> LocationIndicatorLayer::getAccuracyRadiusBorderColor(j jni::Local> LocationIndicatorLayer::getAccuracyRadiusBorderColorTransition( jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusBorderColorTransition(); + mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusBorderColorTransition(); return std::move(*convert>>(env, options)); } @@ -332,9 +332,9 @@ void LocationIndicatorLayer::setAccuracyRadiusBorderColorTransition(jni::JNIEnv& if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toLocationIndicatorLayer(*layer).setAccuracyRadiusBorderColorTransition(options); } @@ -351,17 +351,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> LocationIndicatorJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new LocationIndicatorLayer(toLocationIndicatorLayer(layer))); } jni::Local> LocationIndicatorJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new LocationIndicatorLayer(std::unique_ptr( - static_cast(layer.release())))); + new LocationIndicatorLayer(std::unique_ptr( + static_cast(layer.release())))); } void LocationIndicatorJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -412,4 +412,4 @@ void LocationIndicatorJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.hpp index 4f3ae2dc7..27248492c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class LocationIndicatorLayer : public Layer { @@ -18,9 +18,9 @@ public: LocationIndicatorLayer(jni::JNIEnv&, jni::String&); - LocationIndicatorLayer(mbgl::style::LocationIndicatorLayer&); + LocationIndicatorLayer(mln::style::LocationIndicatorLayer&); - LocationIndicatorLayer(std::unique_ptr); + LocationIndicatorLayer(std::unique_ptr); ~LocationIndicatorLayer(); @@ -71,13 +71,13 @@ public: }; // class LocationIndicatorLayer class LocationIndicatorJavaLayerPeerFactory final : public JavaLayerPeerFactory, - public mbgl::LocationIndicatorLayerFactory { + public mln::LocationIndicatorLayerFactory { public: ~LocationIndicatorJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -86,4 +86,4 @@ public: }; // class LocationIndicatorJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.cpp index a489246bc..8eed88467 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::RasterLayer& toRasterLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::RasterLayer& toRasterLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ RasterLayer::RasterLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -RasterLayer::RasterLayer(mbgl::style::RasterLayer& coreLayer) +RasterLayer::RasterLayer(mln::style::RasterLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -RasterLayer::RasterLayer(std::unique_ptr coreLayer) +RasterLayer::RasterLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} RasterLayer::~RasterLayer() = default; @@ -40,7 +40,7 @@ RasterLayer::~RasterLayer() = default; // Property getters jni::Local> RasterLayer::getRasterOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterOpacity())); @@ -49,12 +49,12 @@ jni::Local> RasterLayer::getRasterOpacity(jni::JNIEnv& env) { } jni::Local> RasterLayer::getRasterOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterOpacityTransition(); + mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -63,14 +63,14 @@ void RasterLayer::setRasterOpacityTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toRasterLayer(*layer).setRasterOpacityTransition(options); } jni::Local> RasterLayer::getRasterHueRotate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterHueRotate())); @@ -79,12 +79,12 @@ jni::Local> RasterLayer::getRasterHueRotate(jni::JNIEnv& env) { } jni::Local> RasterLayer::getRasterHueRotateTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterHueRotateTransition(); + mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterHueRotateTransition(); return std::move(*convert>>(env, options)); } @@ -93,14 +93,14 @@ void RasterLayer::setRasterHueRotateTransition(jni::JNIEnv&, jlong duration, jlo if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toRasterLayer(*layer).setRasterHueRotateTransition(options); } jni::Local> RasterLayer::getRasterBrightnessMin(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterBrightnessMin())); @@ -109,12 +109,12 @@ jni::Local> RasterLayer::getRasterBrightnessMin(jni::JNIEnv& env) } jni::Local> RasterLayer::getRasterBrightnessMinTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMinTransition(); + mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMinTransition(); return std::move(*convert>>(env, options)); } @@ -123,14 +123,14 @@ void RasterLayer::setRasterBrightnessMinTransition(jni::JNIEnv&, jlong duration, if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toRasterLayer(*layer).setRasterBrightnessMinTransition(options); } jni::Local> RasterLayer::getRasterBrightnessMax(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterBrightnessMax())); @@ -139,12 +139,12 @@ jni::Local> RasterLayer::getRasterBrightnessMax(jni::JNIEnv& env) } jni::Local> RasterLayer::getRasterBrightnessMaxTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMaxTransition(); + mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMaxTransition(); return std::move(*convert>>(env, options)); } @@ -153,14 +153,14 @@ void RasterLayer::setRasterBrightnessMaxTransition(jni::JNIEnv&, jlong duration, if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toRasterLayer(*layer).setRasterBrightnessMaxTransition(options); } jni::Local> RasterLayer::getRasterSaturation(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterSaturation())); @@ -169,12 +169,12 @@ jni::Local> RasterLayer::getRasterSaturation(jni::JNIEnv& env) { } jni::Local> RasterLayer::getRasterSaturationTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterSaturationTransition(); + mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterSaturationTransition(); return std::move(*convert>>(env, options)); } @@ -183,14 +183,14 @@ void RasterLayer::setRasterSaturationTransition(jni::JNIEnv&, jlong duration, jl if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toRasterLayer(*layer).setRasterSaturationTransition(options); } jni::Local> RasterLayer::getRasterContrast(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterContrast())); @@ -199,12 +199,12 @@ jni::Local> RasterLayer::getRasterContrast(jni::JNIEnv& env) { } jni::Local> RasterLayer::getRasterContrastTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterContrastTransition(); + mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterContrastTransition(); return std::move(*convert>>(env, options)); } @@ -213,14 +213,14 @@ void RasterLayer::setRasterContrastTransition(jni::JNIEnv&, jlong duration, jlon if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toRasterLayer(*layer).setRasterContrastTransition(options); } jni::Local> RasterLayer::getRasterResampling(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterResampling())); @@ -229,7 +229,7 @@ jni::Local> RasterLayer::getRasterResampling(jni::JNIEnv& env) { } jni::Local> RasterLayer::getRasterFadeDuration(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::RasterLayer::getDefaultRasterFadeDuration())); @@ -250,17 +250,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new RasterLayer(toRasterLayer(layer))); } jni::Local> RasterJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new RasterLayer(std::unique_ptr( - static_cast(layer.release())))); + new RasterLayer(std::unique_ptr( + static_cast(layer.release())))); } void RasterJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -300,4 +300,4 @@ void RasterJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.hpp index 06d3c25cd..aab0d7343 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class RasterLayer : public Layer { @@ -18,9 +18,9 @@ public: RasterLayer(jni::JNIEnv&, jni::String&, jni::String&); - RasterLayer(mbgl::style::RasterLayer&); + RasterLayer(mln::style::RasterLayer&); - RasterLayer(std::unique_ptr); + RasterLayer(std::unique_ptr); ~RasterLayer(); @@ -56,13 +56,13 @@ public: }; // class RasterLayer -class RasterJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::RasterLayerFactory { +class RasterJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::RasterLayerFactory { public: ~RasterJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -71,4 +71,4 @@ public: }; // class RasterJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.cpp index fdb37191b..c5233fb49 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.cpp @@ -9,30 +9,30 @@ #include -namespace mbgl { +namespace mln { namespace android { -inline mbgl::style::SymbolLayer& toSymbolLayer(mbgl::style::Layer& layer) { - return static_cast(layer); +inline mln::style::SymbolLayer& toSymbolLayer(mln::style::Layer& layer) { + return static_cast(layer); } /** * Creates an owning peer object (for layers not attached to the map) from the JVM side */ SymbolLayer::SymbolLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId) - : Layer(std::make_unique(jni::Make(env, layerId), - jni::Make(env, sourceId))) {} + : Layer(std::make_unique(jni::Make(env, layerId), + jni::Make(env, sourceId))) {} /** * Creates a non-owning peer object (for layers currently attached to the map) */ -SymbolLayer::SymbolLayer(mbgl::style::SymbolLayer& coreLayer) +SymbolLayer::SymbolLayer(mln::style::SymbolLayer& coreLayer) : Layer(coreLayer) {} /** * Creates an owning peer object (for layers not attached to the map) */ -SymbolLayer::SymbolLayer(std::unique_ptr coreLayer) +SymbolLayer::SymbolLayer(std::unique_ptr coreLayer) : Layer(std::move(coreLayer)) {} SymbolLayer::~SymbolLayer() = default; @@ -40,7 +40,7 @@ SymbolLayer::~SymbolLayer() = default; // Property getters jni::Local> SymbolLayer::getSymbolPlacement(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultSymbolPlacement())); @@ -49,7 +49,7 @@ jni::Local> SymbolLayer::getSymbolPlacement(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getSymbolSpacing(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultSymbolSpacing())); @@ -58,7 +58,7 @@ jni::Local> SymbolLayer::getSymbolSpacing(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getSymbolAvoidEdges(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultSymbolAvoidEdges())); @@ -67,7 +67,7 @@ jni::Local> SymbolLayer::getSymbolAvoidEdges(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getSymbolSortKey(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultSymbolSortKey())); @@ -76,7 +76,7 @@ jni::Local> SymbolLayer::getSymbolSortKey(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getSymbolZOrder(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultSymbolZOrder())); @@ -85,7 +85,7 @@ jni::Local> SymbolLayer::getSymbolZOrder(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconAllowOverlap(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconAllowOverlap())); @@ -94,7 +94,7 @@ jni::Local> SymbolLayer::getIconAllowOverlap(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconIgnorePlacement(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconIgnorePlacement())); @@ -103,7 +103,7 @@ jni::Local> SymbolLayer::getIconIgnorePlacement(jni::JNIEnv& env) } jni::Local> SymbolLayer::getIconOptional(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconOptional())); @@ -112,7 +112,7 @@ jni::Local> SymbolLayer::getIconOptional(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconRotationAlignment(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -122,7 +122,7 @@ jni::Local> SymbolLayer::getIconRotationAlignment(jni::JNIEnv& env } jni::Local> SymbolLayer::getIconSize(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconSize())); @@ -131,7 +131,7 @@ jni::Local> SymbolLayer::getIconSize(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconTextFit(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconTextFit())); @@ -140,7 +140,7 @@ jni::Local> SymbolLayer::getIconTextFit(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconTextFitPadding(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconTextFitPadding())); @@ -149,7 +149,7 @@ jni::Local> SymbolLayer::getIconTextFitPadding(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconImage(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconImage())); @@ -158,7 +158,7 @@ jni::Local> SymbolLayer::getIconImage(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconRotate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconRotate())); @@ -167,7 +167,7 @@ jni::Local> SymbolLayer::getIconRotate(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconPadding(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconPadding())); @@ -176,7 +176,7 @@ jni::Local> SymbolLayer::getIconPadding(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconKeepUpright(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconKeepUpright())); @@ -185,7 +185,7 @@ jni::Local> SymbolLayer::getIconKeepUpright(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconOffset(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconOffset())); @@ -194,7 +194,7 @@ jni::Local> SymbolLayer::getIconOffset(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconAnchor())); @@ -203,7 +203,7 @@ jni::Local> SymbolLayer::getIconAnchor(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconPitchAlignment(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconPitchAlignment())); @@ -212,7 +212,7 @@ jni::Local> SymbolLayer::getIconPitchAlignment(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextPitchAlignment(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextPitchAlignment())); @@ -221,7 +221,7 @@ jni::Local> SymbolLayer::getTextPitchAlignment(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextRotationAlignment(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -231,7 +231,7 @@ jni::Local> SymbolLayer::getTextRotationAlignment(jni::JNIEnv& env } jni::Local> SymbolLayer::getTextField(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextField())); @@ -240,7 +240,7 @@ jni::Local> SymbolLayer::getTextField(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextFont(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextFont())); @@ -249,7 +249,7 @@ jni::Local> SymbolLayer::getTextFont(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextSize(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextSize())); @@ -258,7 +258,7 @@ jni::Local> SymbolLayer::getTextSize(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextMaxWidth(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextMaxWidth())); @@ -267,7 +267,7 @@ jni::Local> SymbolLayer::getTextMaxWidth(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextLineHeight(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextLineHeight())); @@ -276,7 +276,7 @@ jni::Local> SymbolLayer::getTextLineHeight(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextLetterSpacing(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextLetterSpacing())); @@ -285,7 +285,7 @@ jni::Local> SymbolLayer::getTextLetterSpacing(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextJustify(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextJustify())); @@ -294,7 +294,7 @@ jni::Local> SymbolLayer::getTextJustify(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextRadialOffset(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextRadialOffset())); @@ -303,7 +303,7 @@ jni::Local> SymbolLayer::getTextRadialOffset(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextVariableAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextVariableAnchor())); @@ -312,7 +312,7 @@ jni::Local> SymbolLayer::getTextVariableAnchor(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextVariableAnchorOffset(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move( @@ -322,7 +322,7 @@ jni::Local> SymbolLayer::getTextVariableAnchorOffset(jni::JNIEnv& } jni::Local> SymbolLayer::getTextAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextAnchor())); @@ -331,7 +331,7 @@ jni::Local> SymbolLayer::getTextAnchor(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextMaxAngle(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextMaxAngle())); @@ -340,7 +340,7 @@ jni::Local> SymbolLayer::getTextMaxAngle(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextWritingMode(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextWritingMode())); @@ -349,7 +349,7 @@ jni::Local> SymbolLayer::getTextWritingMode(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextRotate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextRotate())); @@ -358,7 +358,7 @@ jni::Local> SymbolLayer::getTextRotate(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextPadding(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextPadding())); @@ -367,7 +367,7 @@ jni::Local> SymbolLayer::getTextPadding(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextKeepUpright(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextKeepUpright())); @@ -376,7 +376,7 @@ jni::Local> SymbolLayer::getTextKeepUpright(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextTransform(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextTransform())); @@ -385,7 +385,7 @@ jni::Local> SymbolLayer::getTextTransform(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextOffset(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextOffset())); @@ -394,7 +394,7 @@ jni::Local> SymbolLayer::getTextOffset(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextAllowOverlap(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextAllowOverlap())); @@ -403,7 +403,7 @@ jni::Local> SymbolLayer::getTextAllowOverlap(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextIgnorePlacement(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextIgnorePlacement())); @@ -412,7 +412,7 @@ jni::Local> SymbolLayer::getTextIgnorePlacement(jni::JNIEnv& env) } jni::Local> SymbolLayer::getTextOptional(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextOptional())); @@ -421,7 +421,7 @@ jni::Local> SymbolLayer::getTextOptional(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getSymbolScreenSpace(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultSymbolScreenSpace())); @@ -430,7 +430,7 @@ jni::Local> SymbolLayer::getSymbolScreenSpace(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconOpacity())); @@ -439,12 +439,12 @@ jni::Local> SymbolLayer::getIconOpacity(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconOpacityTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -453,14 +453,14 @@ void SymbolLayer::setIconOpacityTransition(jni::JNIEnv&, jlong duration, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setIconOpacityTransition(options); } jni::Local> SymbolLayer::getIconColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconColor())); @@ -469,12 +469,12 @@ jni::Local> SymbolLayer::getIconColor(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconColorTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconColorTransition(); return std::move(*convert>>(env, options)); } @@ -483,14 +483,14 @@ void SymbolLayer::setIconColorTransition(jni::JNIEnv&, jlong duration, jlong del if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setIconColorTransition(options); } jni::Local> SymbolLayer::getIconHaloColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconHaloColor())); @@ -499,12 +499,12 @@ jni::Local> SymbolLayer::getIconHaloColor(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconHaloColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloColorTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloColorTransition(); return std::move(*convert>>(env, options)); } @@ -513,14 +513,14 @@ void SymbolLayer::setIconHaloColorTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setIconHaloColorTransition(options); } jni::Local> SymbolLayer::getIconHaloWidth(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconHaloWidth())); @@ -529,12 +529,12 @@ jni::Local> SymbolLayer::getIconHaloWidth(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconHaloWidthTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloWidthTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloWidthTransition(); return std::move(*convert>>(env, options)); } @@ -543,14 +543,14 @@ void SymbolLayer::setIconHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setIconHaloWidthTransition(options); } jni::Local> SymbolLayer::getIconHaloBlur(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconHaloBlur())); @@ -559,12 +559,12 @@ jni::Local> SymbolLayer::getIconHaloBlur(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconHaloBlurTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloBlurTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloBlurTransition(); return std::move(*convert>>(env, options)); } @@ -573,14 +573,14 @@ void SymbolLayer::setIconHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setIconHaloBlurTransition(options); } jni::Local> SymbolLayer::getIconTranslate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconTranslate())); @@ -589,12 +589,12 @@ jni::Local> SymbolLayer::getIconTranslate(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getIconTranslateTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconTranslateTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconTranslateTransition(); return std::move(*convert>>(env, options)); } @@ -603,14 +603,14 @@ void SymbolLayer::setIconTranslateTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setIconTranslateTransition(options); } jni::Local> SymbolLayer::getIconTranslateAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultIconTranslateAnchor())); @@ -619,7 +619,7 @@ jni::Local> SymbolLayer::getIconTranslateAnchor(jni::JNIEnv& env) } jni::Local> SymbolLayer::getTextOpacity(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextOpacity())); @@ -628,12 +628,12 @@ jni::Local> SymbolLayer::getTextOpacity(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextOpacityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextOpacityTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextOpacityTransition(); return std::move(*convert>>(env, options)); } @@ -642,14 +642,14 @@ void SymbolLayer::setTextOpacityTransition(jni::JNIEnv&, jlong duration, jlong d if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setTextOpacityTransition(options); } jni::Local> SymbolLayer::getTextColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextColor())); @@ -658,12 +658,12 @@ jni::Local> SymbolLayer::getTextColor(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextColorTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextColorTransition(); return std::move(*convert>>(env, options)); } @@ -672,14 +672,14 @@ void SymbolLayer::setTextColorTransition(jni::JNIEnv&, jlong duration, jlong del if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setTextColorTransition(options); } jni::Local> SymbolLayer::getTextHaloColor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextHaloColor())); @@ -688,12 +688,12 @@ jni::Local> SymbolLayer::getTextHaloColor(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextHaloColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloColorTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloColorTransition(); return std::move(*convert>>(env, options)); } @@ -702,14 +702,14 @@ void SymbolLayer::setTextHaloColorTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setTextHaloColorTransition(options); } jni::Local> SymbolLayer::getTextHaloWidth(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextHaloWidth())); @@ -718,12 +718,12 @@ jni::Local> SymbolLayer::getTextHaloWidth(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextHaloWidthTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloWidthTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloWidthTransition(); return std::move(*convert>>(env, options)); } @@ -732,14 +732,14 @@ void SymbolLayer::setTextHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setTextHaloWidthTransition(options); } jni::Local> SymbolLayer::getTextHaloBlur(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextHaloBlur())); @@ -748,12 +748,12 @@ jni::Local> SymbolLayer::getTextHaloBlur(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextHaloBlurTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloBlurTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloBlurTransition(); return std::move(*convert>>(env, options)); } @@ -762,14 +762,14 @@ void SymbolLayer::setTextHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setTextHaloBlurTransition(options); } jni::Local> SymbolLayer::getTextTranslate(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextTranslate())); @@ -778,12 +778,12 @@ jni::Local> SymbolLayer::getTextTranslate(jni::JNIEnv& env) { } jni::Local> SymbolLayer::getTextTranslateTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { - return std::move(*convert>>(env, mbgl::style::TransitionOptions())); + return std::move(*convert>>(env, mln::style::TransitionOptions())); } - mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextTranslateTransition(); + mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextTranslateTransition(); return std::move(*convert>>(env, options)); } @@ -792,14 +792,14 @@ void SymbolLayer::setTextTranslateTransition(jni::JNIEnv&, jlong duration, jlong if (!layer) { return; } - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); toSymbolLayer(*layer).setTextTranslateTransition(options); } jni::Local> SymbolLayer::getTextTranslateAnchor(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; + using namespace mln::android::conversion; auto layer = layerPtr.get(); if (!layer) { return std::move(*convert>>(env, style::SymbolLayer::getDefaultTextTranslateAnchor())); @@ -820,17 +820,17 @@ jni::Local> createJavaPeer(jni::JNIEnv& env, Layer* layer) { } // namespace jni::Local> SymbolJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, - mbgl::style::Layer& layer) { + mln::style::Layer& layer) { assert(layer.baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, new SymbolLayer(toSymbolLayer(layer))); } jni::Local> SymbolJavaLayerPeerFactory::createJavaLayerPeer( - jni::JNIEnv& env, std::unique_ptr layer) { + jni::JNIEnv& env, std::unique_ptr layer) { assert(layer->baseImpl->getTypeInfo() == getTypeInfo()); return createJavaPeer(env, - new SymbolLayer(std::unique_ptr( - static_cast(layer.release())))); + new SymbolLayer(std::unique_ptr( + static_cast(layer.release())))); } void SymbolJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { @@ -931,4 +931,4 @@ void SymbolJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.hpp index 3175f1389..51d2e07c4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class SymbolLayer : public Layer { @@ -18,9 +18,9 @@ public: SymbolLayer(jni::JNIEnv&, jni::String&, jni::String&); - SymbolLayer(mbgl::style::SymbolLayer&); + SymbolLayer(mln::style::SymbolLayer&); - SymbolLayer(std::unique_ptr); + SymbolLayer(std::unique_ptr); ~SymbolLayer(); @@ -166,13 +166,13 @@ public: }; // class SymbolLayer -class SymbolJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::SymbolLayerFactory { +class SymbolJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::SymbolLayerFactory { public: ~SymbolJavaLayerPeerFactory() override; // JavaLayerPeerFactory overrides. - jni::Local> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final; - jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final; + jni::Local> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr) final; void registerNative(jni::JNIEnv&) final; @@ -181,4 +181,4 @@ public: }; // class SymbolJavaLayerPeerFactory } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/light.cpp b/platform/android/MapLibreAndroid/src/cpp/style/light.cpp index e5f510432..42aa2aba4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/light.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/light.cpp @@ -3,18 +3,18 @@ #include "conversion/transition_options.hpp" #include "conversion/position.hpp" -namespace mbgl { +namespace mln { namespace android { -Light::Light(mbgl::Map& coreMap, mbgl::style::Light& coreLight) +Light::Light(mln::Map& coreMap, mln::style::Light& coreLight) : light(coreLight), map(&coreMap) {} -static Light* initializeLightPeer(mbgl::Map& map, mbgl::style::Light& coreLight) { +static Light* initializeLightPeer(mln::Map& map, mln::style::Light& coreLight) { return new Light(map, coreLight); } -jni::Local> Light::createJavaLightPeer(jni::JNIEnv& env, Map& map, mbgl::style::Light& coreLight) { +jni::Local> Light::createJavaLightPeer(jni::JNIEnv& env, Map& map, mln::style::Light& coreLight) { std::unique_ptr peerLight = std::unique_ptr(initializeLightPeer(map, coreLight)); auto result = peerLight->createJavaPeer(env); peerLight.release(); @@ -46,27 +46,27 @@ jni::Local Light::getAnchor(jni::JNIEnv& env) { } void Light::setPosition(jni::JNIEnv& env, const jni::Object& jposition) { - using namespace mbgl::android::conversion; - auto position = *convert(env, jposition); + using namespace mln::android::conversion; + auto position = *convert(env, jposition); light.setPosition(position); } jni::Local> Light::getPosition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::Position position = light.getPosition().asConstant(); + using namespace mln::android::conversion; + mln::style::Position position = light.getPosition().asConstant(); return std::move(*convert>>(env, position)); } jni::Local> Light::getPositionTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = light.getPositionTransition(); + using namespace mln::android::conversion; + mln::style::TransitionOptions options = light.getPositionTransition(); return std::move(*convert>>(env, options)); } void Light::setPositionTransition(jni::JNIEnv&, jlong duration, jlong delay) { - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); light.setPositionTransition(options); } @@ -83,15 +83,15 @@ jni::Local Light::getColor(jni::JNIEnv& env) { } jni::Local> Light::getColorTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = light.getColorTransition(); + using namespace mln::android::conversion; + mln::style::TransitionOptions options = light.getColorTransition(); return std::move(*convert>>(env, options)); } void Light::setColorTransition(jni::JNIEnv&, jlong duration, jlong delay) { - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); light.setColorTransition(options); } @@ -104,15 +104,15 @@ jni::jfloat Light::getIntensity(jni::JNIEnv&) { } jni::Local> Light::getIntensityTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = light.getIntensityTransition(); + using namespace mln::android::conversion; + mln::style::TransitionOptions options = light.getIntensityTransition(); return std::move(*convert>>(env, options)); } void Light::setIntensityTransition(jni::JNIEnv&, jlong duration, jlong delay) { - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); + mln::style::TransitionOptions options; + options.duration.emplace(mln::Milliseconds(duration)); + options.delay.emplace(mln::Milliseconds(delay)); light.setIntensityTransition(options); } @@ -142,4 +142,4 @@ void Light::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/light.hpp b/platform/android/MapLibreAndroid/src/cpp/style/light.hpp index f966fb64d..ee0ec8c34 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/light.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/light.hpp @@ -9,20 +9,20 @@ #include #include -namespace mbgl { +namespace mln { namespace android { using namespace style; -class Light : private mbgl::util::noncopyable { +class Light : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/style/light/Light"; }; static void registerNative(jni::JNIEnv&); - static jni::Local> createJavaLightPeer(jni::JNIEnv&, mbgl::Map&, mbgl::style::Light&); + static jni::Local> createJavaLightPeer(jni::JNIEnv&, mln::Map&, mln::style::Light&); - Light(mbgl::Map&, mbgl::style::Light&); + Light(mln::Map&, mln::style::Light&); void setAnchor(jni::JNIEnv&, const jni::String&); jni::Local getAnchor(jni::JNIEnv&); @@ -42,10 +42,10 @@ public: protected: // Raw reference to the light - mbgl::style::Light& light; + mln::style::Light& light; // Map is set when the light is retrieved - mbgl::Map* map; + mln::Map* map; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/position.cpp b/platform/android/MapLibreAndroid/src/cpp/style/position.cpp index 7f16f4743..9e79d516d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/position.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/position.cpp @@ -1,6 +1,6 @@ #include "position.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> Position::fromPosition(jni::JNIEnv& env, @@ -35,4 +35,4 @@ float Position::getPolarAngle(jni::JNIEnv& env, const jni::Object& pos } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/position.hpp b/platform/android/MapLibreAndroid/src/cpp/style/position.hpp index 2bd5e5db2..f2d7d33a9 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/position.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/position.hpp @@ -4,10 +4,10 @@ #include -namespace mbgl { +namespace mln { namespace android { -class Position : private mbgl::util::noncopyable { +class Position : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/style/light/Position"; }; @@ -21,4 +21,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.cpp index 1ce18877e..922c3c81a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.cpp @@ -15,7 +15,7 @@ #include -namespace mbgl { +namespace mln { namespace android { // This conversion is expected not to fail because it's used only in contexts @@ -26,7 +26,7 @@ static style::CustomGeometrySource::Options convertCustomGeometrySourceOptions(j const jni::Object<>& options, style::TileFunction fetchFn, style::TileFunction cancelFn) { - using namespace mbgl::style::conversion; + using namespace mln::style::conversion; if (!options) { return style::CustomGeometrySource::Options(); } @@ -43,7 +43,7 @@ static style::CustomGeometrySource::Options convertCustomGeometrySourceOptions(j CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& options) : Source(env, - std::make_unique( + std::make_unique( jni::Make(env, sourceId), convertCustomGeometrySourceOptions( env, @@ -52,7 +52,7 @@ CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env, const jni::String& std::bind(&CustomGeometrySource::cancelTile, this, std::placeholders::_1)))) {} CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env, - mbgl::style::Source& coreSource, + mln::style::Source& coreSource, AndroidRendererFrontend* frontend) : Source(env, coreSource, createJavaPeer(env), frontend) {} @@ -60,7 +60,7 @@ CustomGeometrySource::~CustomGeometrySource() { releaseThreads(); } -void CustomGeometrySource::fetchTile(const mbgl::CanonicalTileID& tileID) { +void CustomGeometrySource::fetchTile(const mln::CanonicalTileID& tileID) { android::UniqueEnv _env = android::AttachEnv(); static auto& javaClass = jni::Class::Singleton(*_env); @@ -78,7 +78,7 @@ void CustomGeometrySource::fetchTile(const mbgl::CanonicalTileID& tileID) { peer.Call(*_env, fetchTile, (int)tileID.z, (int)tileID.x, (int)tileID.y); }; -void CustomGeometrySource::cancelTile(const mbgl::CanonicalTileID& tileID) { +void CustomGeometrySource::cancelTile(const mln::CanonicalTileID& tileID) { android::UniqueEnv _env = android::AttachEnv(); static auto& javaClass = jni::Class::Singleton(*_env); @@ -136,33 +136,33 @@ bool CustomGeometrySource::isCancelled(jni::jint z, jni::jint x, jni::jint y) { void CustomGeometrySource::setTileData( jni::JNIEnv& env, jni::jint z, jni::jint x, jni::jint y, const jni::Object& jFeatures) { - using namespace mbgl::android::geojson; + using namespace mln::android::geojson; // Convert the jni object auto geometry = geojson::FeatureCollection::convert(env, jFeatures); // Update the core source if not cancelled if (!isCancelled(z, x, y)) { - source.as()->CustomGeometrySource::setTileData(CanonicalTileID(z, x, y), - GeoJSON(geometry)); + source.as()->CustomGeometrySource::setTileData(CanonicalTileID(z, x, y), + GeoJSON(geometry)); } } void CustomGeometrySource::invalidateTile(jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y) { - source.as()->CustomGeometrySource::invalidateTile(CanonicalTileID(z, x, y)); + source.as()->CustomGeometrySource::invalidateTile(CanonicalTileID(z, x, y)); } void CustomGeometrySource::invalidateBounds(jni::JNIEnv& env, const jni::Object& jBounds) { auto bounds = LatLngBounds::getLatLngBounds(env, jBounds); - source.as()->CustomGeometrySource::invalidateRegion(bounds); + source.as()->CustomGeometrySource::invalidateRegion(bounds); } jni::Local>> CustomGeometrySource::querySourceFeatures( jni::JNIEnv& env, const jni::Array>& jfilter) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; - std::vector features; + std::vector features; if (rendererFrontend) { features = rendererFrontend->querySourceFeatures(source.getID(), {{}, toFilter(env, jfilter)}); } @@ -177,13 +177,13 @@ jni::Local> CustomGeometrySource::createJavaPeer(jni::JNIEnv void CustomGeometrySource::addToMap(JNIEnv& env, const jni::Object& obj, - mbgl::Map& map, + mln::Map& map, AndroidRendererFrontend& frontend) { Source::addToMap(env, obj, map, frontend); startThreads(); } -bool CustomGeometrySource::removeFromMap(JNIEnv& env, const jni::Object& source, mbgl::Map& map) { +bool CustomGeometrySource::removeFromMap(JNIEnv& env, const jni::Object& source, mln::Map& map) { bool successfullyRemoved = Source::removeFromMap(env, source, map); if (successfullyRemoved) { releaseThreads(); @@ -212,4 +212,4 @@ void CustomGeometrySource::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.hpp index 7dc9f5486..a8ebf2f7a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.hpp @@ -10,7 +10,7 @@ #include "../../geometry/lat_lng_bounds.hpp" #include -namespace mbgl { +namespace mln { namespace android { class CustomGeometrySource : public Source { @@ -21,14 +21,14 @@ public: static void registerNative(jni::JNIEnv&); CustomGeometrySource(jni::JNIEnv&, const jni::String&, const jni::Object<>&); - CustomGeometrySource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*); + CustomGeometrySource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*); ~CustomGeometrySource(); - bool removeFromMap(JNIEnv&, const jni::Object&, mbgl::Map&) override; - void addToMap(JNIEnv&, const jni::Object&, mbgl::Map&, AndroidRendererFrontend&) override; + bool removeFromMap(JNIEnv&, const jni::Object&, mln::Map&) override; + void addToMap(JNIEnv&, const jni::Object&, mln::Map&, AndroidRendererFrontend&) override; - void fetchTile(const mbgl::CanonicalTileID& tileID); - void cancelTile(const mbgl::CanonicalTileID& tileID); + void fetchTile(const mln::CanonicalTileID& tileID); + void cancelTile(const mln::CanonicalTileID& tileID); bool isCancelled(jni::jint z, jni::jint x, jni::jint y); void startThreads(); void releaseThreads(); @@ -48,4 +48,4 @@ private: }; // class CustomGeometrySource } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.cpp index 8e1278b94..03e72caeb 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace android { CustomVectorSource::CustomVectorSource(jni::JNIEnv& env, @@ -13,9 +13,9 @@ CustomVectorSource::CustomVectorSource(jni::JNIEnv& env, jni::jint minZoom, jni::jint maxZoom) : Source(env, - std::make_unique( + std::make_unique( jni::Make(env, sourceId), - mbgl::style::CustomVectorSource::Options{ + mln::style::CustomVectorSource::Options{ std::bind(&CustomVectorSource::fetchTile, this, std::placeholders::_1), std::bind(&CustomVectorSource::cancelTile, this, std::placeholders::_1), {static_cast(minZoom), static_cast(maxZoom)}})) {} @@ -24,7 +24,7 @@ CustomVectorSource::~CustomVectorSource() { onRemovedFromMap(); } -void CustomVectorSource::fetchTile(const mbgl::CanonicalTileID& tileID) { +void CustomVectorSource::fetchTile(const mln::CanonicalTileID& tileID) { android::UniqueEnv _env = android::AttachEnv(); static auto& javaClass = jni::Class::Singleton(*_env); @@ -38,7 +38,7 @@ void CustomVectorSource::fetchTile(const mbgl::CanonicalTileID& tileID) { peer.Call(*_env, fetchTile, (int)tileID.z, (int)tileID.x, (int)tileID.y); } -void CustomVectorSource::cancelTile(const mbgl::CanonicalTileID& tileID) { +void CustomVectorSource::cancelTile(const mln::CanonicalTileID& tileID) { android::UniqueEnv _env = android::AttachEnv(); static auto& javaClass = jni::Class::Singleton(*_env); @@ -85,30 +85,30 @@ void CustomVectorSource::setTileData( jni::GetArrayRegion(env, *jData, 0, length, reinterpret_cast(&(*data)[0])); } - source.as()->setTileData( - CanonicalTileID(z, x, y), data, static_cast(format)); + source.as()->setTileData( + CanonicalTileID(z, x, y), data, static_cast(format)); } void CustomVectorSource::setTileError( jni::JNIEnv& env, jni::jint z, jni::jint x, jni::jint y, const jni::String& message) { auto msg = jni::Make(env, message); - source.as()->setTileError(CanonicalTileID(z, x, y), - std::make_exception_ptr(std::runtime_error(msg))); + source.as()->setTileError(CanonicalTileID(z, x, y), + std::make_exception_ptr(std::runtime_error(msg))); } void CustomVectorSource::invalidateTile(jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y) { - source.as()->invalidateTile(CanonicalTileID(z, x, y)); + source.as()->invalidateTile(CanonicalTileID(z, x, y)); } void CustomVectorSource::addToMap(JNIEnv& env, const jni::Object& obj, - mbgl::Map& map, + mln::Map& map, AndroidRendererFrontend& frontend) { Source::addToMap(env, obj, map, frontend); onAddedToMap(); } -bool CustomVectorSource::removeFromMap(JNIEnv& env, const jni::Object& source, mbgl::Map& map) { +bool CustomVectorSource::removeFromMap(JNIEnv& env, const jni::Object& source, mln::Map& map) { bool successfullyRemoved = Source::removeFromMap(env, source, map); if (successfullyRemoved) { onRemovedFromMap(); @@ -134,4 +134,4 @@ void CustomVectorSource::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.hpp index 3f911e687..b1873e05e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class CustomVectorSource : public Source { @@ -18,11 +18,11 @@ public: CustomVectorSource(jni::JNIEnv&, const jni::String&, jni::jint minZoom, jni::jint maxZoom); ~CustomVectorSource(); - bool removeFromMap(JNIEnv&, const jni::Object&, mbgl::Map&) override; - void addToMap(JNIEnv&, const jni::Object&, mbgl::Map&, AndroidRendererFrontend&) override; + bool removeFromMap(JNIEnv&, const jni::Object&, mln::Map&) override; + void addToMap(JNIEnv&, const jni::Object&, mln::Map&, AndroidRendererFrontend&) override; - void fetchTile(const mbgl::CanonicalTileID& tileID); - void cancelTile(const mbgl::CanonicalTileID& tileID); + void fetchTile(const mln::CanonicalTileID& tileID); + void cancelTile(const mln::CanonicalTileID& tileID); void onAddedToMap(); void onRemovedFromMap(); @@ -34,4 +34,4 @@ private: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp index 04a1231df..4fa91c67a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp @@ -25,19 +25,19 @@ // finish as well. Any updates scheduled during processing can be canceled. Conversion // from Java features to core ones is done on a worker thread and once finished, // the ownership of the converted features is returned to the calling thread. -namespace mbgl { +namespace mln { namespace android { // This conversion is expected not to fail because it's used only in contexts where // the value was originally a GeoJsonOptions object on the Java side. If it fails // to convert, it's a bug in our serialization or Java-side static typing. static Immutable convertGeoJSONOptions(jni::JNIEnv& env, const jni::Object<>& options) { - using namespace mbgl::style::conversion; + using namespace mln::style::conversion; if (!options) { return style::GeoJSONOptions::defaultOptions(); } Error error; - std::optional result = convert(mbgl::android::Value(env, options), + std::optional result = convert(mln::android::Value(env, options), error); if (!result) { throw std::logic_error(error.message); @@ -47,14 +47,14 @@ static Immutable convertGeoJSONOptions(jni::JNIEnv& env, GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& options) : Source(env, - std::make_unique(jni::Make(env, sourceId), - convertGeoJSONOptions(env, options))), + std::make_unique(jni::Make(env, sourceId), + convertGeoJSONOptions(env, options))), converter( std::make_unique>(source.as()->isUpdateSynchronous(), Scheduler::GetBackground(), source.as()->impl().getOptions())) {} -GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend) +GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend) : Source(env, coreSource, createJavaPeer(env), frontend), converter( std::make_unique>(source.as()->isUpdateSynchronous(), @@ -98,10 +98,10 @@ jni::Local GeoJSONSource::getURL(jni::JNIEnv& env) { jni::Local>> GeoJSONSource::querySourceFeatures( jni::JNIEnv& env, const jni::Array>& jfilter) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; - std::vector features; + std::vector features; if (rendererFrontend) { features = rendererFrontend->querySourceFeatures(source.getID(), {{}, toFilter(env, jfilter)}); } @@ -110,16 +110,16 @@ jni::Local>> GeoJSONSource::querySource jni::Local>> GeoJSONSource::getClusterChildren( jni::JNIEnv& env, const jni::Object& feature) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; if (rendererFrontend) { - mbgl::Feature _feature = Feature::convert(env, feature); + mln::Feature _feature = Feature::convert(env, feature); _feature.properties["cluster_id"] = static_cast(_feature.properties["cluster_id"].get()); const auto featureExtension = rendererFrontend->queryFeatureExtensions( source.getID(), _feature, "supercluster", "children", {}); - if (featureExtension.is()) { - return Feature::convert(env, featureExtension.get()); + if (featureExtension.is()) { + return Feature::convert(env, featureExtension.get()); } } return jni::Array>::New(env, 0); @@ -127,18 +127,18 @@ jni::Local>> GeoJSONSource::getClusterC jni::Local>> GeoJSONSource::getClusterLeaves( jni::JNIEnv& env, const jni::Object& feature, jni::jlong limit, jni::jlong offset) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; if (rendererFrontend) { - mbgl::Feature _feature = Feature::convert(env, feature); + mln::Feature _feature = Feature::convert(env, feature); _feature.properties["cluster_id"] = static_cast(_feature.properties["cluster_id"].get()); - const std::map options = {{"limit", static_cast(limit)}, - {"offset", static_cast(offset)}}; + const std::map options = {{"limit", static_cast(limit)}, + {"offset", static_cast(offset)}}; auto featureExtension = rendererFrontend->queryFeatureExtensions( source.getID(), _feature, "supercluster", "leaves", options); - if (featureExtension.is()) { - return Feature::convert(env, featureExtension.get()); + if (featureExtension.is()) { + return Feature::convert(env, featureExtension.get()); } } return jni::Array>::New(env, 0); @@ -146,16 +146,16 @@ jni::Local>> GeoJSONSource::getClusterL } jint GeoJSONSource::getClusterExpansionZoom(jni::JNIEnv& env, const jni::Object& feature) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; if (rendererFrontend) { - mbgl::Feature _feature = Feature::convert(env, feature); + mln::Feature _feature = Feature::convert(env, feature); _feature.properties["cluster_id"] = static_cast(_feature.properties["cluster_id"].get()); auto featureExtension = rendererFrontend->queryFeatureExtensions( source.getID(), _feature, "supercluster", "expansion-zoom", {}); - if (featureExtension.is()) { - auto value = featureExtension.get(); + if (featureExtension.is()) { + auto value = featureExtension.get(); if (value.is()) { return value.get(); } @@ -192,7 +192,7 @@ void GeoJSONSource::setAsync(Update::Converter converterFn) { android::UniqueEnv _env = android::AttachEnv(); // Update the core source - source.as()->setGeoJSONData(std::move(geoJSONData)); + source.as()->setGeoJSONData(std::move(geoJSONData)); // if there is an awaiting update, execute it, otherwise, release resources if (awaitingUpdate) { @@ -250,14 +250,14 @@ void GeoJSONSource::registerNative(jni::JNIEnv& env) { } void FeatureConverter::convertJson(std::shared_ptr json, ActorRef callback) { - using namespace mbgl::style::conversion; + using namespace mln::style::conversion; android::UniqueEnv _env = android::AttachEnv(); // Convert the jni object Error error; std::optional converted = parseGeoJSON(*json, error); if (!converted) { - mbgl::Log::Error(mbgl::Event::JNI, "Error setting geo json: " + error.message); + mln::Log::Error(mln::Event::JNI, "Error setting geo json: " + error.message); return; } @@ -269,7 +269,7 @@ template void FeatureConverter::convertObject( std::shared_ptr, jni::EnvAttachingDeleter>> jObject, ActorRef callback) { - using namespace mbgl::android::geojson; + using namespace mln::android::geojson; android::UniqueEnv _env = android::AttachEnv(); // Convert the jni object @@ -283,4 +283,4 @@ Update::Update(Converter _converterFn, std::unique_ptr -namespace mbgl { +namespace mln { namespace android { using GeoJSONDataCallback = std::function)>; @@ -47,7 +47,7 @@ public: static void registerNative(jni::JNIEnv&); GeoJSONSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&); - GeoJSONSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*); + GeoJSONSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*); ~GeoJSONSource(); private: @@ -91,4 +91,4 @@ private: }; // class GeoJSONSource } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.cpp index 8d278b318..2fdb76a49 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.cpp @@ -12,37 +12,37 @@ #include #include -namespace mbgl { +namespace mln { namespace android { ImageSource::ImageSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object& coordinatesObject) : Source(env, - std::make_unique(jni::Make(env, sourceId), - LatLngQuad::getLatLngArray(env, coordinatesObject))) {} + std::make_unique(jni::Make(env, sourceId), + LatLngQuad::getLatLngArray(env, coordinatesObject))) {} -ImageSource::ImageSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend) +ImageSource::ImageSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend) : Source(env, coreSource, createJavaPeer(env), frontend) {} ImageSource::~ImageSource() = default; void ImageSource::setURL(jni::JNIEnv& env, const jni::String& url) { // Update the core source - source.as()->ImageSource::setURL(jni::Make(env, url)); + source.as()->ImageSource::setURL(jni::Make(env, url)); } jni::Local ImageSource::getURL(jni::JNIEnv& env) { - std::optional url = source.as()->ImageSource::getURL(); + std::optional url = source.as()->ImageSource::getURL(); return url ? jni::Make(env, *url) : jni::Local(); } void ImageSource::setImage(jni::JNIEnv& env, const jni::Object& bitmap) { - source.as()->setImage(Bitmap::GetImage(env, bitmap)); + source.as()->setImage(Bitmap::GetImage(env, bitmap)); } void ImageSource::setCoordinates(jni::JNIEnv& env, const jni::Object& coordinatesObject) { - source.as()->setCoordinates(LatLngQuad::getLatLngArray(env, coordinatesObject)); + source.as()->setCoordinates(LatLngQuad::getLatLngArray(env, coordinatesObject)); } jni::Local> ImageSource::createJavaPeer(jni::JNIEnv& env) { @@ -71,4 +71,4 @@ void ImageSource::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.hpp index 4a75e722f..5c01cf0a4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class Bitmap; @@ -19,7 +19,7 @@ public: ImageSource(jni::JNIEnv&, const jni::String&, const jni::Object&); - ImageSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*); + ImageSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*); ~ImageSource(); @@ -36,4 +36,4 @@ private: }; // class ImageSource } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.cpp index 107c96a06..c772432db 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.cpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { namespace android { RasterDEMSource::RasterDEMSource(jni::JNIEnv& env, @@ -17,16 +17,16 @@ RasterDEMSource::RasterDEMSource(jni::JNIEnv& env, const jni::Object<>& urlOrTileSet, jni::jint tileSize) : Source(env, - std::make_unique( + std::make_unique( jni::Make(env, sourceId), convertURLOrTileset(Value(env, urlOrTileSet)), tileSize)) {} -RasterDEMSource::RasterDEMSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend) +RasterDEMSource::RasterDEMSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend) : Source(env, coreSource, createJavaPeer(env), frontend) {} RasterDEMSource::~RasterDEMSource() = default; jni::Local RasterDEMSource::getURL(jni::JNIEnv& env) { - std::optional url = source.as()->RasterDEMSource::getURL(); + std::optional url = source.as()->RasterDEMSource::getURL(); return url ? jni::Make(env, *url) : jni::Local(); } @@ -54,4 +54,4 @@ void RasterDEMSource::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.hpp index bc1d9b60f..ee916ea4f 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class RasterDEMSource : public Source { @@ -15,7 +15,7 @@ public: static void registerNative(jni::JNIEnv&); RasterDEMSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&, jni::jint); - RasterDEMSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*); + RasterDEMSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*); ~RasterDEMSource(); jni::Local getURL(jni::JNIEnv&); @@ -26,4 +26,4 @@ private: }; // class RasterDEMSource } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.cpp index d023fca6d..f5eb57f3a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.cpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace android { RasterSource::RasterSource(jni::JNIEnv& env, @@ -16,16 +16,16 @@ RasterSource::RasterSource(jni::JNIEnv& env, const jni::Object<>& urlOrTileSet, jni::jint tileSize) : Source(env, - std::make_unique( + std::make_unique( jni::Make(env, sourceId), convertURLOrTileset(Value(env, urlOrTileSet)), tileSize)) {} -RasterSource::RasterSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend) +RasterSource::RasterSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend) : Source(env, coreSource, createJavaPeer(env), frontend) {} RasterSource::~RasterSource() = default; jni::Local RasterSource::getURL(jni::JNIEnv& env) { - std::optional url = source.as()->RasterSource::getURL(); + std::optional url = source.as()->RasterSource::getURL(); return url ? jni::Make(env, *url) : jni::Local(); } @@ -53,4 +53,4 @@ void RasterSource::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.hpp index 22835e33e..e052e318a 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class RasterSource : public Source { @@ -15,7 +15,7 @@ public: static void registerNative(jni::JNIEnv&); RasterSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&, jni::jint); - RasterSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*); + RasterSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*); ~RasterSource(); jni::Local getURL(jni::JNIEnv&); @@ -26,4 +26,4 @@ private: }; // class RasterSource } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/source.cpp index e06ba80d1..42bfa50f8 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/source.cpp @@ -33,29 +33,29 @@ #include "custom_vector_source.hpp" #include "raster_dem_source.hpp" -namespace mbgl { +namespace mln { namespace android { static std::unique_ptr createSourcePeer(jni::JNIEnv& env, - mbgl::style::Source& coreSource, + mln::style::Source& coreSource, AndroidRendererFrontend* frontend) { - if (coreSource.is()) { - return std::make_unique(env, *coreSource.as(), frontend); - } else if (coreSource.is()) { - return std::make_unique(env, *coreSource.as(), frontend); - } else if (coreSource.is()) { - return std::make_unique(env, *coreSource.as(), frontend); - } else if (coreSource.is()) { - return std::make_unique(env, *coreSource.as(), frontend); + if (coreSource.is()) { + return std::make_unique(env, *coreSource.as(), frontend); + } else if (coreSource.is()) { + return std::make_unique(env, *coreSource.as(), frontend); + } else if (coreSource.is()) { + return std::make_unique(env, *coreSource.as(), frontend); + } else if (coreSource.is()) { + return std::make_unique(env, *coreSource.as(), frontend); } else { return std::make_unique(env, coreSource, frontend); } } const jni::Object& Source::peerForCoreSource(jni::JNIEnv& env, - mbgl::style::Source& coreSource, + mln::style::Source& coreSource, AndroidRendererFrontend& frontend, - mbgl::Map& map) { + mln::Map& map) { if (!coreSource.peer.has_value()) { coreSource.peer = createSourcePeer(env, coreSource, &frontend); } @@ -64,7 +64,7 @@ const jni::Object& Source::peerForCoreSource(jni::JNIEnv& env, return peer->javaPeer; } -const jni::Object& Source::peerForCoreSource(jni::JNIEnv& env, mbgl::style::Source& coreSource) { +const jni::Object& Source::peerForCoreSource(jni::JNIEnv& env, mln::style::Source& coreSource) { if (!coreSource.peer.has_value()) { coreSource.peer = createSourcePeer(env, coreSource, nullptr); } @@ -72,14 +72,14 @@ const jni::Object& Source::peerForCoreSource(jni::JNIEnv& env, mbgl::sty } Source::Source(jni::JNIEnv& env, - mbgl::style::Source& coreSource, + mln::style::Source& coreSource, const jni::Object& obj, AndroidRendererFrontend* frontend) : source(coreSource), javaPeer(jni::NewGlobal(env, obj)), rendererFrontend(frontend) {} -Source::Source(jni::JNIEnv&, std::unique_ptr coreSource) +Source::Source(jni::JNIEnv&, std::unique_ptr coreSource) : ownedSource(std::move(coreSource)), source(*ownedSource) {} @@ -147,7 +147,7 @@ jni::Local Source::getMaxOverscaleFactorForParentTiles(jni::JNIEnv return jni::Local(env, nullptr); } -void Source::addToStyle(JNIEnv& env, const jni::Object& obj, mbgl::style::Style& style) { +void Source::addToStyle(JNIEnv& env, const jni::Object& obj, mln::style::Style& style) { if (!ownedSource) { throw std::runtime_error("Cannot add source twice"); } @@ -162,7 +162,7 @@ void Source::addToStyle(JNIEnv& env, const jni::Object& obj, mbgl::style javaPeer = jni::NewGlobal(env, obj); } -void Source::addToMap(JNIEnv& env, const jni::Object& obj, mbgl::Map& map, AndroidRendererFrontend& frontend) { +void Source::addToMap(JNIEnv& env, const jni::Object& obj, mln::Map& map, AndroidRendererFrontend& frontend) { // Check to see if we own the source first if (!ownedSource) { throw std::runtime_error("Cannot add source twice"); @@ -180,7 +180,7 @@ void Source::addToMap(JNIEnv& env, const jni::Object& obj, mbgl::Map& ma bindToMap(frontend, map); } -bool Source::removeFromMap(JNIEnv&, const jni::Object&, mbgl::Map& map) { +bool Source::removeFromMap(JNIEnv&, const jni::Object&, mln::Map& map) { // Cannot remove if not attached yet if (ownedSource) { throw std::runtime_error("Cannot remove detached source"); @@ -265,7 +265,7 @@ jni::jboolean Source::removeFeatureState(JNIEnv& env, return jni::jni_true; } -void Source::bindToMap(AndroidRendererFrontend& frontend, mbgl::Map& map) { +void Source::bindToMap(AndroidRendererFrontend& frontend, mln::Map& map) { rendererFrontend = &frontend; this->map = ↦ } @@ -325,4 +325,4 @@ void Source::registerNative(jni::JNIEnv& env) { RasterDEMSource::registerNative(env); } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/source.hpp index ff8b627f4..2d9b31811 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/source.hpp @@ -10,37 +10,37 @@ #include -namespace mbgl { +namespace mln { namespace android { -class Source : private mbgl::util::noncopyable { +class Source : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/style/sources/Source"; }; static void registerNative(jni::JNIEnv&); - static const jni::Object& peerForCoreSource(jni::JNIEnv&, mbgl::style::Source&); + static const jni::Object& peerForCoreSource(jni::JNIEnv&, mln::style::Source&); static const jni::Object& peerForCoreSource(jni::JNIEnv&, - mbgl::style::Source&, + mln::style::Source&, AndroidRendererFrontend&, - mbgl::Map&); + mln::Map&); /* * Called when a Java object is created for a core source that belongs to a map. */ - Source(jni::JNIEnv&, mbgl::style::Source&, const jni::Object&, AndroidRendererFrontend*); + Source(jni::JNIEnv&, mln::style::Source&, const jni::Object&, AndroidRendererFrontend*); /* * Called when a Java object is created for a new core source that does not * belong to a map. */ - Source(jni::JNIEnv&, std::unique_ptr); + Source(jni::JNIEnv&, std::unique_ptr); virtual ~Source(); - virtual void addToMap(JNIEnv&, const jni::Object&, mbgl::Map&, AndroidRendererFrontend&); + virtual void addToMap(JNIEnv&, const jni::Object&, mln::Map&, AndroidRendererFrontend&); - virtual bool removeFromMap(JNIEnv&, const jni::Object&, mbgl::Map&); + virtual bool removeFromMap(JNIEnv&, const jni::Object&, mln::Map&); void releaseJavaPeer(); @@ -56,7 +56,7 @@ public: jni::Local getMaxOverscaleFactorForParentTiles(jni::JNIEnv&); - void addToStyle(JNIEnv& env, const jni::Object& obj, mbgl::style::Style& style); + void addToStyle(JNIEnv& env, const jni::Object& obj, mln::style::Style& style); jni::Local isVolatile(JNIEnv&); @@ -80,14 +80,14 @@ public: const jni::String& featureId, const jni::String& stateKey); - void bindToMap(AndroidRendererFrontend&, mbgl::Map&); + void bindToMap(AndroidRendererFrontend&, mln::Map&); protected: // Set on newly created sources until added to the map. - std::unique_ptr ownedSource; + std::unique_ptr ownedSource; // Raw pointer that is valid at all times. - mbgl::style::Source& source; + mln::style::Source& source; // Set when the source is added to a map. jni::Global> javaPeer; @@ -96,8 +96,8 @@ protected: AndroidRendererFrontend* rendererFrontend{nullptr}; // Map pointer is valid only when added to the map. - mbgl::Map* map{nullptr}; + mln::Map* map{nullptr}; }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.cpp index 925d6b9a5..6e01cee95 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.cpp @@ -3,16 +3,16 @@ namespace { // Dummy initializer (We don't support initializing this from the JVM) -std::unique_ptr init(jni::JNIEnv&) { +std::unique_ptr init(jni::JNIEnv&) { throw std::runtime_error("UnknownSource should not be initialized from the JVM"); } } // namespace -namespace mbgl { +namespace mln { namespace android { -UnknownSource::UnknownSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend) +UnknownSource::UnknownSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend) : Source(env, coreSource, createJavaPeer(env), frontend) {} jni::Local> UnknownSource::createJavaPeer(jni::JNIEnv& env) { @@ -32,4 +32,4 @@ void UnknownSource::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.hpp index ee47d087b..9c7a4a7a4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class UnknownSource : public Source { @@ -14,7 +14,7 @@ public: static void registerNative(jni::JNIEnv&); - UnknownSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*); + UnknownSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*); ~UnknownSource() = default; @@ -24,4 +24,4 @@ private: }; // class UnknownSource } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.cpp index 01e092f83..a17a60999 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.cpp @@ -17,30 +17,30 @@ #include #include -namespace mbgl { +namespace mln { namespace android { VectorSource::VectorSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& urlOrTileSet) : Source(env, - std::make_unique(jni::Make(env, sourceId), - convertURLOrTileset(Value(env, urlOrTileSet)))) {} + std::make_unique(jni::Make(env, sourceId), + convertURLOrTileset(Value(env, urlOrTileSet)))) {} -VectorSource::VectorSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend) +VectorSource::VectorSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend) : Source(env, coreSource, createJavaPeer(env), frontend) {} VectorSource::~VectorSource() = default; jni::Local VectorSource::getURL(jni::JNIEnv& env) { - std::optional url = source.as()->VectorSource::getURL(); + std::optional url = source.as()->VectorSource::getURL(); return url ? jni::Make(env, *url) : jni::Local(); } jni::Local>> VectorSource::querySourceFeatures( jni::JNIEnv& env, const jni::Array& jSourceLayerIds, const jni::Array>& jfilter) { - using namespace mbgl::android::conversion; - using namespace mbgl::android::geojson; + using namespace mln::android::conversion; + using namespace mln::android::geojson; - std::vector features; + std::vector features; if (rendererFrontend) { features = rendererFrontend->querySourceFeatures(source.getID(), {toVector(env, jSourceLayerIds), toFilter(env, jfilter)}); @@ -72,4 +72,4 @@ void VectorSource::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.hpp index 4ea8d9c39..251f5fc45 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.hpp @@ -5,7 +5,7 @@ #include "../../geojson/feature.hpp" #include -namespace mbgl { +namespace mln { namespace android { class VectorSource : public Source { @@ -16,7 +16,7 @@ public: static void registerNative(jni::JNIEnv&); VectorSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&); - VectorSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*); + VectorSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*); ~VectorSource(); private: @@ -31,4 +31,4 @@ private: }; // class VectorSource } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/transition_options.cpp b/platform/android/MapLibreAndroid/src/cpp/style/transition_options.cpp index bbfbf0913..246fe9dfd 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/transition_options.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/transition_options.cpp @@ -1,6 +1,6 @@ #include "transition_options.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> TransitionOptions::fromTransitionOptions( @@ -24,7 +24,7 @@ long TransitionOptions::getDelay(jni::JNIEnv& env, const jni::Object& transitionOptions) { + jni::JNIEnv& env, const jni::Object& transitionOptions) { static auto& javaClass = jni::Class::Singleton(env); static auto field = javaClass.GetField(env, "enablePlacementTransitions"); return transitionOptions.Get(env, field); @@ -35,4 +35,4 @@ void TransitionOptions::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/transition_options.hpp b/platform/android/MapLibreAndroid/src/cpp/style/transition_options.hpp index cc250962b..ff0ccee2f 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/transition_options.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/transition_options.hpp @@ -4,10 +4,10 @@ #include -namespace mbgl { +namespace mln { namespace android { -class TransitionOptions : private mbgl::util::noncopyable { +class TransitionOptions : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/style/layers/TransitionOptions"; }; @@ -26,4 +26,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/value.cpp b/platform/android/MapLibreAndroid/src/cpp/style/value.cpp index ab1a368cd..9f97ff29c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/value.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/value.cpp @@ -2,7 +2,7 @@ #include "../java_types.hpp" -namespace mbgl { +namespace mln { namespace android { // Instance @@ -80,4 +80,4 @@ Value Value::get(const int index) const { return Value(env, jni::Local>(env, jni::GetObjectArrayElement(env, *array, index))); } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/style/value.hpp b/platform/android/MapLibreAndroid/src/cpp/style/value.hpp index 5df4f10b6..14d1f11ca 100644 --- a/platform/android/MapLibreAndroid/src/cpp/style/value.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/style/value.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { class Value { @@ -40,4 +40,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp index e529b5dc0..b23b95d7e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp @@ -23,14 +23,14 @@ * JS tries to extract multiple weights, this implementation only looks for "bold" - mbgl::LocalGlyphRasterizer is the portable interface - mbgl::LocalGlyphRasterizer::Impl stores platform-specific configuration data - mbgl::android::LocalGlyphRasterizer is the JNI wrapper + mln::LocalGlyphRasterizer is the portable interface + mln::LocalGlyphRasterizer::Impl stores platform-specific configuration data + mln::android::LocalGlyphRasterizer is the JNI wrapper com.mapbox.mapboxsdk.text.LocalGlyphRasterizer is the Java implementation that actually does the drawing */ -namespace mbgl { +namespace mln { namespace android { LocalGlyphRasterizer::LocalGlyphRasterizer() { @@ -145,4 +145,4 @@ Glyph LocalGlyphRasterizer::rasterizeGlyph(const FontStack& fontStack, GlyphID g return fixedMetrics; } -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp index 4aa9375df..98ecf81c5 100644 --- a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp @@ -10,11 +10,11 @@ android::LocalGlyphRasterizer is the JNI wrapper of org/maplibre/android/text/LocalGlyphRasterizer - mbgl::LocalGlyphRasterizer is the portable interface + mln::LocalGlyphRasterizer is the portable interface Both implementations are in local_glyph_rasterizer.cpp */ -namespace mbgl { +namespace mln { namespace android { class LocalGlyphRasterizer { @@ -33,4 +33,4 @@ private: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.cpp b/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.cpp index 728c6a371..e1090b41b 100644 --- a/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.cpp @@ -1,28 +1,28 @@ #include "tile_operation.hpp" -namespace mbgl { +namespace mln { namespace android { -jni::Local> TileOperation::Create(jni::JNIEnv& env, mbgl::TileOperation op) { - static auto& _class = jni::Class::Singleton(env); +jni::Local> TileOperation::Create(jni::JNIEnv& env, mln::TileOperation op) { + static auto& _class = jni::Class::Singleton(env); switch (op) { - case mbgl::TileOperation::RequestedFromNetwork: + case mln::TileOperation::RequestedFromNetwork: return _class.Get(env, _class.GetStaticField>(env, "RequestedFromNetwork")); - case mbgl::TileOperation::RequestedFromCache: + case mln::TileOperation::RequestedFromCache: return _class.Get(env, _class.GetStaticField>(env, "RequestedFromCache")); - case mbgl::TileOperation::LoadFromCache: + case mln::TileOperation::LoadFromCache: return _class.Get(env, _class.GetStaticField>(env, "LoadFromCache")); - case mbgl::TileOperation::LoadFromNetwork: + case mln::TileOperation::LoadFromNetwork: return _class.Get(env, _class.GetStaticField>(env, "LoadFromNetwork")); - case mbgl::TileOperation::StartParse: + case mln::TileOperation::StartParse: return _class.Get(env, _class.GetStaticField>(env, "StartParse")); - case mbgl::TileOperation::EndParse: + case mln::TileOperation::EndParse: return _class.Get(env, _class.GetStaticField>(env, "EndParse")); - case mbgl::TileOperation::Error: + case mln::TileOperation::Error: return _class.Get(env, _class.GetStaticField>(env, "Error")); - case mbgl::TileOperation::Cancelled: + case mln::TileOperation::Cancelled: return _class.Get(env, _class.GetStaticField>(env, "Cancelled")); - case mbgl::TileOperation::NullOp: + case mln::TileOperation::NullOp: return _class.Get(env, _class.GetStaticField>(env, "NullOp")); } } @@ -32,4 +32,4 @@ void TileOperation::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.hpp b/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.hpp index f82de4ac1..3a3826a1c 100644 --- a/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/tile/tile_operation.hpp @@ -4,17 +4,17 @@ #include -namespace mbgl { +namespace mln { namespace android { class TileOperation { public: static constexpr auto Name() { return "org/maplibre/android/tile/TileOperation"; }; - static jni::Local> Create(jni::JNIEnv&, mbgl::TileOperation); + static jni::Local> Create(jni::JNIEnv&, mln::TileOperation); static void registerNative(jni::JNIEnv& env); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/util/default_style.cpp b/platform/android/MapLibreAndroid/src/cpp/util/default_style.cpp index 717f049dd..fc3319468 100644 --- a/platform/android/MapLibreAndroid/src/cpp/util/default_style.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/util/default_style.cpp @@ -1,10 +1,10 @@ #include "default_style.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> DefaultStyle::New(jni::JNIEnv& env, - const mbgl::util::DefaultStyle& jDefaultStyle) { + const mln::util::DefaultStyle& jDefaultStyle) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor(env); return javaClass.New(env, @@ -14,9 +14,9 @@ jni::Local> DefaultStyle::New(jni::JNIEnv& env, jDefaultStyle.getCurrentVersion()); } -mbgl::util::DefaultStyle DefaultStyle::getDefaultStyle(jni::JNIEnv& env, const jni::Object& options) { +mln::util::DefaultStyle DefaultStyle::getDefaultStyle(jni::JNIEnv& env, const jni::Object& options) { static auto& javaClass = jni::Class::Singleton(env); - return mbgl::util::DefaultStyle( + return mln::util::DefaultStyle( jni::Make(env, options.Get(env, javaClass.GetField(env, "url"))), jni::Make(env, options.Get(env, javaClass.GetField(env, "name"))), options.Get(env, javaClass.GetField(env, "version"))); @@ -27,4 +27,4 @@ void DefaultStyle::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/util/default_style.hpp b/platform/android/MapLibreAndroid/src/cpp/util/default_style.hpp index 9ef3bfa46..f59a4e352 100644 --- a/platform/android/MapLibreAndroid/src/cpp/util/default_style.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/util/default_style.hpp @@ -5,18 +5,18 @@ #include -namespace mbgl { +namespace mln { namespace android { -class DefaultStyle : private mbgl::util::noncopyable { +class DefaultStyle : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/util/DefaultStyle"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::util::DefaultStyle&); - static mbgl::util::DefaultStyle getDefaultStyle(jni::JNIEnv&, const jni::Object&); + static jni::Local> New(jni::JNIEnv&, const mln::util::DefaultStyle&); + static mln::util::DefaultStyle getDefaultStyle(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.cpp b/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.cpp index 08b42cff3..054fcc99d 100644 --- a/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.cpp @@ -1,10 +1,10 @@ #include "tile_server_options.hpp" -namespace mbgl { +namespace mln { namespace android { jni::Local> TileServerOptions::New(jni::JNIEnv& env, - const mbgl::TileServerOptions& tileServerOptions) { + const mln::TileServerOptions& tileServerOptions) { static auto& javaClass = jni::Class::Singleton(env); static auto constructor = javaClass.GetConstructor> TileServerOptions::New(jni::JNIEnv& e } jni::Local>> TileServerOptions::NewStyles( - jni::JNIEnv& env, const std::vector& nativeStyles) { + jni::JNIEnv& env, const std::vector& nativeStyles) { auto retVal = jni::Array>::New(env, nativeStyles.size()); for (auto it = begin(nativeStyles); it != end(nativeStyles); ++it) { auto converted = DefaultStyle::New(env, *it); @@ -73,31 +73,31 @@ jni::Local>> TileServerOptions::NewStyles( jni::Local> TileServerOptions::DefaultConfiguration( jni::JNIEnv& env, const jni::Class& jOptions) { - auto options = mbgl::TileServerOptions::DefaultConfiguration(); + auto options = mln::TileServerOptions::DefaultConfiguration(); return TileServerOptions::New(env, options); } jni::Local> TileServerOptions::MapboxConfiguration( jni::JNIEnv& env, const jni::Class& jOptions) { - auto options = mbgl::TileServerOptions::MapboxConfiguration(); + auto options = mln::TileServerOptions::MapboxConfiguration(); return TileServerOptions::New(env, options); } jni::Local> TileServerOptions::MapTilerConfiguration( jni::JNIEnv& env, const jni::Class& jOptions) { - auto options = mbgl::TileServerOptions::MapTilerConfiguration(); + auto options = mln::TileServerOptions::MapTilerConfiguration(); return TileServerOptions::New(env, options); } jni::Local> TileServerOptions::MapLibreConfiguration( jni::JNIEnv& env, const jni::Class& jOptions) { - auto options = mbgl::TileServerOptions::MapLibreConfiguration(); + auto options = mln::TileServerOptions::MapLibreConfiguration(); return TileServerOptions::New(env, options); } -mbgl::TileServerOptions TileServerOptions::getTileServerOptions(jni::JNIEnv& env, - const jni::Object& options) { - auto opts = mbgl::TileServerOptions(); +mln::TileServerOptions TileServerOptions::getTileServerOptions(jni::JNIEnv& env, + const jni::Object& options) { + auto opts = mln::TileServerOptions(); static auto& javaClass = jni::Class::Singleton(env); static auto baseURLField = javaClass.GetField(env, "baseURL"); @@ -130,10 +130,10 @@ mbgl::TileServerOptions TileServerOptions::getTileServerOptions(jni::JNIEnv& env static auto defaultStyleField = javaClass.GetField(env, "defaultStyle"); static auto defaultStylesField = javaClass.GetField>>(env, "defaultStyles"); - std::vector defaultStyles = TileServerOptions::getDefaultStyles( + std::vector defaultStyles = TileServerOptions::getDefaultStyles( env, options.Get(env, defaultStylesField)); - auto retVal = mbgl::TileServerOptions() + auto retVal = mln::TileServerOptions() .withBaseURL(jni::Make(env, options.Get(env, baseURLField))) .withUriSchemeAlias(jni::Make(env, options.Get(env, uriSchemeAliasField))) .withApiKeyParameterName(jni::Make(env, options.Get(env, apiKeyParameterNameField))) @@ -175,13 +175,13 @@ mbgl::TileServerOptions TileServerOptions::getTileServerOptions(jni::JNIEnv& env return retVal; } -std::vector TileServerOptions::getDefaultStyles( +std::vector TileServerOptions::getDefaultStyles( jni::JNIEnv& env, const jni::Array>& styles_) { std::size_t length = styles_.Length(env); - std::vector convertedStyles; + std::vector convertedStyles; // convertedStyles.reserve(length); for (std::size_t i = 0; i < length; i++) { - mbgl::util::DefaultStyle converted = DefaultStyle::getDefaultStyle(env, styles_.Get(env, i)); + mln::util::DefaultStyle converted = DefaultStyle::getDefaultStyle(env, styles_.Get(env, i)); convertedStyles.push_back(converted); } @@ -203,4 +203,4 @@ void TileServerOptions::registerNative(jni::JNIEnv& env) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.hpp b/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.hpp index 68b420c2d..79f84e3f4 100644 --- a/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.hpp @@ -8,14 +8,14 @@ #include "default_style.hpp" -namespace mbgl { +namespace mln { namespace android { -class TileServerOptions : private mbgl::util::noncopyable { +class TileServerOptions : private mln::util::noncopyable { public: static constexpr auto Name() { return "org/maplibre/android/util/TileServerOptions"; }; - static jni::Local> New(jni::JNIEnv&, const mbgl::TileServerOptions&); + static jni::Local> New(jni::JNIEnv&, const mln::TileServerOptions&); static jni::Local> DefaultConfiguration(jni::JNIEnv&, const jni::Class&); @@ -26,15 +26,15 @@ public: static jni::Local> MapLibreConfiguration(jni::JNIEnv&, const jni::Class&); - static mbgl::TileServerOptions getTileServerOptions(jni::JNIEnv&, const jni::Object&); + static mln::TileServerOptions getTileServerOptions(jni::JNIEnv&, const jni::Object&); static void registerNative(jni::JNIEnv&); static jni::Local>> NewStyles(jni::JNIEnv& env, - const std::vector&); - static std::vector getDefaultStyles(jni::JNIEnv& env, - const jni::Array>& styles_); + const std::vector&); + static std::vector getDefaultStyles(jni::JNIEnv& env, + const jni::Array>& styles_); }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java index 10173ca64..6b80ed807 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java @@ -169,7 +169,7 @@ public class MapLibreConstants { public static final double MINIMUM_DIRECTION = 0; /** - * The current default vertical field of view (matches mbgl::util::DEFAULT_FOV) + * The current default vertical field of view (matches mln::util::DEFAULT_FOV) */ public static final double DEFAULT_FOV = 36.86989764584402; diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/NativeHttpRequest.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/NativeHttpRequest.java index fdb31ba29..4f2d52d14 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/NativeHttpRequest.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/NativeHttpRequest.java @@ -38,7 +38,7 @@ public class NativeHttpRequest implements HttpResponder { // to cancel at the same time the request is getting // answered on the OkHTTP thread. We could get rid of // this lock by using Runnable when we move Android - // implementation of mbgl::RunLoop to Looper. + // implementation of mln::RunLoop to Looper. lock.lock(); nativePtr = 0; lock.unlock(); diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java index 283428d90..81a8d913e 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java @@ -1381,10 +1381,10 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { /** * Called before a shader is compiled. * - * @param id of a shader type enumeration. See `mbgl::shaders::BuiltIn` for a list + * @param id of a shader type enumeration. See `mln::shaders::BuiltIn` for a list * of possible values. * @param type of graphics backend the shader is being compiled for. See - * `mbgl::gfx::Backend::Type` for a list of possible values. + * `mln::gfx::Backend::Type` for a list of possible values. * @param additionalDefines that specify the permutaion of the shader. */ void onPreCompileShader(int id, int type, String additionalDefines); @@ -1400,10 +1400,10 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { /** * Called after a shader is compiled. * - * @param id of a shader type enumeration. See `mbgl::shaders::BuiltIn` for a list + * @param id of a shader type enumeration. See `mln::shaders::BuiltIn` for a list * of possible values. * @param type of graphics backend the shader is being compiled for. See - * `mbgl::gfx::Backend::Type` for a list of possible values. + * `mln::gfx::Backend::Type` for a list of possible values. * @param additionalDefines that specify the permutation of the shader. */ void onPostCompileShader(int id, int type, String additionalDefines); @@ -1419,10 +1419,10 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { /** * Called when a shader fails to compile. * - * @param id of a shader type enumeration. See `mbgl::shaders::BuiltIn` for a list + * @param id of a shader type enumeration. See `mln::shaders::BuiltIn` for a list * of possible values. * @param type of graphics backend the shader is being compiled for. See - * `mbgl::gfx::Backend::Type` for a list of possible values. + * `mln::gfx::Backend::Type` for a list of possible values. * @param additionalDefines that specify the permutation of the shader. */ void onShaderCompileFailed(int id, int type, String additionalDefines); diff --git a/platform/android/src/async_task.cpp b/platform/android/src/async_task.cpp index cef046bd9..12de2ee6c 100644 --- a/platform/android/src/async_task.cpp +++ b/platform/android/src/async_task.cpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class AsyncTask::Impl : public RunLoop::Impl::Runnable { @@ -59,4 +59,4 @@ void AsyncTask::send() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/attach_env.cpp b/platform/android/src/attach_env.cpp index f07f5afc3..8a7b73751 100644 --- a/platform/android/src/attach_env.cpp +++ b/platform/android/src/attach_env.cpp @@ -1,7 +1,7 @@ #include "attach_env.hpp" #include "jni.hpp" -namespace mbgl { +namespace mln { namespace android { UniqueEnv AttachEnv() { @@ -19,4 +19,4 @@ UniqueEnv AttachEnv() { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/attach_env.hpp b/platform/android/src/attach_env.hpp index 03c03dd5c..deca3476e 100644 --- a/platform/android/src/attach_env.hpp +++ b/platform/android/src/attach_env.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace android { class JNIEnvDeleter { @@ -29,4 +29,4 @@ using UniqueEnv = std::unique_ptr; UniqueEnv AttachEnv(); } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/bitmap.cpp b/platform/android/src/bitmap.cpp index af61d5cae..7e7d55910 100644 --- a/platform/android/src/bitmap.cpp +++ b/platform/android/src/bitmap.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace android { class PixelGuard { @@ -20,7 +20,7 @@ public: ~PixelGuard() { const int result = AndroidBitmap_unlockPixels(&env, jni::Unwrap(*bitmap)); if (result != ANDROID_BITMAP_RESULT_SUCCESS) { - Log::Warning(mbgl::Event::General, "Bitmap decoding: could not unlock pixels"); + Log::Warning(mln::Event::General, "Bitmap decoding: could not unlock pixels"); } } @@ -121,4 +121,4 @@ jni::Local> Bitmap::Copy(jni::JNIEnv& env, const jni::Object } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/bitmap.hpp b/platform/android/src/bitmap.hpp index 21d85287b..ef56f256f 100644 --- a/platform/android/src/bitmap.hpp +++ b/platform/android/src/bitmap.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace android { class Bitmap { @@ -44,4 +44,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/bitmap_factory.cpp b/platform/android/src/bitmap_factory.cpp index 04a90453a..dd8ac8ebf 100644 --- a/platform/android/src/bitmap_factory.cpp +++ b/platform/android/src/bitmap_factory.cpp @@ -1,6 +1,6 @@ #include "bitmap_factory.hpp" -namespace mbgl { +namespace mln { namespace android { void BitmapFactory::registerNative(jni::JNIEnv& env) { @@ -23,4 +23,4 @@ jni::Local> BitmapFactory::DecodeByteArray(jni::JNIEnv& env, } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/bitmap_factory.hpp b/platform/android/src/bitmap_factory.hpp index 005c28be6..de6e3e2f3 100644 --- a/platform/android/src/bitmap_factory.hpp +++ b/platform/android/src/bitmap_factory.hpp @@ -4,7 +4,7 @@ #include "bitmap.hpp" -namespace mbgl { +namespace mln { namespace android { class BitmapFactory { @@ -19,4 +19,4 @@ public: }; } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp index c00f2a2d1..ff3e13e42 100644 --- a/platform/android/src/example_custom_layer.cpp +++ b/platform/android/src/example_custom_layer.cpp @@ -127,11 +127,11 @@ static const GLchar *fragmentShaderSource = "#version 300 es\nuniform highp vec4 fill_color; out highp vec4 fragColor; " "void main() { fragColor = fill_color; }"; -class ExampleCustomLayer : mbgl::style::CustomLayerHost { +class ExampleCustomLayer : mln::style::CustomLayerHost { public: ~ExampleCustomLayer() {} - void initialize(const mbgl::style::CustomLayerInitParameters &) override { + void initialize(const mln::style::CustomLayerInitParameters &) override { __android_log_write(ANDROID_LOG_INFO, LOG_TAG, "Initialize"); // Debug info @@ -163,7 +163,7 @@ public: GL_CHECK_ERROR(glBufferData(GL_ARRAY_BUFFER, 8 * sizeof(GLfloat), background, GL_STATIC_DRAW)); } - void render(const mbgl::style::CustomLayerRenderParameters &) override { + void render(const mln::style::CustomLayerRenderParameters &) override { __android_log_write(ANDROID_LOG_INFO, LOG_TAG, "Render"); glUseProgram(program); glBindBuffer(GL_ARRAY_BUFFER, buffer); diff --git a/platform/android/src/example_vulkan_custom_layer.cpp b/platform/android/src/example_vulkan_custom_layer.cpp index 86f44c7bb..8d58d2b56 100644 --- a/platform/android/src/example_vulkan_custom_layer.cpp +++ b/platform/android/src/example_vulkan_custom_layer.cpp @@ -188,12 +188,12 @@ static const unsigned char kFragSpirv[] = { // --------------------------------------------------------------------------- -class ExampleVulkanCustomLayer : public mbgl::style::CustomLayerHost { +class ExampleVulkanCustomLayer : public mln::style::CustomLayerHost { public: ~ExampleVulkanCustomLayer() = default; - void initialize(const mbgl::style::CustomLayerInitParameters &baseParams) override { - const auto ¶ms = static_cast(baseParams); + void initialize(const mln::style::CustomLayerInitParameters &baseParams) override { + const auto ¶ms = static_cast(baseParams); __android_log_print(ANDROID_LOG_INFO, VK_LOG_TAG, @@ -208,8 +208,8 @@ public: createPipelineLayout(vulkanDevice, *vulkanDispatcher); } - void render(const mbgl::style::CustomLayerRenderParameters &baseParams) override { - const auto ¶ms = static_cast(baseParams); + void render(const mln::style::CustomLayerRenderParameters &baseParams) override { + const auto ¶ms = static_cast(baseParams); const auto &dispatcher = params.dispatcher; const auto &cmd = params.commandBuffer; diff --git a/platform/android/src/gl_functions.cpp b/platform/android/src/gl_functions.cpp index 094eb196b..6b9f0a2c4 100644 --- a/platform/android/src/gl_functions.cpp +++ b/platform/android/src/gl_functions.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { /* OpenGL ES 2.0 */ @@ -277,4 +277,4 @@ void (*const glTexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei) void (*const glGetInternalformativ)(GLenum, GLenum, GLenum, GLsizei, GLint*) = ::glGetInternalformativ; } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/image.cpp b/platform/android/src/image.cpp index 0c756155d..9f5f474b6 100644 --- a/platform/android/src/image.cpp +++ b/platform/android/src/image.cpp @@ -6,7 +6,7 @@ #include "attach_env.hpp" #include "bitmap_factory.hpp" -namespace mbgl { +namespace mln { PremultipliedImage decodeImage(const std::string& string) { auto env{android::AttachEnv()}; @@ -17,4 +17,4 @@ PremultipliedImage decodeImage(const std::string& string) { return android::Bitmap::GetImage(*env, android::BitmapFactory::DecodeByteArray(*env, array, 0, string.size())); } -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index 9c5a71990..078c8dc4d 100644 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace android { JavaVM* theJVM; @@ -20,12 +20,12 @@ bool attach_jni_thread(JavaVM* vm, JNIEnv** env, std::string threadName) { ret = vm->GetEnv(reinterpret_cast(env), JNI_VERSION_1_6); if (ret != JNI_OK) { if (ret != JNI_EDETACHED) { - mbgl::Log::Error(mbgl::Event::JNI, "GetEnv() failed with " + std::to_string(ret)); + mln::Log::Error(mln::Event::JNI, "GetEnv() failed with " + std::to_string(ret)); throw std::runtime_error("GetEnv() failed"); } else { ret = vm->AttachCurrentThread(env, &args); if (ret != JNI_OK) { - mbgl::Log::Error(mbgl::Event::JNI, "AttachCurrentThread() failed with " + std::to_string(ret)); + mln::Log::Error(mln::Event::JNI, "AttachCurrentThread() failed with " + std::to_string(ret)); throw std::runtime_error("AttachCurrentThread() failed"); } detach = true; @@ -43,7 +43,7 @@ void detach_jni_thread(JavaVM* vm, JNIEnv** env, bool detach) { jint ret; if ((ret = vm->DetachCurrentThread()) != JNI_OK) { - mbgl::Log::Error(mbgl::Event::JNI, "DetachCurrentThread() failed with " + std::to_string(ret)); + mln::Log::Error(mln::Event::JNI, "DetachCurrentThread() failed with " + std::to_string(ret)); throw std::runtime_error("DetachCurrentThread() failed"); } } @@ -51,4 +51,4 @@ void detach_jni_thread(JavaVM* vm, JNIEnv** env, bool detach) { } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/jni.hpp b/platform/android/src/jni.hpp index 9bfe2ce5b..b8c2227d6 100644 --- a/platform/android/src/jni.hpp +++ b/platform/android/src/jni.hpp @@ -9,7 +9,7 @@ typedef struct _jmethodID* jmethodID; typedef struct _JavaVM JavaVM; typedef struct _JNIEnv JNIEnv; -namespace mbgl { +namespace mln { namespace android { extern JavaVM* theJVM; @@ -21,4 +21,4 @@ bool attach_jni_thread(JavaVM* vm, JNIEnv** env, std::string threadName); void detach_jni_thread(JavaVM* vm, JNIEnv** env, bool detach); } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/run_loop.cpp b/platform/android/src/run_loop.cpp index ac1fa17ef..6803f755c 100644 --- a/platform/android/src/run_loop.cpp +++ b/platform/android/src/run_loop.cpp @@ -26,7 +26,7 @@ namespace { -using namespace mbgl::util; +using namespace mln::util; int looperCallbackNew(int fd, int, void* data) { int buffer[1]; @@ -71,7 +71,7 @@ int looperCallbackReadEvent(int fd, int, void* data) { } // namespace -namespace mbgl { +namespace mln { namespace util { // This is needed only for the RunLoop living on the main thread because of @@ -89,7 +89,7 @@ public: : loop(loop_) {} void set(const Milliseconds& timeout) { - alarm.start(timeout, mbgl::Duration::zero(), [this]() { loop->wake(); }); + alarm.start(timeout, mln::Duration::zero(), [this]() { loop->wake(); }); } private: @@ -136,11 +136,11 @@ RunLoop::Impl::~Impl() { alarm.reset(); if (ALooper_removeFd(loop, fds[PIPE_OUT]) != 1) { - Log::Error(mbgl::Event::General, "Failed to remove file descriptor from Looper"); + Log::Error(mln::Event::General, "Failed to remove file descriptor from Looper"); } if (close(fds[PIPE_IN]) || close(fds[PIPE_OUT])) { - Log::Error(mbgl::Event::General, "Failed to close file descriptor."); + Log::Error(mln::Event::General, "Failed to close file descriptor."); } ALooper_release(loop); @@ -315,4 +315,4 @@ void RunLoop::removeWatch(int fd) { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/run_loop_impl.hpp b/platform/android/src/run_loop_impl.hpp index 4f0eff410..cdcf90f89 100644 --- a/platform/android/src/run_loop_impl.hpp +++ b/platform/android/src/run_loop_impl.hpp @@ -13,7 +13,7 @@ struct ALooper; -namespace mbgl { +namespace mln { namespace util { using WatchCallback = std::function; @@ -64,4 +64,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/string_util.cpp b/platform/android/src/string_util.cpp index 9a0dcb27b..6e503e4b6 100644 --- a/platform/android/src/string_util.cpp +++ b/platform/android/src/string_util.cpp @@ -2,7 +2,7 @@ #include "attach_env.hpp" #include -namespace mbgl { +namespace mln { namespace platform { std::string uppercase(const std::string& str) { @@ -22,4 +22,4 @@ std::string lowercase(const std::string& str) { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/test/benchmark_runner.cpp b/platform/android/src/test/benchmark_runner.cpp index 5f9327f5e..3c95c6b33 100644 --- a/platform/android/src/test/benchmark_runner.cpp +++ b/platform/android/src/test/benchmark_runner.cpp @@ -4,8 +4,8 @@ #include #include -using namespace mbgl; -using namespace mbgl::android; +using namespace mln; +using namespace mln::android; bool running = false; bool done = false; @@ -22,15 +22,15 @@ void runner() { } argv.push_back(nullptr); - mbgl::Log::Info(mbgl::Event::General, "Start BenchmarkRunner"); - int status = mbgl::runBenchmark(argv.size(), argv.data()); - mbgl::Log::Info(mbgl::Event::General, "BenchmarkRunner finished with status: '%d'", status); + mln::Log::Info(mln::Event::General, "Start BenchmarkRunner"); + int status = mln::runBenchmark(argv.size(), argv.data()); + mln::Log::Info(mln::Event::General, "BenchmarkRunner finished with status: '%d'", status); running = false; ALooper_wake(looper); } void android_main(struct android_app* app) { - mbgl::android::theJVM = app->activity->vm; + mln::android::theJVM = app->activity->vm; JNIEnv* env = nullptr; std::thread benchmarkThread; app->activity->vm->AttachCurrentThread(&env, NULL); @@ -41,7 +41,7 @@ void android_main(struct android_app* app) { if (copyFile(env, app->activity->assetManager, zipFile, storagePath, "data.zip")) { if (chdir("/sdcard")) { - mbgl::Log::Error(mbgl::Event::General, "Failed to change the directory to /sdcard"); + mln::Log::Error(mln::Event::General, "Failed to change the directory to /sdcard"); done = true; changeState(env, app, false); } else { @@ -50,7 +50,7 @@ void android_main(struct android_app* app) { benchmarkThread = std::thread(runner); } } else { - mbgl::Log::Error(mbgl::Event::General, "Failed to copy zip file '%s' to external storage", zipFile.c_str()); + mln::Log::Error(mln::Event::General, "Failed to copy zip file '%s' to external storage", zipFile.c_str()); done = true; changeState(env, app, false); } @@ -65,7 +65,7 @@ void android_main(struct android_app* app) { } if (!running && !done) { - mbgl::Log::Info(mbgl::Event::General, "BenchmarkRunner done"); + mln::Log::Info(mln::Event::General, "BenchmarkRunner done"); done = true; benchmarkThread.join(); changeState(env, app, true); @@ -73,7 +73,7 @@ void android_main(struct android_app* app) { if (app->destroyRequested != 0) { app->activity->vm->DetachCurrentThread(); - mbgl::Log::Info(mbgl::Event::General, "Close the App!"); + mln::Log::Info(mln::Event::General, "Close the App!"); return; } } diff --git a/platform/android/src/test/collator_test_stub.cpp b/platform/android/src/test/collator_test_stub.cpp index 780785fda..c59b74d02 100644 --- a/platform/android/src/test/collator_test_stub.cpp +++ b/platform/android/src/test/collator_test_stub.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { class Collator::Impl { @@ -32,4 +32,4 @@ std::string Collator::resolvedLocale() const { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/test/number_format_test_stub.cpp b/platform/android/src/test/number_format_test_stub.cpp index 08518a41f..a99c4c0ab 100644 --- a/platform/android/src/test/number_format_test_stub.cpp +++ b/platform/android/src/test/number_format_test_stub.cpp @@ -1,6 +1,6 @@ #include -namespace mbgl { +namespace mln { namespace platform { std::string formatNumber(double /*number*/, @@ -13,4 +13,4 @@ std::string formatNumber(double /*number*/, } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp index 91d43a74c..5c4b35eaf 100644 --- a/platform/android/src/test/render_test_runner.cpp +++ b/platform/android/src/test/render_test_runner.cpp @@ -1,8 +1,8 @@ #include #include "test_runner_common.hpp" -using namespace mbgl; -using namespace mbgl::android; +using namespace mln; +using namespace mln::android; void updateProgress(JNIEnv* env, struct android_app* app, int completed, int total) { jobject nativeActivity = app->activity->clazz; @@ -20,7 +20,7 @@ void updateProgress(JNIEnv* env, struct android_app* app, int completed, int tot } void android_main(struct android_app* app) { - mbgl::android::theJVM = app->activity->vm; + mln::android::theJVM = app->activity->vm; JNIEnv* env = nullptr; app->activity->vm->AttachCurrentThread(&env, NULL); @@ -31,8 +31,8 @@ void android_main(struct android_app* app) { int outFd, outEvents; struct android_poll_source* source = nullptr; if (!copyFile(env, app->activity->assetManager, zipFile, storagePath, "data.zip")) { - mbgl::Log::Error(mbgl::Event::General, - "Failed to copy zip File '" + zipFile + "' to external storage for upzipping"); + mln::Log::Error(mln::Event::General, + "Failed to copy zip File '" + zipFile + "' to external storage for upzipping"); } else { unZipFile(env, zipFile, storagePath); @@ -46,7 +46,7 @@ void android_main(struct android_app* app) { } argv.push_back(nullptr); - std::function testStatus = [&](mbgl::TestStatus status) { + std::function testStatus = [&](mln::TestStatus status) { auto result = ALooper_pollOnce(0, &outFd, &outEvents, reinterpret_cast(&source)); if (result == ALOOPER_POLL_ERROR) { throw std::runtime_error("ALooper_pollOnce returned an error"); @@ -56,14 +56,14 @@ void android_main(struct android_app* app) { source->process(app, source); } - mbgl::Log::Info(mbgl::Event::General, - "Current finished tests number is '" + std::to_string(status.completed) + "/" + - std::to_string(status.total) + "'"); + mln::Log::Info(mln::Event::General, + "Current finished tests number is '" + std::to_string(status.completed) + "/" + + std::to_string(status.total) + "'"); updateProgress(env, app, static_cast(status.completed), static_cast(status.total)); }; - mbgl::Log::Info(mbgl::Event::General, "Start running RenderTestRunner with manifest: '" + manifest + "'"); - bool result = mbgl::runRenderTests(argv.size() - 1, argv.data(), testStatus) == 0; - mbgl::Log::Info(mbgl::Event::General, "End running RenderTestRunner with manifest: '" + manifest + "'"); + mln::Log::Info(mln::Event::General, "Start running RenderTestRunner with manifest: '" + manifest + "'"); + bool result = mln::runRenderTests(argv.size() - 1, argv.data(), testStatus) == 0; + mln::Log::Info(mln::Event::General, "End running RenderTestRunner with manifest: '" + manifest + "'"); return result; }; @@ -74,7 +74,7 @@ void android_main(struct android_app* app) { auto result = runTestWithManifest("/metrics/android-render-test-runner-metrics.json"); result = runTestWithManifest("/metrics/android-render-test-runner-style.json") && result; #endif - mbgl::Log::Info(mbgl::Event::General, "All tests are finished!"); + mln::Log::Info(mln::Event::General, "All tests are finished!"); changeState(env, app, result); } while (true) { @@ -88,7 +88,7 @@ void android_main(struct android_app* app) { } if (app->destroyRequested != 0) { app->activity->vm->DetachCurrentThread(); - mbgl::Log::Info(mbgl::Event::General, "Close the App!"); + mln::Log::Info(mln::Event::General, "Close the App!"); return; } } diff --git a/platform/android/src/test/runtime.cpp b/platform/android/src/test/runtime.cpp index 80f810517..1c2dce4ca 100644 --- a/platform/android/src/test/runtime.cpp +++ b/platform/android/src/test/runtime.cpp @@ -19,7 +19,7 @@ const std::string kClassPath{"-Djava.class.path="}; const std::string kDefaultDex{"/data/local/tmp/core-tests/classes.dex"}; } // namespace -namespace mbgl { +namespace mln { namespace android { bool initRuntime(int argc, char* argv[]) { @@ -67,9 +67,9 @@ bool initRuntime(int argc, char* argv[]) { return false; } - mbgl::android::registerNatives(vm); + mln::android::registerNatives(vm); return true; } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/test/runtime.hpp b/platform/android/src/test/runtime.hpp index c5e69d61c..d85633f51 100644 --- a/platform/android/src/test/runtime.hpp +++ b/platform/android/src/test/runtime.hpp @@ -1,9 +1,9 @@ #pragma once -namespace mbgl { +namespace mln { namespace android { bool initRuntime(int argc, char *argv[]); } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/test/test_runner.cpp b/platform/android/src/test/test_runner.cpp index aa0afc5c9..133f3fc92 100644 --- a/platform/android/src/test/test_runner.cpp +++ b/platform/android/src/test/test_runner.cpp @@ -7,8 +7,8 @@ #include #include -using namespace mbgl; -using namespace mbgl::android; +using namespace mln; +using namespace mln::android; std::string testResultToStr(const ::testing::TestResult* testResult) { if (testResult->Passed()) return " (PASSED)"; @@ -69,16 +69,16 @@ void runner(const std::string& gtestOutput) { } argv.push_back(nullptr); - mbgl::Log::Info(mbgl::Event::General, "Start TestRunner"); - int status = mbgl::runTests(argv.size(), argv.data()); - mbgl::Log::Info(mbgl::Event::General, "TestRunner finished with status: '" + std::to_string(status) + "'"); + mln::Log::Info(mln::Event::General, "Start TestRunner"); + int status = mln::runTests(argv.size(), argv.data()); + mln::Log::Info(mln::Event::General, "TestRunner finished with status: '" + std::to_string(status) + "'"); running = false; success = (status == 0); ALooper_wake(looper); } void android_main(struct android_app* app) { - mbgl::android::theJVM = app->activity->vm; + mln::android::theJVM = app->activity->vm; JNIEnv* env = nullptr; std::thread runnerThread; app->activity->vm->AttachCurrentThread(&env, NULL); @@ -90,14 +90,14 @@ void android_main(struct android_app* app) { if (copyFile(env, app->activity->assetManager, zipFile, storagePath, "data.zip")) { if (chdir(storagePath.c_str())) { - mbgl::Log::Error(mbgl::Event::General, "Failed to change the directory to storage dir"); + mln::Log::Error(mln::Event::General, "Failed to change the directory to storage dir"); changeState(env, app, success); } else { unZipFile(env, zipFile, storagePath); runnerThread = std::thread(runner, gtestOutput); } } else { - mbgl::Log::Error(mbgl::Event::General, "Failed to copy zip file '" + zipFile + "' to external storage"); + mln::Log::Error(mln::Event::General, "Failed to copy zip file '" + zipFile + "' to external storage"); changeState(env, app, success); } @@ -112,7 +112,7 @@ void android_main(struct android_app* app) { if (!running) { std::call_once(done, [&] { - mbgl::Log::Info(mbgl::Event::General, "TestRunner done"); + mln::Log::Info(mln::Event::General, "TestRunner done"); runnerThread.join(); changeState(env, app, success); }); @@ -120,7 +120,7 @@ void android_main(struct android_app* app) { if (app->destroyRequested != 0) { app->activity->vm->DetachCurrentThread(); - mbgl::Log::Info(mbgl::Event::General, "Close the App!"); + mln::Log::Info(mln::Event::General, "Close the App!"); return; } } diff --git a/platform/android/src/test/test_runner_common.cpp b/platform/android/src/test/test_runner_common.cpp index d2a7c18c7..46fcbe0b6 100644 --- a/platform/android/src/test/test_runner_common.cpp +++ b/platform/android/src/test/test_runner_common.cpp @@ -3,7 +3,7 @@ #include -namespace mbgl { +namespace mln { void Log::platformRecord(EventSeverity severity, const std::string& msg) { __android_log_print(android::severityToPriority(severity), "mbgl", "%s", msg.c_str()); @@ -98,13 +98,13 @@ bool copyFile(JNIEnv* env, bool stateOk = true; if (env->CallBooleanMethod(fileToCopy.get(), fileExists)) { - mbgl::Log::Warning(mbgl::Event::General, "File '" + filePath + "' already exists"); + mln::Log::Warning(mln::Event::General, "File '" + filePath + "' already exists"); } else { std::unique_ptr> fileAsset( AAssetManager_open(assetManager, fileName.c_str(), AASSET_MODE_BUFFER), [](AAsset* asset) { AAsset_close(asset); }); if (fileAsset == nullptr) { - mbgl::Log::Warning(mbgl::Event::General, "Failed to open asset file " + fileName); + mln::Log::Warning(mln::Event::General, "Failed to open asset file " + fileName); return false; } const void* fileData = AAsset_getBuffer(fileAsset.get()); @@ -115,11 +115,11 @@ bool copyFile(JNIEnv* env, stateOk = newFile != nullptr; if (!stateOk) { - mbgl::Log::Warning(mbgl::Event::General, "Failed to create new file entry " + fileName); + mln::Log::Warning(mln::Event::General, "Failed to create new file entry " + fileName); } else { auto res = static_cast(std::fwrite(fileData, sizeof(char), fileLen, newFile.get())); if (fileLen != res) { - mbgl::Log::Warning(mbgl::Event::General, "Failed to generate file entry" + fileName + "from assets"); + mln::Log::Warning(mln::Event::General, "Failed to generate file entry" + fileName + "from assets"); } } } @@ -186,8 +186,8 @@ void unZipFile(JNIEnv* env, const std::string& zipFilePath, const std::string& d env, static_cast(env->CallObjectMethod(f, fileGetName))); if (!success) { - mbgl::Log::Warning(mbgl::Event::General, - "Failed to create folder entry " + fileNameStr + " from zip"); + mln::Log::Warning(mln::Event::General, + "Failed to create folder entry " + fileNameStr + " from zip"); } } } else if (!(env->CallBooleanMethod(f, fileExists))) { @@ -196,7 +196,7 @@ void unZipFile(JNIEnv* env, const std::string& zipFilePath, const std::string& d static_cast(env->CallObjectMethod(f, fileGetName))); if (!success) { - mbgl::Log::Warning(mbgl::Event::General, "Failed to create folder entry" + fileNameStr + "from zip"); + mln::Log::Warning(mln::Event::General, "Failed to create folder entry" + fileNameStr + "from zip"); continue; } @@ -217,10 +217,10 @@ void unZipFile(JNIEnv* env, const std::string& zipFilePath, const std::string& d if (env->CallBooleanMethod(fileToDelete.get(), fileExists)) { jboolean success = (env->CallBooleanMethod(fileToDelete.get(), deleteFile)); if (!success) { - mbgl::Log::Warning(mbgl::Event::General, "Failed to delete file entry " + zipFilePath); + mln::Log::Warning(mln::Event::General, "Failed to delete file entry " + zipFilePath); } } } } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/test/test_runner_common.hpp b/platform/android/src/test/test_runner_common.hpp index 4be59e917..0ed395764 100644 --- a/platform/android/src/test/test_runner_common.hpp +++ b/platform/android/src/test/test_runner_common.hpp @@ -6,7 +6,7 @@ #include "jni.hpp" -namespace mbgl { +namespace mln { namespace android { int severityToPriority(EventSeverity severity); @@ -20,4 +20,4 @@ bool copyFile(JNIEnv* env, void unZipFile(JNIEnv* env, const std::string& zipFilePath, const std::string& destinationPath); } // namespace android -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/thread.cpp b/platform/android/src/thread.cpp index f480fc5d4..47eade980 100644 --- a/platform/android/src/thread.cpp +++ b/platform/android/src/thread.cpp @@ -10,7 +10,7 @@ // Implementation based on Chromium's platform_thread_android.cc. -namespace mbgl { +namespace mln { namespace platform { thread_local static JNIEnv* env; @@ -61,4 +61,4 @@ void detachThread() { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/android/src/timer.cpp b/platform/android/src/timer.cpp index 81b1ea1f9..cafd23043 100644 --- a/platform/android/src/timer.cpp +++ b/platform/android/src/timer.cpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class Timer::Impl : public RunLoop::Impl::Runnable { @@ -74,4 +74,4 @@ void Timer::stop() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm b/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm index 71ee5908f..35143af15 100644 --- a/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm +++ b/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm @@ -14,7 +14,7 @@ #include @interface MLNCustomDrawableStyleLayer (Internal) -- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer; +- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer; @end class ExampleCustomDrawableStyleLayerHost; @@ -22,14 +22,14 @@ class ExampleCustomDrawableStyleLayerHost; @implementation ExampleCustomDrawableStyleLayer - (instancetype)initWithIdentifier:(NSString *)identifier { - auto layer = std::make_unique( + auto layer = std::make_unique( identifier.UTF8String, std::make_unique(self)); return self = [super initWithPendingLayer:std::move(layer)]; } @end -class ExampleCustomDrawableStyleLayerHost : public mbgl::style::CustomDrawableLayerHost { +class ExampleCustomDrawableStyleLayerHost : public mln::style::CustomDrawableLayerHost { public: ExampleCustomDrawableStyleLayerHost(ExampleCustomDrawableStyleLayer *styleLayer) { layerRef = styleLayer; @@ -47,11 +47,11 @@ public: // if we have built our drawable(s) already, either update or skip if (interface.getDrawableCount()) return; - constexpr float extent = mbgl::util::EXTENT; + constexpr float extent = mln::util::EXTENT; // add classic polylines { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 792}); @@ -99,7 +99,7 @@ public: // add wide vector polylines with tile coordinates { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 792}); @@ -157,7 +157,7 @@ public: // add fill polygon { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 790}); @@ -190,7 +190,7 @@ public: // add symbol { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 789}); @@ -230,7 +230,7 @@ public: // add polylines using wide vectors using geographic coordinates { - using namespace mbgl; + using namespace mln; // add polyline with geographic coordinates Interface::LineOptions options = {/*geometry=*/{}, @@ -266,7 +266,7 @@ public: // add polylines using wide vectors in tile coordinates { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 790}); diff --git a/platform/darwin/core/async_task.cpp b/platform/darwin/core/async_task.cpp index 26fb86d73..610d5071f 100644 --- a/platform/darwin/core/async_task.cpp +++ b/platform/darwin/core/async_task.cpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace util { class AsyncTask::Impl { @@ -55,4 +55,4 @@ void AsyncTask::send() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/collator.mm b/platform/darwin/core/collator.mm index 237e32550..e11e35fb9 100644 --- a/platform/darwin/core/collator.mm +++ b/platform/darwin/core/collator.mm @@ -4,7 +4,7 @@ #import -namespace mbgl { +namespace mln { namespace platform { class Collator::Impl { @@ -61,4 +61,4 @@ int Collator::compare(const std::string& lhs, const std::string& rhs) const { std::string Collator::resolvedLocale() const { return impl->resolvedLocale(); } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/http_file_source.mm b/platform/darwin/core/http_file_source.mm index 23c29c4b3..0aa9c5d36 100644 --- a/platform/darwin/core/http_file_source.mm +++ b/platform/darwin/core/http_file_source.mm @@ -21,7 +21,7 @@ @implementation MBGLBundleCanary @end -namespace mbgl { +namespace mln { // Data that is shared between the requesting thread and the thread running the completion handler. class HTTPRequestShared { @@ -149,7 +149,7 @@ NSString *HTTPFileSource::Impl::getUserAgent() const { // Avoid %s here because it inserts hidden bidirectional markers on macOS when the system // language is set to a right-to-left language. [userAgentComponents addObject:[NSString stringWithFormat:@"MapLibreNative/0.0.0 (%@)", - @(mbgl::version::revision)]]; + @(mln::version::revision)]]; NSString *systemName = @"Darwin"; #if TARGET_OS_IPHONE @@ -267,7 +267,7 @@ std::unique_ptr HTTPFileSource::request(const Resource &resource, [req addValue:impl->userAgent forHTTPHeaderField:@"User-Agent"]; - const bool isTile = resource.kind == mbgl::Resource::Kind::Tile; + const bool isTile = resource.kind == mln::Resource::Kind::Tile; if (isTile) { [MLNNativeNetworkManager.sharedManager startDownloadEvent:url.relativePath type:@"tile"]; @@ -444,4 +444,4 @@ void HTTPFileSource::setClientOptions(ClientOptions options) { ClientOptions HTTPFileSource::getClientOptions() { return impl->getClientOptions(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/image.mm b/platform/darwin/core/image.mm index 19d10e9a9..f2ff5eb6d 100644 --- a/platform/darwin/core/image.mm +++ b/platform/darwin/core/image.mm @@ -11,7 +11,7 @@ using CGDataProviderHandle = CFHandle; using CGContextHandle = CFHandle; -CGImageRef CGImageCreateWithMLNPremultipliedImage(mbgl::PremultipliedImage&& src) { +CGImageRef CGImageCreateWithMLNPremultipliedImage(mln::PremultipliedImage&& src) { // We're converting the PremultipliedImage's backing store to a CGDataProvider, and are taking // over ownership of the memory. CGDataProviderHandle provider(CGDataProviderCreateWithData( @@ -41,11 +41,11 @@ CGImageRef CGImageCreateWithMLNPremultipliedImage(mbgl::PremultipliedImage&& src *colorSpace, bitmapInfo, *provider, NULL, false, kCGRenderingIntentDefault); } -mbgl::PremultipliedImage MLNPremultipliedImageFromCGImage(CGImageRef src) { +mln::PremultipliedImage MLNPremultipliedImageFromCGImage(CGImageRef src) { const size_t width = CGImageGetWidth(src); const size_t height = CGImageGetHeight(src); - mbgl::PremultipliedImage image({static_cast(width), static_cast(height)}); + mln::PremultipliedImage image({static_cast(width), static_cast(height)}); CGColorSpaceHandle colorSpace(CGColorSpaceCreateDeviceRGB()); if (!colorSpace) { @@ -70,7 +70,7 @@ mbgl::PremultipliedImage MLNPremultipliedImageFromCGImage(CGImageRef src) { return image; } -namespace mbgl { +namespace mln { PremultipliedImage decodeImage(const std::string& source) { CFDataHandle data(CFDataCreateWithBytesNoCopy( @@ -93,4 +93,4 @@ PremultipliedImage decodeImage(const std::string& source) { return MLNPremultipliedImageFromCGImage(*image); } -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/local_glyph_rasterizer.mm b/platform/darwin/core/local_glyph_rasterizer.mm index 8c558e61e..0ae952453 100644 --- a/platform/darwin/core/local_glyph_rasterizer.mm +++ b/platform/darwin/core/local_glyph_rasterizer.mm @@ -18,7 +18,7 @@ /// Enables local glyph rasterization for all writing systems, not just CJK. #define MBGL_DARWIN_NO_REMOTE_FONTS 0 -namespace mbgl { +namespace mln { // 2x bitmap with 1x logical metrics. constexpr uint32_t kLocalGlyphTextureScale = 2; @@ -349,4 +349,4 @@ Glyph LocalGlyphRasterizer::rasterizeGlyph(const FontStack &fontStack, GlyphID g return manufacturedGlyph; } -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/logging_nslog.mm b/platform/darwin/core/logging_nslog.mm index ccdbfeaf5..d158ccb81 100644 --- a/platform/darwin/core/logging_nslog.mm +++ b/platform/darwin/core/logging_nslog.mm @@ -3,7 +3,7 @@ #import -namespace mbgl { +namespace mln { void Log::platformRecord(EventSeverity severity, const std::string &msg) { NSString *message = [[NSString alloc] initWithBytes:msg.data() @@ -12,4 +12,4 @@ void Log::platformRecord(EventSeverity severity, const std::string &msg) { NSLog(@"[%s] %@", Enum::toString(severity), message); } -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/nsthread.mm b/platform/darwin/core/nsthread.mm index b93c42d6b..fc1d710e7 100644 --- a/platform/darwin/core/nsthread.mm +++ b/platform/darwin/core/nsthread.mm @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { std::string getCurrentThreadName() { @@ -47,4 +47,4 @@ void attachThread() {} void detachThread() {} } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/number_format.mm b/platform/darwin/core/number_format.mm index 5f5ec333d..4bd253e6d 100644 --- a/platform/darwin/core/number_format.mm +++ b/platform/darwin/core/number_format.mm @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { std::string formatNumber(double number, const std::string& localeId, const std::string& currency, @@ -27,4 +27,4 @@ std::string formatNumber(double number, const std::string& localeId, const std:: } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/run_loop.cpp b/platform/darwin/core/run_loop.cpp index a59443f91..e544a257c 100644 --- a/platform/darwin/core/run_loop.cpp +++ b/platform/darwin/core/run_loop.cpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace util { class RunLoop::Impl { @@ -64,4 +64,4 @@ void RunLoop::waitForEmpty([[maybe_unused]] const SimpleIdentity tag) { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/string_nsstring.mm b/platform/darwin/core/string_nsstring.mm index 3caff87d5..2d6a08720 100644 --- a/platform/darwin/core/string_nsstring.mm +++ b/platform/darwin/core/string_nsstring.mm @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { std::string uppercase(const std::string &string) { @@ -28,4 +28,4 @@ std::string lowercase(const std::string &string) { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/core/timer.cpp b/platform/darwin/core/timer.cpp index 6006a3719..9e9334019 100644 --- a/platform/darwin/core/timer.cpp +++ b/platform/darwin/core/timer.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { CFTimeInterval toCFTimeInterval(Duration duration) { @@ -50,4 +50,4 @@ void Timer::stop() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/include/mbgl/util/image+MLNAdditions.hpp b/platform/darwin/include/mbgl/util/image+MLNAdditions.hpp index 2ec75dae2..4469f0286 100644 --- a/platform/darwin/include/mbgl/util/image+MLNAdditions.hpp +++ b/platform/darwin/include/mbgl/util/image+MLNAdditions.hpp @@ -5,8 +5,8 @@ #include // Creates a CGImage from a PremultipliedImage, taking over the memory ownership. -CGImageRef CGImageCreateWithMLNPremultipliedImage(mbgl::PremultipliedImage&&); +CGImageRef CGImageCreateWithMLNPremultipliedImage(mln::PremultipliedImage&&); // Creates a PremultipliedImage by copying the pixels of the CGImage. // Does not alter the retain count of the supplied CGImage. -mbgl::PremultipliedImage MLNPremultipliedImageFromCGImage(CGImageRef); +mln::PremultipliedImage MLNPremultipliedImageFromCGImage(CGImageRef); diff --git a/platform/darwin/scripts/generate-style-code.mjs b/platform/darwin/scripts/generate-style-code.mjs index 98f0f5ec5..ea4605a8d 100644 --- a/platform/darwin/scripts/generate-style-code.mjs +++ b/platform/darwin/scripts/generate-style-code.mjs @@ -269,9 +269,9 @@ global.mbglTestValue = function (property, layerType) { } let value = camelize(_.last(_.keys(property.values))); if (property['light-property']) { - return `mbgl::style::Light${type}Type::${value}`; + return `mln::style::Light${type}Type::${value}`; } - return `mbgl::style::${type}Type::${value}`; + return `mln::style::${type}Type::${value}`; } case 'color': return '{ 1, 0, 0, 1 }'; @@ -293,9 +293,9 @@ global.mbglTestValue = function (property, layerType) { case 'translate': return '{ 1, 1 }'; case 'anchor': - return '{ mbgl::style::SymbolAnchorType::Top, mbgl::style::SymbolAnchorType::Bottom }'; + return '{ mln::style::SymbolAnchorType::Top, mln::style::SymbolAnchorType::Bottom }'; case 'mode': - return '{ mbgl::style::TextWritingModeType::Horizontal, mbgl::style::TextWritingModeType::Vertical }'; + return '{ mln::style::TextWritingModeType::Horizontal, mln::style::TextWritingModeType::Vertical }'; default: throw new Error(`unknown array type for ${property.name}`); } @@ -310,7 +310,7 @@ global.mbglExpressionTestValue = function (property, layerType) { case 'enum': return `"${_.last(_.keys(property.values))}"`; case 'color': - return 'mbgl::Color(1, 0, 0, 1)'; + return 'mln::Color(1, 0, 0, 1)'; case 'array': switch (arrayType(property)) { case 'anchor': @@ -761,23 +761,23 @@ global.valueTransformerArguments = function (property) { case 'number': return ['float', objCType]; case 'formatted': - return ['mbgl::style::expression::Formatted', objCType]; + return ['mln::style::expression::Formatted', objCType]; case 'resolvedImage': - return ['mbgl::style::expression::Image', objCType]; + return ['mln::style::expression::Image', objCType]; case 'string': return ['std::string', objCType]; case 'enum': return [mbglType(property), 'NSValue *', mbglType(property), `MLN${camelize(property.name)}`]; case 'color': - return ['mbgl::Color', objCType]; + return ['mln::Color', objCType]; case 'numberArray': return ['std::vector', objCType, 'float']; case 'colorArray': - return ['std::vector', objCType, 'mbgl::Color']; + return ['std::vector', objCType, 'mln::Color']; case 'padding': - return ['mbgl::Padding', objCType]; + return ['mln::Padding', objCType]; case 'variableAnchorOffsetCollection': - return ['mbgl::VariableAnchorOffsetCollection', objCType]; + return ['mln::VariableAnchorOffsetCollection', objCType]; case 'array': switch (arrayType(property)) { case 'dasharray': @@ -787,14 +787,14 @@ global.valueTransformerArguments = function (property) { case 'padding': return ['std::array', objCType]; case 'position': - return ['mbgl::style::Position', objCType]; + return ['mln::style::Position', objCType]; case 'offset': case 'translate': return ['std::array', objCType]; case 'anchor': - return ['std::vector', objCType, 'mbgl::style::SymbolAnchorType', 'MLNTextAnchor']; + return ['std::vector', objCType, 'mln::style::SymbolAnchorType', 'MLNTextAnchor']; case 'mode': - return ['std::vector', objCType, 'mbgl::style::TextWritingModeType', 'MLNTextWritingMode']; + return ['std::vector', objCType, 'mln::style::TextWritingModeType', 'MLNTextWritingMode']; default: throw new Error(`unknown array type for ${property.name}`); } @@ -810,15 +810,15 @@ global.mbglType = function(property) { case 'number': return 'float'; case 'formatted': - return 'mbgl::style::expression::Formatted'; + return 'mln::style::expression::Formatted'; case 'resolvedImage': - return 'mbgl::style::expression::Image'; + return 'mln::style::expression::Image'; case 'string': return 'std::string'; case 'enum': { let type = camelize(originalPropertyName(property)); if (property['light-property']) { - return `mbgl::style::Light${type}Type`; + return `mln::style::Light${type}Type`; } if (/-translate-anchor$/.test(originalPropertyName(property))) { type = 'TranslateAnchor'; @@ -829,18 +829,18 @@ global.mbglType = function(property) { if (/^(text|icon)-anchor$/.test(originalPropertyName(property))) { type = 'SymbolAnchor' } - return `mbgl::style::${type}Type`; + return `mln::style::${type}Type`; } case 'color': - return 'mbgl::Color'; + return 'mln::Color'; case 'numberArray': return 'std::vector'; case 'colorArray': - return 'std::vector'; + return 'std::vector'; case 'padding': - return 'mbgl::Padding'; + return 'mln::Padding'; case 'variableAnchorOffsetCollection': - return 'mbgl::VariableAnchorOffsetCollection'; + return 'mln::VariableAnchorOffsetCollection'; case 'array': switch (arrayType(property)) { case 'dasharray': @@ -853,11 +853,11 @@ global.mbglType = function(property) { case 'translate': return 'std::array'; case 'position': - return 'mbgl::style::Position'; + return 'mln::style::Position'; case 'anchor': - return 'std::vector'; + return 'std::vector'; case 'mode': - return 'std::vector'; + return 'std::vector'; default: throw new Error(`unknown array type for ${property.name}`); } @@ -868,9 +868,9 @@ global.mbglType = function(property) { global.initLayer = function (layerType) { if (layerType == "background") { - return `_layer = new mbgl::style::${camelize(layerType)}Layer(identifier.UTF8String);` + return `_layer = new mln::style::${camelize(layerType)}Layer(identifier.UTF8String);` } else { - return `_layer = new mbgl::style::${camelize(layerType)}Layer(identifier.UTF8String, source.identifier.UTF8String);` + return `_layer = new mln::style::${camelize(layerType)}Layer(identifier.UTF8String, source.identifier.UTF8String);` } }; diff --git a/platform/darwin/src/MLNActionJournalOptions.mm b/platform/darwin/src/MLNActionJournalOptions.mm index 605a9de79..9779a7877 100644 --- a/platform/darwin/src/MLNActionJournalOptions.mm +++ b/platform/darwin/src/MLNActionJournalOptions.mm @@ -2,12 +2,12 @@ #import @implementation MLNActionJournalOptions { - std::unique_ptr _actionJournalOptionsInternal; + std::unique_ptr _actionJournalOptionsInternal; } - (instancetype)init { if (self = [super init]) { - _actionJournalOptionsInternal = std::make_unique(); + _actionJournalOptionsInternal = std::make_unique(); NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); _actionJournalOptionsInternal->withPath( @@ -16,7 +16,7 @@ return self; } -- (mbgl::util::ActionJournalOptions)getCoreOptions { +- (mln::util::ActionJournalOptions)getCoreOptions { return *_actionJournalOptionsInternal; } diff --git a/platform/darwin/src/MLNActionJournalOptions_Private.h b/platform/darwin/src/MLNActionJournalOptions_Private.h index a48680b06..51ef95997 100644 --- a/platform/darwin/src/MLNActionJournalOptions_Private.h +++ b/platform/darwin/src/MLNActionJournalOptions_Private.h @@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN @interface MLNActionJournalOptions (Private) -- (mbgl::util::ActionJournalOptions)getCoreOptions; +- (mln::util::ActionJournalOptions)getCoreOptions; @end diff --git a/platform/darwin/src/MLNComputedShapeSource.mm b/platform/darwin/src/MLNComputedShapeSource.mm index 1a4afc24e..b4c7e73f0 100644 --- a/platform/darwin/src/MLNComputedShapeSource.mm +++ b/platform/darwin/src/MLNComputedShapeSource.mm @@ -18,9 +18,9 @@ const MLNShapeSourceOption MLNShapeSourceOptionWrapsCoordinates = const MLNShapeSourceOption MLNShapeSourceOptionClipsCoordinates = @"MLNShapeSourceOptionClipsCoordinates"; -mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDictionary( +mln::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDictionary( NSDictionary *options) { - mbgl::style::CustomGeometrySource::Options sourceOptions; + mln::style::CustomGeometrySource::Options sourceOptions; if (NSNumber *value = options[MLNShapeSourceOptionMinimumZoomLevel]) { if (![value isKindOfClass:[NSNumber class]]) { @@ -74,7 +74,7 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi } @interface MLNComputedShapeSource () { - std::unique_ptr _pendingSource; + std::unique_ptr _pendingSource; } @property (nonatomic, readwrite) NSDictionary *options; @@ -91,17 +91,17 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi @property (nonatomic, assign) BOOL dataSourceImplementsFeaturesForTile; @property (nonatomic, assign) BOOL dataSourceImplementsFeaturesForBounds; @property (nonatomic, weak, nullable) id dataSource; -@property (nonatomic, nullable) mbgl::style::CustomGeometrySource *rawSource; +@property (nonatomic, nullable) mln::style::CustomGeometrySource *rawSource; - (instancetype)initForSource:(MLNComputedShapeSource *)source - tile:(const mbgl::CanonicalTileID &)tileId; + tile:(const mln::CanonicalTileID &)tileId; @end @implementation MLNComputedShapeSourceFetchOperation - (instancetype)initForSource:(MLNComputedShapeSource *)source - tile:(const mbgl::CanonicalTileID &)tileID { + tile:(const mln::CanonicalTileID &)tileID { self = [super init]; _z = tileID.z; _x = tileID.x; @@ -109,8 +109,8 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi _dataSourceImplementsFeaturesForTile = source.dataSourceImplementsFeaturesForTile; _dataSourceImplementsFeaturesForBounds = source.dataSourceImplementsFeaturesForBounds; _dataSource = source.dataSource; - mbgl::style::CustomGeometrySource *rawSource = - static_cast(source.rawSource); + mln::style::CustomGeometrySource *rawSource = + static_cast(source.rawSource); _rawSource = rawSource; return self; } @@ -126,15 +126,15 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi } else if (self.dataSourceImplementsFeaturesForTile) { data = [self.dataSource featuresInTileAtX:self.x y:self.y zoomLevel:self.z]; } else { - mbgl::CanonicalTileID tileID = mbgl::CanonicalTileID(self.z, self.x, self.y); - mbgl::LatLngBounds tileBounds = mbgl::LatLngBounds(tileID); + mln::CanonicalTileID tileID = mln::CanonicalTileID(self.z, self.x, self.y); + mln::LatLngBounds tileBounds = mln::LatLngBounds(tileID); data = [self.dataSource featuresInCoordinateBounds:MLNCoordinateBoundsFromLatLngBounds(tileBounds) zoomLevel:self.z]; } if (![self isCancelled]) { - mbgl::FeatureCollection featureCollection; + mln::FeatureCollection featureCollection; featureCollection.reserve(data.count); for (MLNShape *feature in data) { if ([feature isMemberOfClass:[MLNShapeCollection class]]) { @@ -145,15 +145,15 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi @"This will be logged only once."); }); } - mbgl::GeoJSONFeature geoJsonObject = [feature geoJSONObject].get(); + mln::GeoJSONFeature geoJsonObject = [feature geoJSONObject].get(); featureCollection.push_back(geoJsonObject); } - const auto geojson = mbgl::GeoJSON{featureCollection}; + const auto geojson = mln::GeoJSON{featureCollection}; // Note: potential race condition with `cancel` if (![self isCancelled]) { if (auto *rawSource = self.rawSource) { - rawSource->setTileData(mbgl::CanonicalTileID(self.z, self.x, self.y), geojson); + rawSource->setTileData(mln::CanonicalTileID(self.z, self.x, self.y), geojson); } } } @@ -176,13 +176,13 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi requestQueue.maxConcurrentOperationCount = 4; auto sourceOptions = MBGLCustomGeometrySourceOptionsFromDictionary(options); - sourceOptions.fetchTileFunction = ^void(const mbgl::CanonicalTileID &tileID) { + sourceOptions.fetchTileFunction = ^void(const mln::CanonicalTileID &tileID) { NSOperation *operation = [[MLNComputedShapeSourceFetchOperation alloc] initForSource:self tile:tileID]; [requestQueue addOperation:operation]; }; - sourceOptions.cancelTileFunction = ^void(const mbgl::CanonicalTileID &tileID) { + sourceOptions.cancelTileFunction = ^void(const mln::CanonicalTileID &tileID) { for (MLNComputedShapeSourceFetchOperation *operation in requestQueue.operations) { if (operation.x == tileID.x && operation.y == tileID.y && operation.z == tileID.z) { [operation cancel]; @@ -191,7 +191,7 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi }; auto source = - std::make_unique(identifier.UTF8String, sourceOptions); + std::make_unique(identifier.UTF8String, sourceOptions); if (self = [super initWithPendingSource:std::move(source)]) { _requestQueue = requestQueue; @@ -217,12 +217,11 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi y:(NSUInteger)y zoomLevel:(NSUInteger)zoomLevel { MLNAssertStyleSourceIsValid(); - mbgl::CanonicalTileID tileID = - mbgl::CanonicalTileID((uint8_t)zoomLevel, (uint32_t)x, (uint32_t)y); - mbgl::FeatureCollection featureCollection; + mln::CanonicalTileID tileID = mln::CanonicalTileID((uint8_t)zoomLevel, (uint32_t)x, (uint32_t)y); + mln::FeatureCollection featureCollection; featureCollection.reserve(features.count); for (MLNShape *feature in features) { - mbgl::GeoJSONFeature geoJsonObject = [feature geoJSONObject].get(); + mln::GeoJSONFeature geoJsonObject = [feature geoJSONObject].get(); featureCollection.push_back(geoJsonObject); if ([feature isMemberOfClass:[MLNShapeCollection class]]) { static dispatch_once_t onceToken; @@ -233,8 +232,8 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi }); } } - const auto geojson = mbgl::GeoJSON{featureCollection}; - static_cast(self.rawSource)->setTileData(tileID, geojson); + const auto geojson = mln::GeoJSON{featureCollection}; + static_cast(self.rawSource)->setTileData(tileID, geojson); } - (void)setDataSource:(id)dataSource { @@ -260,14 +259,14 @@ mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDi - (void)invalidateBounds:(MLNCoordinateBounds)bounds { MLNAssertStyleSourceIsValid(); - ((mbgl::style::CustomGeometrySource *)self.rawSource) + ((mln::style::CustomGeometrySource *)self.rawSource) ->invalidateRegion(MLNLatLngBoundsFromCoordinateBounds(bounds)); } - (void)invalidateTileAtX:(NSUInteger)x y:(NSUInteger)y zoomLevel:(NSUInteger)z { MLNAssertStyleSourceIsValid(); - ((mbgl::style::CustomGeometrySource *)self.rawSource) - ->invalidateTile(mbgl::CanonicalTileID(z, (unsigned int)x, (unsigned int)y)); + ((mln::style::CustomGeometrySource *)self.rawSource) + ->invalidateTile(mln::CanonicalTileID(z, (unsigned int)x, (unsigned int)y)); } @end diff --git a/platform/darwin/src/MLNComputedShapeSource_Private.h b/platform/darwin/src/MLNComputedShapeSource_Private.h index 704bce50f..f4c264c86 100644 --- a/platform/darwin/src/MLNComputedShapeSource_Private.h +++ b/platform/darwin/src/MLNComputedShapeSource_Private.h @@ -7,7 +7,7 @@ NS_ASSUME_NONNULL_BEGIN MLN_EXPORT -mbgl::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDictionary( +mln::style::CustomGeometrySource::Options MBGLCustomGeometrySourceOptionsFromDictionary( NSDictionary *options); NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MLNConversion.h b/platform/darwin/src/MLNConversion.h index 6e8615482..1d99f78f3 100644 --- a/platform/darwin/src/MLNConversion.h +++ b/platform/darwin/src/MLNConversion.h @@ -2,7 +2,7 @@ NS_ASSUME_NONNULL_BEGIN -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -111,7 +111,7 @@ public: } } - static std::optional toValue(const Holder& holder) { + static std::optional toValue(const Holder& holder) { const id value = holder.value; if (isUndefined(value)) { return {}; @@ -167,6 +167,6 @@ inline Convertible makeConvertible(const id value) { return Convertible(Holder(v } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MLNCustomDrawableStyleLayer.mm b/platform/darwin/src/MLNCustomDrawableStyleLayer.mm index b9810fc6b..1deda3f46 100644 --- a/platform/darwin/src/MLNCustomDrawableStyleLayer.mm +++ b/platform/darwin/src/MLNCustomDrawableStyleLayer.mm @@ -15,25 +15,25 @@ #include @interface MLNCustomDrawableStyleLayer (Internal) -- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer; +- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer; @end @implementation MLNCustomDrawableStyleLayer -- (instancetype)initWithRawLayer:(mbgl::style::Layer*)rawLayer { +- (instancetype)initWithRawLayer:(mln::style::Layer*)rawLayer { return [super initWithRawLayer:rawLayer]; } -- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer { +- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer { return [super initWithPendingLayer:std::move(pendingLayer)]; } @end -namespace mbgl { +namespace mln { MLNStyleLayer* CustomDrawableStyleLayerPeerFactory::createPeer(style::Layer* rawLayer) { return [[MLNCustomDrawableStyleLayer alloc] initWithRawLayer:rawLayer]; } -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNCustomDrawableStyleLayer_Private.h b/platform/darwin/src/MLNCustomDrawableStyleLayer_Private.h index 97fb9186c..2d0a0520d 100644 --- a/platform/darwin/src/MLNCustomDrawableStyleLayer_Private.h +++ b/platform/darwin/src/MLNCustomDrawableStyleLayer_Private.h @@ -4,12 +4,12 @@ #include -namespace mbgl { +namespace mln { -class CustomDrawableStyleLayerPeerFactory : public LayerPeerFactory, public mbgl::CustomDrawableLayerFactory { +class CustomDrawableStyleLayerPeerFactory : public LayerPeerFactory, public mln::CustomDrawableLayerFactory { // LayerPeerFactory overrides. LayerFactory* getCoreLayerFactory() final { return this; } virtual MLNStyleLayer* createPeer(style::Layer*) final; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNCustomStyleLayer.mm b/platform/darwin/src/MLNCustomStyleLayer.mm index 1727ef786..eb069aa60 100644 --- a/platform/darwin/src/MLNCustomStyleLayer.mm +++ b/platform/darwin/src/MLNCustomStyleLayer.mm @@ -21,7 +21,7 @@ class MLNCustomLayerHost; @interface MLNCustomStyleLayer () -@property (nonatomic, readonly) mbgl::style::CustomLayer *rawLayer; +@property (nonatomic, readonly) mln::style::CustomLayer *rawLayer; @property (nonatomic, readonly, nullable) MLNMapView *mapView; @property (nonatomic, weak, readwrite) MLNStyle *style; @end @@ -29,13 +29,13 @@ class MLNCustomLayerHost; @implementation MLNCustomStyleLayer - (instancetype)initWithIdentifier:(NSString *)identifier { - auto layer = std::make_unique( + auto layer = std::make_unique( identifier.UTF8String, std::make_unique(self)); return self = [super initWithPendingLayer:std::move(layer)]; } -- (mbgl::style::CustomLayer *)rawLayer { - return (mbgl::style::CustomLayer *)super.rawLayer; +- (mln::style::CustomLayer *)rawLayer { + return (mln::style::CustomLayer *)super.rawLayer; } - (MLNMapView *)mapView { @@ -85,14 +85,14 @@ class MLNCustomLayerHost; @end -class MLNCustomLayerHost : public mbgl::style::CustomLayerHost { +class MLNCustomLayerHost : public mln::style::CustomLayerHost { public: MLNCustomLayerHost(MLNCustomStyleLayer *styleLayer) { layerRef = styleLayer; layer = nil; } - void initialize(const mbgl::style::CustomLayerInitParameters &) override { + void initialize(const mln::style::CustomLayerInitParameters &) override { if (layerRef == nil) return; else if (layer == nil) @@ -103,16 +103,16 @@ public: } } - void preRender(const mbgl::gfx::Context &context, - const mbgl::style::CustomLayerRenderParameters ¶meters) override { + void preRender(const mln::gfx::Context &context, + const mln::style::CustomLayerRenderParameters ¶meters) override { if (!layer) return; #if MLN_RENDER_BACKEND_METAL auto renderPassDesc = - static_cast(parameters) + static_cast(parameters) .renderPassDesc.get(); MTL::CommandBuffer *cmdPtr = - static_cast(parameters) + static_cast(parameters) .commandBuffer.get(); id commandBuffer = (__bridge id)cmdPtr; layer.commandBuffer = commandBuffer; @@ -124,7 +124,7 @@ public: .size = CGSizeMake(parameters.width, parameters.height), .centerCoordinate = CLLocationCoordinate2DMake(parameters.latitude, parameters.longitude), .zoomLevel = parameters.zoom, - .direction = mbgl::util::wrap(parameters.bearing, 0., 360.), + .direction = mln::util::wrap(parameters.bearing, 0., 360.), .pitch = static_cast(parameters.pitch), .fieldOfView = static_cast(parameters.fieldOfView), .projectionMatrix = MLNMatrix4Make(parameters.projectionMatrix), @@ -135,18 +135,17 @@ public: } } - void render(const mbgl::style::CustomLayerRenderParameters ¶meters) override { + void render(const mln::style::CustomLayerRenderParameters ¶meters) override { if (!layer) return; #if MLN_RENDER_BACKEND_METAL MTL::CommandBuffer *cmdPtr = - static_cast(parameters) + static_cast(parameters) .commandBuffer.get(); id commandBuffer = (__bridge id)cmdPtr; layer.commandBuffer = commandBuffer; MTL::RenderCommandEncoder *ptr = - static_cast(parameters) - .encoder.get(); + static_cast(parameters).encoder.get(); id encoder = (__bridge id)ptr; layer.renderEncoder = encoder; #endif @@ -155,7 +154,7 @@ public: .size = CGSizeMake(parameters.width, parameters.height), .centerCoordinate = CLLocationCoordinate2DMake(parameters.latitude, parameters.longitude), .zoomLevel = parameters.zoom, - .direction = mbgl::util::wrap(parameters.bearing, 0., 360.), + .direction = mln::util::wrap(parameters.bearing, 0., 360.), .pitch = static_cast(parameters.pitch), .fieldOfView = static_cast(parameters.fieldOfView), .projectionMatrix = MLNMatrix4Make(parameters.projectionMatrix), @@ -183,10 +182,10 @@ private: MLNCustomStyleLayer *layer = nil; }; -namespace mbgl { +namespace mln { MLNStyleLayer *CustomStyleLayerPeerFactory::createPeer(style::Layer *rawLayer) { return [[MLNCustomStyleLayer alloc] initWithRawLayer:rawLayer]; } -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNCustomStyleLayer_Private.h b/platform/darwin/src/MLNCustomStyleLayer_Private.h index 6f11934ac..d742a4688 100644 --- a/platform/darwin/src/MLNCustomStyleLayer_Private.h +++ b/platform/darwin/src/MLNCustomStyleLayer_Private.h @@ -4,12 +4,12 @@ #include -namespace mbgl { +namespace mln { -class CustomStyleLayerPeerFactory : public LayerPeerFactory, public mbgl::CustomLayerFactory { +class CustomStyleLayerPeerFactory : public LayerPeerFactory, public mln::CustomLayerFactory { // LayerPeerFactory overrides. LayerFactory* getCoreLayerFactory() final { return this; } virtual MLNStyleLayer* createPeer(style::Layer*) final; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNFeature.mm b/platform/darwin/src/MLNFeature.mm index 0a5102b1a..c2559831a 100644 --- a/platform/darwin/src/MLNFeature.mm +++ b/platform/darwin/src/MLNFeature.mm @@ -48,12 +48,12 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); return NSDictionaryFeatureForGeometry(@{@"type" : @"Empty"}, self.attributes, self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return mbglFeature({[self geometryObject]}, identifier, self.attributes); } -- (mbgl::Geometry)geometryObject { - return mbgl::EmptyGeometry(); +- (mln::Geometry)geometryObject { + return mln::EmptyGeometry(); } - (NSString *)description { @@ -90,7 +90,7 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return mbglFeature({[self geometryObject]}, identifier, self.attributes); } @@ -154,7 +154,7 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return mbglFeature({[self geometryObject]}, identifier, self.attributes); } @@ -194,7 +194,7 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return mbglFeature({[self geometryObject]}, identifier, self.attributes); } @@ -234,7 +234,7 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return mbglFeature({[self geometryObject]}, identifier, self.attributes); } @@ -263,7 +263,7 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return mbglFeature({[self geometryObject]}, identifier, self.attributes); } @@ -303,7 +303,7 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return mbglFeature({[self geometryObject]}, identifier, self.attributes); } @@ -348,14 +348,14 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); self.identifier); } -- (mbgl::GeoJSON)geoJSONObject { - mbgl::FeatureCollection featureCollection; +- (mln::GeoJSON)geoJSONObject { + mln::FeatureCollection featureCollection; featureCollection.reserve(self.shapes.count); for (MLNShape *feature in self.shapes) { auto geoJSONObject = feature.geoJSONObject; - MLNAssert(geoJSONObject.is(), + MLNAssert(geoJSONObject.is(), @"Feature collection must only contain features."); - featureCollection.push_back(geoJSONObject.get()); + featureCollection.push_back(geoJSONObject.get()); } return featureCollection; } @@ -363,24 +363,24 @@ MLN_DEFINE_FEATURE_ATTRIBUTES_GETTER(); @end /** - Transforms an `mbgl::geometry::geometry` type into an instance of the + Transforms an `mln::geometry::geometry` type into an instance of the corresponding Objective-C geometry class. */ template class GeometryEvaluator { private: - const mbgl::PropertyMap *shared_properties; + const mln::PropertyMap *shared_properties; const bool is_in_feature; public: - GeometryEvaluator(const mbgl::PropertyMap *properties = nullptr, const bool isInFeature = false) + GeometryEvaluator(const mln::PropertyMap *properties = nullptr, const bool isInFeature = false) : shared_properties(properties), is_in_feature(isInFeature) {} - MLNShape *operator()(const mbgl::EmptyGeometry &) const { + MLNShape *operator()(const mln::EmptyGeometry &) const { return is_in_feature ? [[MLNEmptyFeature alloc] init] : [[MLNShape alloc] init]; } - MLNShape *operator()(const mbgl::Point &geometry) const { + MLNShape *operator()(const mln::Point &geometry) const { Class shapeClass = is_in_feature ? [MLNPointFeature class] : [MLNPointAnnotation class]; // If we're dealing with a cluster, we should change the class type. @@ -403,24 +403,24 @@ public: return shape; } - MLNShape *operator()(const mbgl::LineString &geometry) const { + MLNShape *operator()(const mln::LineString &geometry) const { std::vector coordinates = toLocationCoordinates2D(geometry); Class shapeClass = is_in_feature ? [MLNPolylineFeature class] : [MLNPolyline class]; return [shapeClass polylineWithCoordinates:&coordinates[0] count:coordinates.size()]; } - MLNShape *operator()(const mbgl::Polygon &geometry) const { + MLNShape *operator()(const mln::Polygon &geometry) const { return toShape(geometry, is_in_feature); } - MLNShape *operator()(const mbgl::MultiPoint &geometry) const { + MLNShape *operator()(const mln::MultiPoint &geometry) const { std::vector coordinates = toLocationCoordinates2D(geometry); Class shapeClass = is_in_feature ? [MLNPointCollectionFeature class] : [MLNPointCollection class]; return [[shapeClass alloc] initWithCoordinates:&coordinates[0] count:coordinates.size()]; } - MLNShape *operator()(const mbgl::MultiLineString &geometry) const { + MLNShape *operator()(const mln::MultiLineString &geometry) const { NSMutableArray *polylines = [NSMutableArray arrayWithCapacity:geometry.size()]; for (auto &lineString : geometry) { std::vector coordinates = toLocationCoordinates2D(lineString); @@ -433,7 +433,7 @@ public: return [shapeClass multiPolylineWithPolylines:polylines]; } - MLNShape *operator()(const mbgl::MultiPolygon &geometry) const { + MLNShape *operator()(const mln::MultiPolygon &geometry) const { NSMutableArray *polygons = [NSMutableArray arrayWithCapacity:geometry.size()]; for (auto &polygon : geometry) { [polygons addObject:toShape(polygon, false)]; @@ -457,12 +457,12 @@ public: } private: - static CLLocationCoordinate2D toLocationCoordinate2D(const mbgl::Point &point) { + static CLLocationCoordinate2D toLocationCoordinate2D(const mln::Point &point) { return CLLocationCoordinate2DMake(point.y, point.x); } static std::vector toLocationCoordinates2D( - const std::vector> &points) { + const std::vector> &points) { std::vector coordinates; coordinates.reserve(points.size()); std::transform(points.begin(), points.end(), std::back_inserter(coordinates), @@ -471,7 +471,7 @@ private: } template - static U *toShape(const mbgl::Polygon &geometry, const bool isInFeature) { + static U *toShape(const mln::Polygon &geometry, const bool isInFeature) { auto &linearRing = geometry.front(); std::vector coordinates = toLocationCoordinates2D(linearRing); NSMutableArray *innerPolygons; @@ -496,18 +496,18 @@ private: template class GeoJSONEvaluator { public: - MLNShape *operator()(const mbgl::Geometry &geometry) const { + MLNShape *operator()(const mln::Geometry &geometry) const { GeometryEvaluator evaluator; MLNShape *shape = mapbox::geometry::geometry::visit(geometry, evaluator); return shape; } - MLNShape *operator()(const mbgl::GeoJSONFeature &feature) const { + MLNShape *operator()(const mln::GeoJSONFeature &feature) const { MLNShape *shape = (MLNShape *)MLNFeatureFromMBGLFeature(feature); return shape; } - MLNShape *operator()(const mbgl::FeatureCollection &collection) const { + MLNShape *operator()(const mln::FeatureCollection &collection) const { NSMutableArray *shapes = [NSMutableArray arrayWithCapacity:collection.size()]; for (const auto &feature : collection) { [shapes addObject:MLNFeatureFromMBGLFeature(feature)]; @@ -517,16 +517,16 @@ public: }; NSArray *> *MLNFeaturesFromMBGLFeatures( - const std::vector &features) { + const std::vector &features) { NSMutableArray *shapes = [NSMutableArray arrayWithCapacity:features.size()]; for (const auto &feature : features) { - [shapes addObject:MLNFeatureFromMBGLFeature(static_cast(feature))]; + [shapes addObject:MLNFeatureFromMBGLFeature(static_cast(feature))]; } return shapes; } NSArray *> *MLNFeaturesFromMBGLFeatures( - const std::vector &features) { + const std::vector &features) { NSMutableArray *shapes = [NSMutableArray arrayWithCapacity:features.size()]; for (const auto &feature : features) { [shapes addObject:MLNFeatureFromMBGLFeature(feature)]; @@ -534,19 +534,19 @@ NSArray *> *MLNFeaturesFromMBGLFeatures( return shapes; } -id MLNFeatureFromMBGLFeature(const mbgl::GeoJSONFeature &feature) { +id MLNFeatureFromMBGLFeature(const mln::GeoJSONFeature &feature) { NSMutableDictionary *attributes = [NSMutableDictionary dictionaryWithCapacity:feature.properties.size()]; for (auto &pair : feature.properties) { auto &value = pair.second; ValueEvaluator evaluator; - attributes[@(pair.first.c_str())] = mbgl::Value::visit(value, evaluator); + attributes[@(pair.first.c_str())] = mln::Value::visit(value, evaluator); } GeometryEvaluator evaluator(&feature.properties, true); MLNShape *shape = (MLNShape *)mapbox::geometry::geometry::visit( feature.geometry, evaluator); if (!feature.id.is()) { - shape.identifier = mbgl::FeatureIdentifier::visit(feature.id, ValueEvaluator()); + shape.identifier = mln::FeatureIdentifier::visit(feature.id, ValueEvaluator()); } shape.attributes = attributes; @@ -559,8 +559,8 @@ MLNShape *MLNShapeFromGeoJSON(const mapbox::geojson::geojson &geojson) { return shape; } -mbgl::GeoJSONFeature mbglFeature(mbgl::GeoJSONFeature feature, id identifier, - NSDictionary *attributes) { +mln::GeoJSONFeature mbglFeature(mln::GeoJSONFeature feature, id identifier, + NSDictionary *attributes) { if (identifier) { NSExpression *identifierExpression = [NSExpression expressionForConstantValue:identifier]; feature.id = [identifierExpression mgl_featureIdentifier]; diff --git a/platform/darwin/src/MLNFeature_Private.h b/platform/darwin/src/MLNFeature_Private.h index f6961d581..9d2ecac14 100644 --- a/platform/darwin/src/MLNFeature_Private.h +++ b/platform/darwin/src/MLNFeature_Private.h @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN */ MLN_EXPORT NSArray *> *MLNFeaturesFromMBGLFeatures( - const std::vector &features); + const std::vector &features); /** Returns an array of ``MLNFeature`` objects converted from the given vector of @@ -22,13 +22,13 @@ NSArray *> *MLNFeaturesFromMBGLFeatures( */ MLN_EXPORT NSArray *> *MLNFeaturesFromMBGLFeatures( - const std::vector &features); + const std::vector &features); /** - Returns an ``MLNFeature`` object converted from the given mbgl::GeoJSONFeature + Returns an ``MLNFeature`` object converted from the given mln::GeoJSONFeature */ MLN_EXPORT -id MLNFeatureFromMBGLFeature(const mbgl::GeoJSONFeature &feature); +id MLNFeatureFromMBGLFeature(const mln::GeoJSONFeature &feature); /** Returns an ``MLNShape`` representing the given geojson. The shape can be @@ -37,12 +37,12 @@ id MLNFeatureFromMBGLFeature(const mbgl::GeoJSONFeature &feature); MLNShape *MLNShapeFromGeoJSON(const mapbox::geojson::geojson &geojson); /** - Takes an `mbgl::GeoJSONFeature` object, an identifer, and attributes dictionary and - returns the feature object with converted `mbgl::FeatureIdentifier` and - `mbgl::PropertyMap` properties. + Takes an `mln::GeoJSONFeature` object, an identifer, and attributes dictionary and + returns the feature object with converted `mln::FeatureIdentifier` and + `mln::PropertyMap` properties. */ -mbgl::GeoJSONFeature mbglFeature(mbgl::GeoJSONFeature feature, id identifier, - NSDictionary *attributes); +mln::GeoJSONFeature mbglFeature(mln::GeoJSONFeature feature, id identifier, + NSDictionary *attributes); /** Returns an `NSDictionary` representation of an ``MLNFeature``. diff --git a/platform/darwin/src/MLNFoundation.mm b/platform/darwin/src/MLNFoundation.mm index df7f89f06..9d3e77b4e 100644 --- a/platform/darwin/src/MLNFoundation.mm +++ b/platform/darwin/src/MLNFoundation.mm @@ -1,4 +1,4 @@ #import "MLNFoundation_Private.h" /// Initializes the run loop shim that lives on the main thread. -void MLNInitializeRunLoop() { static mbgl::util::RunLoop runLoop; } +void MLNInitializeRunLoop() { static mln::util::RunLoop runLoop; } diff --git a/platform/darwin/src/MLNGeometry.mm b/platform/darwin/src/MLNGeometry.mm index 03c43b7fd..739dcc5b8 100644 --- a/platform/darwin/src/MLNGeometry.mm +++ b/platform/darwin/src/MLNGeometry.mm @@ -36,9 +36,9 @@ CGRect MLNExtendRect(CGRect rect, CGPoint point) { return rect; } -mbgl::LatLng MLNLatLngFromLocationCoordinate2D(CLLocationCoordinate2D coordinate) { +mln::LatLng MLNLatLngFromLocationCoordinate2D(CLLocationCoordinate2D coordinate) { try { - return mbgl::LatLng(coordinate.latitude, coordinate.longitude); + return mln::LatLng(coordinate.latitude, coordinate.longitude); } catch (std::domain_error &error) { [NSException raise:NSInvalidArgumentException format:@"%s", error.what()]; return {}; @@ -48,7 +48,7 @@ mbgl::LatLng MLNLatLngFromLocationCoordinate2D(CLLocationCoordinate2D coordinate CLLocationDistance MLNAltitudeForZoomLevel(double zoomLevel, CGFloat pitch, CLLocationDegrees latitude, CGSize size) { CLLocationDistance metersPerPixel = - mbgl::Projection::getMetersPerPixelAtLatitude(latitude, zoomLevel); + mln::Projection::getMetersPerPixelAtLatitude(latitude, zoomLevel); CLLocationDistance metersTall = metersPerPixel * size.height; CLLocationDistance altitude = metersTall / 2 / std::tan(MLNRadiansFromDegrees(MLNAngularFieldOfView) / 2.); @@ -62,9 +62,9 @@ double MLNZoomLevelForAltitude(CLLocationDistance altitude, CGFloat pitch, CLLocationDistance metersTall = eyeAltitude * 2 * std::tan(MLNRadiansFromDegrees(MLNAngularFieldOfView) / 2.); CLLocationDistance metersPerPixel = metersTall / size.height; - CGFloat mapPixelWidthAtZoom = std::cos(MLNRadiansFromDegrees(latitude)) * mbgl::util::M2PI * - mbgl::util::EARTH_RADIUS_M / metersPerPixel; - return ::log2(mapPixelWidthAtZoom / mbgl::util::tileSize_D); + CGFloat mapPixelWidthAtZoom = std::cos(MLNRadiansFromDegrees(latitude)) * mln::util::M2PI * + mln::util::EARTH_RADIUS_M / metersPerPixel; + return ::log2(mapPixelWidthAtZoom / mln::util::tileSize_D); } MLNRadianDistance MLNDistanceBetweenRadianCoordinates(MLNRadianCoordinate2D from, @@ -129,7 +129,7 @@ CGPoint MLNPointRounded(CGPoint point) { } MLNMapPoint MLNMapPointForCoordinate(CLLocationCoordinate2D coordinate, double zoomLevel) { - mbgl::Point projectedCoordinate = mbgl::Projection::project( + mln::Point projectedCoordinate = mln::Projection::project( MLNLatLngFromLocationCoordinate2D(coordinate), std::pow(2.0, zoomLevel)); return MLNMapPointMake(projectedCoordinate.x, projectedCoordinate.y, zoomLevel); } diff --git a/platform/darwin/src/MLNGeometry_Private.h b/platform/darwin/src/MLNGeometry_Private.h index b51e3a110..b0cf39d99 100644 --- a/platform/darwin/src/MLNGeometry_Private.h +++ b/platform/darwin/src/MLNGeometry_Private.h @@ -45,39 +45,39 @@ NS_INLINE NSString *MLNStringFromCLLocationCoordinate2D(CLLocationCoordinate2D c [NSString stringWithFormat:@"(lat: %f, lon: %f)", coordinate.latitude, coordinate.longitude]; } -mbgl::LatLng MLNLatLngFromLocationCoordinate2D(CLLocationCoordinate2D coordinate); +mln::LatLng MLNLatLngFromLocationCoordinate2D(CLLocationCoordinate2D coordinate); -NS_INLINE mbgl::Point MLNPointFromLocationCoordinate2D(CLLocationCoordinate2D coordinate) { - return mbgl::Point(coordinate.longitude, coordinate.latitude); +NS_INLINE mln::Point MLNPointFromLocationCoordinate2D(CLLocationCoordinate2D coordinate) { + return mln::Point(coordinate.longitude, coordinate.latitude); } -NS_INLINE CLLocationCoordinate2D MLNLocationCoordinate2DFromPoint(mbgl::Point point) { +NS_INLINE CLLocationCoordinate2D MLNLocationCoordinate2DFromPoint(mln::Point point) { return CLLocationCoordinate2DMake(point.y, point.x); } -NS_INLINE CLLocationCoordinate2D MLNLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) { +NS_INLINE CLLocationCoordinate2D MLNLocationCoordinate2DFromLatLng(mln::LatLng latLng) { return CLLocationCoordinate2DMake(latLng.latitude(), latLng.longitude()); } -NS_INLINE MLNCoordinateBounds MLNCoordinateBoundsFromLatLngBounds(mbgl::LatLngBounds latLngBounds) { +NS_INLINE MLNCoordinateBounds MLNCoordinateBoundsFromLatLngBounds(mln::LatLngBounds latLngBounds) { return MLNCoordinateBoundsMake(MLNLocationCoordinate2DFromLatLng(latLngBounds.southwest()), MLNLocationCoordinate2DFromLatLng(latLngBounds.northeast())); } -NS_INLINE mbgl::LatLngBounds MLNLatLngBoundsFromCoordinateBounds( +NS_INLINE mln::LatLngBounds MLNLatLngBoundsFromCoordinateBounds( MLNCoordinateBounds coordinateBounds) { - return mbgl::LatLngBounds::hull(MLNLatLngFromLocationCoordinate2D(coordinateBounds.sw), - MLNLatLngFromLocationCoordinate2D(coordinateBounds.ne)); + return mln::LatLngBounds::hull(MLNLatLngFromLocationCoordinate2D(coordinateBounds.sw), + MLNLatLngFromLocationCoordinate2D(coordinateBounds.ne)); } -NS_INLINE std::array MLNLatLngArrayFromCoordinateQuad(MLNCoordinateQuad quad) { +NS_INLINE std::array MLNLatLngArrayFromCoordinateQuad(MLNCoordinateQuad quad) { return {MLNLatLngFromLocationCoordinate2D(quad.topLeft), MLNLatLngFromLocationCoordinate2D(quad.topRight), MLNLatLngFromLocationCoordinate2D(quad.bottomRight), MLNLatLngFromLocationCoordinate2D(quad.bottomLeft)}; } -NS_INLINE MLNCoordinateQuad MLNCoordinateQuadFromLatLngArray(std::array quad) { +NS_INLINE MLNCoordinateQuad MLNCoordinateQuadFromLatLngArray(std::array quad) { return {MLNLocationCoordinate2DFromLatLng(quad[0]), MLNLocationCoordinate2DFromLatLng(quad[3]), MLNLocationCoordinate2DFromLatLng(quad[2]), MLNLocationCoordinate2DFromLatLng(quad[1])}; } @@ -99,11 +99,11 @@ NS_INLINE BOOL MLNLocationCoordinate2DIsValid(CLLocationCoordinate2D coordinate) #define MLNEdgeInsetsMake NSEdgeInsetsMake #endif -NS_INLINE mbgl::EdgeInsets MLNEdgeInsetsFromNSEdgeInsets(MLNEdgeInsets insets) { +NS_INLINE mln::EdgeInsets MLNEdgeInsetsFromNSEdgeInsets(MLNEdgeInsets insets) { return {insets.top, insets.left, insets.bottom, insets.right}; } -NS_INLINE MLNEdgeInsets NSEdgeInsetsFromMLNEdgeInsets(const mbgl::EdgeInsets &insets) { +NS_INLINE MLNEdgeInsets NSEdgeInsetsFromMLNEdgeInsets(const mln::EdgeInsets &insets) { return MLNEdgeInsetsMake(insets.top(), insets.left(), insets.bottom(), insets.right()); } diff --git a/platform/darwin/src/MLNImageSource.mm b/platform/darwin/src/MLNImageSource.mm index 90ee4c0f1..ac1313699 100644 --- a/platform/darwin/src/MLNImageSource.mm +++ b/platform/darwin/src/MLNImageSource.mm @@ -18,7 +18,7 @@ - (instancetype)initWithIdentifier:(NSString *)identifier coordinateQuad:(MLNCoordinateQuad)coordinateQuad NS_DESIGNATED_INITIALIZER; -@property (nonatomic, readonly) mbgl::style::ImageSource *rawSource; +@property (nonatomic, readonly) mln::style::ImageSource *rawSource; @end @@ -27,7 +27,7 @@ - (instancetype)initWithIdentifier:(NSString *)identifier coordinateQuad:(MLNCoordinateQuad)coordinateQuad { const auto coordsArray = MLNLatLngArrayFromCoordinateQuad(coordinateQuad); - auto source = std::make_unique(identifier.UTF8String, coordsArray); + auto source = std::make_unique(identifier.UTF8String, coordsArray); return self = [super initWithPendingSource:std::move(source)]; } @@ -69,7 +69,7 @@ if (image != nullptr) { self.rawSource->setImage(image.mgl_premultipliedImage); } else { - self.rawSource->setImage(mbgl::PremultipliedImage({0, 0})); + self.rawSource->setImage(mln::PremultipliedImage({0, 0})); } _image = image; } @@ -98,8 +98,8 @@ } } -- (mbgl::style::ImageSource *)rawSource { - return (mbgl::style::ImageSource *)super.rawSource; +- (mln::style::ImageSource *)rawSource { + return (mln::style::ImageSource *)super.rawSource; } - (NSString *)attributionHTMLString { diff --git a/platform/darwin/src/MLNLight.mm.ejs b/platform/darwin/src/MLNLight.mm.ejs index cc5d5b244..e763768e8 100644 --- a/platform/darwin/src/MLNLight.mm.ejs +++ b/platform/darwin/src/MLNLight.mm.ejs @@ -15,7 +15,7 @@ #import #import -namespace mbgl { +namespace mln { MBGL_DEFINE_ENUM(MLNLightAnchor, { <% for (const property of properties) { -%> @@ -35,7 +35,7 @@ namespace mbgl { @implementation MLNLight -- (instancetype)initWithMBGLLight:(const mbgl::style::Light *)mbglLight +- (instancetype)initWithMBGLLight:(const mln::style::Light *)mbglLight { if (self = [super init]) { MLNLogInfo(@"Initializing %@.", NSStringFromClass([self class])); @@ -45,10 +45,10 @@ namespace mbgl { auto <%- camelizeWithLeadingLowercase(property.name) -%> = mbglLight->get<%- camelize(property.name) -%>(); NSExpression *<%- camelizeWithLeadingLowercase(property.name) -%>Expression; if (<%- camelizeWithLeadingLowercase(property.name) -%>.isUndefined()) { - mbgl::style::PropertyValueType> default<%- camelize(property.name) -%> = mbglLight->getDefault<%- camelize(property.name) -%>(); - <%- camelizeWithLeadingLowercase(property.name) -%>Expression = MLNStyleValueTransformerType, MLNLight<%- camelize(property.name) -%>>().toExpression(default<%- camelize(property.name) -%>); + mln::style::PropertyValueType> default<%- camelize(property.name) -%> = mbglLight->getDefault<%- camelize(property.name) -%>(); + <%- camelizeWithLeadingLowercase(property.name) -%>Expression = MLNStyleValueTransformerType, MLNLight<%- camelize(property.name) -%>>().toExpression(default<%- camelize(property.name) -%>); } else { - <%- camelizeWithLeadingLowercase(property.name) -%>Expression = MLNStyleValueTransformerType, NSValue *, mbgl::style::Light<%- camelize(property.name) -%>Type, MLNLight<%- camelize(property.name) -%>>().toExpression(<%- camelizeWithLeadingLowercase(property.name) -%>); + <%- camelizeWithLeadingLowercase(property.name) -%>Expression = MLNStyleValueTransformerType, NSValue *, mln::style::Light<%- camelize(property.name) -%>Type, MLNLight<%- camelize(property.name) -%>>().toExpression(<%- camelizeWithLeadingLowercase(property.name) -%>); } _<%- camelizeWithLeadingLowercase(property.name) -%> = <%- camelizeWithLeadingLowercase(property.name) -%>Expression; @@ -75,17 +75,17 @@ namespace mbgl { return self; } -- (mbgl::style::Light)mbglLight +- (mln::style::Light)mbglLight { - mbgl::style::Light mbglLight; + mln::style::Light mbglLight; <% if (properties.length) { -%> <% for (const property of properties) { -%> <% if (property.type == "enum") { -%> - auto <%- camelizeWithLeadingLowercase(property.name) -%> = MLNStyleValueTransformerType, NSValue *, mbgl::style::Light<%- camelize(property.name) -%>Type, MLNLight<%- camelize(property.name) -%>>().toPropertyValue>>(self.<%- camelizeWithLeadingLowercase(property.name) -%>, false); + auto <%- camelizeWithLeadingLowercase(property.name) -%> = MLNStyleValueTransformerType, NSValue *, mln::style::Light<%- camelize(property.name) -%>Type, MLNLight<%- camelize(property.name) -%>>().toPropertyValue>>(self.<%- camelizeWithLeadingLowercase(property.name) -%>, false); mbglLight.set<%- camelize(property.name) -%>(<%- camelizeWithLeadingLowercase(property.name) -%>); <% } else {-%> - auto <%- camelizeWithLeadingLowercase(property.name) -%> = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(self.<%- camelizeWithLeadingLowercase(property.name) -%>, false); + auto <%- camelizeWithLeadingLowercase(property.name) -%> = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(self.<%- camelizeWithLeadingLowercase(property.name) -%>, false); mbglLight.set<%- camelize(property.name) -%>(<%- camelizeWithLeadingLowercase(property.name) -%>); <% } -%> diff --git a/platform/darwin/src/MLNLight_Private.h b/platform/darwin/src/MLNLight_Private.h index f2c6f451d..6f84d9618 100644 --- a/platform/darwin/src/MLNLight_Private.h +++ b/platform/darwin/src/MLNLight_Private.h @@ -2,22 +2,22 @@ #import "MLNLight.h" -namespace mbgl { +namespace mln { namespace style { class Light; } -} // namespace mbgl +} // namespace mln @interface MLNLight (Private) /** Initializes and returns a ``MLNLight`` associated with a style's light. */ -- (instancetype)initWithMBGLLight:(const mbgl::style::Light *)mbglLight; +- (instancetype)initWithMBGLLight:(const mln::style::Light *)mbglLight; /** - Returns an `mbgl::style::Light` representation of the ``MLNLight``. + Returns an `mln::style::Light` representation of the ``MLNLight``. */ -- (mbgl::style::Light)mbglLight; +- (mln::style::Light)mbglLight; @end diff --git a/platform/darwin/src/MLNLoggingConfiguration.mm b/platform/darwin/src/MLNLoggingConfiguration.mm index 8bf8ed1a2..fde379711 100644 --- a/platform/darwin/src/MLNLoggingConfiguration.mm +++ b/platform/darwin/src/MLNLoggingConfiguration.mm @@ -8,7 +8,7 @@ #import #endif -namespace mbgl { +namespace mln { class MLNCoreLoggingObserver : public Log ::Observer { public: @@ -37,10 +37,10 @@ public: return true; } }; -} // namespace mbgl +} // namespace mln @implementation MLNLoggingConfiguration { - std::unique_ptr _coreLoggingObserver; + std::unique_ptr _coreLoggingObserver; } + (instancetype)sharedConfiguration { @@ -55,7 +55,7 @@ public: - (id)init { if (self = [super init]) { - mbgl::Log::setObserver(std::make_unique()); + mln::Log::setObserver(std::make_unique()); } return self; } diff --git a/platform/darwin/src/MLNMapCamera.mm b/platform/darwin/src/MLNMapCamera.mm index d978e86bc..94b7b2ecf 100644 --- a/platform/darwin/src/MLNMapCamera.mm +++ b/platform/darwin/src/MLNMapCamera.mm @@ -31,7 +31,7 @@ longitude:eyeCoordinate.longitude]; CLLocationDistance groundDistance = [eyeLocation distanceFromLocation:centerLocation]; CGFloat radianPitch = atan2(eyeAltitude, groundDistance); - pitch = mbgl::util::wrap(90 - MLNDegreesFromRadians(radianPitch), 0.0, 360.0); + pitch = mln::util::wrap(90 - MLNDegreesFromRadians(radianPitch), 0.0, 360.0); } return [[self alloc] initWithCenterCoordinate:centerCoordinate diff --git a/platform/darwin/src/MLNMapSnapshotter.mm b/platform/darwin/src/MLNMapSnapshotter.mm index 6918f79ff..45f04589a 100644 --- a/platform/darwin/src/MLNMapSnapshotter.mm +++ b/platform/darwin/src/MLNMapSnapshotter.mm @@ -46,21 +46,21 @@ const CGPoint MLNLogoImagePosition = CGPointMake(8, 8); const CGFloat MLNSnapshotterMinimumPixelSize = 64; NSString *const MLNSnapshotterAnnotationSpritePrefix = @"org.maplibre.sprites."; -MLNImage *MLNAttributedSnapshot(mbgl::MapSnapshotter::Attributions attributions, MLNImage *mglImage, - mbgl::MapSnapshotter::PointForFn pointForFn, - mbgl::MapSnapshotter::LatLngForFn latLngForFn, +MLNImage *MLNAttributedSnapshot(mln::MapSnapshotter::Attributions attributions, MLNImage *mglImage, + mln::MapSnapshotter::PointForFn pointForFn, + mln::MapSnapshotter::LatLngForFn latLngForFn, MLNMapSnapshotOptions *options, MLNMapSnapshotOverlayHandler overlayHandler); MLNMapSnapshot *MLNSnapshotWithDecoratedImage(MLNImage *mglImage, MLNMapSnapshotOptions *options, - mbgl::MapSnapshotter::Attributions attributions, - mbgl::MapSnapshotter::PointForFn pointForFn, - mbgl::MapSnapshotter::LatLngForFn latLngForFn, + mln::MapSnapshotter::Attributions attributions, + mln::MapSnapshotter::PointForFn pointForFn, + mln::MapSnapshotter::LatLngForFn latLngForFn, MLNMapSnapshotOverlayHandler overlayHandler, NSError *_Nullable *outError); NSArray *MLNAttributionInfosFromAttributions( - mbgl::MapSnapshotter::Attributions attributions); + mln::MapSnapshotter::Attributions attributions); -class MLNMapSnapshotterDelegateHost : public mbgl::MapSnapshotterObserver { +class MLNMapSnapshotterDelegateHost : public mln::MapSnapshotterObserver { public: MLNMapSnapshotterDelegateHost(MLNMapSnapshotter *snapshotter_) : snapshotter(snapshotter_) {} @@ -109,20 +109,20 @@ private: @property (nonatomic, assign) CGFloat scale; - (instancetype)initWithContext:(CGContextRef)context scale:(CGFloat)scale - pointForFn:(mbgl::MapSnapshotter::PointForFn)pointForFn - latLngForFn:(mbgl::MapSnapshotter::LatLngForFn)latLngForFn; + pointForFn:(mln::MapSnapshotter::PointForFn)pointForFn + latLngForFn:(mln::MapSnapshotter::LatLngForFn)latLngForFn; @end @implementation MLNMapSnapshotOverlay { - mbgl::MapSnapshotter::PointForFn _pointForFn; - mbgl::MapSnapshotter::LatLngForFn _latLngForFn; + mln::MapSnapshotter::PointForFn _pointForFn; + mln::MapSnapshotter::LatLngForFn _latLngForFn; } - (instancetype)initWithContext:(CGContextRef)context scale:(CGFloat)scale - pointForFn:(mbgl::MapSnapshotter::PointForFn)pointForFn - latLngForFn:(mbgl::MapSnapshotter::LatLngForFn)latLngForFn { + pointForFn:(mln::MapSnapshotter::PointForFn)pointForFn + latLngForFn:(mln::MapSnapshotter::LatLngForFn)latLngForFn { self = [super init]; if (self) { _context = context; @@ -137,27 +137,27 @@ private: #if TARGET_OS_IPHONE - (CGPoint)pointForCoordinate:(CLLocationCoordinate2D)coordinate { - mbgl::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); + mln::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); return CGPointMake(sc.x, sc.y); } - (CLLocationCoordinate2D)coordinateForPoint:(CGPoint)point { - mbgl::LatLng latLng = _latLngForFn(mbgl::ScreenCoordinate(point.x, point.y)); + mln::LatLng latLng = _latLngForFn(mln::ScreenCoordinate(point.x, point.y)); return MLNLocationCoordinate2DFromLatLng(latLng); } #else - (NSPoint)pointForCoordinate:(CLLocationCoordinate2D)coordinate { - mbgl::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); + mln::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); CGFloat height = ((CGFloat)CGBitmapContextGetHeight(self.context)) / self.scale; return NSMakePoint(sc.x, height - sc.y); } - (CLLocationCoordinate2D)coordinateForPoint:(NSPoint)point { CGFloat height = ((CGFloat)CGBitmapContextGetHeight(self.context)) / self.scale; - auto screenCoord = mbgl::ScreenCoordinate(point.x, height - point.y); - mbgl::LatLng latLng = _latLngForFn(screenCoord); + auto screenCoord = mln::ScreenCoordinate(point.x, height - point.y); + mln::LatLng latLng = _latLngForFn(screenCoord); return MLNLocationCoordinate2DFromLatLng(latLng); } @@ -207,21 +207,21 @@ private: @interface MLNMapSnapshot () - (instancetype)initWithImage:(nullable MLNImage *)image scale:(CGFloat)scale - pointForFn:(mbgl::MapSnapshotter::PointForFn)pointForFn - latLngForFn:(mbgl::MapSnapshotter::LatLngForFn)latLngForFn; + pointForFn:(mln::MapSnapshotter::PointForFn)pointForFn + latLngForFn:(mln::MapSnapshotter::LatLngForFn)latLngForFn; @property (nonatomic) CGFloat scale; @end @implementation MLNMapSnapshot { - mbgl::MapSnapshotter::PointForFn _pointForFn; - mbgl::MapSnapshotter::LatLngForFn _latLngForFn; + mln::MapSnapshotter::PointForFn _pointForFn; + mln::MapSnapshotter::LatLngForFn _latLngForFn; } - (instancetype)initWithImage:(nullable MLNImage *)image scale:(CGFloat)scale - pointForFn:(mbgl::MapSnapshotter::PointForFn)pointForFn - latLngForFn:(mbgl::MapSnapshotter::LatLngForFn)latLngForFn { + pointForFn:(mln::MapSnapshotter::PointForFn)pointForFn + latLngForFn:(mln::MapSnapshotter::LatLngForFn)latLngForFn { self = [super init]; if (self) { _pointForFn = pointForFn; @@ -235,25 +235,25 @@ private: #if TARGET_OS_IPHONE - (CGPoint)pointForCoordinate:(CLLocationCoordinate2D)coordinate { - mbgl::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); + mln::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); return CGPointMake(sc.x, sc.y); } - (CLLocationCoordinate2D)coordinateForPoint:(CGPoint)point { - mbgl::LatLng latLng = _latLngForFn(mbgl::ScreenCoordinate(point.x, point.y)); + mln::LatLng latLng = _latLngForFn(mln::ScreenCoordinate(point.x, point.y)); return MLNLocationCoordinate2DFromLatLng(latLng); } #else - (NSPoint)pointForCoordinate:(CLLocationCoordinate2D)coordinate { - mbgl::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); + mln::ScreenCoordinate sc = _pointForFn(MLNLatLngFromLocationCoordinate2D(coordinate)); return NSMakePoint(sc.x, self.image.size.height - sc.y); } - (CLLocationCoordinate2D)coordinateForPoint:(NSPoint)point { - auto screenCoord = mbgl::ScreenCoordinate(point.x, self.image.size.height - point.y); - mbgl::LatLng latLng = _latLngForFn(screenCoord); + auto screenCoord = mln::ScreenCoordinate(point.x, self.image.size.height - point.y); + mln::LatLng latLng = _latLngForFn(screenCoord); return MLNLocationCoordinate2DFromLatLng(latLng); } @@ -267,7 +267,7 @@ private: @end @implementation MLNMapSnapshotter { - std::unique_ptr _mbglMapSnapshotter; + std::unique_ptr _mbglMapSnapshotter; std::unique_ptr _delegateHost; NSMutableArray> *_annotationsToInstall; NSMutableSet *_installedImages; @@ -365,7 +365,7 @@ private: [self installAnnotationImage:annotationImage]; - _mbglMapSnapshotter->addAnnotation(mbgl::SymbolAnnotation{ + _mbglMapSnapshotter->addAnnotation(mln::SymbolAnnotation{ MLNPointFromLocationCoordinate2D(annotation.coordinate), symbolName.UTF8String}); } } @@ -439,12 +439,12 @@ private: // the snapshot block below, causing the only remaining references to the snapshotter to go out of // scope. __block MLNMapSnapshotter *strongSelf = self; - _mbglMapSnapshotter->snapshot(^(std::exception_ptr mbglError, mbgl::PremultipliedImage image, - mbgl::MapSnapshotter::Attributions attributions, - mbgl::MapSnapshotter::PointForFn pointForFn, - mbgl::MapSnapshotter::LatLngForFn latLngForFn) { + _mbglMapSnapshotter->snapshot(^(std::exception_ptr mbglError, mln::PremultipliedImage image, + mln::MapSnapshotter::Attributions attributions, + mln::MapSnapshotter::PointForFn pointForFn, + mln::MapSnapshotter::LatLngForFn latLngForFn) { if (mbglError) { - NSString *description = @(mbgl::util::toString(mbglError).c_str()); + NSString *description = @(mln::util::toString(mbglError).c_str()); NSDictionary *userInfo = @{NSLocalizedDescriptionKey : description}; NSError *error = [NSError errorWithDomain:MLNErrorDomain code:MLNErrorCodeSnapshotFailed @@ -485,7 +485,7 @@ private: }); } -MLNImage *MLNAttributedSnapshot(mbgl::MapSnapshotter::Attributions attributions, MLNImage *mglImage, +MLNImage *MLNAttributedSnapshot(mln::MapSnapshotter::Attributions attributions, MLNImage *mglImage, MLNMapSnapshotOptions *options, void (^overlayHandler)()) { NSArray *attributionInfo = MLNAttributionInfosFromAttributions(attributions); @@ -663,9 +663,9 @@ MLNImage *MLNAttributedSnapshot(mbgl::MapSnapshotter::Attributions attributions, } MLNMapSnapshot *MLNSnapshotWithDecoratedImage(MLNImage *mglImage, MLNMapSnapshotOptions *options, - mbgl::MapSnapshotter::Attributions attributions, - mbgl::MapSnapshotter::PointForFn pointForFn, - mbgl::MapSnapshotter::LatLngForFn latLngForFn, + mln::MapSnapshotter::Attributions attributions, + mln::MapSnapshotter::PointForFn pointForFn, + mln::MapSnapshotter::LatLngForFn latLngForFn, MLNMapSnapshotOverlayHandler overlayHandler, NSError *_Nullable *outError) { MLNImage *compositedImage = MLNAttributedSnapshot(attributions, mglImage, options, ^{ @@ -718,7 +718,7 @@ MLNMapSnapshot *MLNSnapshotWithDecoratedImage(MLNImage *mglImage, MLNMapSnapshot } NSArray *MLNAttributionInfosFromAttributions( - mbgl::MapSnapshotter::Attributions attributions) { + mln::MapSnapshotter::Attributions attributions) { NSMutableArray *infos = [NSMutableArray array]; #if TARGET_OS_IPHONE @@ -872,7 +872,7 @@ NSArray *MLNAttributionInfosFromAttributions( // Size; taking into account the minimum texture size for OpenGL ES // For non retina screens the ratio is 1:1 MLNSnapshotterMinimumPixelSize - mbgl::Size size = { + mln::Size size = { static_cast(MAX(options.size.width, MLNSnapshotterMinimumPixelSize)), static_cast(MAX(options.size.height, MLNSnapshotterMinimumPixelSize))}; @@ -882,11 +882,11 @@ NSArray *MLNAttributionInfosFromAttributions( MLNRendererConfiguration *config = [MLNRendererConfiguration currentConfiguration]; auto tileServerOptions = [[MLNSettings sharedSettings] tileServerOptionsInternal]; - mbgl::ResourceOptions resourceOptions; + mln::ResourceOptions resourceOptions; resourceOptions.withTileServerOptions(*tileServerOptions) .withCachePath(MLNOfflineStorage.sharedOfflineStorage.databasePath.UTF8String) .withAssetPath(NSBundle.mainBundle.resourceURL.path.UTF8String); - mbgl::ClientOptions clientOptions; + mln::ClientOptions clientOptions; auto apiKey = [[MLNSettings sharedSettings] apiKey]; if (apiKey) { @@ -898,13 +898,13 @@ NSArray *MLNAttributionInfosFromAttributions( config.localFontFamilyName ? std::optional(std::string(config.localFontFamilyName.UTF8String)) : std::nullopt; _delegateHost = std::make_unique(self); - _mbglMapSnapshotter = std::make_unique( + _mbglMapSnapshotter = std::make_unique( size, pixelRatio, resourceOptions, clientOptions, *_delegateHost, localFontFamilyName); _mbglMapSnapshotter->setStyleURL(std::string(options.styleURL.absoluteString.UTF8String)); // Camera options - mbgl::CameraOptions cameraOptions; + mln::CameraOptions cameraOptions; if (CLLocationCoordinate2DIsValid(options.camera.centerCoordinate)) { cameraOptions.center = MLNLatLngFromLocationCoordinate2D(options.camera.centerCoordinate); } @@ -920,7 +920,7 @@ NSArray *MLNAttributionInfosFromAttributions( if (options.camera.roll != 0) { cameraOptions.roll = options.camera.roll; } - if (cameraOptions != mbgl::CameraOptions()) { + if (cameraOptions != mln::CameraOptions()) { _mbglMapSnapshotter->setCameraOptions(cameraOptions); } @@ -949,21 +949,21 @@ NSArray *MLNAttributionInfosFromAttributions( return 1.0; } -- (mbgl::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation { +- (mln::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation { if ([self.delegate respondsToSelector:@selector(mapSnapshotter:strokeColorForShapeAnnotation:)]) { MLNColor *color = [self.delegate mapSnapshotter:self strokeColorForShapeAnnotation:annotation]; return color.mgl_color; } - return mbgl::Color::white(); + return mln::Color::white(); } -- (mbgl::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation { +- (mln::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation { if ([self.delegate respondsToSelector:@selector(mapSnapshotter:fillColorForPolygonAnnotation:)]) { MLNColor *color = [self.delegate mapSnapshotter:self fillColorForPolygonAnnotation:annotation]; return color.mgl_color; } - return mbgl::Color::white(); + return mln::Color::white(); } - (CGFloat)lineWidthForPolylineAnnotation:(MLNPolyline *)annotation { diff --git a/platform/darwin/src/MLNMultiPoint.mm b/platform/darwin/src/MLNMultiPoint.mm index 0f89e003e..1604a60de 100644 --- a/platform/darwin/src/MLNMultiPoint.mm +++ b/platform/darwin/src/MLNMultiPoint.mm @@ -6,7 +6,7 @@ #import "NSCoder+MLNAdditions.h" @implementation MLNMultiPoint { - std::optional _bounds; + std::optional _bounds; std::vector _coordinates; } @@ -168,10 +168,10 @@ - (MLNCoordinateBounds)overlayBounds { if (!_bounds) { - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (auto coordinate : _coordinates) { if (!MLNLocationCoordinate2DIsValid(coordinate)) { - bounds = mbgl::LatLngBounds::empty(); + bounds = mln::LatLngBounds::empty(); break; } bounds.extend(MLNLatLngFromLocationCoordinate2D(coordinate)); @@ -185,10 +185,10 @@ return MLNCoordinateBoundsIntersectsCoordinateBounds(self.overlayBounds, overlayBounds); } -- (mbgl::Annotation)annotationObjectWithDelegate:(__unused id)delegate { +- (mln::Annotation)annotationObjectWithDelegate:(__unused id)delegate { MLNAssert(NO, @"Cannot add an annotation from an instance of %@", NSStringFromClass([self class])); - return mbgl::SymbolAnnotation(mbgl::Point()); + return mln::SymbolAnnotation(mln::Point()); } - (NSString *)description { diff --git a/platform/darwin/src/MLNMultiPoint_Private.h b/platform/darwin/src/MLNMultiPoint_Private.h index deeb261df..7694f709d 100644 --- a/platform/darwin/src/MLNMultiPoint_Private.h +++ b/platform/darwin/src/MLNMultiPoint_Private.h @@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN - (BOOL)intersectsOverlayBounds:(MLNCoordinateBounds)overlayBounds; /** Constructs a shape annotation object, asking the delegate for style values. */ -- (mbgl::Annotation)annotationObjectWithDelegate:(id)delegate; +- (mln::Annotation)annotationObjectWithDelegate:(id)delegate; @end @@ -33,10 +33,10 @@ NS_ASSUME_NONNULL_BEGIN - (double)alphaForShapeAnnotation:(MLNShape *)annotation; /** Returns the stroke color object for the given annotation. */ -- (mbgl::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation; +- (mln::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation; /** Returns the fill color object for the given annotation. */ -- (mbgl::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation; +- (mln::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation; /** Returns the stroke width object for the given annotation. */ - (CGFloat)lineWidthForPolylineAnnotation:(MLNPolyline *)annotation; diff --git a/platform/darwin/src/MLNOfflinePack.mm b/platform/darwin/src/MLNOfflinePack.mm index 8b3b4d53d..c94235e2d 100644 --- a/platform/darwin/src/MLNOfflinePack.mm +++ b/platform/darwin/src/MLNOfflinePack.mm @@ -40,12 +40,12 @@ const MLNExceptionName MLNInvalidOfflinePackException = @"MLNInvalidOfflinePackE @interface MLNShapeOfflineRegion () @end -class MBGLOfflineRegionObserver : public mbgl::OfflineRegionObserver { +class MBGLOfflineRegionObserver : public mln::OfflineRegionObserver { public: MBGLOfflineRegionObserver(MLNOfflinePack *pack_) : pack(pack_) {} - void statusChanged(mbgl::OfflineRegionStatus status) override; - void responseError(mbgl::Response::Error error) override; + void statusChanged(mln::OfflineRegionStatus status) override; + void responseError(mln::Response::Error error) override; void mapboxTileCountLimitExceeded(uint64_t limit) override; private: @@ -54,14 +54,14 @@ private: @interface MLNOfflinePack () -@property (nonatomic, nullable, readwrite) mbgl::OfflineRegion *mbglOfflineRegion; +@property (nonatomic, nullable, readwrite) mln::OfflineRegion *mbglOfflineRegion; @property (nonatomic, readwrite) MLNOfflinePackProgress progress; @end @implementation MLNOfflinePack { BOOL _isSuspending; - std::shared_ptr _mbglDatabaseFileSource; + std::shared_ptr _mbglDatabaseFileSource; } - (instancetype)init { @@ -75,7 +75,7 @@ private: return self; } -- (instancetype)initWithMBGLRegion:(mbgl::OfflineRegion *)region { +- (instancetype)initWithMBGLRegion:(mln::OfflineRegion *)region { if (self = [super init]) { _mbglOfflineRegion = region; _state = MLNOfflinePackStateUnknown; @@ -103,28 +103,28 @@ private: - (id)region { MLNAssertOfflinePackIsValid(); - const mbgl::OfflineRegionDefinition ®ionDefinition = _mbglOfflineRegion->getDefinition(); + const mln::OfflineRegionDefinition ®ionDefinition = _mbglOfflineRegion->getDefinition(); MLNAssert([MLNTilePyramidOfflineRegion conformsToProtocol:@protocol(MLNOfflineRegion_Private)], @"MLNTilePyramidOfflineRegion should conform to MLNOfflineRegion_Private."); MLNAssert([MLNShapeOfflineRegion conformsToProtocol:@protocol(MLNOfflineRegion_Private)], @"MLNShapeOfflineRegion should conform to MLNOfflineRegion_Private."); return std::visit( - mbgl::overloaded{[&](const mbgl::OfflineTilePyramidRegionDefinition def) { - return (id)[[MLNTilePyramidOfflineRegion alloc] - initWithOfflineRegionDefinition:def]; - }, - [&](const mbgl::OfflineGeometryRegionDefinition &def) { - return (id)[[MLNShapeOfflineRegion alloc] - initWithOfflineRegionDefinition:def]; - }}, + mln::overloaded{[&](const mln::OfflineTilePyramidRegionDefinition def) { + return (id)[[MLNTilePyramidOfflineRegion alloc] + initWithOfflineRegionDefinition:def]; + }, + [&](const mln::OfflineGeometryRegionDefinition &def) { + return (id)[[MLNShapeOfflineRegion alloc] + initWithOfflineRegionDefinition:def]; + }}, regionDefinition); } - (NSData *)context { MLNAssertOfflinePackIsValid(); - const mbgl::OfflineRegionMetadata &metadata = _mbglOfflineRegion->getMetadata(); + const mln::OfflineRegionMetadata &metadata = _mbglOfflineRegion->getMetadata(); return [NSData dataWithBytes:&metadata[0] length:metadata.size()]; } @@ -132,19 +132,19 @@ private: completionHandler:(void (^_Nullable)(NSError *_Nullable error))completion { MLNAssertOfflinePackIsValid(); - mbgl::OfflineRegionMetadata metadata(context.length); + mln::OfflineRegionMetadata metadata(context.length); [context getBytes:&metadata[0] length:metadata.size()]; [self willChangeValueForKey:@"context"]; __weak MLNOfflinePack *weakSelf = self; _mbglDatabaseFileSource->updateOfflineMetadata( _mbglOfflineRegion->getID(), metadata, - [&, completion, weakSelf](mbgl::expected - mbglOfflineRegionMetadata) { + [&, completion, weakSelf]( + mln::expected mbglOfflineRegionMetadata) { NSError *error; if (!mbglOfflineRegionMetadata) { NSString *errorDescription = - @(mbgl::util::toString(mbglOfflineRegionMetadata.error()).c_str()); + @(mln::util::toString(mbglOfflineRegionMetadata.error()).c_str()); error = [NSError errorWithDomain:MLNErrorDomain code:MLNErrorCodeModifyingOfflineStorageFailed userInfo:errorDescription ? @{ @@ -188,7 +188,7 @@ private: self.state = MLNOfflinePackStateActive; _mbglDatabaseFileSource->setOfflineRegionDownloadState(*_mbglOfflineRegion, - mbgl::OfflineRegionDownloadState::Active); + mln::OfflineRegionDownloadState::Active); } - (void)suspend { @@ -200,8 +200,8 @@ private: _isSuspending = YES; } - _mbglDatabaseFileSource->setOfflineRegionDownloadState( - *_mbglOfflineRegion, mbgl::OfflineRegionDownloadState::Inactive); + _mbglDatabaseFileSource->setOfflineRegionDownloadState(*_mbglOfflineRegion, + mln::OfflineRegionDownloadState::Inactive); } - (void)invalidate { @@ -226,7 +226,7 @@ private: // -[MLNOfflineStorage removePack:withCompletionHandler:] but before the // removal is complete and the completion handler is called. MLNAssert(_state == MLNOfflinePackStateInvalid, - @"A valid MLNOfflinePack has no mbgl::OfflineRegion."); + @"A valid MLNOfflinePack has no mln::OfflineRegion."); return; } @@ -246,9 +246,9 @@ private: __weak MLNOfflinePack *weakSelf = self; _mbglDatabaseFileSource->getOfflineRegionStatus( *_mbglOfflineRegion, - [&, weakSelf](mbgl::expected status) { + [&, weakSelf](mln::expected status) { if (status) { - mbgl::OfflineRegionStatus checkedStatus = *status; + mln::OfflineRegionStatus checkedStatus = *status; dispatch_async(dispatch_get_main_queue(), ^{ MLNOfflinePack *strongSelf = weakSelf; [strongSelf offlineRegionStatusDidChange:checkedStatus]; @@ -257,16 +257,16 @@ private: }); } -- (void)offlineRegionStatusDidChange:(mbgl::OfflineRegionStatus)status { +- (void)offlineRegionStatusDidChange:(mln::OfflineRegionStatus)status { MLNAssert(_state != MLNOfflinePackStateInvalid, @"Cannot change update progress of an invalid offline pack."); switch (status.downloadState) { - case mbgl::OfflineRegionDownloadState::Inactive: + case mln::OfflineRegionDownloadState::Inactive: self.state = status.complete() ? MLNOfflinePackStateComplete : MLNOfflinePackStateInactive; break; - case mbgl::OfflineRegionDownloadState::Active: + case mln::OfflineRegionDownloadState::Active: self.state = MLNOfflinePackStateActive; break; } @@ -314,18 +314,18 @@ private: userInfo:userInfo]; } -NSError *MLNErrorFromResponseError(mbgl::Response::Error error) { +NSError *MLNErrorFromResponseError(mln::Response::Error error) { NSInteger errorCode = MLNErrorCodeUnknown; switch (error.reason) { - case mbgl::Response::Error::Reason::NotFound: + case mln::Response::Error::Reason::NotFound: errorCode = MLNErrorCodeNotFound; break; - case mbgl::Response::Error::Reason::Server: + case mln::Response::Error::Reason::Server: errorCode = MLNErrorCodeBadServerResponse; break; - case mbgl::Response::Error::Reason::Connection: + case mln::Response::Error::Reason::Connection: errorCode = MLNErrorCodeConnectionFailed; break; @@ -341,14 +341,14 @@ NSError *MLNErrorFromResponseError(mbgl::Response::Error error) { @end -void MBGLOfflineRegionObserver::statusChanged(mbgl::OfflineRegionStatus status) { +void MBGLOfflineRegionObserver::statusChanged(mln::OfflineRegionStatus status) { __weak MLNOfflinePack *weakPack = pack; dispatch_async(dispatch_get_main_queue(), ^{ [weakPack offlineRegionStatusDidChange:status]; }); } -void MBGLOfflineRegionObserver::responseError(mbgl::Response::Error error) { +void MBGLOfflineRegionObserver::responseError(mln::Response::Error error) { __weak MLNOfflinePack *weakPack = pack; dispatch_async(dispatch_get_main_queue(), ^{ [weakPack didReceiveError:MLNErrorFromResponseError(error)]; diff --git a/platform/darwin/src/MLNOfflinePack_Private.h b/platform/darwin/src/MLNOfflinePack_Private.h index 6f3080fa7..165e1bbe2 100644 --- a/platform/darwin/src/MLNOfflinePack_Private.h +++ b/platform/darwin/src/MLNOfflinePack_Private.h @@ -6,11 +6,11 @@ NS_ASSUME_NONNULL_BEGIN @interface MLNOfflinePack (Private) -@property (nonatomic, nullable) mbgl::OfflineRegion *mbglOfflineRegion; +@property (nonatomic, nullable) mln::OfflineRegion *mbglOfflineRegion; @property (nonatomic, readwrite) MLNOfflinePackState state; -- (instancetype)initWithMBGLRegion:(mbgl::OfflineRegion *)region; +- (instancetype)initWithMBGLRegion:(mln::OfflineRegion *)region; /** Invalidates the pack and ensures that no future progress update can ever diff --git a/platform/darwin/src/MLNOfflineRegion_Private.h b/platform/darwin/src/MLNOfflineRegion_Private.h index d194b883f..1fd15bab8 100644 --- a/platform/darwin/src/MLNOfflineRegion_Private.h +++ b/platform/darwin/src/MLNOfflineRegion_Private.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN Creates and returns a C++ offline region definition corresponding to the receiver. */ -- (const mbgl::OfflineRegionDefinition)offlineRegionDefinition; +- (const mln::OfflineRegionDefinition)offlineRegionDefinition; /** Attributes to be passed into the offline download start event diff --git a/platform/darwin/src/MLNOfflineStorage.mm b/platform/darwin/src/MLNOfflineStorage.mm index cc577ddab..585b1fb97 100644 --- a/platform/darwin/src/MLNOfflineStorage.mm +++ b/platform/darwin/src/MLNOfflineStorage.mm @@ -46,15 +46,15 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio @interface MLNOfflineStorage () @property (nonatomic, strong, readwrite) NSMutableArray *packs; -@property (nonatomic) std::shared_ptr mbglDatabaseFileSource; -@property (nonatomic) std::shared_ptr mbglOnlineFileSource; -@property (nonatomic) std::shared_ptr mbglFileSource; +@property (nonatomic) std::shared_ptr mbglDatabaseFileSource; +@property (nonatomic) std::shared_ptr mbglOnlineFileSource; +@property (nonatomic) std::shared_ptr mbglFileSource; @property (nonatomic, getter=isPaused) BOOL paused; @end @implementation MLNOfflineStorage { NSURL *_databaseURL; - std::unique_ptr> _mbglResourceTransform; + std::unique_ptr> _mbglResourceTransform; } + (instancetype)sharedOfflineStorage { @@ -112,38 +112,38 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio _delegate = newValue; if ([self.delegate respondsToSelector:@selector(offlineStorage:URLForResourceOfKind:withURL:)]) { _mbglResourceTransform = - std::make_unique>( - *mbgl::Scheduler::GetCurrent(), + std::make_unique>( + *mln::Scheduler::GetCurrent(), [offlineStorage = self](auto kind_, const std::string &url_, - mbgl::ResourceTransform::FinishedCallback cb) { + mln::ResourceTransform::FinishedCallback cb) { NSURL *url = [NSURL URLWithString:[[NSString alloc] initWithBytes:url_.data() length:url_.length() encoding:NSUTF8StringEncoding]]; MLNResourceKind kind = MLNResourceKindUnknown; switch (kind_) { - case mbgl::Resource::Kind::Tile: + case mln::Resource::Kind::Tile: kind = MLNResourceKindTile; break; - case mbgl::Resource::Kind::Glyphs: + case mln::Resource::Kind::Glyphs: kind = MLNResourceKindGlyphs; break; - case mbgl::Resource::Kind::Style: + case mln::Resource::Kind::Style: kind = MLNResourceKindStyle; break; - case mbgl::Resource::Kind::Source: + case mln::Resource::Kind::Source: kind = MLNResourceKindSource; break; - case mbgl::Resource::Kind::SpriteImage: + case mln::Resource::Kind::SpriteImage: kind = MLNResourceKindSpriteImage; break; - case mbgl::Resource::Kind::SpriteJSON: + case mln::Resource::Kind::SpriteJSON: kind = MLNResourceKindSpriteJSON; break; - case mbgl::Resource::Kind::Image: + case mln::Resource::Kind::Image: kind = MLNResourceKindImage; break; - case mbgl::Resource::Kind::Unknown: + case mln::Resource::Kind::Unknown: kind = MLNResourceKindUnknown; break; } @@ -154,9 +154,9 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio }); _mbglOnlineFileSource->setResourceTransform( - {[actorRef = _mbglResourceTransform->self()]( - auto kind_, const std::string &url_, mbgl::ResourceTransform::FinishedCallback cb_) { - actorRef.invoke(&mbgl::ResourceTransform::TransformCallback::operator(), kind_, url_, + {[actorRef = _mbglResourceTransform->self()](auto kind_, const std::string &url_, + mln::ResourceTransform::FinishedCallback cb_) { + actorRef.invoke(&mln::ResourceTransform::TransformCallback::operator(), kind_, url_, std::move(cb_)); }}); } else { @@ -174,20 +174,20 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio MLNInitializeRunLoop(); if (self = [super init]) { - mbgl::TileServerOptions *tileServerOptions = + mln::TileServerOptions *tileServerOptions = [[MLNSettings sharedSettings] tileServerOptionsInternal]; - mbgl::ResourceOptions resourceOptions; + mln::ResourceOptions resourceOptions; resourceOptions.withCachePath(self.databasePath.UTF8String) .withAssetPath([NSBundle mainBundle].resourceURL.path.UTF8String) .withTileServerOptions(*tileServerOptions); - mbgl::ClientOptions clientOptions; - _mbglFileSource = mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::ResourceLoader, resourceOptions, clientOptions); - _mbglOnlineFileSource = mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::Network, resourceOptions, clientOptions); - _mbglDatabaseFileSource = std::static_pointer_cast( - std::shared_ptr(mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::Database, resourceOptions, clientOptions))); + mln::ClientOptions clientOptions; + _mbglFileSource = mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::ResourceLoader, resourceOptions, clientOptions); + _mbglOnlineFileSource = mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::Network, resourceOptions, clientOptions); + _mbglDatabaseFileSource = std::static_pointer_cast( + std::shared_ptr(mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::Database, resourceOptions, clientOptions))); // Observe for changes to the tile server options (and find out the current one). [[MLNSettings sharedSettings] @@ -225,7 +225,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio if ([keyPath isEqualToString:@"apiKey"] && object == [MLNSettings sharedSettings]) { NSString *apiKey = change[NSKeyValueChangeNewKey]; if (![apiKey isKindOfClass:[NSNull class]]) { - _mbglOnlineFileSource->setProperty(mbgl::API_KEY_KEY, apiKey.UTF8String); + _mbglOnlineFileSource->setProperty(mln::API_KEY_KEY, apiKey.UTF8String); } } else if ([keyPath isEqualToString:@"tileServerOptionsChangeToken"] && object == [MLNSettings sharedSettings]) { @@ -428,7 +428,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio NSError *_Nullable error))completion { _mbglDatabaseFileSource->mergeOfflineRegions( std::string(static_cast([filePath UTF8String])), - [&, completion, filePath](mbgl::expected result) { + [&, completion, filePath](mln::expected result) { NSError *error; NSMutableArray *packs; if (!result) { @@ -443,14 +443,14 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio userInfo:@{ NSLocalizedDescriptionKey : description, NSLocalizedFailureReasonErrorKey : - @(mbgl::util::toString(result.error()).c_str()) + @(mln::util::toString(result.error()).c_str()) }]; } else { auto ®ions = result.value(); packs = [NSMutableArray arrayWithCapacity:regions.size()]; for (auto ®ion : regions) { MLNOfflinePack *pack = [[MLNOfflinePack alloc] - initWithMBGLRegion:new mbgl::OfflineRegion(std::move(region))]; + initWithMBGLRegion:new mln::OfflineRegion(std::move(region))]; [packs addObject:pack]; } } @@ -490,16 +490,16 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio return; } - const mbgl::OfflineRegionDefinition regionDefinition = + const mln::OfflineRegionDefinition regionDefinition = [(id)region offlineRegionDefinition]; - mbgl::OfflineRegionMetadata metadata(context.length); + mln::OfflineRegionMetadata metadata(context.length); [context getBytes:&metadata[0] length:metadata.size()]; _mbglDatabaseFileSource->createOfflineRegion( regionDefinition, metadata, - [&, completion](mbgl::expected mbglOfflineRegion) { + [&, completion](mln::expected mbglOfflineRegion) { NSError *error; if (!mbglOfflineRegion) { - NSString *errorDescription = @(mbgl::util::toString(mbglOfflineRegion.error()).c_str()); + NSString *errorDescription = @(mln::util::toString(mbglOfflineRegion.error()).c_str()); error = [NSError errorWithDomain:MLNErrorDomain code:MLNErrorCodeModifyingOfflineStorageFailed userInfo:errorDescription ? @{ @@ -510,7 +510,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio if (completion) { MLNOfflinePack *pack = mbglOfflineRegion - ? [[MLNOfflinePack alloc] initWithMBGLRegion:new mbgl::OfflineRegion(std::move( + ? [[MLNOfflinePack alloc] initWithMBGLRegion:new mln::OfflineRegion(std::move( mbglOfflineRegion.value()))] : nil; dispatch_async(dispatch_get_main_queue(), @@ -533,7 +533,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio - (void)_removePack:(MLNOfflinePack *)pack withCompletionHandler:(MLNOfflinePackRemovalCompletionHandler)completion { - mbgl::OfflineRegion *mbglOfflineRegion = pack.mbglOfflineRegion; + mln::OfflineRegion *mbglOfflineRegion = pack.mbglOfflineRegion; [pack invalidate]; @@ -551,7 +551,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio errorWithDomain:MLNErrorDomain code:MLNErrorCodeModifyingOfflineStorageFailed userInfo:@{ - NSLocalizedDescriptionKey : @(mbgl::util::toString(exception).c_str()), + NSLocalizedDescriptionKey : @(mln::util::toString(exception).c_str()), }]; } if (completion) { @@ -563,7 +563,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio - (void)invalidatePack:(MLNOfflinePack *)pack withCompletionHandler:(void (^)(NSError *_Nullable))completion { - mbgl::OfflineRegion ®ion = *pack.mbglOfflineRegion; + mln::OfflineRegion ®ion = *pack.mbglOfflineRegion; NSError *error; if (!pack.mbglOfflineRegion) { completion(nil); @@ -576,7 +576,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio [NSError errorWithDomain:MLNErrorDomain code:MLNErrorCodeModifyingOfflineStorageFailed userInfo:@{ - NSLocalizedDescriptionKey : @(mbgl::util::toString(exception).c_str()), + NSLocalizedDescriptionKey : @(mln::util::toString(exception).c_str()), }]; } }); @@ -599,7 +599,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio - (void)getPacksWithCompletionHandler:(void (^)(NSArray *packs, NSError *_Nullable error))completion { _mbglDatabaseFileSource->listOfflineRegions( - [&, completion](mbgl::expected result) { + [&, completion](mln::expected result) { NSError *error; NSMutableArray *packs; if (!result) { @@ -607,14 +607,14 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio errorWithDomain:MLNErrorDomain code:MLNErrorCodeUnknown userInfo:@{ - NSLocalizedDescriptionKey : @(mbgl::util::toString(result.error()).c_str()), + NSLocalizedDescriptionKey : @(mln::util::toString(result.error()).c_str()), }]; } else { auto ®ions = result.value(); packs = [NSMutableArray arrayWithCapacity:regions.size()]; for (auto ®ion : regions) { MLNOfflinePack *pack = [[MLNOfflinePack alloc] - initWithMBGLRegion:new mbgl::OfflineRegion(std::move(region))]; + initWithMBGLRegion:new mln::OfflineRegion(std::move(region))]; [packs addObject:pack]; } } @@ -643,7 +643,7 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio errorWithDomain:MLNErrorDomain code:MLNErrorCodeModifyingOfflineStorageFailed userInfo:@{ - NSLocalizedDescriptionKey : @(mbgl::util::toString(exception).c_str()), + NSLocalizedDescriptionKey : @(mln::util::toString(exception).c_str()), }]; } dispatch_sync(dispatch_get_main_queue(), ^{ @@ -659,12 +659,12 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio if (completion) { if (exception) { // Convert std::exception_ptr to an NSError. - error = [NSError - errorWithDomain:MLNErrorDomain - code:MLNErrorCodeModifyingOfflineStorageFailed - userInfo:@{ - NSLocalizedDescriptionKey : @(mbgl::util::toString(exception).c_str()), - }]; + error = + [NSError errorWithDomain:MLNErrorDomain + code:MLNErrorCodeModifyingOfflineStorageFailed + userInfo:@{ + NSLocalizedDescriptionKey : @(mln::util::toString(exception).c_str()), + }]; } dispatch_async(dispatch_get_main_queue(), ^{ completion(error); @@ -678,12 +678,12 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio NSError *error; if (completion) { if (exception) { - error = [NSError - errorWithDomain:MLNErrorDomain - code:MLNErrorCodeModifyingOfflineStorageFailed - userInfo:@{ - NSLocalizedDescriptionKey : @(mbgl::util::toString(exception).c_str()), - }]; + error = + [NSError errorWithDomain:MLNErrorDomain + code:MLNErrorCodeModifyingOfflineStorageFailed + userInfo:@{ + NSLocalizedDescriptionKey : @(mln::util::toString(exception).c_str()), + }]; } dispatch_async(dispatch_get_main_queue(), [&, completion, error](void) { completion(error); }); @@ -696,12 +696,12 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio NSError *error; if (completion) { if (exception) { - error = [NSError - errorWithDomain:MLNErrorDomain - code:MLNErrorCodeUnknown - userInfo:@{ - NSLocalizedDescriptionKey : @(mbgl::util::toString(exception).c_str()), - }]; + error = + [NSError errorWithDomain:MLNErrorDomain + code:MLNErrorCodeUnknown + userInfo:@{ + NSLocalizedDescriptionKey : @(mln::util::toString(exception).c_str()), + }]; } dispatch_async(dispatch_get_main_queue(), ^{ completion(error); @@ -739,8 +739,8 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio eTag:(nullable NSString *)eTag mustRevalidate:(BOOL)mustRevalidate completionHandler:(nullable MLNOfflinePreloadDataCompletionHandler)completion { - mbgl::Resource resource(mbgl::Resource::Kind::Unknown, url.absoluteString.UTF8String); - mbgl::Response response; + mln::Resource resource(mln::Resource::Kind::Unknown, url.absoluteString.UTF8String); + mln::Response response; response.data = std::make_shared(static_cast(data.bytes), data.length); response.mustRevalidate = mustRevalidate; @@ -750,14 +750,14 @@ const MLNExceptionName MLNUnsupportedRegionTypeException = @"MLNUnsupportedRegio if (modified) { response.modified = - mbgl::Timestamp() + std::chrono::duration_cast( - MLNDurationFromTimeInterval(modified.timeIntervalSince1970)); + mln::Timestamp() + std::chrono::duration_cast( + MLNDurationFromTimeInterval(modified.timeIntervalSince1970)); } if (expires) { response.expires = - mbgl::Timestamp() + std::chrono::duration_cast( - MLNDurationFromTimeInterval(expires.timeIntervalSince1970)); + mln::Timestamp() + std::chrono::duration_cast( + MLNDurationFromTimeInterval(expires.timeIntervalSince1970)); } std::function callback; diff --git a/platform/darwin/src/MLNOfflineStorage_Private.h b/platform/darwin/src/MLNOfflineStorage_Private.h index dc020e16d..ac0848250 100644 --- a/platform/darwin/src/MLNOfflineStorage_Private.h +++ b/platform/darwin/src/MLNOfflineStorage_Private.h @@ -16,17 +16,17 @@ NS_ASSUME_NONNULL_BEGIN /** The shared database file source object owned by the shared offline storage object. */ -@property (nonatomic) std::shared_ptr mbglDatabaseFileSource; +@property (nonatomic) std::shared_ptr mbglDatabaseFileSource; /** The shared online file source object owned by the shared offline storage object. */ -@property (nonatomic) std::shared_ptr mbglOnlineFileSource; +@property (nonatomic) std::shared_ptr mbglOnlineFileSource; /** The shared resource loader file source object owned by the shared offline storage object. */ -@property (nonatomic) std::shared_ptr mbglFileSource; +@property (nonatomic) std::shared_ptr mbglFileSource; - (void)getPacksWithCompletionHandler:(void (^)(NSArray *packs, NSError *_Nullable error))completion; diff --git a/platform/darwin/src/MLNPluginStyleLayer.mm b/platform/darwin/src/MLNPluginStyleLayer.mm index 6bda2c204..c228ffb69 100644 --- a/platform/darwin/src/MLNPluginStyleLayer.mm +++ b/platform/darwin/src/MLNPluginStyleLayer.mm @@ -7,12 +7,12 @@ @implementation MLNPluginStyleLayer - (void)getStats { - mbgl::style::PluginLayer *l = (mbgl::style::PluginLayer *)self.rawLayer; + mln::style::PluginLayer *l = (mln::style::PluginLayer *)self.rawLayer; auto pl = l->impl(); } - (MLNPluginLayer *)pluginLayer { - mbgl::style::PluginLayer *l = (mbgl::style::PluginLayer *)self.rawLayer; + mln::style::PluginLayer *l = (mln::style::PluginLayer *)self.rawLayer; if (l->_platformReference) { MLNPluginLayer *pl = (__bridge MLNPluginLayer *)l->_platformReference; return pl; @@ -23,6 +23,6 @@ @end -MLNStyleLayer *mbgl::PluginLayerPeerFactory::createPeer(style::Layer *rawLayer) { +MLNStyleLayer *mln::PluginLayerPeerFactory::createPeer(style::Layer *rawLayer) { return [[MLNPluginStyleLayer alloc] initWithRawLayer:rawLayer]; } diff --git a/platform/darwin/src/MLNPluginStyleLayer_Private.h b/platform/darwin/src/MLNPluginStyleLayer_Private.h index f72b0ea2c..df05c7ef0 100644 --- a/platform/darwin/src/MLNPluginStyleLayer_Private.h +++ b/platform/darwin/src/MLNPluginStyleLayer_Private.h @@ -4,22 +4,22 @@ #include -namespace mbgl { +namespace mln { -class PluginLayerPeerFactory : public LayerPeerFactory, public mbgl::PluginLayerFactory { +class PluginLayerPeerFactory : public LayerPeerFactory, public mln::PluginLayerFactory { public: PluginLayerPeerFactory(std::string& layerType, - mbgl::style::LayerTypeInfo::Source source, - mbgl::style::LayerTypeInfo::Pass3D pass3D, - mbgl::style::LayerTypeInfo::Layout layout, - mbgl::style::LayerTypeInfo::FadingTiles fadingTiles, - mbgl::style::LayerTypeInfo::CrossTileIndex crossTileIndex, - mbgl::style::LayerTypeInfo::TileKind tileKind) - : mbgl::PluginLayerFactory(layerType, source, pass3D, layout, fadingTiles, crossTileIndex, tileKind) {} + mln::style::LayerTypeInfo::Source source, + mln::style::LayerTypeInfo::Pass3D pass3D, + mln::style::LayerTypeInfo::Layout layout, + mln::style::LayerTypeInfo::FadingTiles fadingTiles, + mln::style::LayerTypeInfo::CrossTileIndex crossTileIndex, + mln::style::LayerTypeInfo::TileKind tileKind) + : mln::PluginLayerFactory(layerType, source, pass3D, layout, fadingTiles, crossTileIndex, tileKind) {} // LayerPeerFactory overrides. LayerFactory* getCoreLayerFactory() final { return this; } virtual MLNStyleLayer* createPeer(style::Layer*) final; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNPointAnnotation.mm b/platform/darwin/src/MLNPointAnnotation.mm index a1bb1b387..da7d08b82 100644 --- a/platform/darwin/src/MLNPointAnnotation.mm +++ b/platform/darwin/src/MLNPointAnnotation.mm @@ -58,8 +58,8 @@ }; } -- (mbgl::Geometry)geometryObject { - mbgl::Point point = {self.coordinate.longitude, self.coordinate.latitude}; +- (mln::Geometry)geometryObject { + mln::Point point = {self.coordinate.longitude, self.coordinate.latitude}; return point; } diff --git a/platform/darwin/src/MLNPointCollection.mm b/platform/darwin/src/MLNPointCollection.mm index a26d9ed90..a9e534348 100644 --- a/platform/darwin/src/MLNPointCollection.mm +++ b/platform/darwin/src/MLNPointCollection.mm @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation MLNPointCollection { - std::optional _bounds; + std::optional _bounds; std::vector _coordinates; } @@ -59,10 +59,10 @@ NS_ASSUME_NONNULL_BEGIN - (MLNCoordinateBounds)overlayBounds { if (!_bounds) { - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (auto coordinate : _coordinates) { if (!MLNLocationCoordinate2DIsValid(coordinate)) { - bounds = mbgl::LatLngBounds::empty(); + bounds = mln::LatLngBounds::empty(); break; } bounds.extend(MLNLatLngFromLocationCoordinate2D(coordinate)); @@ -101,12 +101,12 @@ NS_ASSUME_NONNULL_BEGIN return MLNCoordinateBoundsIntersectsCoordinateBounds(self.overlayBounds, overlayBounds); } -- (mbgl::Geometry)geometryObject { - mbgl::MultiPoint multiPoint; +- (mln::Geometry)geometryObject { + mln::MultiPoint multiPoint; multiPoint.reserve(self.pointCount); for (NSUInteger i = 0; i < self.pointCount; i++) { multiPoint.push_back( - mbgl::Point(self.coordinates[i].longitude, self.coordinates[i].latitude)); + mln::Point(self.coordinates[i].longitude, self.coordinates[i].latitude)); } return multiPoint; } diff --git a/platform/darwin/src/MLNPolygon.mm b/platform/darwin/src/MLNPolygon.mm index 1b58cba6b..a2ced45cb 100644 --- a/platform/darwin/src/MLNPolygon.mm +++ b/platform/darwin/src/MLNPolygon.mm @@ -77,20 +77,20 @@ return MLNLocationCoordinate2DFromPoint(poi); } -- (mbgl::LinearRing)ring { +- (mln::LinearRing)ring { NSUInteger count = self.pointCount; CLLocationCoordinate2D *coordinates = self.coordinates; - mbgl::LinearRing result; + mln::LinearRing result; result.reserve(self.pointCount); for (NSUInteger i = 0; i < count; i++) { - result.push_back(mbgl::Point(coordinates[i].longitude, coordinates[i].latitude)); + result.push_back(mln::Point(coordinates[i].longitude, coordinates[i].latitude)); } return result; } -- (mbgl::Polygon)polygon { - mbgl::Polygon geometry; +- (mln::Polygon)polygon { + mln::Polygon geometry; geometry.push_back(self.ring); for (MLNPolygon *polygon in self.interiorPolygons) { geometry.push_back(polygon.ring); @@ -98,12 +98,12 @@ return geometry; } -- (mbgl::Geometry)geometryObject { +- (mln::Geometry)geometryObject { return [self polygon]; } -- (mbgl::Annotation)annotationObjectWithDelegate:(id)delegate { - mbgl::FillAnnotation annotation{[self polygon]}; +- (mln::Annotation)annotationObjectWithDelegate:(id)delegate { + mln::FillAnnotation annotation{[self polygon]}; annotation.opacity = {static_cast([delegate alphaForShapeAnnotation:self])}; annotation.outlineColor = {[delegate strokeColorForShapeAnnotation:self]}; annotation.color = {[delegate fillColorForPolygonAnnotation:self]}; @@ -164,7 +164,7 @@ if (self = [super init]) { _polygons = polygons; - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (MLNPolygon *polygon in _polygons) { bounds.extend(MLNLatLngBoundsFromCoordinateBounds(polygon.overlayBounds)); @@ -181,7 +181,7 @@ [NSSet setWithArray:@[ [NSDictionary class], [NSArray class], [MLNPolygon class] ]]; _polygons = [decoder decodeObjectOfClasses:polygonsClasses forKey:@"polygons"]; - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (MLNPolygon *polygon in _polygons) { bounds.extend(MLNLatLngBoundsFromCoordinateBounds(polygon.overlayBounds)); @@ -222,11 +222,11 @@ return MLNCoordinateBoundsIntersectsCoordinateBounds(_overlayBounds, overlayBounds); } -- (mbgl::MultiPolygon)multiPolygon { - mbgl::MultiPolygon multiPolygon; +- (mln::MultiPolygon)multiPolygon { + mln::MultiPolygon multiPolygon; multiPolygon.reserve(self.polygons.count); for (MLNPolygon *polygon in self.polygons) { - mbgl::Polygon geometry; + mln::Polygon geometry; geometry.push_back(polygon.ring); for (MLNPolygon *interiorPolygon in polygon.interiorPolygons) { geometry.push_back(interiorPolygon.ring); @@ -236,7 +236,7 @@ return multiPolygon; } -- (mbgl::Geometry)geometryObject { +- (mln::Geometry)geometryObject { return [self multiPolygon]; } diff --git a/platform/darwin/src/MLNPolyline.mm b/platform/darwin/src/MLNPolyline.mm index a4a49c023..1b4ea8c81 100644 --- a/platform/darwin/src/MLNPolyline.mm +++ b/platform/darwin/src/MLNPolyline.mm @@ -22,21 +22,21 @@ return [[self alloc] initWithCoordinates:coords count:count]; } -- (mbgl::LineString)lineString { +- (mln::LineString)lineString { NSUInteger count = self.pointCount; CLLocationCoordinate2D *coordinates = self.coordinates; - mbgl::LineString geometry; + mln::LineString geometry; geometry.reserve(self.pointCount); for (NSUInteger i = 0; i < count; i++) { - geometry.push_back(mbgl::Point(coordinates[i].longitude, coordinates[i].latitude)); + geometry.push_back(mln::Point(coordinates[i].longitude, coordinates[i].latitude)); } return geometry; } -- (mbgl::Annotation)annotationObjectWithDelegate:(id)delegate { - mbgl::LineAnnotation annotation{[self lineString]}; +- (mln::Annotation)annotationObjectWithDelegate:(id)delegate { + mln::LineAnnotation annotation{[self lineString]}; annotation.opacity = {static_cast([delegate alphaForShapeAnnotation:self])}; annotation.color = {[delegate strokeColorForShapeAnnotation:self]}; annotation.width = {static_cast([delegate lineWidthForPolylineAnnotation:self])}; @@ -44,7 +44,7 @@ return annotation; } -- (mbgl::Geometry)geometryObject { +- (mln::Geometry)geometryObject { return [self lineString]; } @@ -90,12 +90,12 @@ to = MLNRadianCoordinateFromLocationCoordinate(coordinates[i - 1]); CLLocationDirection direction = [self direction:from to:to] - 180; MLNRadianCoordinate2D otherCoordinate = MLNRadianCoordinateAtDistanceFacingDirection( - from, overshoot / mbgl::util::EARTH_RADIUS_M, MLNRadiansFromDegrees(direction)); + from, overshoot / mln::util::EARTH_RADIUS_M, MLNRadiansFromDegrees(direction)); return CLLocationCoordinate2DMake(MLNDegreesFromRadians(otherCoordinate.latitude), MLNDegreesFromRadians(otherCoordinate.longitude)); } - traveled += (MLNDistanceBetweenRadianCoordinates(from, to) * mbgl::util::EARTH_RADIUS_M); + traveled += (MLNDistanceBetweenRadianCoordinates(from, to) * mln::util::EARTH_RADIUS_M); } } @@ -112,7 +112,7 @@ length += (MLNDistanceBetweenRadianCoordinates( MLNRadianCoordinateFromLocationCoordinate(coordinates[i]), MLNRadianCoordinateFromLocationCoordinate(coordinates[i + 1])) * - mbgl::util::EARTH_RADIUS_M); + mln::util::EARTH_RADIUS_M); } return length; @@ -145,7 +145,7 @@ if (self = [super init]) { _polylines = polylines; - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (MLNPolyline *polyline in _polylines) { bounds.extend(MLNLatLngBoundsFromCoordinateBounds(polyline.overlayBounds)); @@ -166,7 +166,7 @@ [NSSet setWithArray:@[ [NSDictionary class], [NSArray class], [MLNPolyline class] ]]; _polylines = [decoder decodeObjectOfClasses:polylinesClasses forKey:@"polylines"]; - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (MLNPolyline *polyline in _polylines) { bounds.extend(MLNLatLngBoundsFromCoordinateBounds(polyline.overlayBounds)); @@ -211,8 +211,8 @@ return MLNCoordinateBoundsIntersectsCoordinateBounds(_overlayBounds, overlayBounds); } -- (mbgl::Geometry)geometryObject { - mbgl::MultiLineString multiLineString; +- (mln::Geometry)geometryObject { + mln::MultiLineString multiLineString; multiLineString.reserve(self.polylines.count); for (MLNPolyline *polyline in self.polylines) { multiLineString.push_back([polyline lineString]); diff --git a/platform/darwin/src/MLNRasterDEMSource.mm b/platform/darwin/src/MLNRasterDEMSource.mm index bb87b71db..cd2d13b9c 100644 --- a/platform/darwin/src/MLNRasterDEMSource.mm +++ b/platform/darwin/src/MLNRasterDEMSource.mm @@ -9,12 +9,12 @@ const MLNTileSourceOption MLNTileSourceOptionDEMEncoding = @"MLNTileSourceOption @implementation MLNRasterDEMSource -- (std::unique_ptr) +- (std::unique_ptr) pendingSourceWithIdentifier:(NSString *)identifier - urlOrTileset:(mbgl::variant)urlOrTileset + urlOrTileset:(mln::variant)urlOrTileset tileSize:(uint16_t)tileSize { auto source = - std::make_unique(identifier.UTF8String, urlOrTileset, tileSize); + std::make_unique(identifier.UTF8String, urlOrTileset, tileSize); return source; } @end diff --git a/platform/darwin/src/MLNRasterTileSource.mm b/platform/darwin/src/MLNRasterTileSource.mm index 2734b8dd6..d6548ffd7 100644 --- a/platform/darwin/src/MLNRasterTileSource.mm +++ b/platform/darwin/src/MLNRasterTileSource.mm @@ -16,7 +16,7 @@ static const CGFloat MLNRasterTileSourceRetinaTileSize = 512; @interface MLNRasterTileSource () -@property (nonatomic, readonly) mbgl::style::RasterSource *rawSource; +@property (nonatomic, readonly) mln::style::RasterSource *rawSource; @end @@ -46,19 +46,19 @@ static const CGFloat MLNRasterTileSourceRetinaTileSize = 512; return self = [super initWithPendingSource:std::move(source)]; } -- (std::unique_ptr) +- (std::unique_ptr) pendingSourceWithIdentifier:(NSString *)identifier - urlOrTileset:(mbgl::variant)urlOrTileset + urlOrTileset:(mln::variant)urlOrTileset tileSize:(uint16_t)tileSize { auto source = - std::make_unique(identifier.UTF8String, urlOrTileset, tileSize); + std::make_unique(identifier.UTF8String, urlOrTileset, tileSize); return source; } - (instancetype)initWithIdentifier:(NSString *)identifier tileURLTemplates:(NSArray *)tileURLTemplates options:(nullable NSDictionary *)options { - mbgl::Tileset tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, options); + mln::Tileset tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, options); uint16_t tileSize = MLNRasterTileSourceRetinaTileSize; if (NSNumber *tileSizeNumber = options[MLNTileSourceOptionTileSize]) { @@ -75,8 +75,8 @@ static const CGFloat MLNRasterTileSourceRetinaTileSize = 512; return self = [super initWithPendingSource:std::move(source)]; } -- (mbgl::style::RasterSource *)rawSource { - return (mbgl::style::RasterSource *)super.rawSource; +- (mln::style::RasterSource *)rawSource { + return (mln::style::RasterSource *)super.rawSource; } - (NSURL *)configurationURL { diff --git a/platform/darwin/src/MLNRasterTileSource_Private.h b/platform/darwin/src/MLNRasterTileSource_Private.h index 098c7b1ab..c46a1829f 100644 --- a/platform/darwin/src/MLNRasterTileSource_Private.h +++ b/platform/darwin/src/MLNRasterTileSource_Private.h @@ -3,22 +3,22 @@ #include #include -namespace mbgl { +namespace mln { class Tileset; namespace style { class RasterSource; } -} // namespace mbgl +} // namespace mln NS_ASSUME_NONNULL_BEGIN @interface MLNRasterTileSource (Private) -@property (nonatomic, readonly, nullable) mbgl::style::RasterSource *rawSource; +@property (nonatomic, readonly, nullable) mln::style::RasterSource *rawSource; -- (std::unique_ptr) +- (std::unique_ptr) pendingSourceWithIdentifier:(NSString *)identifier - urlOrTileset:(mbgl::variant)urlOrTileset + urlOrTileset:(mln::variant)urlOrTileset tileSize:(uint16_t)tileSize; @end diff --git a/platform/darwin/src/MLNRendererConfiguration.m b/platform/darwin/src/MLNRendererConfiguration.m index 18243fb59..f62c8c671 100644 --- a/platform/darwin/src/MLNRendererConfiguration.m +++ b/platform/darwin/src/MLNRendererConfiguration.m @@ -35,7 +35,7 @@ static NSString * const MLNIdeographicFontFamilyNameKey = @"MLNIdeographicFontFa } else if ([infoDictionaryObject isKindOfClass:[NSString class]]) { return infoDictionaryObject; } else if ([infoDictionaryObject isKindOfClass:[NSArray class]]) { - // mbgl::LocalGlyphRasterizer::Impl accepts only a single string, but form a cascade list with one font on each line. + // mln::LocalGlyphRasterizer::Impl accepts only a single string, but form a cascade list with one font on each line. return [infoDictionaryObject componentsJoinedByString:@"\n"]; } diff --git a/platform/darwin/src/MLNRendererFrontend.h b/platform/darwin/src/MLNRendererFrontend.h index ae3662834..9f39a37e3 100644 --- a/platform/darwin/src/MLNRendererFrontend.h +++ b/platform/darwin/src/MLNRendererFrontend.h @@ -9,10 +9,10 @@ The RenderFrontend is passed to the Map to facilitate rendering in a platform dependent way. */ -class MLNRenderFrontend : public mbgl::RendererFrontend { +class MLNRenderFrontend : public mln::RendererFrontend { public: - MLNRenderFrontend(std::unique_ptr renderer_, MLNMapView* nativeView_, - mbgl::gfx::RendererBackend& mbglBackend_, bool async = false) + MLNRenderFrontend(std::unique_ptr renderer_, MLNMapView* nativeView_, + mln::gfx::RendererBackend& mbglBackend_, bool async = false) : renderer(std::move(renderer_)), nativeView(nativeView_), mbglBackend(mbglBackend_) { if (async) { asyncInvalidate.emplace([&]() { [nativeView setNeedsRerender]; }); @@ -25,7 +25,7 @@ public: } } - void update(std::shared_ptr updateParameters_) override { + void update(std::shared_ptr updateParameters_) override { updateParameters = std::move(updateParameters_); if (asyncInvalidate) { asyncInvalidate->send(); @@ -34,11 +34,9 @@ public: } } - const mbgl::TaggedScheduler& getThreadPool() const override { - return mbglBackend.getThreadPool(); - } + const mln::TaggedScheduler& getThreadPool() const override { return mbglBackend.getThreadPool(); } - void setObserver(mbgl::RendererObserver& observer) override { + void setObserver(mln::RendererObserver& observer) override { if (!renderer) return; renderer->setObserver(&observer); } @@ -46,7 +44,7 @@ public: void render() { if (!renderer || !updateParameters) return; - mbgl::gfx::BackendScope guard{mbglBackend, mbgl::gfx::BackendScope::ScopeType::Implicit}; + mln::gfx::BackendScope guard{mbglBackend, mln::gfx::BackendScope::ScopeType::Implicit}; // onStyleImageMissing might be called during a render. The user implemented method // could trigger a call to MLNRenderFrontend#update which overwrites `updateParameters`. @@ -56,7 +54,7 @@ public: renderer->render(updateParameters_); } - mbgl::Renderer* getRenderer() { return renderer.get(); } + mln::Renderer* getRenderer() { return renderer.get(); } void setTileCacheEnabled(bool enable) { if (!renderer) return; @@ -74,9 +72,9 @@ public: } private: - std::unique_ptr renderer; + std::unique_ptr renderer; __weak MLNMapView* nativeView = nullptr; - mbgl::gfx::RendererBackend& mbglBackend; - std::shared_ptr updateParameters; - std::optional asyncInvalidate; + mln::gfx::RendererBackend& mbglBackend; + std::shared_ptr updateParameters; + std::optional asyncInvalidate; }; diff --git a/platform/darwin/src/MLNRenderingStats.mm b/platform/darwin/src/MLNRenderingStats.mm index 337e53702..55c2ac1cc 100644 --- a/platform/darwin/src/MLNRenderingStats.mm +++ b/platform/darwin/src/MLNRenderingStats.mm @@ -2,7 +2,7 @@ @implementation MLNRenderingStats -- (void)setCoreData:(const mbgl::gfx::RenderingStats&)stats { +- (void)setCoreData:(const mln::gfx::RenderingStats&)stats { _encodingTime = stats.encodingTime; _renderingTime = stats.renderingTime; _numFrames = stats.numFrames; diff --git a/platform/darwin/src/MLNRenderingStats_Private.h b/platform/darwin/src/MLNRenderingStats_Private.h index 24265f40d..69ce77100 100644 --- a/platform/darwin/src/MLNRenderingStats_Private.h +++ b/platform/darwin/src/MLNRenderingStats_Private.h @@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN @interface MLNRenderingStats (Private) -- (void)setCoreData:(const mbgl::gfx::RenderingStats&)stats; +- (void)setCoreData:(const mln::gfx::RenderingStats&)stats; @end diff --git a/platform/darwin/src/MLNSettings.mm b/platform/darwin/src/MLNSettings.mm index 8c1f00265..770ffd29d 100644 --- a/platform/darwin/src/MLNSettings.mm +++ b/platform/darwin/src/MLNSettings.mm @@ -8,7 +8,7 @@ @interface MLNSettings () @property (atomic) NSString *apiKey; -@property (atomic) mbgl::TileServerOptions *tileServerOptionsInternal; +@property (atomic) mln::TileServerOptions *tileServerOptionsInternal; @property (atomic) NSString *tileServerOptionsChangeToken; @end @@ -20,7 +20,7 @@ - (instancetype)init { if (self = [super init]) { self.tileServerOptionsInternal = - new mbgl::TileServerOptions(mbgl::TileServerOptions::DefaultConfiguration()); + new mln::TileServerOptions(mln::TileServerOptions::DefaultConfiguration()); } return self; } @@ -94,13 +94,13 @@ return url; } -+ (void)setTileServerOptionsInternal:(mbgl::TileServerOptions)options { - [MLNSettings sharedSettings].tileServerOptionsInternal = new mbgl::TileServerOptions(); ++ (void)setTileServerOptionsInternal:(mln::TileServerOptions)options { + [MLNSettings sharedSettings].tileServerOptionsInternal = new mln::TileServerOptions(); *[MLNSettings sharedSettings].tileServerOptionsInternal = options.clone(); [self tileServerOptionsChanged]; } -+ (mbgl::TileServerOptions)tileServerOptionsInternal { ++ (mln::TileServerOptions)tileServerOptionsInternal { auto options = [MLNSettings sharedSettings]; return options.tileServerOptionsInternal->clone(); } @@ -112,21 +112,21 @@ + (void)useWellKnownTileServer:(MLNWellKnownTileServer)tileServer { switch (tileServer) { case MLNMapTiler: - [MLNSettings setTileServerOptionsInternal:mbgl::TileServerOptions::MapTilerConfiguration()]; + [MLNSettings setTileServerOptionsInternal:mln::TileServerOptions::MapTilerConfiguration()]; break; case MLNMapLibre: - [MLNSettings setTileServerOptionsInternal:mbgl::TileServerOptions::MapLibreConfiguration()]; + [MLNSettings setTileServerOptionsInternal:mln::TileServerOptions::MapLibreConfiguration()]; break; case MLNMapbox: - [MLNSettings setTileServerOptionsInternal:mbgl::TileServerOptions::MapboxConfiguration()]; + [MLNSettings setTileServerOptionsInternal:mln::TileServerOptions::MapboxConfiguration()]; break; default: - [MLNSettings setTileServerOptionsInternal:mbgl::TileServerOptions::DefaultConfiguration()]; + [MLNSettings setTileServerOptionsInternal:mln::TileServerOptions::DefaultConfiguration()]; } } + (void)setTileServerOptions:(MLNTileServerOptions *)options { - auto opts = mbgl::TileServerOptions() + auto opts = mln::TileServerOptions() .withBaseURL(std::string([options.baseURL UTF8String])) .withUriSchemeAlias(std::string([options.uriSchemeAlias UTF8String])) .withApiKeyParameterName(std::string([options.apiKeyParameterName UTF8String])); @@ -161,12 +161,11 @@ ? std::string([options.tileVersionPrefix UTF8String]) : std::optional{}); - std::vector defaultStyles; + std::vector defaultStyles; if (options.defaultStyles) { for (MLNDefaultStyle *objCStyle in options.defaultStyles) { - mbgl::util::DefaultStyle cppStyle(std::string([objCStyle.url.absoluteString UTF8String]), - std::string([objCStyle.name UTF8String]), - objCStyle.version); + mln::util::DefaultStyle cppStyle(std::string([objCStyle.url.absoluteString UTF8String]), + std::string([objCStyle.name UTF8String]), objCStyle.version); defaultStyles.push_back(cppStyle); } } @@ -220,7 +219,7 @@ ? [NSString stringWithUTF8String:cppOpts->tileVersionPrefix().value().c_str()] : nil; - std::vector cppDefaultStyles = cppOpts->defaultStyles(); + std::vector cppDefaultStyles = cppOpts->defaultStyles(); NSMutableArray *mglStyles = [[NSMutableArray alloc] init]; for (auto it = begin(cppDefaultStyles); it != end(cppDefaultStyles); ++it) { diff --git a/platform/darwin/src/MLNSettings_Private.h b/platform/darwin/src/MLNSettings_Private.h index fae2adff3..2d89ff611 100644 --- a/platform/darwin/src/MLNSettings_Private.h +++ b/platform/darwin/src/MLNSettings_Private.h @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @property (atomic, nullable) NSString *apiKey; /// internal access to tile server options -@property (atomic, readwrite, nullable) mbgl::TileServerOptions *tileServerOptionsInternal; +@property (atomic, readwrite, nullable) mln::TileServerOptions *tileServerOptionsInternal; /// tile server base url @property (atomic, readwrite, nullable) NSURL *apiBaseURL; diff --git a/platform/darwin/src/MLNShape.mm b/platform/darwin/src/MLNShape.mm index 050ceb1f8..4ea042f96 100644 --- a/platform/darwin/src/MLNShape.mm +++ b/platform/darwin/src/MLNShape.mm @@ -39,13 +39,13 @@ bool operator==(const CLLocationCoordinate2D lhs, const CLLocationCoordinate2D r } } -- (mbgl::GeoJSON)geoJSONObject { +- (mln::GeoJSON)geoJSONObject { return self.geometryObject; } -- (mbgl::Geometry)geometryObject { +- (mln::Geometry)geometryObject { [NSException raise:MLNAbstractClassException format:@"MLNShape is an abstract class"]; - return mbgl::Point(); + return mln::Point(); } - (NSData *)geoJSONDataUsingEncoding:(NSStringEncoding)encoding { diff --git a/platform/darwin/src/MLNShapeCollection.mm b/platform/darwin/src/MLNShapeCollection.mm index ed9fbfeb2..6b339dc2f 100644 --- a/platform/darwin/src/MLNShapeCollection.mm +++ b/platform/darwin/src/MLNShapeCollection.mm @@ -73,7 +73,7 @@ return [geometries copy]; } -- (mbgl::Geometry)geometryObject { +- (mln::Geometry)geometryObject { mapbox::geojson::geometry_collection collection; collection.reserve(self.shapes.count); for (MLNShape *shape in self.shapes) { diff --git a/platform/darwin/src/MLNShapeOfflineRegion.mm b/platform/darwin/src/MLNShapeOfflineRegion.mm index 07558d4a9..f88904d75 100644 --- a/platform/darwin/src/MLNShapeOfflineRegion.mm +++ b/platform/darwin/src/MLNShapeOfflineRegion.mm @@ -70,7 +70,7 @@ } - (instancetype)initWithOfflineRegionDefinition: - (const mbgl::OfflineGeometryRegionDefinition &)definition { + (const mln::OfflineGeometryRegionDefinition &)definition { NSURL *styleURL = [NSURL URLWithString:@(definition.styleURL.c_str())]; MLNShape *shape = MLNShapeFromGeoJSON(definition.geometry); MLNShapeOfflineRegion *result = [self initWithStyleURL:styleURL @@ -81,7 +81,7 @@ return result; } -- (const mbgl::OfflineRegionDefinition)offlineRegionDefinition { +- (const mln::OfflineRegionDefinition)offlineRegionDefinition { #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR const float scaleFactor = [UIScreen instancesRespondToSelector:@selector(nativeScale)] ? [[UIScreen mainScreen] nativeScale] @@ -89,7 +89,7 @@ #elif TARGET_OS_MAC const float scaleFactor = [NSScreen mainScreen].backingScaleFactor; #endif - return mbgl::OfflineGeometryRegionDefinition( + return mln::OfflineGeometryRegionDefinition( _styleURL.absoluteString.UTF8String, _shape.geometryObject, _minimumZoomLevel, _maximumZoomLevel, scaleFactor, _includesIdeographicGlyphs); } diff --git a/platform/darwin/src/MLNShapeOfflineRegion_Private.h b/platform/darwin/src/MLNShapeOfflineRegion_Private.h index a70bb46ec..809a8cbc2 100644 --- a/platform/darwin/src/MLNShapeOfflineRegion_Private.h +++ b/platform/darwin/src/MLNShapeOfflineRegion_Private.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN offline region. */ - (instancetype)initWithOfflineRegionDefinition: - (const mbgl::OfflineGeometryRegionDefinition &)definition; + (const mln::OfflineGeometryRegionDefinition &)definition; @end diff --git a/platform/darwin/src/MLNShapeSource.mm b/platform/darwin/src/MLNShapeSource.mm index 05c385214..acf56a6f4 100644 --- a/platform/darwin/src/MLNShapeSource.mm +++ b/platform/darwin/src/MLNShapeSource.mm @@ -37,9 +37,9 @@ const MLNShapeSourceOption MLNShapeSourceOptionLineDistanceMetrics = const MLNShapeSourceOption MLNShapeSourceOptionSynchronousUpdate = @"MLNShapeSourceOptionSynchronousUpdate"; -mbgl::Immutable MLNGeoJSONOptionsFromDictionary( +mln::Immutable MLNGeoJSONOptionsFromDictionary( NSDictionary *options) { - auto geoJSONOptions = mbgl::makeMutable(); + auto geoJSONOptions = mln::makeMutable(); if (NSNumber *value = options[MLNShapeSourceOptionMinimumZoomLevel]) { if (![value isKindOfClass:[NSNumber class]]) { @@ -188,7 +188,7 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( @interface MLNShapeSource () @property (nonatomic, readwrite) NSDictionary *options; -@property (nonatomic, readonly) mbgl::style::GeoJSONSource *rawSource; +@property (nonatomic, readonly) mln::style::GeoJSONSource *rawSource; @end @@ -198,8 +198,8 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( URL:(NSURL *)url options:(NSDictionary *)options { auto geoJSONOptions = MLNGeoJSONOptionsFromDictionary(options); - auto source = std::make_unique(identifier.UTF8String, - std::move(geoJSONOptions)); + auto source = + std::make_unique(identifier.UTF8String, std::move(geoJSONOptions)); if (self = [super initWithPendingSource:std::move(source)]) { self.URL = url; } @@ -210,8 +210,8 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( shape:(nullable MLNShape *)shape options:(NSDictionary *)options { auto geoJSONOptions = MLNGeoJSONOptionsFromDictionary(options); - auto source = std::make_unique(identifier.UTF8String, - std::move(geoJSONOptions)); + auto source = + std::make_unique(identifier.UTF8String, std::move(geoJSONOptions)); if (self = [super initWithPendingSource:std::move(source)]) { if ([shape isMemberOfClass:[MLNShapeCollection class]]) { static dispatch_once_t onceToken; @@ -249,8 +249,8 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( return [self initWithIdentifier:identifier shape:shapeCollection options:options]; } -- (mbgl::style::GeoJSONSource *)rawSource { - return (mbgl::style::GeoJSONSource *)super.rawSource; +- (mln::style::GeoJSONSource *)rawSource { + return (mln::style::GeoJSONSource *)super.rawSource; } - (NSURL *)URL { @@ -289,12 +289,12 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( - (NSArray> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate { MLNAssertStyleSourceIsValid(); - std::optional optionalFilter; + std::optional optionalFilter; if (predicate) { optionalFilter = predicate.mgl_filter; } - std::vector features; + std::vector features; if ([self.stylable isKindOfClass:[MLNMapView class]]) { MLNMapView *mapView = (MLNMapView *)self.stylable; features = mapView.renderer->querySourceFeatures(self.rawSource->getID(), {{}, optionalFilter}); @@ -304,12 +304,12 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( // MARK: - MLNCluster management -- (std::optional) +- (std::optional) featureExtensionValueOfCluster:(MLNShape *)cluster extension:(std::string)extension - options:(const std::map)options { + options:(const std::map)options { MLNAssertStyleSourceIsValid(); - std::optional extensionValue; + std::optional extensionValue; // Check parameters if (!self.rawSource || !self.stylable || !cluster) { @@ -318,12 +318,12 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( auto geoJSON = [cluster geoJSONObject]; - if (!geoJSON.is()) { + if (!geoJSON.is()) { MLNAssert(0, @"cluster geoJSON object is not a feature."); return extensionValue; } - auto clusterFeature = geoJSON.get(); + auto clusterFeature = geoJSON.get(); if ([self.stylable isKindOfClass:[MLNMapView class]]) { MLNMapView *mapView = (MLNMapView *)self.stylable; @@ -336,8 +336,8 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( - (NSArray> *)leavesOfCluster:(MLNPointFeatureCluster *)cluster offset:(NSUInteger)offset limit:(NSUInteger)limit { - const std::map options = {{"limit", static_cast(limit)}, - {"offset", static_cast(offset)}}; + const std::map options = {{"limit", static_cast(limit)}, + {"offset", static_cast(offset)}}; auto featureExtension = [self featureExtensionValueOfCluster:cluster extension:"leaves" @@ -347,11 +347,11 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( return @[]; } - if (!featureExtension->is()) { + if (!featureExtension->is()) { return @[]; } - std::vector leaves = featureExtension->get(); + std::vector leaves = featureExtension->get(); return MLNFeaturesFromMBGLFeatures(leaves); } @@ -364,11 +364,11 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( return @[]; } - if (!featureExtension->is()) { + if (!featureExtension->is()) { return @[]; } - std::vector leaves = featureExtension->get(); + std::vector leaves = featureExtension->get(); return MLNFeaturesFromMBGLFeatures(leaves); } @@ -381,11 +381,11 @@ mbgl::Immutable MLNGeoJSONOptionsFromDictionary( return -1.0; } - if (!featureExtension->is()) { + if (!featureExtension->is()) { return -1.0; } - auto value = featureExtension->get(); + auto value = featureExtension->get(); if (value.is()) { auto zoom = value.get(); return static_cast(zoom); diff --git a/platform/darwin/src/MLNShapeSource_Private.h b/platform/darwin/src/MLNShapeSource_Private.h index 3cb1e36d9..f776415e7 100644 --- a/platform/darwin/src/MLNShapeSource_Private.h +++ b/platform/darwin/src/MLNShapeSource_Private.h @@ -4,14 +4,14 @@ NS_ASSUME_NONNULL_BEGIN -namespace mbgl { +namespace mln { namespace style { struct GeoJSONOptions; } -} // namespace mbgl +} // namespace mln MLN_EXPORT -mbgl::Immutable MLNGeoJSONOptionsFromDictionary( +mln::Immutable MLNGeoJSONOptionsFromDictionary( NSDictionary *options); @interface MLNShapeSource (Private) diff --git a/platform/darwin/src/MLNShape_Private.h b/platform/darwin/src/MLNShape_Private.h index cbaf9ff7c..305df1e02 100644 --- a/platform/darwin/src/MLNShape_Private.h +++ b/platform/darwin/src/MLNShape_Private.h @@ -9,14 +9,14 @@ bool operator==(const CLLocationCoordinate2D lhs, const CLLocationCoordinate2D r @interface MLNShape (Private) /** - Returns an `mbgl::GeoJSON` representation of the ``MLNShape``. + Returns an `mln::GeoJSON` representation of the ``MLNShape``. */ -- (mbgl::GeoJSON)geoJSONObject; +- (mln::GeoJSON)geoJSONObject; /** - Returns an `mbgl::Geometry` representation of the ``MLNShape``. + Returns an `mln::Geometry` representation of the ``MLNShape``. */ -- (mbgl::Geometry)geometryObject; +- (mln::Geometry)geometryObject; /** Returns a dictionary with the GeoJSON geometry member object. diff --git a/platform/darwin/src/MLNSource.mm b/platform/darwin/src/MLNSource.mm index d0184cdb7..5d8c3e663 100644 --- a/platform/darwin/src/MLNSource.mm +++ b/platform/darwin/src/MLNSource.mm @@ -12,16 +12,16 @@ const MLNExceptionName MLNInvalidStyleSourceException = @"MLNInvalidStyleSourceE @interface MLNSource () // Even though this class is abstract, MLNStyle uses it to represent some -// special internal source types like mbgl::AnnotationSource. -@property (nonatomic, readonly) mbgl::style::Source *rawSource; +// special internal source types like mln::AnnotationSource. +@property (nonatomic, readonly) mln::style::Source *rawSource; @property (nonatomic, readonly, weak) id stylable; @end @implementation MLNSource { - std::unique_ptr _pendingSource; - mapbox::base::WeakPtr _weakSource; + std::unique_ptr _pendingSource; + mapbox::base::WeakPtr _weakSource; } - (instancetype)initWithIdentifier:(NSString *)identifier { @@ -31,7 +31,7 @@ const MLNExceptionName MLNInvalidStyleSourceException = @"MLNInvalidStyleSourceE return self; } -- (instancetype)initWithRawSource:(mbgl::style::Source *)rawSource +- (instancetype)initWithRawSource:(mln::style::Source *)rawSource stylable:(id)stylable { NSString *identifier = @(rawSource->getID().c_str()); if (self = [self initWithIdentifier:identifier]) { @@ -42,11 +42,11 @@ const MLNExceptionName MLNInvalidStyleSourceException = @"MLNInvalidStyleSourceE return self; } -- (mbgl::style::Source *)rawSource { +- (mln::style::Source *)rawSource { return _weakSource.get(); } -- (instancetype)initWithPendingSource:(std::unique_ptr)pendingSource { +- (instancetype)initWithPendingSource:(std::unique_ptr)pendingSource { if (self = [self initWithRawSource:pendingSource.get() stylable:nil]) { _pendingSource = std::move(pendingSource); } diff --git a/platform/darwin/src/MLNSource_Private.h b/platform/darwin/src/MLNSource_Private.h index 9356a9135..d363f0158 100644 --- a/platform/darwin/src/MLNSource_Private.h +++ b/platform/darwin/src/MLNSource_Private.h @@ -6,16 +6,16 @@ NS_ASSUME_NONNULL_BEGIN @protocol MLNStylable; -namespace mbgl { +namespace mln { namespace style { class Source; } -} // namespace mbgl +} // namespace mln -// A struct to be stored in the `peer` member of mbgl::style::Source, in order to implement +// A struct to be stored in the `peer` member of mln::style::Source, in order to implement // object identity. We don't store a MLNSource pointer directly because that doesn't // interoperate with ARC. The inner pointer is weak in order to avoid a reference cycle for -// "pending" MLNSources, which have a strong owning pointer to the mbgl::style::Source. +// "pending" MLNSources, which have a strong owning pointer to the mln::style::Source. struct SourceWrapper { __weak MLNSource *source; }; @@ -42,23 +42,23 @@ struct SourceWrapper { Initializes and returns a source with a raw pointer to the backing store, associated with a style. */ -- (instancetype)initWithRawSource:(mbgl::style::Source *)rawSource +- (instancetype)initWithRawSource:(mln::style::Source *)rawSource stylable:(nullable id)stylable; /** Initializes and returns a source with an owning pointer to the backing store, unassociated from a style. */ -- (instancetype)initWithPendingSource:(std::unique_ptr)pendingSource; +- (instancetype)initWithPendingSource:(std::unique_ptr)pendingSource; /** A raw pointer to the mbgl object, which is always initialized, either to the - value returned by `mbgl::Map getSource`, or for independently created objects, + value returned by `mln::Map getSource`, or for independently created objects, to the pointer value held in `pendingSource`. In the latter case, this raw pointer value stays even after ownership of the object is transferred via - `mbgl::Map addSource`. + `mln::Map addSource`. */ -@property (nonatomic, readonly) mbgl::style::Source *rawSource; +@property (nonatomic, readonly) mln::style::Source *rawSource; /** The stylable object whose style currently contains the source. @@ -71,8 +71,8 @@ struct SourceWrapper { /** Adds the mbgl source that this object represents to the mbgl map. Once a mbgl source is added, ownership of the object is transferred to the - `mbgl::Map` and this object no longer has an active unique_ptr reference to the - `mbgl::Source`. If this object's mbgl source is in that state, the mbgl source + `mln::Map` and this object no longer has an active unique_ptr reference to the + `mln::Source`. If this object's mbgl source is in that state, the mbgl source can still be changed but the changes will not be visible until the ``MLNSource`` is added back to the map via ``MLNStyle/addSource:`` and styled with a ``MLNLayer``. diff --git a/platform/darwin/src/MLNStyle.mm b/platform/darwin/src/MLNStyle.mm index dd225ef38..4c8a2e127 100644 --- a/platform/darwin/src/MLNStyle.mm +++ b/platform/darwin/src/MLNStyle.mm @@ -82,7 +82,7 @@ const MLNExceptionName MLNRedundantSourceIdentifierException = @interface MLNStyle () @property (nonatomic, readonly, weak) id stylable; -@property (nonatomic, readonly) mbgl::style::Style *rawStyle; +@property (nonatomic, readonly) mln::style::Style *rawStyle; @property (readonly, copy, nullable) NSURL *URL; @property (nonatomic, readwrite, strong) NSMutableDictionary *customLayers; @@ -124,7 +124,7 @@ const MLNExceptionName MLNRedundantSourceIdentifierException = // MARK: - -- (instancetype)initWithRawStyle:(mbgl::style::Style *)rawStyle stylable:(id)stylable { +- (instancetype)initWithRawStyle:(mln::style::Style *)rawStyle stylable:(id)stylable { MLNLogInfo(@"Initializing %@ with stylable: %@", NSStringFromClass([self class]), stylable); if (self = [super init]) { _stylable = stylable; @@ -192,7 +192,7 @@ const MLNExceptionName MLNRedundantSourceIdentifierException = return rawSource ? [self sourceFromMBGLSource:rawSource] : nil; } -- (MLNSource *)sourceFromMBGLSource:(mbgl::style::Source *)rawSource { +- (MLNSource *)sourceFromMBGLSource:(mln::style::Source *)rawSource { if (MLNSource *source = rawSource->peer.has_value() ? rawSource->peer.get().source : nil) { return source; @@ -200,15 +200,15 @@ const MLNExceptionName MLNRedundantSourceIdentifierException = // TODO: Fill in options specific to the respective source classes // https://github.com/mapbox/mapbox-gl-native/issues/6584 - if (auto vectorSource = rawSource->as()) { + if (auto vectorSource = rawSource->as()) { return [[MLNVectorTileSource alloc] initWithRawSource:vectorSource stylable:self.stylable]; - } else if (auto geoJSONSource = rawSource->as()) { + } else if (auto geoJSONSource = rawSource->as()) { return [[MLNShapeSource alloc] initWithRawSource:geoJSONSource stylable:self.stylable]; - } else if (auto rasterSource = rawSource->as()) { + } else if (auto rasterSource = rawSource->as()) { return [[MLNRasterTileSource alloc] initWithRawSource:rasterSource stylable:self.stylable]; - } else if (auto rasterDEMSource = rawSource->as()) { + } else if (auto rasterDEMSource = rawSource->as()) { return [[MLNRasterDEMSource alloc] initWithRawSource:rasterDEMSource stylable:self.stylable]; - } else if (auto imageSource = rawSource->as()) { + } else if (auto imageSource = rawSource->as()) { return [[MLNImageSource alloc] initWithRawSource:imageSource stylable:self.stylable]; } else { return [[MLNSource alloc] initWithRawSource:rawSource stylable:self.stylable]; @@ -373,7 +373,7 @@ const MLNExceptionName MLNRedundantSourceIdentifierException = [styleLayer removeFromStyle:self]; } -- (MLNStyleLayer *)layerFromMBGLLayer:(mbgl::style::Layer *)rawLayer { +- (MLNStyleLayer *)layerFromMBGLLayer:(mln::style::Layer *)rawLayer { NSParameterAssert(rawLayer); if (MLNStyleLayer *layer = @@ -381,7 +381,7 @@ const MLNExceptionName MLNRedundantSourceIdentifierException = return layer; } - return mbgl::LayerManagerDarwin::get()->createPeer(rawLayer); + return mln::LayerManagerDarwin::get()->createPeer(rawLayer); } - (MLNStyleLayer *)layerWithIdentifier:(NSString *)identifier { @@ -540,27 +540,27 @@ const MLNExceptionName MLNRedundantSourceIdentifierException = } - (MLNTransition)transition { - const mbgl::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); + const mln::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); return MLNTransitionFromOptions(transitionOptions); } - (void)setPerformsPlacementTransitions:(BOOL)performsPlacementTransitions { - mbgl::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); + mln::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); transitionOptions.enablePlacementTransitions = static_cast(performsPlacementTransitions); self.rawStyle->setTransitionOptions(transitionOptions); } - (BOOL)performsPlacementTransitions { - mbgl::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); + mln::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); return transitionOptions.enablePlacementTransitions; } // MARK: Style light - (void)setLight:(MLNLight *)light { - std::unique_ptr mbglLight = - std::make_unique([light mbglLight]); + std::unique_ptr mbglLight = + std::make_unique([light mbglLight]); self.rawStyle->setLight(std::move(mbglLight)); } diff --git a/platform/darwin/src/MLNStyleLayer.mm b/platform/darwin/src/MLNStyleLayer.mm index 50bd27ad5..18b1c7894 100644 --- a/platform/darwin/src/MLNStyleLayer.mm +++ b/platform/darwin/src/MLNStyleLayer.mm @@ -8,16 +8,16 @@ const MLNExceptionName MLNInvalidStyleLayerException = @"MLNInvalidStyleLayerExc @interface MLNStyleLayer () -@property (nonatomic, readonly) mbgl::style::Layer *rawLayer; +@property (nonatomic, readonly) mln::style::Layer *rawLayer; @end @implementation MLNStyleLayer { - std::unique_ptr _pendingLayer; - mapbox::base::WeakPtr _weakLayer; + std::unique_ptr _pendingLayer; + mapbox::base::WeakPtr _weakLayer; } -- (instancetype)initWithRawLayer:(mbgl::style::Layer *)rawLayer { +- (instancetype)initWithRawLayer:(mln::style::Layer *)rawLayer { if (self = [super init]) { _identifier = @(rawLayer->getID().c_str()); _weakLayer = rawLayer->makeWeakPtr(); @@ -26,14 +26,14 @@ const MLNExceptionName MLNInvalidStyleLayerException = @"MLNInvalidStyleLayerExc return self; } -- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer { +- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer { if (self = [self initWithRawLayer:pendingLayer.get()]) { _pendingLayer = std::move(pendingLayer); } return self; } -- (mbgl::style::Layer *)rawLayer { +- (mln::style::Layer *)rawLayer { return _weakLayer.get(); } @@ -62,16 +62,16 @@ const MLNExceptionName MLNInvalidStyleLayerException = @"MLNInvalidStyleLayerExc - (void)setVisible:(BOOL)visible { MLNAssertStyleLayerIsValid(); - mbgl::style::VisibilityType v = - visible ? mbgl::style::VisibilityType::Visible : mbgl::style::VisibilityType::None; + mln::style::VisibilityType v = + visible ? mln::style::VisibilityType::Visible : mln::style::VisibilityType::None; self.rawLayer->setVisibility(v); } - (BOOL)isVisible { MLNAssertStyleLayerIsValid(); - mbgl::style::VisibilityType v = self.rawLayer->getVisibility(); - return (v == mbgl::style::VisibilityType::Visible); + mln::style::VisibilityType v = self.rawLayer->getVisibility(); + return (v == mln::style::VisibilityType::Visible); } - (void)setMaximumZoomLevel:(float)maximumZoomLevel { diff --git a/platform/darwin/src/MLNStyleLayer.mm.ejs b/platform/darwin/src/MLNStyleLayer.mm.ejs index 13ac36129..9332501a3 100644 --- a/platform/darwin/src/MLNStyleLayer.mm.ejs +++ b/platform/darwin/src/MLNStyleLayer.mm.ejs @@ -21,7 +21,7 @@ <% if (enumProperties) { -%> -namespace mbgl { +namespace mln { <% if (layoutProperties.length) { -%> <% for (const property of layoutProperties) { -%> @@ -52,7 +52,7 @@ namespace mbgl { @interface MLN<%- camelize(type) %>StyleLayer () -@property (nonatomic, readonly) mbgl::style::<%- camelize(type) %>Layer *rawLayer; +@property (nonatomic, readonly) mln::style::<%- camelize(type) %>Layer *rawLayer; @end @@ -62,7 +62,7 @@ namespace mbgl { - (instancetype)initWithIdentifier:(NSString *)identifier { MLNLogDebug(@"Initializing %@ with identifier: %@", NSStringFromClass([self class]), identifier); - auto layer = std::make_uniqueLayer>(identifier.UTF8String); + auto layer = std::make_uniqueLayer>(identifier.UTF8String); return self = [super initWithPendingLayer:std::move(layer)]; } @@ -70,14 +70,14 @@ namespace mbgl { - (instancetype)initWithIdentifier:(NSString *)identifier source:(MLNSource *)source { MLNLogDebug(@"Initializing %@ with identifier: %@ source: %@", NSStringFromClass([self class]), identifier, source); - auto layer = std::make_uniqueLayer>(identifier.UTF8String, source.identifier.UTF8String); + auto layer = std::make_uniqueLayer>(identifier.UTF8String, source.identifier.UTF8String); return self = [super initWithPendingLayer:std::move(layer)]; } <% } -%> -- (mbgl::style::<%- camelize(type) %>Layer *)rawLayer +- (mln::style::<%- camelize(type) %>Layer *)rawLayer { - return (mbgl::style::<%- camelize(type) %>Layer *)super.rawLayer; + return (mln::style::<%- camelize(type) %>Layer *)super.rawLayer; } <% if (type !== 'background') { -%> @@ -110,7 +110,7 @@ namespace mbgl { MLNAssertStyleLayerIsValid(); MLNLogDebug(@"Setting predicate: %@", predicate); - self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter()); + self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mln::style::Filter()); } - (NSPredicate *)predicate @@ -132,25 +132,25 @@ namespace mbgl { <% if (property.tokens) { -%> if (<%- objCName(property) %> && <%- objCName(property) %>.expressionType == NSConstantValueExpressionType) { std::string string = ((NSString *)<%- objCName(property) %>.constantValue).UTF8String; - if (mbgl::style::conversion::hasTokens(string)) { + if (mln::style::conversion::hasTokens(string)) { <% if (property.type === 'formatted') { -%> - self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mbgl::style::PropertyValue( - mbgl::style::conversion::convertTokenStringToFormatExpression(string))); + self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mln::style::PropertyValue( + mln::style::conversion::convertTokenStringToFormatExpression(string))); <% } else if (property.type === 'resolvedImage') { -%> - self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mbgl::style::PropertyValue( - mbgl::style::conversion::convertTokenStringToImageExpression(string))); + self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mln::style::PropertyValue( + mln::style::conversion::convertTokenStringToImageExpression(string))); <% } else { -%> - self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mbgl::style::PropertyValue( - mbgl::style::conversion::convertTokenStringToExpression(string))); + self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mln::style::PropertyValue( + mln::style::conversion::convertTokenStringToExpression(string))); <% } -%> return; } } <% } -%> <% if (isDataDriven(property)) { -%> - auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, true); + auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, true); <% } else { -%> - auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, false); + auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, false); <% } -%> self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mbglValue); } @@ -186,14 +186,14 @@ namespace mbgl { <% switch (property['property-type']) { case 'color-ramp': -%> - auto mbglValue = MLNStyleValueTransformer().toPropertyValue(<%- objCName(property) %>); + auto mbglValue = MLNStyleValueTransformer().toPropertyValue(<%- objCName(property) %>); <% break case 'data-driven': case 'cross-faded-data-driven': -%> - auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, true); + auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, true); <% break default: -%> - auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, false); + auto mbglValue = MLNStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue>>(<%- objCName(property) %>, false); <% } -%> self.rawLayer->set<%- camelize(originalPropertyName(property)) %>(mbglValue); } @@ -219,7 +219,7 @@ namespace mbgl { - (MLNTransition)<%- objCGetter(property) %>Transition { MLNAssertStyleLayerIsValid(); - mbgl::style::TransitionOptions transitionOptions = self.rawLayer->get<%- camelize(originalPropertyName(property)) %>Transition(); + mln::style::TransitionOptions transitionOptions = self.rawLayer->get<%- camelize(originalPropertyName(property)) %>Transition(); return MLNTransitionFromOptions(transitionOptions); } @@ -256,10 +256,10 @@ namespace mbgl { @end <% } -%> -namespace mbgl { +namespace mln { MLNStyleLayer* <%- camelize(type) %>StyleLayerPeerFactory::createPeer(style::Layer* rawLayer) { return [[MLN<%- camelize(type) %>StyleLayer alloc] initWithRawLayer:rawLayer]; } -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNStyleLayerManager.h b/platform/darwin/src/MLNStyleLayerManager.h index aab007db5..b4a8357ae 100644 --- a/platform/darwin/src/MLNStyleLayerManager.h +++ b/platform/darwin/src/MLNStyleLayerManager.h @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { class LayerManagerDarwin : public LayerManager { public: @@ -26,7 +26,7 @@ public: * in order to save binary size (the corresponding SDK layer wrappers * should be excluded from the project build). */ - void addLayerTypeCoreOnly(std::unique_ptr) override; + void addLayerTypeCoreOnly(std::unique_ptr) override; /** * Enables a layer type for both JSON style and runtime API. @@ -38,13 +38,13 @@ private: void registerCoreFactory(LayerFactory*); LayerPeerFactory* getPeerFactory(const style::LayerTypeInfo* typeInfo); - // mbgl::LayerManager overrides. + // mln::LayerManager overrides. LayerFactory* getFactory(const std::string& type) noexcept final; - LayerFactory* getFactory(const mbgl::style::LayerTypeInfo* info) noexcept final; + LayerFactory* getFactory(const mln::style::LayerTypeInfo* info) noexcept final; std::vector> peerFactories; std::vector> coreFactories; std::map typeToFactory; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNStyleLayerManager.mm b/platform/darwin/src/MLNStyleLayerManager.mm index 7005c84ad..c5c94663d 100644 --- a/platform/darwin/src/MLNStyleLayerManager.mm +++ b/platform/darwin/src/MLNStyleLayerManager.mm @@ -16,7 +16,7 @@ #include -namespace mbgl { +namespace mln { LayerManagerDarwin::LayerManagerDarwin() { #if defined(MBGL_LAYER_FILL_DISABLE_RUNTIME) @@ -114,7 +114,7 @@ void LayerManagerDarwin::registerCoreFactory(LayerFactory* factory) { } } -LayerPeerFactory* LayerManagerDarwin::getPeerFactory(const mbgl::style::LayerTypeInfo* typeInfo) { +LayerPeerFactory* LayerManagerDarwin::getPeerFactory(const mln::style::LayerTypeInfo* typeInfo) { for (const auto& factory : peerFactories) { if (layerTypeInfoEquals(factory->getCoreLayerFactory()->getTypeInfo(), typeInfo)) { return factory.get(); @@ -128,7 +128,7 @@ LayerFactory* LayerManagerDarwin::getFactory(const std::string& type) noexcept { return (search != typeToFactory.end()) ? search->second : nullptr; } -LayerFactory* LayerManagerDarwin::getFactory(const mbgl::style::LayerTypeInfo* info) noexcept { +LayerFactory* LayerManagerDarwin::getFactory(const mln::style::LayerTypeInfo* info) noexcept { if (LayerPeerFactory* peerFactory = getPeerFactory(info)) { return peerFactory->getCoreLayerFactory(); } @@ -159,4 +159,4 @@ const bool LayerManager::annotationsEnabled = false; const bool LayerManager::annotationsEnabled = true; #endif -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNStyleLayer_Private.h b/platform/darwin/src/MLNStyleLayer_Private.h index 24d503fe2..54613c1f8 100644 --- a/platform/darwin/src/MLNStyleLayer_Private.h +++ b/platform/darwin/src/MLNStyleLayer_Private.h @@ -8,10 +8,10 @@ NS_ASSUME_NONNULL_BEGIN -// A struct to be stored in the `peer` member of mbgl::style::Layer, in order to implement +// A struct to be stored in the `peer` member of mln::style::Layer, in order to implement // object identity. We don't store a MLNStyleLayer pointer directly because that doesn't // interoperate with ARC. The inner pointer is weak in order to avoid a reference cycle for -// "pending" MLNStyleLayers, which have a strong owning pointer to the mbgl::style::Layer. +// "pending" MLNStyleLayers, which have a strong owning pointer to the mln::style::Layer. struct LayerWrapper { __weak MLNStyleLayer *layer; }; @@ -44,32 +44,32 @@ struct LayerWrapper { Initializes and returns a layer with a raw pointer to the backing store, associated with a style. */ -- (instancetype)initWithRawLayer:(mbgl::style::Layer *)rawLayer; +- (instancetype)initWithRawLayer:(mln::style::Layer *)rawLayer; /** Initializes and returns a layer with an owning pointer to the backing store, unassociated from a style. */ -- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer; +- (instancetype)initWithPendingLayer:(std::unique_ptr)pendingLayer; @property (nonatomic, readwrite, copy) NSString *identifier; /** A raw pointer to the mbgl object, which is always initialized, either to the - value returned by `mbgl::Map getLayer`, or for independently created objects, + value returned by `mln::Map getLayer`, or for independently created objects, to the pointer value held in `pendingLayer`. In the latter case, this raw pointer value stays even after ownership of the object is transferred via - `mbgl::Map addLayer`. + `mln::Map addLayer`. */ -@property (nonatomic, readonly) mbgl::style::Layer *rawLayer; +@property (nonatomic, readonly) mln::style::Layer *rawLayer; /** Adds the mbgl style layer that this object represents to the mbgl map below the specified `otherLayer`. Once a mbgl style layer is added, ownership of the object is transferred to the - `mbgl::Map` and this object no longer has an active unique_ptr reference to the - `mbgl::style::Layer`. + `mln::Map` and this object no longer has an active unique_ptr reference to the + `mln::style::Layer`. */ - (void)addToStyle:(MLNStyle *)style belowLayer:(nullable MLNStyleLayer *)otherLayer; @@ -84,7 +84,7 @@ struct LayerWrapper { @end -namespace mbgl { +namespace mln { class LayerPeerFactory { public: @@ -99,6 +99,6 @@ public: virtual MLNStyleLayer *createPeer(style::Layer *) = 0; }; -} // namespace mbgl +} // namespace mln NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/MLNStyleLayer_Private.h.ejs b/platform/darwin/src/MLNStyleLayer_Private.h.ejs index 69bc30fc8..46f74a187 100644 --- a/platform/darwin/src/MLNStyleLayer_Private.h.ejs +++ b/platform/darwin/src/MLNStyleLayer_Private.h.ejs @@ -13,12 +13,12 @@ #include _layer_factory.hpp> -namespace mbgl { +namespace mln { -class <%- camelize(type) %>StyleLayerPeerFactory : public LayerPeerFactory, public mbgl::<%- camelize(type) %>LayerFactory { +class <%- camelize(type) %>StyleLayerPeerFactory : public LayerPeerFactory, public mln::<%- camelize(type) %>LayerFactory { // LayerPeerFactory overrides. LayerFactory* getCoreLayerFactory() final { return this; } virtual MLNStyleLayer* createPeer(style::Layer*) final; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/MLNStyleValue.mm b/platform/darwin/src/MLNStyleValue.mm index 8ce2a1bf9..4407016f4 100644 --- a/platform/darwin/src/MLNStyleValue.mm +++ b/platform/darwin/src/MLNStyleValue.mm @@ -7,28 +7,28 @@ const MLNStyleFunctionOption MLNStyleFunctionOptionInterpolationBase = const MLNStyleFunctionOption MLNStyleFunctionOptionDefaultValue = @"MLNStyleFunctionOptionDefaultValue"; -id MLNJSONObjectFromMBGLValue(const mbgl::Value &value) { +id MLNJSONObjectFromMBGLValue(const mln::Value &value) { return value.match( - [](const mbgl::NullValue) -> id { return [NSNull null]; }, + [](const mln::NullValue) -> id { return [NSNull null]; }, [](const bool value) { return @(value); }, [](const float value) { return @(value); }, [](const int64_t value) { return @(value); }, [](const uint64_t value) { return @(value); }, [](const double value) { return @(value); }, [](const std::string &value) { return @(value.c_str()); }, - [](const mbgl::Color &value) { return [MLNColor mgl_colorWithColor:value]; }, - [](const mbgl::style::Position &value) { + [](const mln::Color &value) { return [MLNColor mgl_colorWithColor:value]; }, + [](const mln::style::Position &value) { std::array spherical = value.getSpherical(); MLNSphericalPosition position = MLNSphericalPositionMake(spherical[0], spherical[1], spherical[2]); return [NSValue valueWithMLNSphericalPosition:position]; }, - [&](const std::vector &vector) { + [&](const std::vector &vector) { NSMutableArray *array = [NSMutableArray arrayWithCapacity:vector.size()]; for (auto value : vector) { [array addObject:MLNJSONObjectFromMBGLValue(value)]; } return array; }, - [&](const std::unordered_map &map) { + [&](const std::unordered_map &map) { NSMutableDictionary *dictionary = [NSMutableDictionary dictionaryWithCapacity:map.size()]; for (auto &item : map) { dictionary[@(item.first.c_str())] = MLNJSONObjectFromMBGLValue(item.second); @@ -38,11 +38,11 @@ id MLNJSONObjectFromMBGLValue(const mbgl::Value &value) { [](const auto &) -> id { return nil; }); } -id MLNJSONObjectFromMBGLExpression(const mbgl::style::expression::Expression &mbglExpression) { +id MLNJSONObjectFromMBGLExpression(const mln::style::expression::Expression &mbglExpression) { return MLNJSONObjectFromMBGLValue(mbglExpression.serialize()); } -std::unique_ptr MLNClusterPropertyFromNSExpression( +std::unique_ptr MLNClusterPropertyFromNSExpression( NSExpression *expression) { if (!expression) { return nullptr; @@ -50,8 +50,8 @@ std::unique_ptr MLNClusterPropertyFromNSExp NSArray *jsonExpression = expression.mgl_jsonExpressionObject; - auto expr = mbgl::style::expression::dsl::createExpression( - mbgl::style::conversion::makeConvertible(jsonExpression)); + auto expr = mln::style::expression::dsl::createExpression( + mln::style::conversion::makeConvertible(jsonExpression)); return expr; } diff --git a/platform/darwin/src/MLNStyleValue_Private.h b/platform/darwin/src/MLNStyleValue_Private.h index d9668f3ec..c54222c2e 100644 --- a/platform/darwin/src/MLNStyleValue_Private.h +++ b/platform/darwin/src/MLNStyleValue_Private.h @@ -28,48 +28,48 @@ #import "NSColor+MLNAdditions.h" #endif -namespace mbgl { +namespace mln { namespace style { namespace expression { class Expression; } } // namespace style -} // namespace mbgl +} // namespace mln -id MLNJSONObjectFromMBGLValue(const mbgl::Value &value); +id MLNJSONObjectFromMBGLValue(const mln::Value &value); -NS_INLINE MLNTransition MLNTransitionFromOptions(const mbgl::style::TransitionOptions &options) { +NS_INLINE MLNTransition MLNTransitionFromOptions(const mln::style::TransitionOptions &options) { MLNTransition transition; transition.duration = - MLNTimeIntervalFromDuration(options.duration.value_or(mbgl::Duration::zero())); - transition.delay = MLNTimeIntervalFromDuration(options.delay.value_or(mbgl::Duration::zero())); + MLNTimeIntervalFromDuration(options.duration.value_or(mln::Duration::zero())); + transition.delay = MLNTimeIntervalFromDuration(options.delay.value_or(mln::Duration::zero())); return transition; } -NS_INLINE mbgl::style::TransitionOptions MLNOptionsFromTransition(MLNTransition transition) { - mbgl::style::TransitionOptions options{{MLNDurationFromTimeInterval(transition.duration)}, - {MLNDurationFromTimeInterval(transition.delay)}}; +NS_INLINE mln::style::TransitionOptions MLNOptionsFromTransition(MLNTransition transition) { + mln::style::TransitionOptions options{{MLNDurationFromTimeInterval(transition.duration)}, + {MLNDurationFromTimeInterval(transition.delay)}}; return options; } -std::unique_ptr MLNClusterPropertyFromNSExpression( +std::unique_ptr MLNClusterPropertyFromNSExpression( NSExpression *expression); -id MLNJSONObjectFromMBGLExpression(const mbgl::style::expression::Expression &mbglExpression); +id MLNJSONObjectFromMBGLExpression(const mln::style::expression::Expression &mbglExpression); template class MLNStyleValueTransformer { public: /// Convert an mbgl property value into an mgl style value - NSExpression *toExpression(const mbgl::style::PropertyValue &mbglValue) { + NSExpression *toExpression(const mln::style::PropertyValue &mbglValue) { PropertyExpressionEvaluator evaluator; return mbglValue.evaluate(evaluator); } // Convert an mbgl heatmap color property value into an mgl style value - NSExpression *toExpression(const mbgl::style::ColorRampPropertyValue &mbglValue) { + NSExpression *toExpression(const mln::style::ColorRampPropertyValue &mbglValue) { if (mbglValue.isUndefined()) { return nil; } @@ -81,7 +81,7 @@ public: Converts an NSExpression to an mbgl property value. */ template - typename std::enable_if_t::value, + typename std::enable_if_t::value, MBGLValue> toPropertyValue(NSExpression *expression, bool allowDataExpressions) { if (!expression) { @@ -101,9 +101,9 @@ public: NSArray *jsonExpression = expression.mgl_jsonExpressionObject; - mbgl::style::conversion::Error valueError; - auto value = mbgl::style::conversion::convert( - mbgl::style::conversion::makeConvertible(jsonExpression), valueError, allowDataExpressions, + mln::style::conversion::Error valueError; + auto value = mln::style::conversion::convert( + mln::style::conversion::makeConvertible(jsonExpression), valueError, allowDataExpressions, false); if (!value) { [NSException raise:NSInvalidArgumentException @@ -118,7 +118,7 @@ public: Converts an NSExpression to an mbgl property value. */ template - typename std::enable_if_t::value, + typename std::enable_if_t::value, MBGLValue> toPropertyValue(NSExpression *expression) { if (!expression) { @@ -127,9 +127,9 @@ public: NSArray *jsonExpression = expression.mgl_jsonExpressionObject; - mbgl::style::conversion::Error valueError; - auto value = mbgl::style::conversion::convert( - mbgl::style::conversion::makeConvertible(jsonExpression), valueError); + mln::style::conversion::Error valueError; + auto value = mln::style::conversion::convert( + mln::style::conversion::makeConvertible(jsonExpression), valueError); if (!value) { [NSException raise:NSInvalidArgumentException format:@"Invalid property value: %@", @(valueError.message.c_str())]; @@ -170,7 +170,7 @@ private: // Private utilities for converting from mgl to mbgl values NSString *toRawStyleSpecValue(ObjCType rawValue, MBGLEnum &) { MLNEnum mglEnum; [rawValue getValue:&mglEnum]; - return @(mbgl::Enum::toString(mglEnum)); + return @(mln::Enum::toString(mglEnum)); } NSObject *toRawStyleSpecValue(MLNColor *color, MBGLType &) { @@ -187,8 +187,8 @@ private: // Private utilities for converting from mgl to mbgl values void getMBGLValue(NSString *rawValue, std::string &mbglValue) { mbglValue = rawValue.UTF8String; } // Formatted - void getMBGLValue(NSString *rawValue, mbgl::style::expression::Formatted &mbglValue) { - mbglValue = mbgl::style::expression::Formatted(rawValue.UTF8String); + void getMBGLValue(NSString *rawValue, mln::style::expression::Formatted &mbglValue) { + mbglValue = mln::style::expression::Formatted(rawValue.UTF8String); } // Offsets @@ -217,10 +217,10 @@ private: // Private utilities for converting from mgl to mbgl values } // Padding type (supports numbers and float arrays w/ sizes 1 to 4) - void getMBGLValue(id rawValue, mbgl::Padding &mbglValue) { + void getMBGLValue(id rawValue, mln::Padding &mbglValue) { if ([rawValue isKindOfClass:[NSNumber class]]) { NSNumber *number = (NSNumber *)rawValue; - mbglValue = mbgl::Padding(number.floatValue); + mbglValue = mln::Padding(number.floatValue); } else if ([rawValue isKindOfClass:[NSArray class]]) { NSArray *array = (NSArray *)rawValue; if (array.count < 1 || array.count > 4) { @@ -231,17 +231,17 @@ private: // Private utilities for converting from mgl to mbgl values for (size_t i = 0; i < array.count; ++i) { getMBGLValue(array[i], values[i]); } - mbglValue = mbgl::Padding(std::span(values.begin(), array.count)); + mbglValue = mln::Padding(std::span(values.begin(), array.count)); } else if ([rawValue isKindOfClass:[NSValue class]]) { - mbglValue = mbgl::Padding([rawValue mgl_paddingArrayValue]); + mbglValue = mln::Padding([rawValue mgl_paddingArrayValue]); } } // Color - void getMBGLValue(MLNColor *rawValue, mbgl::Color &mbglValue) { mbglValue = rawValue.mgl_color; } + void getMBGLValue(MLNColor *rawValue, mln::Color &mbglValue) { mbglValue = rawValue.mgl_color; } // VariableAnchorOffsetCollection - void getMBGLValue(id rawValue, mbgl::VariableAnchorOffsetCollection &mbglValue) { + void getMBGLValue(id rawValue, mln::VariableAnchorOffsetCollection &mbglValue) { if ([rawValue isKindOfClass:[NSArray class]]) { NSArray *array = (NSArray *)rawValue; if (array.count % 2 != 0) { @@ -250,11 +250,11 @@ private: // Private utilities for converting from mgl to mbgl values format:@"VariableTextAnchorOffset array should have an even number of elements."]; } - std::vector anchorOffsets; + std::vector anchorOffsets; anchorOffsets.reserve(array.count / 2); for (NSUInteger i = 0; i < array.count; i += 2) { - mbgl::style::SymbolAnchorType anchor{0}; - getMBGLValue(array[i], anchor); + mln::style::SymbolAnchorType anchor{0}; + getMBGLValue(array[i], anchor); std::array offsetArray; getMBGLValue(array[i + 1], offsetArray); @@ -262,13 +262,13 @@ private: // Private utilities for converting from mgl to mbgl values anchorOffsets.emplace_back(anchor, offsetArray); } - mbglValue = mbgl::VariableAnchorOffsetCollection(std::move(anchorOffsets)); + mbglValue = mln::VariableAnchorOffsetCollection(std::move(anchorOffsets)); } } // Image - void getMBGLValue(NSString *rawValue, mbgl::style::expression::Image &mbglValue) { - mbglValue = mbgl::style::expression::Image(rawValue.UTF8String); + void getMBGLValue(NSString *rawValue, mln::style::expression::Image &mbglValue) { + mbglValue = mln::style::expression::Image(rawValue.UTF8String); } // Array @@ -286,9 +286,9 @@ private: // Private utilities for converting from mgl to mbgl values } } - void getMBGLValue(NSValue *rawValue, mbgl::style::Position &mbglValue) { + void getMBGLValue(NSValue *rawValue, mln::style::Position &mbglValue) { auto spherical = rawValue.mgl_lightPositionArrayValue; - mbgl::style::Position position(spherical); + mln::style::Position position(spherical); mbglValue = position; } @@ -298,12 +298,12 @@ private: // Private utilities for converting from mgl to mbgl values class = typename std::enable_if::value>::type> void getMBGLValue(id rawValue, MBGLEnum &mbglValue) { if ([rawValue isKindOfClass:[NSString class]]) { - mbglValue = *mbgl::Enum::toEnum([(NSString *)rawValue UTF8String]); + mbglValue = *mln::Enum::toEnum([(NSString *)rawValue UTF8String]); } else { MLNEnum mglEnum; [(NSValue *)rawValue getValue:&mglEnum]; - auto str = mbgl::Enum::toString(mglEnum); - mbglValue = *mbgl::Enum::toEnum(str); + auto str = mln::Enum::toString(mglEnum); + mbglValue = *mln::Enum::toEnum(str); } } @@ -323,7 +323,7 @@ private: // Private utilities for converting from mbgl to mgl values } // Formatted - static NSString *toMLNRawStyleValue(const mbgl::style::expression::Formatted &mbglStopValue) { + static NSString *toMLNRawStyleValue(const mln::style::expression::Formatted &mbglStopValue) { return @(mbglStopValue.toString().c_str()); } @@ -338,18 +338,18 @@ private: // Private utilities for converting from mbgl to mgl values } // Padding type - static NSValue *toMLNRawStyleValue(const mbgl::Padding &mbglStopValue) { + static NSValue *toMLNRawStyleValue(const mln::Padding &mbglStopValue) { return [NSValue mgl_valueWithPaddingArray:mbglStopValue.toArray()]; } // Color - static MLNColor *toMLNRawStyleValue(const mbgl::Color mbglStopValue) { + static MLNColor *toMLNRawStyleValue(const mln::Color mbglStopValue) { return [MLNColor mgl_colorWithColor:mbglStopValue]; } // VariableAnchorOffsetCollection static NSArray *toMLNRawStyleValue( - const mbgl::VariableAnchorOffsetCollection mbglStopValue) { + const mln::VariableAnchorOffsetCollection mbglStopValue) { NSMutableArray *array = [NSMutableArray arrayWithCapacity:mbglStopValue.size() * 2]; for (const auto &anchorOffset : mbglStopValue) { NSString *anchor = toMLNRawStyleValue(anchorOffset.anchorType); @@ -361,7 +361,7 @@ private: // Private utilities for converting from mbgl to mgl values } // Image - static NSString *toMLNRawStyleValue(const mbgl::style::expression::Image &mbglImageValue) { + static NSString *toMLNRawStyleValue(const mln::style::expression::Image &mbglImageValue) { return @(mbglImageValue.id().c_str()); } @@ -375,7 +375,7 @@ private: // Private utilities for converting from mbgl to mgl values return array; } - static NSValue *toMLNRawStyleValue(const mbgl::style::Position &mbglStopValue) { + static NSValue *toMLNRawStyleValue(const mln::style::Position &mbglStopValue) { std::array spherical = mbglStopValue.getSpherical(); MLNSphericalPosition position = MLNSphericalPositionMake(spherical[0], spherical[1], spherical[2]); @@ -385,13 +385,13 @@ private: // Private utilities for converting from mbgl to mgl values // Enumerations template static NSString *toMLNRawStyleValue(const MBGLEnum &value) { - return @(mbgl::Enum::toString(value)); + return @(mln::Enum::toString(value)); } /// Converts all types of mbgl property values into an equivalent NSExpression. class PropertyExpressionEvaluator { public: - NSExpression *operator()(const mbgl::style::Undefined) const { return nil; } + NSExpression *operator()(const mln::style::Undefined) const { return nil; } NSExpression *operator()(const MBGLType &value) const { id constantValue = toMLNRawStyleValue(value); @@ -401,7 +401,7 @@ private: // Private utilities for converting from mbgl to mgl values return [NSExpression expressionForConstantValue:constantValue]; } - NSExpression *operator()(const mbgl::style::PropertyExpression &mbglValue) const { + NSExpression *operator()(const mln::style::PropertyExpression &mbglValue) const { return [NSExpression expressionWithMLNJSONObject:MLNJSONObjectFromMBGLExpression(mbglValue.getExpression())]; } diff --git a/platform/darwin/src/MLNStyle_Private.h b/platform/darwin/src/MLNStyle_Private.h index ae18d428a..ce3931049 100644 --- a/platform/darwin/src/MLNStyle_Private.h +++ b/platform/darwin/src/MLNStyle_Private.h @@ -5,11 +5,11 @@ NS_ASSUME_NONNULL_BEGIN -namespace mbgl { +namespace mln { namespace style { class Style; } -} // namespace mbgl +} // namespace mln @class MLNAttributionInfo; @class MLNMapView; @@ -19,10 +19,10 @@ class Style; @interface MLNStyle (Private) -- (instancetype)initWithRawStyle:(mbgl::style::Style *)rawStyle stylable:(id)stylable; +- (instancetype)initWithRawStyle:(mln::style::Style *)rawStyle stylable:(id)stylable; @property (nonatomic, readonly, weak) id stylable; -@property (nonatomic, readonly) mbgl::style::Style *rawStyle; +@property (nonatomic, readonly) mln::style::Style *rawStyle; - (nullable NSArray *)attributionInfosWithFontSize:(CGFloat)fontSize linkColor: diff --git a/platform/darwin/src/MLNTilePyramidOfflineRegion.mm b/platform/darwin/src/MLNTilePyramidOfflineRegion.mm index d21adff36..244239394 100644 --- a/platform/darwin/src/MLNTilePyramidOfflineRegion.mm +++ b/platform/darwin/src/MLNTilePyramidOfflineRegion.mm @@ -68,7 +68,7 @@ } - (instancetype)initWithOfflineRegionDefinition: - (const mbgl::OfflineTilePyramidRegionDefinition &)definition { + (const mln::OfflineTilePyramidRegionDefinition &)definition { NSURL *styleURL = [NSURL URLWithString:@(definition.styleURL.c_str())]; MLNCoordinateBounds bounds = MLNCoordinateBoundsFromLatLngBounds(definition.bounds); MLNTilePyramidOfflineRegion *result = [self initWithStyleURL:styleURL @@ -79,7 +79,7 @@ return result; } -- (const mbgl::OfflineRegionDefinition)offlineRegionDefinition { +- (const mln::OfflineRegionDefinition)offlineRegionDefinition { #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR const float scaleFactor = [UIScreen instancesRespondToSelector:@selector(nativeScale)] ? [[UIScreen mainScreen] nativeScale] @@ -87,7 +87,7 @@ #elif TARGET_OS_MAC const float scaleFactor = [NSScreen mainScreen].backingScaleFactor; #endif - return mbgl::OfflineTilePyramidRegionDefinition( + return mln::OfflineTilePyramidRegionDefinition( _styleURL.absoluteString.UTF8String, MLNLatLngBoundsFromCoordinateBounds(_bounds), _minimumZoomLevel, _maximumZoomLevel, scaleFactor, _includesIdeographicGlyphs); } diff --git a/platform/darwin/src/MLNTilePyramidOfflineRegion_Private.h b/platform/darwin/src/MLNTilePyramidOfflineRegion_Private.h index f601268ba..cc2efd8e8 100644 --- a/platform/darwin/src/MLNTilePyramidOfflineRegion_Private.h +++ b/platform/darwin/src/MLNTilePyramidOfflineRegion_Private.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN offline region. */ - (instancetype)initWithOfflineRegionDefinition: - (const mbgl::OfflineTilePyramidRegionDefinition &)definition; + (const mln::OfflineTilePyramidRegionDefinition &)definition; @end diff --git a/platform/darwin/src/MLNTileSource.mm b/platform/darwin/src/MLNTileSource.mm index 98a1ae2bf..2b9383ea6 100644 --- a/platform/darwin/src/MLNTileSource.mm +++ b/platform/darwin/src/MLNTileSource.mm @@ -53,10 +53,10 @@ const MLNTileSourceOption MLNTileSourceOptionTileCoordinateSystem = @end -mbgl::Tileset MLNTileSetFromTileURLTemplates( +mln::Tileset MLNTileSetFromTileURLTemplates( NSArray *tileURLTemplates, NSDictionary *_Nullable options) { - mbgl::Tileset tileSet; + mln::Tileset tileSet; for (NSString *tileURLTemplate in tileURLTemplates) { tileSet.tiles.push_back(tileURLTemplate.UTF8String); @@ -138,10 +138,10 @@ mbgl::Tileset MLNTileSetFromTileURLTemplates( [tileCoordinateSystemNumber getValue:&tileCoordinateSystem]; switch (tileCoordinateSystem) { case MLNTileCoordinateSystemXYZ: - tileSet.scheme = mbgl::Tileset::Scheme::XYZ; + tileSet.scheme = mln::Tileset::Scheme::XYZ; break; case MLNTileCoordinateSystemTMS: - tileSet.scheme = mbgl::Tileset::Scheme::TMS; + tileSet.scheme = mln::Tileset::Scheme::TMS; break; } } @@ -156,10 +156,10 @@ mbgl::Tileset MLNTileSetFromTileURLTemplates( [encodingNumber getValue:&encoding]; switch (encoding) { case MLNDEMEncodingMapbox: - tileSet.rasterEncoding = mbgl::Tileset::RasterEncoding::Mapbox; + tileSet.rasterEncoding = mln::Tileset::RasterEncoding::Mapbox; break; case MLNDEMEncodingTerrarium: - tileSet.rasterEncoding = mbgl::Tileset::RasterEncoding::Terrarium; + tileSet.rasterEncoding = mln::Tileset::RasterEncoding::Terrarium; break; } } @@ -175,10 +175,10 @@ mbgl::Tileset MLNTileSetFromTileURLTemplates( [encodingNumber getValue:&encoding]; switch (encoding) { case MLNVectorTileSourceEncodingMapbox: - tileSet.vectorEncoding = mbgl::Tileset::VectorEncoding::Mapbox; + tileSet.vectorEncoding = mln::Tileset::VectorEncoding::Mapbox; break; case MLNVectorTileSourceEncodingMLT: - tileSet.vectorEncoding = mbgl::Tileset::VectorEncoding::MLT; + tileSet.vectorEncoding = mln::Tileset::VectorEncoding::MLT; break; } } diff --git a/platform/darwin/src/MLNTileSource_Private.h b/platform/darwin/src/MLNTileSource_Private.h index 8e16c6c4a..14bdb1428 100644 --- a/platform/darwin/src/MLNTileSource_Private.h +++ b/platform/darwin/src/MLNTileSource_Private.h @@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN -namespace mbgl { +namespace mln { class Tileset; } @@ -34,7 +34,7 @@ class Tileset; @end MLN_EXPORT -mbgl::Tileset MLNTileSetFromTileURLTemplates( +mln::Tileset MLNTileSetFromTileURLTemplates( NSArray *tileURLTemplates, NSDictionary *_Nullable options); diff --git a/platform/darwin/src/MLNValueEvaluator.h b/platform/darwin/src/MLNValueEvaluator.h index 903099df5..85c55d0fc 100644 --- a/platform/darwin/src/MLNValueEvaluator.h +++ b/platform/darwin/src/MLNValueEvaluator.h @@ -8,7 +8,7 @@ */ class ValueEvaluator { public: - id operator()(const mbgl::NullValue &) const { return [NSNull null]; } + id operator()(const mln::NullValue &) const { return [NSNull null]; } id operator()(const bool &value) const { return value ? @YES : @NO; } @@ -20,18 +20,18 @@ public: id operator()(const std::string &value) const { return @(value.c_str()); } - id operator()(const std::vector &values) const { + id operator()(const std::vector &values) const { NSMutableArray *objects = [NSMutableArray arrayWithCapacity:values.size()]; for (const auto &v : values) { - [objects addObject:mbgl::Value::visit(v, *this)]; + [objects addObject:mln::Value::visit(v, *this)]; } return objects; } - id operator()(const std::unordered_map &items) const { + id operator()(const std::unordered_map &items) const { NSMutableDictionary *attributes = [NSMutableDictionary dictionaryWithCapacity:items.size()]; for (auto &item : items) { - attributes[@(item.first.c_str())] = mbgl::Value::visit(item.second, *this); + attributes[@(item.first.c_str())] = mln::Value::visit(item.second, *this); } return attributes; } diff --git a/platform/darwin/src/MLNVectorTileSource.mm b/platform/darwin/src/MLNVectorTileSource.mm index c0cbf8363..259e74376 100644 --- a/platform/darwin/src/MLNVectorTileSource.mm +++ b/platform/darwin/src/MLNVectorTileSource.mm @@ -18,7 +18,7 @@ const MLNTileSourceOption MLNVectorTileSourceOptionEncoding = @"MLNVectorTileSou @interface MLNVectorTileSource () -@property (nonatomic, readonly) mbgl::style::VectorSource *rawSource; +@property (nonatomic, readonly) mln::style::VectorSource *rawSource; @end @@ -26,7 +26,7 @@ const MLNTileSourceOption MLNVectorTileSourceOptionEncoding = @"MLNVectorTileSou - (instancetype)initWithIdentifier:(NSString *)identifier configurationURL:(NSURL *)configurationURL { - auto source = std::make_unique( + auto source = std::make_unique( identifier.UTF8String, configurationURL.mgl_URLByStandardizingScheme.absoluteString.UTF8String); return self = [super initWithPendingSource:std::move(source)]; @@ -34,8 +34,8 @@ const MLNTileSourceOption MLNVectorTileSourceOptionEncoding = @"MLNVectorTileSou - (instancetype)initWithIdentifier:(NSString *)identifier configurationURLString:(NSString *)configurationURLString { - auto source = std::make_unique(identifier.UTF8String, - configurationURLString.UTF8String); + auto source = std::make_unique(identifier.UTF8String, + configurationURLString.UTF8String); return self = [super initWithPendingSource:std::move(source)]; } @@ -43,13 +43,13 @@ const MLNTileSourceOption MLNVectorTileSourceOptionEncoding = @"MLNVectorTileSou - (instancetype)initWithIdentifier:(NSString *)identifier tileURLTemplates:(NSArray *)tileURLTemplates options:(nullable NSDictionary *)options { - mbgl::Tileset tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, options); - auto source = std::make_unique(identifier.UTF8String, tileSet); + mln::Tileset tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, options); + auto source = std::make_unique(identifier.UTF8String, tileSet); return self = [super initWithPendingSource:std::move(source)]; } -- (mbgl::style::VectorSource *)rawSource { - return (mbgl::style::VectorSource *)super.rawSource; +- (mln::style::VectorSource *)rawSource { + return (mln::style::VectorSource *)super.rawSource; } - (NSURL *)configurationURL { @@ -84,12 +84,12 @@ const MLNTileSourceOption MLNVectorTileSourceOptionEncoding = @"MLNVectorTileSou optionalSourceLayerIDs = layerIDs; } - std::optional optionalFilter; + std::optional optionalFilter; if (predicate) { optionalFilter = predicate.mgl_filter; } - std::vector features; + std::vector features; if ([self.stylable isKindOfClass:[MLNMapView class]]) { MLNMapView *mapView = (MLNMapView *)self.stylable; features = mapView.renderer->querySourceFeatures(self.rawSource->getID(), diff --git a/platform/darwin/src/NSArray+MLNAdditions.h b/platform/darwin/src/NSArray+MLNAdditions.h index 76fd0e4c8..a7a94974e 100644 --- a/platform/darwin/src/NSArray+MLNAdditions.h +++ b/platform/darwin/src/NSArray+MLNAdditions.h @@ -5,7 +5,7 @@ @interface NSArray (MLNAdditions) -- (std::vector)mgl_vector; +- (std::vector)mgl_vector; /** Returns a string resulting from inserting a separator between each attributed string in the * array */ diff --git a/platform/darwin/src/NSArray+MLNAdditions.mm b/platform/darwin/src/NSArray+MLNAdditions.mm index 6c6d68db2..b29e7613c 100644 --- a/platform/darwin/src/NSArray+MLNAdditions.mm +++ b/platform/darwin/src/NSArray+MLNAdditions.mm @@ -6,15 +6,15 @@ @implementation NSArray (MLNAdditions) -- (std::vector)mgl_vector { - std::vector vector; +- (std::vector)mgl_vector { + std::vector vector; vector.reserve(self.count); for (id value in self) { if ([value isKindOfClass:[NSArray class]]) { - std::vector innerVector = [value mgl_vector]; + std::vector innerVector = [value mgl_vector]; vector.push_back(innerVector); } else if ([value isKindOfClass:[NSDictionary class]]) { - mbgl::PropertyMap propertyMap = [value mgl_propertyMap]; + mln::PropertyMap propertyMap = [value mgl_propertyMap]; vector.push_back(propertyMap); } else { NSExpression *expression = [NSExpression expressionForConstantValue:value]; diff --git a/platform/darwin/src/NSComparisonPredicate+MLNAdditions.mm b/platform/darwin/src/NSComparisonPredicate+MLNAdditions.mm index f2eeb910a..3e1524c5f 100644 --- a/platform/darwin/src/NSComparisonPredicate+MLNAdditions.mm +++ b/platform/darwin/src/NSComparisonPredicate+MLNAdditions.mm @@ -24,12 +24,12 @@ return nil; } -- (mbgl::Value)mgl_constantValue { +- (mln::Value)mgl_constantValue { NSExpression *leftExpression = self.leftExpression; NSExpression *rightExpression = self.rightExpression; NSExpressionType leftType = leftExpression.expressionType; NSExpressionType rightType = rightExpression.expressionType; - mbgl::Value value; + mln::Value value; if (leftType == NSKeyPathExpressionType && rightType == NSConstantValueExpressionType) { value = rightExpression.mgl_constantMBGLValue; } else if (leftType == NSConstantValueExpressionType && rightType == NSKeyPathExpressionType) { @@ -42,12 +42,12 @@ return value; } -- (mbgl::FeatureType)mgl_featureType { +- (mln::FeatureType)mgl_featureType { NSExpression *leftExpression = self.leftExpression; NSExpression *rightExpression = self.rightExpression; NSExpressionType leftType = leftExpression.expressionType; NSExpressionType rightType = rightExpression.expressionType; - mbgl::FeatureType type; + mln::FeatureType type; if (leftType == NSKeyPathExpressionType && rightType == NSConstantValueExpressionType) { type = rightExpression.mgl_featureType; } else if (leftType == NSConstantValueExpressionType && rightType == NSKeyPathExpressionType) { @@ -60,12 +60,12 @@ return type; } -- (mbgl::FeatureIdentifier)mgl_featureIdentifier { +- (mln::FeatureIdentifier)mgl_featureIdentifier { NSExpression *leftExpression = self.leftExpression; NSExpression *rightExpression = self.rightExpression; NSExpressionType leftType = leftExpression.expressionType; NSExpressionType rightType = rightExpression.expressionType; - mbgl::FeatureIdentifier identifier; + mln::FeatureIdentifier identifier; if (leftType == NSKeyPathExpressionType && rightType == NSConstantValueExpressionType) { identifier = rightExpression.mgl_featureIdentifier; } else if (leftType == NSConstantValueExpressionType && rightType == NSKeyPathExpressionType) { diff --git a/platform/darwin/src/NSCompoundPredicate+MLNAdditions.mm b/platform/darwin/src/NSCompoundPredicate+MLNAdditions.mm index 24fff9930..857bcae8f 100644 --- a/platform/darwin/src/NSCompoundPredicate+MLNAdditions.mm +++ b/platform/darwin/src/NSCompoundPredicate+MLNAdditions.mm @@ -10,8 +10,8 @@ @implementation NSCompoundPredicate (MLNAdditions) -- (std::vector)mgl_subfilters { - std::vector filters; +- (std::vector)mgl_subfilters { + std::vector filters; for (NSPredicate *predicate in self.subpredicates) { filters.push_back(predicate.mgl_filter); } diff --git a/platform/darwin/src/NSDate+MLNAdditions.h b/platform/darwin/src/NSDate+MLNAdditions.h index 0e0345129..a972de92c 100644 --- a/platform/darwin/src/NSDate+MLNAdditions.h +++ b/platform/darwin/src/NSDate+MLNAdditions.h @@ -7,10 +7,10 @@ NS_ASSUME_NONNULL_BEGIN /// Converts from a duration in seconds to a duration object usable in mbgl. MLN_EXPORT -mbgl::Duration MLNDurationFromTimeInterval(NSTimeInterval duration); +mln::Duration MLNDurationFromTimeInterval(NSTimeInterval duration); /// Converts from an mbgl duration object to a duration in seconds. MLN_EXPORT -NSTimeInterval MLNTimeIntervalFromDuration(mbgl::Duration duration); +NSTimeInterval MLNTimeIntervalFromDuration(mln::Duration duration); NS_ASSUME_NONNULL_END diff --git a/platform/darwin/src/NSDate+MLNAdditions.mm b/platform/darwin/src/NSDate+MLNAdditions.mm index 8c78fcc74..80cc39e59 100644 --- a/platform/darwin/src/NSDate+MLNAdditions.mm +++ b/platform/darwin/src/NSDate+MLNAdditions.mm @@ -1,11 +1,10 @@ #import #import "NSDate+MLNAdditions.h" -mbgl::Duration MLNDurationFromTimeInterval(NSTimeInterval duration) { - return std::chrono::duration_cast( - std::chrono::duration(duration)); +mln::Duration MLNDurationFromTimeInterval(NSTimeInterval duration) { + return std::chrono::duration_cast(std::chrono::duration(duration)); } -NSTimeInterval MLNTimeIntervalFromDuration(mbgl::Duration duration) { +NSTimeInterval MLNTimeIntervalFromDuration(mln::Duration duration) { return std::chrono::duration>(duration).count(); } diff --git a/platform/darwin/src/NSDictionary+MLNAdditions.h b/platform/darwin/src/NSDictionary+MLNAdditions.h index eb8d5c28e..ee99f60df 100644 --- a/platform/darwin/src/NSDictionary+MLNAdditions.h +++ b/platform/darwin/src/NSDictionary+MLNAdditions.h @@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN @interface NSDictionary (MLNAdditions) -- (mbgl::PropertyMap)mgl_propertyMap; +- (mln::PropertyMap)mgl_propertyMap; @end diff --git a/platform/darwin/src/NSDictionary+MLNAdditions.mm b/platform/darwin/src/NSDictionary+MLNAdditions.mm index 3afc3300f..5b8e62dde 100644 --- a/platform/darwin/src/NSDictionary+MLNAdditions.mm +++ b/platform/darwin/src/NSDictionary+MLNAdditions.mm @@ -5,8 +5,8 @@ @implementation NSDictionary (MLNAdditions) -- (mbgl::PropertyMap)mgl_propertyMap { - mbgl::PropertyMap propertyMap; +- (mln::PropertyMap)mgl_propertyMap { + mln::PropertyMap propertyMap; for (NSString *key in self.allKeys) { if ([self[key] isKindOfClass:[NSDictionary class]]) { propertyMap[[key UTF8String]] = [self[key] mgl_propertyMap]; diff --git a/platform/darwin/src/NSExpression+MLNAdditions.mm b/platform/darwin/src/NSExpression+MLNAdditions.mm index 263dd1c5b..259218290 100644 --- a/platform/darwin/src/NSExpression+MLNAdditions.mm +++ b/platform/darwin/src/NSExpression+MLNAdditions.mm @@ -271,10 +271,10 @@ const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier = @implementation NSExpression (MLNPrivateAdditions) -- (std::vector)mgl_aggregateMBGLValue { +- (std::vector)mgl_aggregateMBGLValue { if ([self.constantValue isKindOfClass:[NSArray class]] || [self.constantValue isKindOfClass:[NSSet class]]) { - std::vector convertedValues; + std::vector convertedValues; for (id value in self.constantValue) { NSExpression *expression = value; if (![expression isKindOfClass:[NSExpression class]]) { @@ -289,7 +289,7 @@ const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier = return {}; } -- (mbgl::Value)mgl_constantMBGLValue { +- (mln::Value)mgl_constantMBGLValue { id value = self.constantValue; if ([value isKindOfClass:NSString.class]) { return {std::string([(NSString *)value UTF8String])}; @@ -319,11 +319,11 @@ const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier = return {(double)number.doubleValue}; } else if ([number compare:@(0)] == NSOrderedDescending || [number compare:@(0)] == NSOrderedSame) { - // Positive integer or zero; use uint64_t per mbgl::Value definition. + // Positive integer or zero; use uint64_t per mln::Value definition. // We use unsigned long long here to avoid any truncation. return {(uint64_t)number.unsignedLongLongValue}; } else if ([number compare:@(0)] == NSOrderedAscending) { - // Negative integer; use int64_t per mbgl::Value definition. + // Negative integer; use int64_t per mln::Value definition. // We use long long here to avoid any truncation. return {(int64_t)number.longLongValue}; } @@ -332,15 +332,15 @@ const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier = return {hexString}; } else if (value && value != [NSNull null]) { [NSException raise:NSInvalidArgumentException - format:@"Can’t convert %s:%@ to mbgl::Value", [value objCType], value]; + format:@"Can’t convert %s:%@ to mln::Value", [value objCType], value]; } return {}; } -- (std::vector)mgl_aggregateFeatureType { +- (std::vector)mgl_aggregateFeatureType { if ([self.constantValue isKindOfClass:[NSArray class]] || [self.constantValue isKindOfClass:[NSSet class]]) { - std::vector convertedValues; + std::vector convertedValues; for (id value in self.constantValue) { NSExpression *expression = value; if (![expression isKindOfClass:[NSExpression class]]) { @@ -355,37 +355,37 @@ const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier = return {}; } -- (mbgl::FeatureType)mgl_featureType { +- (mln::FeatureType)mgl_featureType { id value = self.constantValue; if ([value isKindOfClass:NSString.class]) { if ([value isEqualToString:@"Point"]) { - return mbgl::FeatureType::Point; + return mln::FeatureType::Point; } if ([value isEqualToString:@"LineString"]) { - return mbgl::FeatureType::LineString; + return mln::FeatureType::LineString; } if ([value isEqualToString:@"Polygon"]) { - return mbgl::FeatureType::Polygon; + return mln::FeatureType::Polygon; } } else if ([value isKindOfClass:NSNumber.class]) { switch ([value integerValue]) { case 1: - return mbgl::FeatureType::Point; + return mln::FeatureType::Point; case 2: - return mbgl::FeatureType::LineString; + return mln::FeatureType::LineString; case 3: - return mbgl::FeatureType::Polygon; + return mln::FeatureType::Polygon; default: break; } } - return mbgl::FeatureType::Unknown; + return mln::FeatureType::Unknown; } -- (std::vector)mgl_aggregateFeatureIdentifier { +- (std::vector)mgl_aggregateFeatureIdentifier { if ([self.constantValue isKindOfClass:[NSArray class]] || [self.constantValue isKindOfClass:[NSSet class]]) { - std::vector convertedValues; + std::vector convertedValues; for (id value in self.constantValue) { NSExpression *expression = value; if (![expression isKindOfClass:[NSExpression class]]) { @@ -400,8 +400,8 @@ const MLNExpressionInterpolationMode MLNExpressionInterpolationModeCubicBezier = return {}; } -- (mbgl::FeatureIdentifier)mgl_featureIdentifier { - mbgl::Value mbglValue = self.mgl_constantMBGLValue; +- (mln::FeatureIdentifier)mgl_featureIdentifier { + mln::Value mbglValue = self.mgl_constantMBGLValue; if (mbglValue.is()) { return mbglValue.get(); diff --git a/platform/darwin/src/NSExpression+MLNPrivateAdditions.h b/platform/darwin/src/NSExpression+MLNPrivateAdditions.h index 81e538799..fa8133838 100644 --- a/platform/darwin/src/NSExpression+MLNPrivateAdditions.h +++ b/platform/darwin/src/NSExpression+MLNPrivateAdditions.h @@ -21,12 +21,12 @@ NS_ASSUME_NONNULL_BEGIN @interface NSExpression (MLNPrivateAdditions) -@property (nonatomic, readonly) mbgl::Value mgl_constantMBGLValue; -@property (nonatomic, readonly) std::vector mgl_aggregateMBGLValue; -@property (nonatomic, readonly) mbgl::FeatureType mgl_featureType; -@property (nonatomic, readonly) std::vector mgl_aggregateFeatureType; -@property (nonatomic, readonly) mbgl::FeatureIdentifier mgl_featureIdentifier; -@property (nonatomic, readonly) std::vector mgl_aggregateFeatureIdentifier; +@property (nonatomic, readonly) mln::Value mgl_constantMBGLValue; +@property (nonatomic, readonly) std::vector mgl_aggregateMBGLValue; +@property (nonatomic, readonly) mln::FeatureType mgl_featureType; +@property (nonatomic, readonly) std::vector mgl_aggregateFeatureType; +@property (nonatomic, readonly) mln::FeatureIdentifier mgl_featureIdentifier; +@property (nonatomic, readonly) std::vector mgl_aggregateFeatureIdentifier; @end diff --git a/platform/darwin/src/NSPredicate+MLNAdditions.mm b/platform/darwin/src/NSPredicate+MLNAdditions.mm index 2d91f1b56..ab4155cb1 100644 --- a/platform/darwin/src/NSPredicate+MLNAdditions.mm +++ b/platform/darwin/src/NSPredicate+MLNAdditions.mm @@ -8,23 +8,23 @@ @implementation NSPredicate (MLNPrivateAdditions) -- (mbgl::style::Filter)mgl_filter { - mbgl::style::conversion::Error valueError; +- (mln::style::Filter)mgl_filter { + mln::style::conversion::Error valueError; NSArray *jsonObject = self.mgl_jsonExpressionObject; - auto value = mbgl::style::conversion::convert( - mbgl::style::conversion::makeConvertible(jsonObject), valueError); + auto value = mln::style::conversion::convert( + mln::style::conversion::makeConvertible(jsonObject), valueError); if (!value) { [NSException raise:NSInvalidArgumentException format:@"Invalid filter value: %@", @(valueError.message.c_str())]; return {}; } - mbgl::style::Filter filter = std::move(*value); + mln::style::Filter filter = std::move(*value); return filter; } -+ (instancetype)mgl_predicateWithFilter:(mbgl::style::Filter)filter { ++ (instancetype)mgl_predicateWithFilter:(mln::style::Filter)filter { if (filter.expression) { id jsonObject = MLNJSONObjectFromMBGLExpression(**filter.expression); return [NSPredicate predicateWithMLNJSONObject:jsonObject]; diff --git a/platform/darwin/src/NSPredicate+MLNPrivateAdditions.h b/platform/darwin/src/NSPredicate+MLNPrivateAdditions.h index cc30e8626..065ad9bef 100644 --- a/platform/darwin/src/NSPredicate+MLNPrivateAdditions.h +++ b/platform/darwin/src/NSPredicate+MLNPrivateAdditions.h @@ -8,9 +8,9 @@ NS_ASSUME_NONNULL_BEGIN @interface NSPredicate (MLNPrivateAdditions) -- (mbgl::style::Filter)mgl_filter; +- (mln::style::Filter)mgl_filter; -+ (nullable instancetype)mgl_predicateWithFilter:(mbgl::style::Filter)filter; ++ (nullable instancetype)mgl_predicateWithFilter:(mln::style::Filter)filter; @end diff --git a/platform/darwin/src/gl_functions.cpp b/platform/darwin/src/gl_functions.cpp index 5050214eb..541ce0d58 100644 --- a/platform/darwin/src/gl_functions.cpp +++ b/platform/darwin/src/gl_functions.cpp @@ -16,7 +16,7 @@ #error Unsupported Apple platform #endif -namespace mbgl { +namespace mln { namespace platform { /* OpenGL ES 2.0 */ @@ -293,4 +293,4 @@ void (*const glTexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei) void (*const glGetInternalformativ)(GLenum, GLenum, GLenum, GLsizei, GLint*) = ::glGetInternalformativ; } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/headless_backend_cgl.mm b/platform/darwin/src/headless_backend_cgl.mm index 0403d20a4..c6328e366 100644 --- a/platform/darwin/src/headless_backend_cgl.mm +++ b/platform/darwin/src/headless_backend_cgl.mm @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { // This class provides a singleton that contains information about the pixel format used for @@ -124,4 +124,4 @@ void HeadlessBackend::createImpl() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/src/headless_backend_eagl.mm b/platform/darwin/src/headless_backend_eagl.mm index 7182d2d29..986dc1ff6 100644 --- a/platform/darwin/src/headless_backend_eagl.mm +++ b/platform/darwin/src/headless_backend_eagl.mm @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { class EAGLBackendImpl final : public HeadlessBackend::Impl { @@ -44,4 +44,4 @@ void HeadlessBackend::createImpl() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/darwin/test/MLNExpressionTests.mm b/platform/darwin/test/MLNExpressionTests.mm index 4f3d35203..214ce85c2 100644 --- a/platform/darwin/test/MLNExpressionTests.mm +++ b/platform/darwin/test/MLNExpressionTests.mm @@ -171,7 +171,7 @@ using namespace std::string_literals; } - (void)testIntegerValuation { - // Negative integers should always come back as int64_t per mbgl::Value definition. + // Negative integers should always come back as int64_t per mln::Value definition. MLNAssertConstantEqualsValue(@SHRT_MIN, static_cast(SHRT_MIN), @"Negative short NSNumber should convert to int64_t."); MLNAssertConstantEqualsValue(@INT_MIN, static_cast(INT_MIN), @@ -183,7 +183,7 @@ using namespace std::string_literals; MLNAssertConstantEqualsValue(@NSIntegerMin, static_cast(NSIntegerMin), @"Negative NSInteger NSNumber should convert to int64_t."); - // Positive integers should always come back as uint64_t per mbgl::Value definition. + // Positive integers should always come back as uint64_t per mln::Value definition. MLNAssertConstantEqualsValue(@SHRT_MAX, static_cast(SHRT_MAX), @"Positive short NSNumber should convert to uint64_t."); MLNAssertConstantEqualsValue(@INT_MAX, static_cast(INT_MAX), @@ -197,7 +197,7 @@ using namespace std::string_literals; } - (void)testUnsignedIntegerValuation { - // Zero-value integers should always come back as uint64_t per mbgl::Value definition + // Zero-value integers should always come back as uint64_t per mln::Value definition // (using the interpretation that zero is not negative). We use the unsigned long long // value just for parity with the positive integer test. MLNAssertConstantEqualsValue(@(static_cast(0)), static_cast(0), @@ -211,7 +211,7 @@ using namespace std::string_literals; MLNAssertConstantEqualsValue(@(static_cast(0)), static_cast(0), @"Unsigned NSUInteger NSNumber should convert to uint64_t."); - // Positive integers should always come back as uint64_t per mbgl::Value definition. + // Positive integers should always come back as uint64_t per mln::Value definition. // We use the unsigned long long value because it can store the highest number on // both 32- and 64-bit and won't overflow. MLNAssertConstantEqualsValue(@USHRT_MAX, static_cast(USHRT_MAX), @@ -227,40 +227,40 @@ using namespace std::string_literals; } - (void)testNullValuation { - mbgl::NullValue nullValue; + mln::NullValue nullValue; MLNAssertConstantEqualsValue([NSNull null], nullValue, - @"NSNull should convert to mbgl::NullValue."); + @"NSNull should convert to mln::NullValue."); } // MARK: - Feature type tests - (void)testFeatureType { XCTAssertEqual([NSExpression expressionForConstantValue:@"Point"].mgl_featureType, - mbgl::FeatureType::Point); + mln::FeatureType::Point); XCTAssertEqual([NSExpression expressionForConstantValue:@"LineString"].mgl_featureType, - mbgl::FeatureType::LineString); + mln::FeatureType::LineString); XCTAssertEqual([NSExpression expressionForConstantValue:@"Polygon"].mgl_featureType, - mbgl::FeatureType::Polygon); + mln::FeatureType::Polygon); XCTAssertEqual([NSExpression expressionForConstantValue:@"Unknown"].mgl_featureType, - mbgl::FeatureType::Unknown); + mln::FeatureType::Unknown); XCTAssertEqual([NSExpression expressionForConstantValue:@""].mgl_featureType, - mbgl::FeatureType::Unknown); + mln::FeatureType::Unknown); XCTAssertEqual([NSExpression expressionForConstantValue:@1].mgl_featureType, - mbgl::FeatureType::Point); + mln::FeatureType::Point); XCTAssertEqual([NSExpression expressionForConstantValue:@2].mgl_featureType, - mbgl::FeatureType::LineString); + mln::FeatureType::LineString); XCTAssertEqual([NSExpression expressionForConstantValue:@3].mgl_featureType, - mbgl::FeatureType::Polygon); + mln::FeatureType::Polygon); XCTAssertEqual([NSExpression expressionForConstantValue:@0].mgl_featureType, - mbgl::FeatureType::Unknown); + mln::FeatureType::Unknown); XCTAssertEqual([NSExpression expressionForConstantValue:@-1].mgl_featureType, - mbgl::FeatureType::Unknown); + mln::FeatureType::Unknown); XCTAssertEqual([NSExpression expressionForConstantValue:@4].mgl_featureType, - mbgl::FeatureType::Unknown); + mln::FeatureType::Unknown); XCTAssertEqual([NSExpression expressionForConstantValue:nil].mgl_featureType, - mbgl::FeatureType::Unknown); + mln::FeatureType::Unknown); } // MARK: - JSON expression object tests diff --git a/platform/darwin/test/MLNFeatureTests.mm b/platform/darwin/test/MLNFeatureTests.mm index 0bb986acc..c7e50afb7 100644 --- a/platform/darwin/test/MLNFeatureTests.mm +++ b/platform/darwin/test/MLNFeatureTests.mm @@ -12,18 +12,18 @@ @implementation MLNFeatureTests - (void)testGeometryConversion { - std::vector features; + std::vector features; - mbgl::Point point = {-90.066667, 29.95}; - features.push_back(mbgl::Feature{point}); + mln::Point point = {-90.066667, 29.95}; + features.push_back(mln::Feature{point}); - mbgl::LineString lineString = { + mln::LineString lineString = { {-84.516667, 39.1}, {-90.066667, 29.95}, }; - features.push_back(mbgl::Feature{lineString}); + features.push_back(mln::Feature{lineString}); - mbgl::Polygon polygon = { + mln::Polygon polygon = { { {1, 1}, {4, 1}, @@ -37,7 +37,7 @@ {2, 3}, }, }; - features.push_back(mbgl::Feature{polygon}); + features.push_back(mln::Feature{polygon}); NSArray *> *shapes = MLNFeaturesFromMBGLFeatures(features); XCTAssertEqual(shapes.count, 3UL, @"All features should be converted into shapes"); @@ -91,8 +91,8 @@ } - (void)testClusterGeometryConversion { - mbgl::Point point = {-90.066667, 29.95}; - mbgl::Feature pointFeature{point}; + mln::Point point = {-90.066667, 29.95}; + mln::Feature pointFeature{point}; pointFeature.id = {UINT64_MAX}; pointFeature.properties["cluster"] = true; pointFeature.properties["cluster_id"] = 1ULL; @@ -111,10 +111,10 @@ } - (void)testPropertyConversion { - std::vector features; + std::vector features; - mbgl::Point point = {-90.066667, 29.95}; - mbgl::Feature pointFeature{point}; + mln::Point point = {-90.066667, 29.95}; + mln::Feature pointFeature{point}; pointFeature.id = {UINT64_MAX}; pointFeature.properties["null"] = mapbox::feature::null_value; pointFeature.properties["bool"] = true; diff --git a/platform/darwin/test/MLNHeatmapColorTests.mm b/platform/darwin/test/MLNHeatmapColorTests.mm index 89b133878..e6a3a4543 100644 --- a/platform/darwin/test/MLNHeatmapColorTests.mm +++ b/platform/darwin/test/MLNHeatmapColorTests.mm @@ -18,7 +18,7 @@ MLNHeatmapStyleLayer *layer = [[MLNHeatmapStyleLayer alloc] initWithIdentifier:@"layerID" source:source]; - auto rawLayer = static_cast(layer.rawLayer); + auto rawLayer = static_cast(layer.rawLayer); XCTAssertTrue(rawLayer->getHeatmapColor().isUndefined(), @"heatmap-color should be unset initially."); @@ -27,9 +27,9 @@ NSExpression *constantExpression = [NSExpression expressionWithFormat:@"%@", [MLNColor redColor]]; layer.heatmapColor = constantExpression; - mbgl::style::PropertyValue propertyValue = {0xff}; + mln::style::PropertyValue propertyValue = {0xff}; XCTAssertEqual( - rawLayer->getHeatmapColor().evaluate(0.0), mbgl::Color::red(), + rawLayer->getHeatmapColor().evaluate(0.0), mln::Color::red(), @"Setting heatmapColor to a constant value expression should update heatmap-color."); XCTAssertEqualObjects(layer.heatmapColor, constantExpression, @"heatmapColor should round-trip constant value expressions."); @@ -46,10 +46,10 @@ constantExpression, @{@12 : constantExpression2}]; layer.heatmapColor = functionExpression; - XCTAssertEqual(rawLayer->getHeatmapColor().evaluate(11.0), mbgl::Color::red(), + XCTAssertEqual(rawLayer->getHeatmapColor().evaluate(11.0), mln::Color::red(), @"Setting heatmapColor to an expression depending on $heatmapDensity should " @"update heatmap-color."); - XCTAssertEqual(rawLayer->getHeatmapColor().evaluate(12.0), mbgl::Color::blue(), + XCTAssertEqual(rawLayer->getHeatmapColor().evaluate(12.0), mln::Color::blue(), @"Setting heatmapColor to an expression depending on $heatmapDensity should " @"update heatmap-color."); XCTExpectFailure( diff --git a/platform/darwin/test/MLNImageTests.mm b/platform/darwin/test/MLNImageTests.mm index 7d4f2204c..1fc449a89 100644 --- a/platform/darwin/test/MLNImageTests.mm +++ b/platform/darwin/test/MLNImageTests.mm @@ -80,12 +80,12 @@ auto stretchX = styleImage->getStretchX(); XCTAssertEqual(stretchX.size(), 1UL); if (!stretchX.empty()) { - XCTAssertEqual(stretchX.front(), mbgl::style::ImageStretch(0, 24 * scale)); + XCTAssertEqual(stretchX.front(), mln::style::ImageStretch(0, 24 * scale)); } auto stretchY = styleImage->getStretchY(); XCTAssertEqual(stretchY.size(), 1UL); if (!stretchY.empty()) { - XCTAssertEqual(stretchY.front(), mbgl::style::ImageStretch(0, 24 * scale)); + XCTAssertEqual(stretchY.front(), mln::style::ImageStretch(0, 24 * scale)); } MLNImage *imageAfter = [[MLNImage alloc] initWithMLNStyleImage:*styleImage]; @@ -119,12 +119,12 @@ auto stretchX = styleImage->getStretchX(); XCTAssertEqual(stretchX.size(), 1UL); if (!stretchX.empty()) { - XCTAssertEqual(stretchX.front(), mbgl::style::ImageStretch(2 * scale, 20 * scale)); + XCTAssertEqual(stretchX.front(), mln::style::ImageStretch(2 * scale, 20 * scale)); } auto stretchY = styleImage->getStretchY(); XCTAssertEqual(stretchY.size(), 1UL); if (!stretchY.empty()) { - XCTAssertEqual(stretchY.front(), mbgl::style::ImageStretch(1 * scale, 21 * scale)); + XCTAssertEqual(stretchY.front(), mln::style::ImageStretch(1 * scale, 21 * scale)); } MLNImage *imageAfter = [[MLNImage alloc] initWithMLNStyleImage:*styleImage]; diff --git a/platform/darwin/test/MLNLightTest.mm.ejs b/platform/darwin/test/MLNLightTest.mm.ejs index 2c481ddf6..e29923bdb 100644 --- a/platform/darwin/test/MLNLightTest.mm.ejs +++ b/platform/darwin/test/MLNLightTest.mm.ejs @@ -25,12 +25,12 @@ MLNTransition defaultTransition = MLNTransitionMake(0, 0); MLNTransition transition = MLNTransitionMake(6, 3); - mbgl::style::TransitionOptions transitionOptions { { MLNDurationFromTimeInterval(6) }, { MLNDurationFromTimeInterval(3) } }; + mln::style::TransitionOptions transitionOptions { { MLNDurationFromTimeInterval(6) }, { MLNDurationFromTimeInterval(3) } }; <% for (const property of properties) { -%> // <%- property.name %> { - mbgl::style::Light light; + mln::style::Light light; MLNLight *mglLight = [[MLNLight alloc] initWithMBGLLight:&light]; auto lightFromMLNLight = mglLight.mbglLight; @@ -48,10 +48,10 @@ <% } -%> <% if (property.type == "array") { -%> std::array positionArray = { { 6, 180, 90 } }; - mbgl::style::Position position = { positionArray }; - mbgl::style::PropertyValue propertyValue = { position }; + mln::style::Position position = { positionArray }; + mln::style::PropertyValue propertyValue = { position }; <% } else { -%> - mbgl::style::PropertyValue<<%- mbglType(property) %>> propertyValue = { <%- mbglTestValue(property, type) %> }; + mln::style::PropertyValue<<%- mbglType(property) %>> propertyValue = { <%- mbglTestValue(property, type) %> }; <% } -%> light.set<%- camelize(property.name) -%>(propertyValue); <% if (property.transition) { -%> diff --git a/platform/darwin/test/MLNNSDateAdditionsTests.mm b/platform/darwin/test/MLNNSDateAdditionsTests.mm index 3d6eca725..904b767b5 100644 --- a/platform/darwin/test/MLNNSDateAdditionsTests.mm +++ b/platform/darwin/test/MLNNSDateAdditionsTests.mm @@ -12,13 +12,13 @@ using namespace std::chrono_literals; - (void)testDurationToNSTimeInterval { NSTimeInterval timeInterval = 5; - mbgl::Duration duration = MLNDurationFromTimeInterval(timeInterval); + mln::Duration duration = MLNDurationFromTimeInterval(timeInterval); NSTimeInterval durationTimeInterval = MLNTimeIntervalFromDuration(duration); - mbgl::Duration expectedDuration = 5s; - mbgl::Duration expectedDurationMiliSeconds = 5000ms; - mbgl::Duration expectedDurationMicroSeconds = 5000000us; - mbgl::Duration expectedDurationNanoSeconds = 5000000000ns; + mln::Duration expectedDuration = 5s; + mln::Duration expectedDurationMiliSeconds = 5000ms; + mln::Duration expectedDurationMicroSeconds = 5000000us; + mln::Duration expectedDurationNanoSeconds = 5000000000ns; XCTAssertEqual(timeInterval, durationTimeInterval); XCTAssertEqual(timeInterval, MLNTimeIntervalFromDuration(expectedDuration)); @@ -26,9 +26,9 @@ using namespace std::chrono_literals; XCTAssertEqual(timeInterval, MLNTimeIntervalFromDuration(expectedDurationMicroSeconds)); XCTAssertEqual(timeInterval, MLNTimeIntervalFromDuration(expectedDurationNanoSeconds)); - mbgl::Duration durationMiliSeconds = 2500ms; - mbgl::Duration durationMicroSeconds = 2500000us; - mbgl::Duration durationNanoSeconds = 2500000000ns; + mln::Duration durationMiliSeconds = 2500ms; + mln::Duration durationMicroSeconds = 2500000us; + mln::Duration durationNanoSeconds = 2500000000ns; XCTAssertEqual(NSTimeInterval(2.5), MLNTimeIntervalFromDuration(durationMiliSeconds)); XCTAssertEqual(NSTimeInterval(2.5), MLNTimeIntervalFromDuration(durationMicroSeconds)); diff --git a/platform/darwin/test/MLNOfflineStorageTests.mm b/platform/darwin/test/MLNOfflineStorageTests.mm index 147896d10..3ad19bef0 100644 --- a/platform/darwin/test/MLNOfflineStorageTests.mm +++ b/platform/darwin/test/MLNOfflineStorageTests.mm @@ -665,9 +665,9 @@ auto fs = os.mbglOnlineFileSource; // Delegate returns "https://api.mapbox.com" as a replacement URL. - const mbgl::Resource resource{mbgl::Resource::Unknown, "test://api"}; - std::unique_ptr req; - req = fs->request(resource, [&](mbgl::Response res) { + const mln::Resource resource{mln::Resource::Unknown, "test://api"}; + std::unique_ptr req; + req = fs->request(resource, [&](mln::Response res) { req.reset(); XCTAssertFalse(res.error.get(), @"Request should not return an error"); XCTAssertTrue(res.data.get(), @"Request should return data"); @@ -821,7 +821,7 @@ MLNOfflineStorage *os = [MLNOfflineStorage sharedOfflineStorage]; std::string testData("test data"); NSData *data = [NSData dataWithBytes:testData.c_str() length:testData.length()]; - __block std::unique_ptr req; + __block std::unique_ptr req; [os preloadData:data forURL:styleURL modificationDate:nil @@ -833,8 +833,8 @@ XCTAssertEqual(styleURL, url, @"Preloaded resource url is invalid"); auto fs = os.mbglDatabaseFileSource; - const mbgl::Resource resource{mbgl::Resource::Unknown, "https://api.mapbox.com/some/thing"}; - req = fs->request(resource, [&](mbgl::Response res) { + const mln::Resource resource{mln::Resource::Unknown, "https://api.mapbox.com/some/thing"}; + req = fs->request(resource, [&](mln::Response res) { XCTAssertFalse(res.error.get(), @"Request should not return an error"); XCTAssertTrue(res.data.get(), @"Request should return data"); XCTAssertFalse(res.modified, @"Request should not have a modification timestamp"); @@ -857,7 +857,7 @@ NSData *data = [NSData dataWithBytes:testData.c_str() length:testData.length()]; __block NSDate *now = [NSDate date]; __block NSDate *future = [now dateByAddingTimeInterval:600]; - __block std::unique_ptr req; + __block std::unique_ptr req; [os preloadData:data forURL:styleURL modificationDate:now @@ -869,10 +869,9 @@ XCTAssertEqual(styleURL, url, @"Preloaded resource url is invalid"); auto fs = os.mbglDatabaseFileSource; - const mbgl::Resource resource{mbgl::Resource::Unknown, - "https://api.mapbox.com/some/thing1"}; + const mln::Resource resource{mln::Resource::Unknown, "https://api.mapbox.com/some/thing1"}; req = fs->request(resource, [&, tNow = now.timeIntervalSince1970, - tFuture = future.timeIntervalSince1970](mbgl::Response res) { + tFuture = future.timeIntervalSince1970](mln::Response res) { XCTAssertFalse(res.error.get(), @"Request should not return an error"); XCTAssertTrue(res.data.get(), @"Request should return data"); XCTAssertTrue(res.modified, @"Request should have a modification timestamp"); diff --git a/platform/darwin/test/MLNResourceTests.mm b/platform/darwin/test/MLNResourceTests.mm index 8ecc7159e..cbb8b64c2 100644 --- a/platform/darwin/test/MLNResourceTests.mm +++ b/platform/darwin/test/MLNResourceTests.mm @@ -2,10 +2,10 @@ #import #import -namespace mbgl { +namespace mln { extern NSURL *resourceURL(const Resource &resource); extern BOOL isValidMapboxEndpoint(NSURL *url); -} // namespace mbgl +} // namespace mln @interface MLNResourceTests : XCTestCase @end @@ -13,7 +13,7 @@ extern BOOL isValidMapboxEndpoint(NSURL *url); @implementation MLNResourceTests - (void)testValidEndpoints { - using namespace mbgl; + using namespace mln; XCTAssertTrue(isValidMapboxEndpoint([NSURL URLWithString:@"https://mapbox.com"])); XCTAssertTrue(isValidMapboxEndpoint([NSURL URLWithString:@"https://mapbox.cn"])); @@ -27,7 +27,7 @@ extern BOOL isValidMapboxEndpoint(NSURL *url); } - (void)internalTestOfflineQueryParameterIsAddedForOfflineResource:(std::string)testURL { - using namespace mbgl; + using namespace mln; // Is our test URL "correct" for subsequent checks? { diff --git a/platform/darwin/test/MLNStyleLayerTests.mm.ejs b/platform/darwin/test/MLNStyleLayerTests.mm.ejs index f1ad50acf..5e03ec97f 100644 --- a/platform/darwin/test/MLNStyleLayerTests.mm.ejs +++ b/platform/darwin/test/MLNStyleLayerTests.mm.ejs @@ -58,7 +58,7 @@ <% } -%> XCTAssertNotEqual(layer.rawLayer, nullptr); XCTAssertEqualObjects(@(layer.rawLayer->getTypeInfo()->type), @"<%- type %>"); - auto rawLayer = static_castLayer*>(layer.rawLayer); + auto rawLayer = static_castLayer*>(layer.rawLayer); MLNTransition transitionTest = MLNTransitionMake(5, 4); @@ -79,7 +79,7 @@ NSExpression *constantExpression = [NSExpression expressionWithFormat:<%- objCTestValue(property, type, true, 3) %>]; <% } -%> layer.<%- objCName(property) %> = constantExpression; - mbgl::style::PropertyValue<<%- mbglType(property) %>> propertyValue = { <%- mbglTestValue(property, type) %> }; + mln::style::PropertyValue<<%- mbglType(property) %>> propertyValue = { <%- mbglTestValue(property, type) %> }; XCTAssertEqual(rawLayer->get<%- camelize(originalPropertyName(property)) %>(), propertyValue, @"Setting <%- objCName(property) %> to a constant value expression should update <%- originalPropertyName(property) %>."); XCTAssertEqualObjects(layer.<%- objCName(property) %>, constantExpression, @@ -97,8 +97,8 @@ layer.<%- objCName(property) %> = functionExpression; { - using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::PropertyExpression<<%- mbglType(property) %>>( + using namespace mln::style::expression::dsl; + propertyValue = mln::style::PropertyExpression<<%- mbglType(property) %>>( <% if (property.type === 'formatted') { -%> step(zoom(), format(<%- mbglExpressionTestValue(property, type) %>), 18.0, format(<%- mbglExpressionTestValue(property, type) %>)) <% } else if (property.type === 'resolvedImage') { -%> @@ -119,8 +119,8 @@ layer.<%- objCName(property) %> = functionExpression; { - using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::PropertyExpression<<%- mbglType(property) %>>( + using namespace mln::style::expression::dsl; + propertyValue = mln::style::PropertyExpression<<%- mbglType(property) %>>( interpolate(linear(), number(get("keyName")), 18.0, literal(<%- mbglExpressionTestValue(property, type) %>)) ); } @@ -135,8 +135,8 @@ layer.<%- objCName(property) %> = functionExpression; { - using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::PropertyExpression<<%- mbglType(property) %>>( + using namespace mln::style::expression::dsl; + propertyValue = mln::style::PropertyExpression<<%- mbglType(property) %>>( interpolate(linear(), zoom(), 10.0, interpolate(linear(), number(get("keyName")), 18.0, literal(<%- mbglExpressionTestValue(property, type) %>))) ); } @@ -180,8 +180,8 @@ layer.<%- objCName(property) %> = [NSExpression expressionForConstantValue:@"{token}"]; { - using namespace mbgl::style::expression::dsl; - propertyValue = mbgl::style::PropertyExpression<<%- mbglType(property) %>>( + using namespace mln::style::expression::dsl; + propertyValue = mln::style::PropertyExpression<<%- mbglType(property) %>>( <% if (property.type === 'formatted') { -%> format(toString(get(literal("token")))) <% } else if (property.type === 'resolvedImage') { -%> diff --git a/platform/darwin/test/MLNTileSetTests.mm b/platform/darwin/test/MLNTileSetTests.mm index 3469c6f27..609b44106 100644 --- a/platform/darwin/test/MLNTileSetTests.mm +++ b/platform/darwin/test/MLNTileSetTests.mm @@ -20,7 +20,7 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; } // namespace - (void)testTileSetFromTileURLTemplates { - mbgl::Tileset tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, nil); + mln::Tileset tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, nil); // has the correct URL templates XCTAssertEqual(tileSet.tiles.size(), 3UL); @@ -29,7 +29,7 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; XCTAssertEqual(tileSet.tiles[2], "tile.3"); // has the default scheme - XCTAssertEqual(tileSet.scheme, mbgl::Tileset::Scheme::XYZ); + XCTAssertEqual(tileSet.scheme, mln::Tileset::Scheme::XYZ); // when the tile set has no min or max zoom level set // the mbgl object has default values for min and max zoom level @@ -124,7 +124,7 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; }); // the scheme is reflected by the mbgl tileset - XCTAssertEqual(tileSet.scheme, mbgl::Tileset::Scheme::TMS); + XCTAssertEqual(tileSet.scheme, mln::Tileset::Scheme::TMS); // when the tile coordinate system is changed using an NSValue MLNTileCoordinateSystem tms = MLNTileCoordinateSystemTMS; @@ -134,11 +134,11 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; }); // the scheme is reflected by the mbgl tileset - XCTAssertEqual(tileSet.scheme, mbgl::Tileset::Scheme::TMS); + XCTAssertEqual(tileSet.scheme, mln::Tileset::Scheme::TMS); } - (void)testTileSetFromTileURLTemplatesRasterEncodings { - mbgl::Tileset tileSet; + mln::Tileset tileSet; // when the DEM encoding is changed using an NSNumber tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, @{ @@ -146,7 +146,7 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; }); // the encoding is reflected by the mbgl tileset - XCTAssertEqual(tileSet.rasterEncoding, mbgl::Tileset::RasterEncoding::Terrarium); + XCTAssertEqual(tileSet.rasterEncoding, mln::Tileset::RasterEncoding::Terrarium); XCTAssertFalse(tileSet.vectorEncoding); // when the raster encoding is changed using an NSValue @@ -157,12 +157,12 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; }); // the encoding is reflected by the mbgl tileset - XCTAssertEqual(tileSet.rasterEncoding, mbgl::Tileset::RasterEncoding::Terrarium); + XCTAssertEqual(tileSet.rasterEncoding, mln::Tileset::RasterEncoding::Terrarium); XCTAssertFalse(tileSet.vectorEncoding); } - (void)testTileSetFromTileURLTemplatesVectorEncodings { - mbgl::Tileset tileSet; + mln::Tileset tileSet; // when the raster encoding is changed using an NSNumber tileSet = MLNTileSetFromTileURLTemplates(tileURLTemplates, @{ @@ -170,7 +170,7 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; }); // the encoding is reflected by the mbgl tileset - XCTAssertEqual(tileSet.vectorEncoding, mbgl::Tileset::VectorEncoding::Mapbox); + XCTAssertEqual(tileSet.vectorEncoding, mln::Tileset::VectorEncoding::Mapbox); XCTAssertFalse(tileSet.rasterEncoding); // when the raster encoding is changed using an NSNumber @@ -179,7 +179,7 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; }); // the encoding is reflected by the mbgl tileset - XCTAssertEqual(tileSet.vectorEncoding, mbgl::Tileset::VectorEncoding::MLT); + XCTAssertEqual(tileSet.vectorEncoding, mln::Tileset::VectorEncoding::MLT); XCTAssertFalse(tileSet.rasterEncoding); // when the raster encoding is changed using an NSValue @@ -190,7 +190,7 @@ NSArray *tileURLTemplates = @[ @"tile.1", @"tile.2", @"tile.3" ]; }); // the encoding is reflected by the mbgl tileset - XCTAssertEqual(tileSet.vectorEncoding, mbgl::Tileset::VectorEncoding::MLT); + XCTAssertEqual(tileSet.vectorEncoding, mln::Tileset::VectorEncoding::MLT); XCTAssertFalse(tileSet.rasterEncoding); } diff --git a/platform/default/include/jni/string_conversion.hpp b/platform/default/include/jni/string_conversion.hpp index 66df539f4..bd70ba487 100644 --- a/platform/default/include/jni/string_conversion.hpp +++ b/platform/default/include/jni/string_conversion.hpp @@ -7,11 +7,11 @@ namespace jni { inline std::u16string convertUTF8ToUTF16(const std::string& str) { - return mbgl::util::convertUTF8ToUTF16(str); + return mln::util::convertUTF8ToUTF16(str); } inline std::string convertUTF16ToUTF8(const std::u16string& str) { - return mbgl::util::convertUTF16ToUTF8(str); + return mln::util::convertUTF16ToUTF8(str); } } // namespace jni diff --git a/platform/default/include/mbgl/gfx/headless_backend.hpp b/platform/default/include/mbgl/gfx/headless_backend.hpp index e60e7f697..b38f29674 100644 --- a/platform/default/include/mbgl/gfx/headless_backend.hpp +++ b/platform/default/include/mbgl/gfx/headless_backend.hpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { // Common headless backend interface, provides HeadlessBackend backend factory @@ -38,4 +38,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/gfx/headless_frontend.hpp b/platform/default/include/mbgl/gfx/headless_frontend.hpp index 6c2d30a3f..ab8b5445c 100644 --- a/platform/default/include/mbgl/gfx/headless_frontend.hpp +++ b/platform/default/include/mbgl/gfx/headless_frontend.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class Renderer; class Map; @@ -75,4 +75,4 @@ private: std::shared_ptr updateParameters; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/gl/headless_backend.hpp b/platform/default/include/mbgl/gl/headless_backend.hpp index 85ca7c5cb..c3df0f4bf 100644 --- a/platform/default/include/mbgl/gl/headless_backend.hpp +++ b/platform/default/include/mbgl/gl/headless_backend.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class HeadlessBackend final : public gl::RendererBackend, public gfx::HeadlessBackend { @@ -47,4 +47,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/map/map_snapshotter.hpp b/platform/default/include/mbgl/map/map_snapshotter.hpp index bb75a4170..46e06e288 100644 --- a/platform/default/include/mbgl/map/map_snapshotter.hpp +++ b/platform/default/include/mbgl/map/map_snapshotter.hpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { struct CameraOptions; class ClientOptions; @@ -62,8 +62,8 @@ public: void setRegion(const LatLngBounds&); LatLngBounds getRegion() const; - void setPadding(const mbgl::EdgeInsets&); - mbgl::EdgeInsets getPadding() const; + void setPadding(const mln::EdgeInsets&); + mln::EdgeInsets getPadding() const; void addAnnotationImage(std::unique_ptr); void addAnnotation(const Annotation&); @@ -83,4 +83,4 @@ private: std::unique_ptr impl; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/mtl/headless_backend.hpp b/platform/default/include/mbgl/mtl/headless_backend.hpp index 95f6523d3..dceeed4b4 100644 --- a/platform/default/include/mbgl/mtl/headless_backend.hpp +++ b/platform/default/include/mbgl/mtl/headless_backend.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class HeadlessBackend final : public mtl::RendererBackend, public gfx::HeadlessBackend { @@ -33,4 +33,4 @@ private: }; } // namespace mtl -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/storage/file_source_request.hpp b/platform/default/include/mbgl/storage/file_source_request.hpp index 79ad53ff2..ab92031fd 100644 --- a/platform/default/include/mbgl/storage/file_source_request.hpp +++ b/platform/default/include/mbgl/storage/file_source_request.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { class Mailbox; @@ -28,4 +28,4 @@ private: std::shared_ptr mailbox; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/storage/local_file_request.hpp b/platform/default/include/mbgl/storage/local_file_request.hpp index 0d3426954..770bff18c 100644 --- a/platform/default/include/mbgl/storage/local_file_request.hpp +++ b/platform/default/include/mbgl/storage/local_file_request.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { template class ActorRef; @@ -12,4 +12,4 @@ void requestLocalFile(const std::string& path, const ActorRef& req, const std::optional>& dataRange = std::nullopt); -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/storage/merge_sideloaded.hpp b/platform/default/include/mbgl/storage/merge_sideloaded.hpp index ff12ae13e..5e8d904c9 100644 --- a/platform/default/include/mbgl/storage/merge_sideloaded.hpp +++ b/platform/default/include/mbgl/storage/merge_sideloaded.hpp @@ -3,7 +3,7 @@ // THIS IS A GENERATED FILE; EDIT merge_sideloaded.sql INSTEAD // To regenerate, run `node platform/default/mbgl/storage/merge_sideloaded.js` -namespace mbgl { +namespace mln { static constexpr const char* mergeSideloadedDatabaseSQL = "INSERT INTO regions\n" @@ -59,4 +59,4 @@ static constexpr const char* mergeSideloadedDatabaseSQL = " \n" "DROP TABLE region_mapping;\n"; -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/storage/merge_sideloaded.js b/platform/default/include/mbgl/storage/merge_sideloaded.js index 5d5e91cff..6b66545dc 100644 --- a/platform/default/include/mbgl/storage/merge_sideloaded.js +++ b/platform/default/include/mbgl/storage/merge_sideloaded.js @@ -4,7 +4,7 @@ fs.writeFileSync('platform/default/mbgl/storage/merge_sideloaded.hpp', `#pragma // THIS IS A GENERATED FILE; EDIT merge_sideloaded.sql INSTEAD // To regenerate, run \`node platform/default/mbgl/storage/merge_sideloaded.js\` -namespace mbgl { +namespace mln { static constexpr const char* mergeSideloadedDatabaseSQL = ${fs.readFileSync('platform/default/mbgl/storage/merge_sideloaded.sql', 'utf8') @@ -16,5 +16,5 @@ ${fs.readFileSync('platform/default/mbgl/storage/merge_sideloaded.sql', 'utf8') } ; -} // namespace mbgl +} // namespace mln `); diff --git a/platform/default/include/mbgl/storage/offline_database.hpp b/platform/default/include/mbgl/storage/offline_database.hpp index d34ec79ef..402dfeb16 100644 --- a/platform/default/include/mbgl/storage/offline_database.hpp +++ b/platform/default/include/mbgl/storage/offline_database.hpp @@ -23,7 +23,7 @@ class Exception; } // namespace sqlite } // namespace mapbox -namespace mbgl { +namespace mln { class Response; class TileID; @@ -191,4 +191,4 @@ private: bool readOnly = false; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/storage/offline_download.hpp b/platform/default/include/mbgl/storage/offline_download.hpp index 42bd9d5b8..7f3c81f08 100644 --- a/platform/default/include/mbgl/storage/offline_download.hpp +++ b/platform/default/include/mbgl/storage/offline_download.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { class OfflineDatabase; class FileSource; @@ -69,4 +69,4 @@ private: void markPendingUsedResources(); }; -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/storage/offline_schema.hpp b/platform/default/include/mbgl/storage/offline_schema.hpp index a825435d2..558aa3f6a 100644 --- a/platform/default/include/mbgl/storage/offline_schema.hpp +++ b/platform/default/include/mbgl/storage/offline_schema.hpp @@ -3,7 +3,7 @@ // THIS IS A GENERATED FILE; EDIT offline_schema.sql INSTEAD // To regenerate, run `node platform/default/include/mbgl/storage/offline_schema.js` -namespace mbgl { +namespace mln { static constexpr const char* offlineDatabaseSchema = "CREATE TABLE resources (\n" @@ -59,4 +59,4 @@ static constexpr const char* offlineDatabaseSchema = "CREATE INDEX region_tiles_tile_id\n" "ON region_tiles (tile_id);\n"; -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/storage/offline_schema.js b/platform/default/include/mbgl/storage/offline_schema.js index 4eb818d58..7e0c6a1ea 100755 --- a/platform/default/include/mbgl/storage/offline_schema.js +++ b/platform/default/include/mbgl/storage/offline_schema.js @@ -6,7 +6,7 @@ fs.writeFileSync('platform/default/include/mbgl/storage/offline_schema.hpp', `#p // THIS IS A GENERATED FILE; EDIT offline_schema.sql INSTEAD // To regenerate, run \`node platform/default/include/mbgl/storage/offline_schema.js\` -namespace mbgl { +namespace mln { static constexpr const char* offlineDatabaseSchema = ${fs.readFileSync('platform/default/include/mbgl/storage/offline_schema.sql', 'utf8') @@ -18,5 +18,5 @@ ${fs.readFileSync('platform/default/include/mbgl/storage/offline_schema.sql', 'u } ; -} // namespace mbgl +} // namespace mln `); diff --git a/platform/default/include/mbgl/text/unaccent.hpp b/platform/default/include/mbgl/text/unaccent.hpp index 85ac37a7d..47716d7fa 100644 --- a/platform/default/include/mbgl/text/unaccent.hpp +++ b/platform/default/include/mbgl/text/unaccent.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { // Non-locale-aware diacritic folding based on nunicode @@ -10,4 +10,4 @@ namespace platform { std::string unaccent(const std::string &string); } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/vulkan/headless_backend.hpp b/platform/default/include/mbgl/vulkan/headless_backend.hpp index e4f035d6a..3ddfc8403 100644 --- a/platform/default/include/mbgl/vulkan/headless_backend.hpp +++ b/platform/default/include/mbgl/vulkan/headless_backend.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class Texture2D; @@ -41,4 +41,4 @@ private: }; } // namespace vulkan -} // namespace mbgl +} // namespace mln diff --git a/platform/default/include/mbgl/webgpu/headless_backend.hpp b/platform/default/include/mbgl/webgpu/headless_backend.hpp index 45ed5ae11..177cbf4b1 100644 --- a/platform/default/include/mbgl/webgpu/headless_backend.hpp +++ b/platform/default/include/mbgl/webgpu/headless_backend.hpp @@ -5,7 +5,7 @@ #include "mbgl/gfx/offscreen_texture.hpp" #include -namespace mbgl { +namespace mln { namespace webgpu { class HeadlessBackend final : public webgpu::RendererBackend, public gfx::HeadlessBackend { @@ -28,7 +28,7 @@ public: // Override WebGPU-specific methods void* getCurrentTextureView() override; void* getDepthStencilView() override; - mbgl::Size getFramebufferSize() const override; + mln::Size getFramebufferSize() const override; private: void activate() override; @@ -42,4 +42,4 @@ private: }; } // namespace webgpu -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/benchmark/main.cpp b/platform/default/src/mbgl/benchmark/main.cpp index afe785140..228fc550f 100644 --- a/platform/default/src/mbgl/benchmark/main.cpp +++ b/platform/default/src/mbgl/benchmark/main.cpp @@ -1,5 +1,5 @@ #include int main(int argc, char* argv[]) { - return mbgl::runBenchmark(argc, argv); + return mln::runBenchmark(argc, argv); } diff --git a/platform/default/src/mbgl/gfx/headless_backend.cpp b/platform/default/src/mbgl/gfx/headless_backend.cpp index a580024b8..1ec660892 100644 --- a/platform/default/src/mbgl/gfx/headless_backend.cpp +++ b/platform/default/src/mbgl/gfx/headless_backend.cpp @@ -1,12 +1,12 @@ #include -namespace mbgl { +namespace mln { namespace gfx { bool Backend::enableGPUExpressionEval = false; HeadlessBackend::HeadlessBackend(Size size_) - : mbgl::gfx::Renderable(size_, nullptr) {} + : mln::gfx::Renderable(size_, nullptr) {} void HeadlessBackend::setSize(Size size_) { size = size_; @@ -14,4 +14,4 @@ void HeadlessBackend::setSize(Size size_) { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/gfx/headless_frontend.cpp b/platform/default/src/mbgl/gfx/headless_frontend.cpp index 3760706bc..349bcae0f 100644 --- a/platform/default/src/mbgl/gfx/headless_frontend.cpp +++ b/platform/default/src/mbgl/gfx/headless_frontend.cpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { HeadlessFrontend::HeadlessFrontend(float pixelRatio_, gfx::HeadlessBackend::SwapBehaviour swapBehavior, @@ -163,7 +163,7 @@ void HeadlessFrontend::renderOnce(Map&) { void HeadlessFrontend::renderFrame() { if (renderer && updateParameters) { - auto startTime = mbgl::util::MonotonicTimer::now(); + auto startTime = mln::util::MonotonicTimer::now(); gfx::BackendScope guard{*getBackend()}; // onStyleImageMissing might be called during a render. The user @@ -174,7 +174,7 @@ void HeadlessFrontend::renderFrame() { auto updateParameters_ = updateParameters; renderer->render(updateParameters_); - auto endTime = mbgl::util::MonotonicTimer::now(); + auto endTime = mln::util::MonotonicTimer::now(); frameTime = (endTime - startTime).count(); } } @@ -187,4 +187,4 @@ std::optional HeadlessFrontend::getTransformState() const { } } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/gl/headless_backend.cpp b/platform/default/src/mbgl/gl/headless_backend.cpp index dfb1db842..ccce30e80 100644 --- a/platform/default/src/mbgl/gl/headless_backend.cpp +++ b/platform/default/src/mbgl/gl/headless_backend.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class HeadlessRenderableResource final : public gl::RenderableResource { @@ -44,8 +44,8 @@ public: HeadlessBackend::HeadlessBackend(const Size size_, gfx::HeadlessBackend::SwapBehaviour swapBehaviour_, const gfx::ContextMode contextMode_) - : mbgl::gl::RendererBackend(contextMode_), - mbgl::gfx::HeadlessBackend(size_), + : mln::gl::RendererBackend(contextMode_), + mln::gfx::HeadlessBackend(size_), swapBehaviour(swapBehaviour_) {} HeadlessBackend::~HeadlessBackend() { @@ -135,4 +135,4 @@ std::unique_ptr Backend::Create(caseSensitive, diacriticSensitive, locale)) {} } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/i18n/number_format.cpp b/platform/default/src/mbgl/i18n/number_format.cpp index 6a975926d..d6804b9f9 100644 --- a/platform/default/src/mbgl/i18n/number_format.cpp +++ b/platform/default/src/mbgl/i18n/number_format.cpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { #if !defined(MBGL_USE_BUILTIN_ICU) @@ -45,4 +45,4 @@ std::string formatNumber(double number, const std::string&, const std::string&, #endif } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/layermanager/layer_manager.cpp b/platform/default/src/mbgl/layermanager/layer_manager.cpp index 7949c169f..fc7d3d98e 100644 --- a/platform/default/src/mbgl/layermanager/layer_manager.cpp +++ b/platform/default/src/mbgl/layermanager/layer_manager.cpp @@ -19,7 +19,7 @@ #include #include -namespace mbgl { +namespace mln { class LayerManagerDefault final : public LayerManager { public: @@ -32,7 +32,7 @@ public: * in order to save binary size (the corresponding SDK layer wrappers * should be excluded from the project build). */ - void addLayerTypeCoreOnly(std::unique_ptr) override; + void addLayerTypeCoreOnly(std::unique_ptr) override; private: void addLayerType(std::unique_ptr); @@ -44,7 +44,7 @@ private: std::map typeToFactory; }; -void LayerManagerDefault::addLayerTypeCoreOnly(std::unique_ptr layerFactory) { +void LayerManagerDefault::addLayerTypeCoreOnly(std::unique_ptr layerFactory) { addLayerType(std::move(layerFactory)); } @@ -104,7 +104,7 @@ void LayerManagerDefault::addLayerType(std::unique_ptr factory) { factories.emplace_back(std::move(factory)); } -LayerFactory* LayerManagerDefault::getFactory(const mbgl::style::LayerTypeInfo* typeInfo) noexcept { +LayerFactory* LayerManagerDefault::getFactory(const mln::style::LayerTypeInfo* typeInfo) noexcept { assert(typeInfo); for (const auto& factory : factories) { if (layerTypeInfoEquals(factory->getTypeInfo(), typeInfo)) { @@ -133,4 +133,4 @@ const bool LayerManager::annotationsEnabled = false; const bool LayerManager::annotationsEnabled = true; #endif -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/map/map_snapshotter.cpp b/platform/default/src/mbgl/map/map_snapshotter.cpp index 74130bccc..a5a935153 100644 --- a/platform/default/src/mbgl/map/map_snapshotter.cpp +++ b/platform/default/src/mbgl/map/map_snapshotter.cpp @@ -16,7 +16,7 @@ #include #include -namespace mbgl { +namespace mln { // static MapSnapshotterObserver& MapSnapshotterObserver::nullObserver() { @@ -173,7 +173,7 @@ public: PremultipliedImage takeImage() { return renderer->actor().ask(&SnapshotterRenderer::takeImage).get(); } - const mbgl::TaggedScheduler& getThreadPool() const override { + const mln::TaggedScheduler& getThreadPool() const override { return renderer->actor().ask(&SnapshotterRenderer::getThreadPool).get(); } @@ -206,7 +206,7 @@ public: map.jumpTo(map.cameraForLatLngs(latLngs, regionInsets)); } - void setPadding(const mbgl::EdgeInsets& insets) { + void setPadding(const mln::EdgeInsets& insets) { regionInsets = insets; if (!region.isEmpty()) { std::vector latLngs = {region.southwest(), region.northeast()}; @@ -214,7 +214,7 @@ public: } } - mbgl::EdgeInsets getPadding() const { return regionInsets; } + mln::EdgeInsets getPadding() const { return regionInsets; } void addAnnotationImage(std::unique_ptr image) { map.addAnnotationImage(std::move(image)); } @@ -302,7 +302,7 @@ private: SnapshotterRendererFrontend frontend; Map map; LatLngBounds region; - mbgl::EdgeInsets regionInsets; + mln::EdgeInsets regionInsets; }; MapSnapshotter::MapSnapshotter(Size size, @@ -368,11 +368,11 @@ LatLngBounds MapSnapshotter::getRegion() const { return impl->getMap().latLngBoundsForCamera(impl->getMap().getCameraOptions(getPadding())); } -void MapSnapshotter::setPadding(const mbgl::EdgeInsets& insets) { +void MapSnapshotter::setPadding(const mln::EdgeInsets& insets) { impl->setPadding(insets); } -mbgl::EdgeInsets MapSnapshotter::getPadding() const { +mln::EdgeInsets MapSnapshotter::getPadding() const { return impl->getPadding(); } @@ -400,4 +400,4 @@ void MapSnapshotter::cancel() { impl->cancel(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/mtl/headless_backend.cpp b/platform/default/src/mbgl/mtl/headless_backend.cpp index 65f0bbcf1..b9a96eadf 100644 --- a/platform/default/src/mbgl/mtl/headless_backend.cpp +++ b/platform/default/src/mbgl/mtl/headless_backend.cpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { namespace mtl { class HeadlessRenderableResource final : public mtl::RenderableResource { @@ -56,8 +56,8 @@ public: HeadlessBackend::HeadlessBackend(const Size size_, gfx::HeadlessBackend::SwapBehaviour swapBehaviour_, const gfx::ContextMode contextMode_) - : mbgl::mtl::RendererBackend(contextMode_), - mbgl::gfx::HeadlessBackend(size_), + : mln::mtl::RendererBackend(contextMode_), + mln::gfx::HeadlessBackend(size_), swapBehaviour(swapBehaviour_) {} HeadlessBackend::~HeadlessBackend() { @@ -119,4 +119,4 @@ std::unique_ptr Backend::Create } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/platform/time.cpp b/platform/default/src/mbgl/platform/time.cpp index 647464bb9..43c8a1fff 100644 --- a/platform/default/src/mbgl/platform/time.cpp +++ b/platform/default/src/mbgl/platform/time.cpp @@ -1,6 +1,6 @@ #include -namespace mbgl { +namespace mln { namespace platform { std::chrono::time_point now() { @@ -8,4 +8,4 @@ std::chrono::time_point now() { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/render-test/main.cpp b/platform/default/src/mbgl/render-test/main.cpp index e8df75bde..bf017cd5c 100644 --- a/platform/default/src/mbgl/render-test/main.cpp +++ b/platform/default/src/mbgl/render-test/main.cpp @@ -12,7 +12,7 @@ int main(int argc, char* argv[]) { #ifdef IS_IOS try { #endif - return mbgl::runRenderTests(argc, argv, [](mbgl::TestStatus) {}); + return mln::runRenderTests(argc, argv, [](mln::TestStatus) {}); #ifdef IS_IOS } catch (std::exception const& e) { std::cerr << "Caught an exception while running tests\n" << e.what() << '\n'; diff --git a/platform/default/src/mbgl/storage/asset_file_source.cpp b/platform/default/src/mbgl/storage/asset_file_source.cpp index 9fb8057ec..669a0ab55 100644 --- a/platform/default/src/mbgl/storage/asset_file_source.cpp +++ b/platform/default/src/mbgl/storage/asset_file_source.cpp @@ -13,11 +13,11 @@ namespace { bool acceptsURL(const std::string& url) { - return url.starts_with(mbgl::util::ASSET_PROTOCOL); + return url.starts_with(mln::util::ASSET_PROTOCOL); } } // namespace -namespace mbgl { +namespace mln { class AssetFileSource::Impl { public: @@ -36,7 +36,7 @@ public: // Cut off the protocol and prefix with path. const auto path = root + "/" + - mbgl::util::percentDecode( + mln::util::percentDecode( resource.url.substr(std::char_traits::length(util::ASSET_PROTOCOL))); requestLocalFile(path, req, resource.dataRange); } @@ -114,4 +114,4 @@ ClientOptions AssetFileSource::getClientOptions() { return impl->actor().ask(&Impl::getClientOptions).get(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/database_file_source.cpp b/platform/default/src/mbgl/storage/database_file_source.cpp index 884c02f24..2fc37014d 100644 --- a/platform/default/src/mbgl/storage/database_file_source.cpp +++ b/platform/default/src/mbgl/storage/database_file_source.cpp @@ -15,7 +15,7 @@ #include #include -namespace mbgl { +namespace mln { class DatabaseFileSourceThread { public: DatabaseFileSourceThread(std::shared_ptr onlineFileSource_, const std::string& cachePath) @@ -229,8 +229,8 @@ void DatabaseFileSource::forward(const Resource& res, const Response& response, bool DatabaseFileSource::canRequest(const Resource& resource) const { return resource.hasLoadingMethod(Resource::LoadingMethod::Cache) && - resource.url.rfind(mbgl::util::ASSET_PROTOCOL, 0) == std::string::npos && - resource.url.rfind(mbgl::util::FILE_PROTOCOL, 0) == std::string::npos; + resource.url.rfind(mln::util::ASSET_PROTOCOL, 0) == std::string::npos && + resource.url.rfind(mln::util::FILE_PROTOCOL, 0) == std::string::npos; } void DatabaseFileSource::setDatabasePath(const std::string& path, std::function callback) { @@ -356,4 +356,4 @@ ClientOptions DatabaseFileSource::getClientOptions() { return impl->getClientOptions(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/file_source_manager.cpp b/platform/default/src/mbgl/storage/file_source_manager.cpp index b78a94e6d..4a9518481 100644 --- a/platform/default/src/mbgl/storage/file_source_manager.cpp +++ b/platform/default/src/mbgl/storage/file_source_manager.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class DefaultFileSourceManagerImpl final : public FileSourceManager { public: @@ -55,4 +55,4 @@ FileSourceManager* FileSourceManager::get() noexcept { return &instance; } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/file_source_request.cpp b/platform/default/src/mbgl/storage/file_source_request.cpp index c8d5ae46a..831bcea9b 100644 --- a/platform/default/src/mbgl/storage/file_source_request.cpp +++ b/platform/default/src/mbgl/storage/file_source_request.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { FileSourceRequest::FileSourceRequest(FileSource::Callback&& callback) : responseCallback(callback), @@ -33,4 +33,4 @@ ActorRef FileSourceRequest::actor() { return ActorRef(*this, mailbox); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/http_file_source.cpp b/platform/default/src/mbgl/storage/http_file_source.cpp index 24be9fafc..d0bb54d3f 100644 --- a/platform/default/src/mbgl/storage/http_file_source.cpp +++ b/platform/default/src/mbgl/storage/http_file_source.cpp @@ -35,7 +35,7 @@ void handleError(CURLcode code) { } } // namespace -namespace mbgl { +namespace mln { class HTTPFileSource::Impl { public: @@ -238,7 +238,7 @@ int HTTPFileSource::Impl::startTimeout(CURLM * /* multi */, long timeout_ms, voi timeout_ms = std::max(timeout_ms, 0); context->timeout.stop(); - context->timeout.start(mbgl::Milliseconds(timeout_ms), Duration::zero(), std::bind(&Impl::onTimeout, context)); + context->timeout.start(mln::Milliseconds(timeout_ms), Duration::zero(), std::bind(&Impl::onTimeout, context)); return 0; } @@ -311,7 +311,7 @@ HTTPRequest::HTTPRequest(HTTPFileSource::Impl *context_, Resource resource_, Fil HTTPRequest::~HTTPRequest() { if (curl_multi_remove_handle(context->multi, handle) != CURLM_OK) { - mbgl::Log::Error(mbgl::Event::HttpRequest, "Error removing curl multi handle"); + mln::Log::Error(mln::Event::HttpRequest, "Error removing curl multi handle"); } context->returnHandle(handle); @@ -479,4 +479,4 @@ ClientOptions HTTPFileSource::getClientOptions() { return impl->getClientOptions(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/local_file_request.cpp b/platform/default/src/mbgl/storage/local_file_request.cpp index 8c6cf43d8..3b9cbd350 100644 --- a/platform/default/src/mbgl/storage/local_file_request.cpp +++ b/platform/default/src/mbgl/storage/local_file_request.cpp @@ -9,7 +9,7 @@ #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif -namespace mbgl { +namespace mln { void requestLocalFile(const std::string& path, const ActorRef& req, @@ -35,4 +35,4 @@ void requestLocalFile(const std::string& path, req.invoke(&FileSourceRequest::setResponse, response); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/local_file_source.cpp b/platform/default/src/mbgl/storage/local_file_source.cpp index e855e0670..90b11186a 100644 --- a/platform/default/src/mbgl/storage/local_file_source.cpp +++ b/platform/default/src/mbgl/storage/local_file_source.cpp @@ -13,11 +13,11 @@ namespace { bool acceptsURL(const std::string& url) { - return url.starts_with(mbgl::util::FILE_PROTOCOL); + return url.starts_with(mln::util::FILE_PROTOCOL); } } // namespace -namespace mbgl { +namespace mln { class LocalFileSource::Impl { public: @@ -34,7 +34,7 @@ public: } // Cut off the protocol and prefix with path. - const auto path = mbgl::util::percentDecode( + const auto path = mln::util::percentDecode( resource.url.substr(std::char_traits::length(util::FILE_PROTOCOL))); requestLocalFile(path, req, resource.dataRange); } @@ -111,4 +111,4 @@ ClientOptions LocalFileSource::getClientOptions() { return impl->actor().ask(&Impl::getClientOptions).get(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/main_resource_loader.cpp b/platform/default/src/mbgl/storage/main_resource_loader.cpp index 063443387..5e11d72d1 100644 --- a/platform/default/src/mbgl/storage/main_resource_loader.cpp +++ b/platform/default/src/mbgl/storage/main_resource_loader.cpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { class MainResourceLoaderThread { public: @@ -290,4 +290,4 @@ ClientOptions MainResourceLoader::getClientOptions() { return impl->getClientOptions(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/mbtiles_file_source.cpp b/platform/default/src/mbgl/storage/mbtiles_file_source.cpp index 4a5508629..ab2e9c356 100644 --- a/platform/default/src/mbgl/storage/mbtiles_file_source.cpp +++ b/platform/default/src/mbgl/storage/mbtiles_file_source.cpp @@ -29,15 +29,15 @@ namespace { bool acceptsURL(const std::string &url) { - return url.starts_with(mbgl::util::MBTILES_PROTOCOL); + return url.starts_with(mln::util::MBTILES_PROTOCOL); } std::string url_to_path(const std::string &url) { - return mbgl::util::percentDecode(url.substr(std::char_traits::length(mbgl::util::MBTILES_PROTOCOL))); + return mln::util::percentDecode(url.substr(std::char_traits::length(mln::util::MBTILES_PROTOCOL))); } } // namespace -namespace mbgl { +namespace mln { using namespace rapidjson; class MBTilesFileSource::Impl { @@ -338,4 +338,4 @@ ClientOptions MBTilesFileSource::getClientOptions() { return thread->actor().ask(&Impl::getClientOptions).get(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/offline.cpp b/platform/default/src/mbgl/storage/offline.cpp index f590c7db6..8667ec58f 100644 --- a/platform/default/src/mbgl/storage/offline.cpp +++ b/platform/default/src/mbgl/storage/offline.cpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { // OfflineTilePyramidRegionDefinition @@ -170,4 +170,4 @@ const OfflineRegionMetadata& OfflineRegion::getMetadata() const { int64_t OfflineRegion::getID() const { return id; } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/offline_database.cpp b/platform/default/src/mbgl/storage/offline_database.cpp index 10a76fe70..8426436ed 100644 --- a/platform/default/src/mbgl/storage/offline_database.cpp +++ b/platform/default/src/mbgl/storage/offline_database.cpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { // Single-point transformer for offline storage keys. For sources where the URL is // not enough to guarantee uniqueness (eg. PMTiles where all requests resolve to @@ -1528,4 +1528,4 @@ void OfflineDatabase::updateAmbientCacheSize(DatabaseSizeChangeStats& stats) { } } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/offline_download.cpp b/platform/default/src/mbgl/storage/offline_download.cpp index 29df87d1f..a17db1d8a 100644 --- a/platform/default/src/mbgl/storage/offline_download.cpp +++ b/platform/default/src/mbgl/storage/offline_download.cpp @@ -28,7 +28,7 @@ const size_t kMarkBatchSize = 200; } // namespace -namespace mbgl { +namespace mln { using namespace style; @@ -444,7 +444,7 @@ void OfflineDownload::queueResource(Resource&& resource) { resource.setPriority(Resource::Priority::Low); resource.setUsage(Resource::Usage::Offline); status.requiredResourceCount++; - if (resource.kind == mbgl::Resource::Kind::Tile) { + if (resource.kind == mln::Resource::Kind::Tile) { status.requiredTileCount++; } resourcesRemaining.push_front(std::move(resource)); @@ -562,4 +562,4 @@ void OfflineDownload::onMapboxTileCountLimitExceeded() { setState(OfflineRegionDownloadState::Inactive); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/online_file_source.cpp b/platform/default/src/mbgl/storage/online_file_source.cpp index f93b965d4..7f349d25a 100644 --- a/platform/default/src/mbgl/storage/online_file_source.cpp +++ b/platform/default/src/mbgl/storage/online_file_source.cpp @@ -29,7 +29,7 @@ #include #include -namespace mbgl { +namespace mln { // For testing only constexpr const char* ONLINE_STATUS_KEY = "online-status"; @@ -626,7 +626,7 @@ std::unique_ptr OnlineFileSource::request(const Resource& resource break; case Resource::Kind::Style: - res.url = mbgl::util::mapbox::normalizeStyleURL(options, resource.url, impl->getApiKey()); + res.url = mln::util::mapbox::normalizeStyleURL(options, resource.url, impl->getApiKey()); break; case Resource::Kind::Source: @@ -655,8 +655,8 @@ std::unique_ptr OnlineFileSource::request(const Resource& resource bool OnlineFileSource::canRequest(const Resource& resource) const { return resource.hasLoadingMethod(Resource::LoadingMethod::Network) && - resource.url.rfind(mbgl::util::ASSET_PROTOCOL, 0) == std::string::npos && - resource.url.rfind(mbgl::util::FILE_PROTOCOL, 0) == std::string::npos; + resource.url.rfind(mln::util::ASSET_PROTOCOL, 0) == std::string::npos && + resource.url.rfind(mln::util::FILE_PROTOCOL, 0) == std::string::npos; } void OnlineFileSource::pause() { @@ -718,4 +718,4 @@ ClientOptions OnlineFileSource::getClientOptions() { return impl->getClientOptions(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/pmtiles_file_source.cpp b/platform/default/src/mbgl/storage/pmtiles_file_source.cpp index e82da09f0..06aa1fcf8 100644 --- a/platform/default/src/mbgl/storage/pmtiles_file_source.cpp +++ b/platform/default/src/mbgl/storage/pmtiles_file_source.cpp @@ -39,11 +39,11 @@ constexpr int pmtilesHeaderLength = 127; constexpr int MAX_DIRECTORY_CACHE_ENTRIES = 100; bool acceptsURL(const std::string& url) { - return url.starts_with(mbgl::util::PMTILES_PROTOCOL); + return url.starts_with(mln::util::PMTILES_PROTOCOL); } std::string extract_url(const std::string& url) { - return url.substr(std::char_traits::length(mbgl::util::PMTILES_PROTOCOL)); + return url.substr(std::char_traits::length(mln::util::PMTILES_PROTOCOL)); } } // namespace @@ -52,7 +52,7 @@ namespace pmtiles { const uint8_t TILETYPE_MLT = 0x6; } // namespace pmtiles -namespace mbgl { +namespace mln { using namespace rapidjson; using AsyncCallback = std::function)>; @@ -259,9 +259,9 @@ private: if (response.error->message.empty() && response.error->reason == Response::Error::Reason::NotFound) { - if (url.starts_with(mbgl::util::FILE_PROTOCOL)) { + if (url.starts_with(mln::util::FILE_PROTOCOL)) { message += "path not found: " + - url.substr(std::char_traits::length(mbgl::util::FILE_PROTOCOL)); + url.substr(std::char_traits::length(mln::util::FILE_PROTOCOL)); } else { message += "url not found: " + url; } @@ -670,4 +670,4 @@ ClientOptions PMTilesFileSource::getClientOptions() { return thread->actor().ask(&Impl::getClientOptions).get(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/pmtiles_file_source_stub.cpp b/platform/default/src/mbgl/storage/pmtiles_file_source_stub.cpp index 48ff40475..7d9e6c0b0 100644 --- a/platform/default/src/mbgl/storage/pmtiles_file_source_stub.cpp +++ b/platform/default/src/mbgl/storage/pmtiles_file_source_stub.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class PMTilesFileSource::Impl { public: @@ -35,4 +35,4 @@ ClientOptions PMTilesFileSource::getClientOptions() { return {}; } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/storage/sqlite3.cpp b/platform/default/src/mbgl/storage/sqlite3.cpp index d7a93f299..b4de47ae8 100644 --- a/platform/default/src/mbgl/storage/sqlite3.cpp +++ b/platform/default/src/mbgl/storage/sqlite3.cpp @@ -24,31 +24,31 @@ namespace mapbox { namespace sqlite { -static_assert(mbgl::underlying_type(ResultCode::OK) == SQLITE_OK, "error"); -static_assert(mbgl::underlying_type(ResultCode::Error) == SQLITE_ERROR, "error"); -static_assert(mbgl::underlying_type(ResultCode::Internal) == SQLITE_INTERNAL, "error"); -static_assert(mbgl::underlying_type(ResultCode::Perm) == SQLITE_PERM, "error"); -static_assert(mbgl::underlying_type(ResultCode::Abort) == SQLITE_ABORT, "error"); -static_assert(mbgl::underlying_type(ResultCode::Busy) == SQLITE_BUSY, "error"); -static_assert(mbgl::underlying_type(ResultCode::Locked) == SQLITE_LOCKED, "error"); -static_assert(mbgl::underlying_type(ResultCode::NoMem) == SQLITE_NOMEM, "error"); -static_assert(mbgl::underlying_type(ResultCode::ReadOnly) == SQLITE_READONLY, "error"); -static_assert(mbgl::underlying_type(ResultCode::Interrupt) == SQLITE_INTERRUPT, "error"); -static_assert(mbgl::underlying_type(ResultCode::IOErr) == SQLITE_IOERR, "error"); -static_assert(mbgl::underlying_type(ResultCode::Corrupt) == SQLITE_CORRUPT, "error"); -static_assert(mbgl::underlying_type(ResultCode::NotFound) == SQLITE_NOTFOUND, "error"); -static_assert(mbgl::underlying_type(ResultCode::Full) == SQLITE_FULL, "error"); -static_assert(mbgl::underlying_type(ResultCode::CantOpen) == SQLITE_CANTOPEN, "error"); -static_assert(mbgl::underlying_type(ResultCode::Protocol) == SQLITE_PROTOCOL, "error"); -static_assert(mbgl::underlying_type(ResultCode::Schema) == SQLITE_SCHEMA, "error"); -static_assert(mbgl::underlying_type(ResultCode::TooBig) == SQLITE_TOOBIG, "error"); -static_assert(mbgl::underlying_type(ResultCode::Constraint) == SQLITE_CONSTRAINT, "error"); -static_assert(mbgl::underlying_type(ResultCode::Mismatch) == SQLITE_MISMATCH, "error"); -static_assert(mbgl::underlying_type(ResultCode::Misuse) == SQLITE_MISUSE, "error"); -static_assert(mbgl::underlying_type(ResultCode::NoLFS) == SQLITE_NOLFS, "error"); -static_assert(mbgl::underlying_type(ResultCode::Auth) == SQLITE_AUTH, "error"); -static_assert(mbgl::underlying_type(ResultCode::Range) == SQLITE_RANGE, "error"); -static_assert(mbgl::underlying_type(ResultCode::NotADB) == SQLITE_NOTADB, "error"); +static_assert(mln::underlying_type(ResultCode::OK) == SQLITE_OK, "error"); +static_assert(mln::underlying_type(ResultCode::Error) == SQLITE_ERROR, "error"); +static_assert(mln::underlying_type(ResultCode::Internal) == SQLITE_INTERNAL, "error"); +static_assert(mln::underlying_type(ResultCode::Perm) == SQLITE_PERM, "error"); +static_assert(mln::underlying_type(ResultCode::Abort) == SQLITE_ABORT, "error"); +static_assert(mln::underlying_type(ResultCode::Busy) == SQLITE_BUSY, "error"); +static_assert(mln::underlying_type(ResultCode::Locked) == SQLITE_LOCKED, "error"); +static_assert(mln::underlying_type(ResultCode::NoMem) == SQLITE_NOMEM, "error"); +static_assert(mln::underlying_type(ResultCode::ReadOnly) == SQLITE_READONLY, "error"); +static_assert(mln::underlying_type(ResultCode::Interrupt) == SQLITE_INTERRUPT, "error"); +static_assert(mln::underlying_type(ResultCode::IOErr) == SQLITE_IOERR, "error"); +static_assert(mln::underlying_type(ResultCode::Corrupt) == SQLITE_CORRUPT, "error"); +static_assert(mln::underlying_type(ResultCode::NotFound) == SQLITE_NOTFOUND, "error"); +static_assert(mln::underlying_type(ResultCode::Full) == SQLITE_FULL, "error"); +static_assert(mln::underlying_type(ResultCode::CantOpen) == SQLITE_CANTOPEN, "error"); +static_assert(mln::underlying_type(ResultCode::Protocol) == SQLITE_PROTOCOL, "error"); +static_assert(mln::underlying_type(ResultCode::Schema) == SQLITE_SCHEMA, "error"); +static_assert(mln::underlying_type(ResultCode::TooBig) == SQLITE_TOOBIG, "error"); +static_assert(mln::underlying_type(ResultCode::Constraint) == SQLITE_CONSTRAINT, "error"); +static_assert(mln::underlying_type(ResultCode::Mismatch) == SQLITE_MISMATCH, "error"); +static_assert(mln::underlying_type(ResultCode::Misuse) == SQLITE_MISUSE, "error"); +static_assert(mln::underlying_type(ResultCode::NoLFS) == SQLITE_NOLFS, "error"); +static_assert(mln::underlying_type(ResultCode::Auth) == SQLITE_AUTH, "error"); +static_assert(mln::underlying_type(ResultCode::Range) == SQLITE_RANGE, "error"); +static_assert(mln::underlying_type(ResultCode::NotADB) == SQLITE_NOTADB, "error"); void setTempPath(const std::string& path) { sqlite3_temp_directory = sqlite3_mprintf("%s", path.c_str()); @@ -60,17 +60,17 @@ public: : db(db_) { const int error = sqlite3_extended_result_codes(db, true); if (error != SQLITE_OK) { - mbgl::Log::Warning(mbgl::Event::Database, - error, - std::string("Failed to enable extended result codes: ") + sqlite3_errmsg(db)); + mln::Log::Warning(mln::Event::Database, + error, + std::string("Failed to enable extended result codes: ") + sqlite3_errmsg(db)); } } ~DatabaseImpl() { const int error = sqlite3_close(db); if (error != SQLITE_OK) { - mbgl::Log::Error( - mbgl::Event::Database, error, std::string("Failed to close database: ") + sqlite3_errmsg(db)); + mln::Log::Error( + mln::Event::Database, error, std::string("Failed to close database: ") + sqlite3_errmsg(db)); } } @@ -109,7 +109,7 @@ public: #ifndef NDEBUG void logSqlMessage(void*, const int err, const char* msg) { - mbgl::Log::Record(mbgl::EventSeverity::Debug, mbgl::Event::Database, std::to_string(err) + msg); + mln::Log::Record(mln::EventSeverity::Debug, mln::Event::Database, std::to_string(err) + msg); } #endif diff --git a/platform/default/src/mbgl/test/main.cpp b/platform/default/src/mbgl/test/main.cpp index d6bc14889..819bfd5eb 100644 --- a/platform/default/src/mbgl/test/main.cpp +++ b/platform/default/src/mbgl/test/main.cpp @@ -24,5 +24,5 @@ int main(int argc, char *argv[]) { } #endif - return mbgl::runTests(argc, argv); + return mln::runTests(argc, argv); } diff --git a/platform/default/src/mbgl/text/bidi.cpp b/platform/default/src/mbgl/text/bidi.cpp index 9fecfcd09..ca88ec216 100644 --- a/platform/default/src/mbgl/text/bidi.cpp +++ b/platform/default/src/mbgl/text/bidi.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class BiDiImpl { public: @@ -35,7 +35,7 @@ std::u16string applyArabicShaping(const std::u16string& input) { UErrorCode errorCode = U_ZERO_ERROR; const int32_t outputLength = u_shapeArabic( - mbgl::utf16char_cast(input.c_str()), + mln::utf16char_cast(input.c_str()), static_cast(input.size()), nullptr, 0, @@ -48,9 +48,9 @@ std::u16string applyArabicShaping(const std::u16string& input) { std::u16string outputText(outputLength, 0); u_shapeArabic( - mbgl::utf16char_cast(input.c_str()), + mln::utf16char_cast(input.c_str()), static_cast(input.size()), - mbgl::utf16char_cast(outputText.data()), + mln::utf16char_cast(outputText.data()), outputLength, (U_SHAPE_LETTERS_SHAPE & U_SHAPE_LETTERS_MASK) | (U_SHAPE_TEXT_DIRECTION_LOGICAL & U_SHAPE_TEXT_DIRECTION_MASK), &errorCode); @@ -101,7 +101,7 @@ std::vector BiDi::processText(const std::u16string& input, std:: UErrorCode errorCode = U_ZERO_ERROR; ubidi_setPara(impl->bidiText, - mbgl::utf16char_cast(input.c_str()), + mln::utf16char_cast(input.c_str()), static_cast(input.size()), UBIDI_DEFAULT_LTR, nullptr, @@ -122,7 +122,7 @@ std::vector BiDi::processStyledText(const StyledText& input, std::se UErrorCode errorCode = U_ZERO_ERROR; ubidi_setPara(impl->bidiText, - mbgl::utf16char_cast(inputText.c_str()), + mln::utf16char_cast(inputText.c_str()), static_cast(inputText.size()), UBIDI_DEFAULT_LTR, nullptr, @@ -210,9 +210,9 @@ std::u16string BiDi::writeReverse(const std::u16string& input, std::size_t logic // parentheses UBIDI_REMOVE_BIDI_CONTROLS: Now that all the lines are set, // remove control characters so that they don't show up on screen (some // fonts have glyphs representing them) - int32_t outputLength = ubidi_writeReverse(mbgl::utf16char_cast(&input[logicalStart]), + int32_t outputLength = ubidi_writeReverse(mln::utf16char_cast(&input[logicalStart]), logicalLength, - mbgl::utf16char_cast(outputText.data()), + mln::utf16char_cast(outputText.data()), logicalLength + 1, // Extra room for null terminator, although we don't // really need to have ICU write it for us UBIDI_DO_MIRRORING | UBIDI_REMOVE_BIDI_CONTROLS, @@ -247,7 +247,7 @@ std::u16string BiDi::getLine(std::size_t start, std::size_t end) { // remove control characters so that they don't show up on screen (some // fonts have glyphs representing them) int32_t finalLength = ubidi_writeReordered(impl->bidiLine, - mbgl::utf16char_cast(outputText.data()), + mln::utf16char_cast(outputText.data()), outputLength, UBIDI_DO_MIRRORING | UBIDI_REMOVE_BIDI_CONTROLS, &errorCode); @@ -261,4 +261,4 @@ std::u16string BiDi::getLine(std::size_t start, std::size_t end) { return outputText; } -} // end namespace mbgl +} // end namespace mln diff --git a/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp b/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp index caf81fd46..26a60c2f1 100644 --- a/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp +++ b/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp @@ -1,6 +1,6 @@ #include -namespace mbgl { +namespace mln { class LocalGlyphRasterizer::Impl {}; @@ -16,4 +16,4 @@ Glyph LocalGlyphRasterizer::rasterizeGlyph(const FontStack&, GlyphID) { return Glyph(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/async_task.cpp b/platform/default/src/mbgl/util/async_task.cpp index 6e6d17c63..6fa04a2d8 100644 --- a/platform/default/src/mbgl/util/async_task.cpp +++ b/platform/default/src/mbgl/util/async_task.cpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace util { class AsyncTask::Impl { @@ -56,4 +56,4 @@ void AsyncTask::send() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/compression.cpp b/platform/default/src/mbgl/util/compression.cpp index 953c57117..e5a28b7c3 100644 --- a/platform/default/src/mbgl/util/compression.cpp +++ b/platform/default/src/mbgl/util/compression.cpp @@ -23,7 +23,7 @@ return true; }(); -namespace mbgl { +namespace mln { namespace util { // Needed when using a zlib compiled with -DZ_PREFIX @@ -138,4 +138,4 @@ std::uint32_t crc32(const void *raw, size_t size) noexcept { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/filesystem.cpp b/platform/default/src/mbgl/util/filesystem.cpp index e814180d0..f4c0abfaf 100644 --- a/platform/default/src/mbgl/util/filesystem.cpp +++ b/platform/default/src/mbgl/util/filesystem.cpp @@ -3,11 +3,11 @@ #if defined(USE_STD_FILESYSTEM) #include -bool mbgl::util::is_absolute_path(std::string path) { +bool mln::util::is_absolute_path(std::string path) { return std::filesystem::path(path).is_absolute(); } #else -bool mbgl::util::is_absolute_path(std::string path) { +bool mln::util::is_absolute_path(std::string path) { return path.at(0) == '/'; } #endif diff --git a/platform/default/src/mbgl/util/image.cpp b/platform/default/src/mbgl/util/image.cpp index 1ff505d6f..a3a573ac5 100644 --- a/platform/default/src/mbgl/util/image.cpp +++ b/platform/default/src/mbgl/util/image.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { PremultipliedImage decodePNG(const uint8_t*, size_t); PremultipliedImage decodeJPEG(const uint8_t*, size_t); @@ -44,4 +44,4 @@ PremultipliedImage decodeImage(const std::string& string) { throw std::runtime_error("unsupported image type"); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/jpeg_reader.cpp b/platform/default/src/mbgl/util/jpeg_reader.cpp index 9dc0196c4..ed45556d2 100644 --- a/platform/default/src/mbgl/util/jpeg_reader.cpp +++ b/platform/default/src/mbgl/util/jpeg_reader.cpp @@ -9,7 +9,7 @@ extern "C" { #include } -namespace mbgl { +namespace mln { const static unsigned BUF_SIZE = 4096; @@ -144,4 +144,4 @@ PremultipliedImage decodeJPEG(const uint8_t* data, size_t size) { return image; } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/logging_stderr.cpp b/platform/default/src/mbgl/util/logging_stderr.cpp index 6b5439044..b5aef15e5 100644 --- a/platform/default/src/mbgl/util/logging_stderr.cpp +++ b/platform/default/src/mbgl/util/logging_stderr.cpp @@ -3,10 +3,10 @@ #include -namespace mbgl { +namespace mln { void Log::platformRecord(EventSeverity severity, const std::string &msg) { std::cerr << "[" << Enum::toString(severity) << "] " << msg << '\n'; } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/monotonic_timer.cpp b/platform/default/src/mbgl/util/monotonic_timer.cpp index 70af59cf9..6d3ae3208 100644 --- a/platform/default/src/mbgl/util/monotonic_timer.cpp +++ b/platform/default/src/mbgl/util/monotonic_timer.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { // Prefer high resolution timer if it is monotonic @@ -24,4 +24,4 @@ std::chrono::duration MonotonicTimer::now() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/png_reader.cpp b/platform/default/src/mbgl/util/png_reader.cpp index 333b17213..3b76e6e35 100644 --- a/platform/default/src/mbgl/util/png_reader.cpp +++ b/platform/default/src/mbgl/util/png_reader.cpp @@ -35,7 +35,7 @@ const static bool png_version_check [[maybe_unused]] = []() { return true; }(); -namespace mbgl { +namespace mln { namespace { void user_error_fn(png_structp, png_const_charp error_msg) { @@ -133,4 +133,4 @@ PremultipliedImage decodePNG(const uint8_t* data, size_t size) { return util::premultiply(std::move(image)); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/png_writer.cpp b/platform/default/src/mbgl/util/png_writer.cpp index 19290cc99..c253550a9 100644 --- a/platform/default/src/mbgl/util/png_writer.cpp +++ b/platform/default/src/mbgl/util/png_writer.cpp @@ -31,7 +31,7 @@ void addChunk(std::string& png, const char* type, const char* data = "", const u } // namespace -namespace mbgl { +namespace mln { // Encode PNGs without libpng. std::string encodePNG(const PremultipliedImage& pre) { @@ -72,4 +72,4 @@ std::string encodePNG(const PremultipliedImage& pre) { return png; } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/run_loop.cpp b/platform/default/src/mbgl/util/run_loop.cpp index 4dbb5fc7f..ef46fb9f9 100644 --- a/platform/default/src/mbgl/util/run_loop.cpp +++ b/platform/default/src/mbgl/util/run_loop.cpp @@ -17,7 +17,7 @@ void dummyCallback(uv_async_t*) {} } // namespace -namespace mbgl { +namespace mln { namespace util { struct Watch { @@ -157,7 +157,7 @@ void RunLoop::updateTime() { uv_update_time(impl->loop); } -void RunLoop::waitForEmpty([[maybe_unused]] const mbgl::util::SimpleIdentity tag) { +void RunLoop::waitForEmpty([[maybe_unused]] const mln::util::SimpleIdentity tag) { while (true) { std::size_t remaining; { @@ -243,4 +243,4 @@ void RunLoop::removeWatch(int fd) { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/string_stdlib.cpp b/platform/default/src/mbgl/util/string_stdlib.cpp index 8eef7b373..fc308aa72 100644 --- a/platform/default/src/mbgl/util/string_stdlib.cpp +++ b/platform/default/src/mbgl/util/string_stdlib.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace platform { std::string uppercase(const std::string &str) { @@ -59,4 +59,4 @@ std::string lowercase(const std::string &str) { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/thread.cpp b/platform/default/src/mbgl/util/thread.cpp index 1ee5b1211..f6ab75127 100644 --- a/platform/default/src/mbgl/util/thread.cpp +++ b/platform/default/src/mbgl/util/thread.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace platform { std::string getCurrentThreadName() { @@ -60,4 +60,4 @@ void attachThread() {} void detachThread() {} } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/thread_local.cpp b/platform/default/src/mbgl/util/thread_local.cpp index 3ab51d923..33fc6c1be 100644 --- a/platform/default/src/mbgl/util/thread_local.cpp +++ b/platform/default/src/mbgl/util/thread_local.cpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace util { namespace impl { @@ -43,4 +43,4 @@ void ThreadLocalBase::set(void* ptr) { } // namespace impl } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/timer.cpp b/platform/default/src/mbgl/util/timer.cpp index fd8f94f65..5b4a49529 100644 --- a/platform/default/src/mbgl/util/timer.cpp +++ b/platform/default/src/mbgl/util/timer.cpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace util { class Timer::Impl { @@ -75,4 +75,4 @@ void Timer::stop() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/utf.cpp b/platform/default/src/mbgl/util/utf.cpp index b492e0662..495a9623a 100644 --- a/platform/default/src/mbgl/util/utf.cpp +++ b/platform/default/src/mbgl/util/utf.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { std::u16string convertUTF8ToUTF16(const std::string& str) { @@ -21,4 +21,4 @@ std::string convertUTF16ToUTF8(const std::u16string& str) { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/util/webp_reader.cpp b/platform/default/src/mbgl/util/webp_reader.cpp index 7faf6641d..8a3610e9e 100644 --- a/platform/default/src/mbgl/util/webp_reader.cpp +++ b/platform/default/src/mbgl/util/webp_reader.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { PremultipliedImage decodeWEBP(const uint8_t* data, size_t size) { int32_t width, height; @@ -23,4 +23,4 @@ PremultipliedImage decodeWEBP(const uint8_t* data, size_t size) { return util::premultiply(std::move(img)); } -} // namespace mbgl +} // namespace mln diff --git a/platform/default/src/mbgl/vulkan/headless_backend.cpp b/platform/default/src/mbgl/vulkan/headless_backend.cpp index 2e55df35f..161bf8be9 100644 --- a/platform/default/src/mbgl/vulkan/headless_backend.cpp +++ b/platform/default/src/mbgl/vulkan/headless_backend.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace vulkan { class HeadlessRenderableResource final : public vulkan::SurfaceRenderableResource { @@ -34,8 +34,8 @@ public: HeadlessBackend::HeadlessBackend(const Size size_, gfx::HeadlessBackend::SwapBehaviour, const gfx::ContextMode contextMode_) - : mbgl::vulkan::RendererBackend(contextMode_), - mbgl::gfx::HeadlessBackend(size_) { + : mln::vulkan::RendererBackend(contextMode_), + mln::gfx::HeadlessBackend(size_) { init(); } @@ -104,4 +104,4 @@ std::unique_ptr Backend::Create ExampleCustomDrawableStyleLayerHost::project(const mbgl::LatLng& c, const mbgl::TransformState& s) { - mbgl::LatLng unwrappedLatLng = c.wrapped(); - unwrappedLatLng.unwrapForShortestPath(s.getLatLng(mbgl::LatLng::Wrapped)); - return mbgl::Projection::project(unwrappedLatLng, s.getScale()); +mln::Point ExampleCustomDrawableStyleLayerHost::project(const mln::LatLng& c, const mln::TransformState& s) { + mln::LatLng unwrappedLatLng = c.wrapped(); + unwrappedLatLng.unwrapForShortestPath(s.getLatLng(mln::LatLng::Wrapped)); + return mln::Projection::project(unwrappedLatLng, s.getScale()); } void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) { - constexpr float extent = mbgl::util::EXTENT; + constexpr float extent = mln::util::EXTENT; // add classic polylines { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 792}); @@ -130,7 +130,7 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) // add wide vector polylines with tile coordinates { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 792}); @@ -225,7 +225,7 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) // add fill polygon { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 790}); @@ -258,7 +258,7 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) // add symbol { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 789}); @@ -267,7 +267,7 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) // load image std::shared_ptr image = std::make_shared( - mbgl::decodeImage(mbgl::util::read_file(assetsPath + "puck_hat.png"))); + mln::decodeImage(mln::util::read_file(assetsPath + "puck_hat.png"))); // set symbol options Interface::SymbolOptions options; @@ -291,13 +291,13 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) } { - using namespace mbgl; + using namespace mln; GeometryCoordinate position{static_cast(extent * 1.0f), static_cast(extent * 0.5f)}; // load image std::shared_ptr image = std::make_shared( - mbgl::decodeImage(mbgl::util::read_file(assetsPath + "puck_hat.png"))); + mln::decodeImage(mln::util::read_file(assetsPath + "puck_hat.png"))); // set symbol options Interface::SymbolOptions options; @@ -321,7 +321,7 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) // add polylines using wide vectors using geographic coordinates { - using namespace mbgl; + using namespace mln; // add polyline with geographic coordinates Interface::LineOptions options = {/*geometry=*/{}, @@ -358,7 +358,7 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) // add polylines using wide vectors in tile coordinates { - using namespace mbgl; + using namespace mln; // set tile interface.setTileID({11, 327, 790}); @@ -408,19 +408,19 @@ void ExampleCustomDrawableStyleLayerHost::createDrawables(Interface& interface) void ExampleCustomDrawableStyleLayerHost::generateGeometry(Interface& interface) { constexpr float itemScale = 10.0f; - const mbgl::LatLng location{37.78, -122.47}; + const mln::LatLng location{37.78, -122.47}; Interface::GeometryOptions options; // load image - std::shared_ptr image = std::make_shared( - mbgl::decodeImage(mbgl::util::read_file(assetsPath + "puck.png"))); + std::shared_ptr image = std::make_shared( + mln::decodeImage(mln::util::read_file(assetsPath + "puck.png"))); options.texture = interface.context.createTexture2D(); options.texture->setImage(image); - options.texture->setSamplerConfiguration({.filter = mbgl::gfx::TextureFilterType::Linear, - .wrapU = mbgl::gfx::TextureWrapType::Clamp, - .wrapV = mbgl::gfx::TextureWrapType::Clamp}); + options.texture->setSamplerConfiguration({.filter = mln::gfx::TextureFilterType::Linear, + .wrapU = mln::gfx::TextureWrapType::Clamp, + .wrapV = mln::gfx::TextureWrapType::Clamp}); const std::shared_ptr sharedVertices = std::make_shared(); VertexVector& vertices = *sharedVertices; @@ -434,7 +434,7 @@ void ExampleCustomDrawableStyleLayerHost::generateGeometry(Interface& interface) vertices.emplace_back(Interface::GeometryVertex{.position = {0.0f, 0.0f, 0.0f}, .texcoords = {0.5f, 0.5f}}); for (unsigned long i = 1; i <= numVtxCircumference; ++i) { - const float rad = mbgl::util::deg2radf((i - 1) * bearingStep); + const float rad = mln::util::deg2radf((i - 1) * bearingStep); Interface::GeometryVertex vertex; vertex.position = {sinf(rad) / 2.0f, cosf(rad) / 2.0f, 0.0f}; @@ -450,27 +450,27 @@ void ExampleCustomDrawableStyleLayerHost::generateGeometry(Interface& interface) interface.setGeometryOptions(options); - interface.setGeometryTweakerCallback([=, frameCount = 0]([[maybe_unused]] mbgl::gfx::Drawable& drawable, - const mbgl::PaintParameters& params, + interface.setGeometryTweakerCallback([=, frameCount = 0]([[maybe_unused]] mln::gfx::Drawable& drawable, + const mln::PaintParameters& params, Interface::GeometryOptions& currentOptions) mutable { frameCount++; - const mbgl::Point& center = project(location, params.state); + const mln::Point& center = project(location, params.state); const float scale = itemScale * static_cast(std::pow(2.f, params.state.getZoom())) * params.pixelsToGLUnits[0]; - mbgl::mat4 matrix = mbgl::matrix::identity4(); - mbgl::matrix::translate(matrix, matrix, center.x, center.y, 0.0); - mbgl::matrix::rotate_z(matrix, matrix, frameCount * 0.05f); - mbgl::matrix::scale(matrix, matrix, scale, scale, 1.0f); - mbgl::matrix::multiply(currentOptions.matrix, params.transformParams.nearClippedProjMatrix, matrix); + mln::mat4 matrix = mln::matrix::identity4(); + mln::matrix::translate(matrix, matrix, center.x, center.y, 0.0); + mln::matrix::rotate_z(matrix, matrix, frameCount * 0.05f); + mln::matrix::scale(matrix, matrix, scale, scale, 1.0f); + mln::matrix::multiply(currentOptions.matrix, params.transformParams.nearClippedProjMatrix, matrix); if (frameCount % 100 == 0) { if (currentOptions.color.g > 0.0f) { - currentOptions.color = mbgl::Color::red(); + currentOptions.color = mln::Color::red(); } else { - currentOptions.color = mbgl::Color::white(); + currentOptions.color = mln::Color::white(); } } }); @@ -481,25 +481,25 @@ void ExampleCustomDrawableStyleLayerHost::generateGeometry(Interface& interface) void ExampleCustomDrawableStyleLayerHost::loadGeometry(Interface& interface) { constexpr float itemScale = 0.1f; constexpr std::array itemRotation = {90.0f, 0.0f, 0.0f}; - const mbgl::LatLng location{37.76, -122.47}; + const mln::LatLng location{37.76, -122.47}; Interface::GeometryOptions options; - interface.setGeometryTweakerCallback([=]([[maybe_unused]] mbgl::gfx::Drawable& drawable, - const mbgl::PaintParameters& params, + interface.setGeometryTweakerCallback([=]([[maybe_unused]] mln::gfx::Drawable& drawable, + const mln::PaintParameters& params, Interface::GeometryOptions& currentOptions) mutable { - const mbgl::Point& center = project(location, params.state); + const mln::Point& center = project(location, params.state); const float scale = itemScale * static_cast(std::pow(2.f, params.state.getZoom())) * params.pixelsToGLUnits[0]; - mbgl::mat4 matrix = mbgl::matrix::identity4(); - mbgl::matrix::translate(matrix, matrix, center.x, center.y, 0.0); - mbgl::matrix::rotate_x(matrix, matrix, mbgl::util::deg2radf(itemRotation[0])); - mbgl::matrix::rotate_y(matrix, matrix, mbgl::util::deg2radf(itemRotation[1])); - mbgl::matrix::rotate_z(matrix, matrix, mbgl::util::deg2radf(itemRotation[2])); - mbgl::matrix::scale(matrix, matrix, scale, scale, scale); - mbgl::matrix::multiply(currentOptions.matrix, params.transformParams.nearClippedProjMatrix, matrix); + mln::mat4 matrix = mln::matrix::identity4(); + mln::matrix::translate(matrix, matrix, center.x, center.y, 0.0); + mln::matrix::rotate_x(matrix, matrix, mln::util::deg2radf(itemRotation[0])); + mln::matrix::rotate_y(matrix, matrix, mln::util::deg2radf(itemRotation[1])); + mln::matrix::rotate_z(matrix, matrix, mln::util::deg2radf(itemRotation[2])); + mln::matrix::scale(matrix, matrix, scale, scale, scale); + mln::matrix::multiply(currentOptions.matrix, params.transformParams.nearClippedProjMatrix, matrix); }); const std::shared_ptr sharedVertices = std::make_shared(); @@ -526,7 +526,7 @@ void ExampleCustomDrawableStyleLayerHost::importObj(Interface& interface, if (!reader.ParseFromFile(filename, readerConfig)) { if (!reader.Error().empty()) { - mbgl::Log::Error(mbgl::Event::General, reader.Error()); + mln::Log::Error(mln::Event::General, reader.Error()); } assert(false); @@ -534,14 +534,14 @@ void ExampleCustomDrawableStyleLayerHost::importObj(Interface& interface, } if (!reader.Warning().empty()) { - mbgl::Log::Error(mbgl::Event::General, reader.Warning()); + mln::Log::Error(mln::Event::General, reader.Warning()); } const tinyobj::attrib_t& attributes = reader.GetAttrib(); const std::vector& shapes = reader.GetShapes(); if (attributes.texcoords.empty()) { - options.color = mbgl::Color::green(); + options.color = mln::Color::green(); } else { // TODO parse material @@ -575,15 +575,15 @@ void ExampleCustomDrawableStyleLayerHost::importObj(Interface& interface, } } -mbgl::gfx::Texture2DPtr ExampleCustomDrawableStyleLayerHost::createCheckerboardTexture( +mln::gfx::Texture2DPtr ExampleCustomDrawableStyleLayerHost::createCheckerboardTexture( Interface& interface, uint16_t wb, uint16_t hb, uint16_t blockSize, const std::array& color1, const std::array& color2) { - std::shared_ptr image = std::make_shared( - mbgl::Size(wb * blockSize, hb * blockSize)); + std::shared_ptr image = std::make_shared( + mln::Size(wb * blockSize, hb * blockSize)); constexpr uint8_t pixelSize = sizeof(uint8_t) * 4; @@ -601,9 +601,9 @@ mbgl::gfx::Texture2DPtr ExampleCustomDrawableStyleLayerHost::createCheckerboardT } auto texture = interface.context.createTexture2D(); - texture->setSamplerConfiguration({.filter = mbgl::gfx::TextureFilterType::Linear, - .wrapU = mbgl::gfx::TextureWrapType::Clamp, - .wrapV = mbgl::gfx::TextureWrapType::Clamp}); + texture->setSamplerConfiguration({.filter = mln::gfx::TextureFilterType::Linear, + .wrapU = mln::gfx::TextureWrapType::Clamp, + .wrapV = mln::gfx::TextureWrapType::Clamp}); texture->setImage(std::move(image)); return texture; diff --git a/platform/glfw/example_custom_drawable_style_layer.hpp b/platform/glfw/example_custom_drawable_style_layer.hpp index 9a1e130f2..edc4e8443 100644 --- a/platform/glfw/example_custom_drawable_style_layer.hpp +++ b/platform/glfw/example_custom_drawable_style_layer.hpp @@ -2,10 +2,10 @@ #include -class ExampleCustomDrawableStyleLayerHost : public mbgl::style::CustomDrawableLayerHost { +class ExampleCustomDrawableStyleLayerHost : public mln::style::CustomDrawableLayerHost { public: - using VertexVector = mbgl::gfx::VertexVector; - using TriangleIndexVector = mbgl::gfx::IndexVector; + using VertexVector = mln::gfx::VertexVector; + using TriangleIndexVector = mln::gfx::IndexVector; ExampleCustomDrawableStyleLayerHost(const std::string& assetsPath); ~ExampleCustomDrawableStyleLayerHost(); @@ -16,7 +16,7 @@ public: void update(Interface& interface) override; protected: - static mbgl::Point project(const mbgl::LatLng& c, const mbgl::TransformState& s); + static mln::Point project(const mln::LatLng& c, const mln::TransformState& s); void createDrawables(Interface& interface); void generateGeometry(Interface& interface); @@ -27,12 +27,12 @@ protected: TriangleIndexVector& indices, Interface::GeometryOptions& options); - mbgl::gfx::Texture2DPtr createCheckerboardTexture(Interface& interface, - uint16_t wb, - uint16_t hb, - uint16_t blockSize, - const std::array& color1, - const std::array& color2); + mln::gfx::Texture2DPtr createCheckerboardTexture(Interface& interface, + uint16_t wb, + uint16_t hb, + uint16_t blockSize, + const std::array& color1, + const std::array& color2); protected: const std::string assetsPath; diff --git a/platform/glfw/glfw_backend.hpp b/platform/glfw/glfw_backend.hpp index 867e60d79..fc9677c7f 100644 --- a/platform/glfw/glfw_backend.hpp +++ b/platform/glfw/glfw_backend.hpp @@ -3,11 +3,11 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class RendererBackend; } // namespace gfx -} // namespace mbgl +} // namespace mln struct GLFWwindow; @@ -19,10 +19,10 @@ public: virtual ~GLFWBackend() = default; static std::unique_ptr Create(GLFWwindow* window, bool capFrameRate) { - return mbgl::gfx::Backend::Create(window, capFrameRate); + return mln::gfx::Backend::Create(window, capFrameRate); } - virtual mbgl::gfx::RendererBackend& getRendererBackend() = 0; - virtual mbgl::Size getSize() const = 0; - virtual void setSize(mbgl::Size) = 0; + virtual mln::gfx::RendererBackend& getRendererBackend() = 0; + virtual mln::Size getSize() const = 0; + virtual void setSize(mln::Size) = 0; }; diff --git a/platform/glfw/glfw_gl_backend.cpp b/platform/glfw/glfw_gl_backend.cpp index c609d4730..421c06763 100644 --- a/platform/glfw/glfw_gl_backend.cpp +++ b/platform/glfw/glfw_gl_backend.cpp @@ -6,7 +6,7 @@ #include -class GLFWGLRenderableResource final : public mbgl::gl::RenderableResource { +class GLFWGLRenderableResource final : public mln::gl::RenderableResource { public: explicit GLFWGLRenderableResource(GLFWGLBackend& backend_) : backend(backend_) {} @@ -29,13 +29,13 @@ private: }; GLFWGLBackend::GLFWGLBackend(GLFWwindow* window_, const bool capFrameRate) - : mbgl::gl::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable( + : mln::gl::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable( [window_] { int fbWidth; int fbHeight; glfwGetFramebufferSize(window_, &fbWidth, &fbHeight); - return mbgl::Size{static_cast(fbWidth), static_cast(fbHeight)}; + return mln::Size{static_cast(fbWidth), static_cast(fbHeight)}; }(), std::make_unique(*this)), window(window_) { @@ -64,7 +64,7 @@ void GLFWGLBackend::deactivate() { glfwMakeContextCurrent(nullptr); } -mbgl::gl::ProcAddress GLFWGLBackend::getExtensionFunctionPointer(const char* name) { +mln::gl::ProcAddress GLFWGLBackend::getExtensionFunctionPointer(const char* name) { return glfwGetProcAddress(name); } @@ -75,11 +75,11 @@ void GLFWGLBackend::updateAssumedState() { setViewport(0, 0, size); } -mbgl::Size GLFWGLBackend::getSize() const { +mln::Size GLFWGLBackend::getSize() const { return size; } -void GLFWGLBackend::setSize(const mbgl::Size newSize) { +void GLFWGLBackend::setSize(const mln::Size newSize) { size = newSize; } @@ -89,15 +89,15 @@ void GLFWGLBackend::swap() { glfwSwapBuffers(window); } -namespace mbgl { +namespace mln { namespace gfx { template <> -std::unique_ptr Backend::Create(GLFWwindow* window, bool capFrameRate) { +std::unique_ptr Backend::Create(GLFWwindow* window, bool capFrameRate) { MLN_TRACE_FUNC(); return std::make_unique(window, capFrameRate); } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/glfw/glfw_gl_backend.hpp b/platform/glfw/glfw_gl_backend.hpp index cd7a2ab01..7ea605904 100644 --- a/platform/glfw/glfw_gl_backend.hpp +++ b/platform/glfw/glfw_gl_backend.hpp @@ -7,7 +7,7 @@ struct GLFWwindow; -class GLFWGLBackend final : public GLFWBackend, public mbgl::gl::RendererBackend, public mbgl::gfx::Renderable { +class GLFWGLBackend final : public GLFWBackend, public mln::gl::RendererBackend, public mln::gfx::Renderable { public: GLFWGLBackend(GLFWwindow*, bool capFrameRate); ~GLFWGLBackend() override; @@ -16,21 +16,21 @@ public: // GLFWRendererBackend implementation public: - mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; } - mbgl::Size getSize() const override; - void setSize(mbgl::Size) override; + mln::gfx::RendererBackend& getRendererBackend() override { return *this; } + mln::Size getSize() const override; + void setSize(mln::Size) override; - // mbgl::gfx::RendererBackend implementation + // mln::gfx::RendererBackend implementation public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } protected: void activate() override; void deactivate() override; - // mbgl::gl::RendererBackend implementation + // mln::gl::RendererBackend implementation protected: - mbgl::gl::ProcAddress getExtensionFunctionPointer(const char*) override; + mln::gl::ProcAddress getExtensionFunctionPointer(const char*) override; void updateAssumedState() override; private: diff --git a/platform/glfw/glfw_metal_backend.h b/platform/glfw/glfw_metal_backend.h index 3ae0cb3c4..b4319dd91 100644 --- a/platform/glfw/glfw_metal_backend.h +++ b/platform/glfw/glfw_metal_backend.h @@ -13,23 +13,23 @@ class GLFWMetalBackend final : public GLFWBackend { public: GLFWMetalBackend(GLFWwindow *window_, const bool capFrameRate); ~GLFWMetalBackend() = default; - mbgl::gfx::RendererBackend &getRendererBackend() override; - void setSize(mbgl::Size) override; - mbgl::Size getSize() const override; + mln::gfx::RendererBackend &getRendererBackend() override; + void setSize(mln::Size) override; + mln::Size getSize() const override; private: NSWindow *window; MetalBackend rendererBackend; }; -namespace mbgl { +namespace mln { namespace gfx { template <> -std::unique_ptr Backend::Create(GLFWwindow *window, - bool capFrameRate) { +std::unique_ptr Backend::Create(GLFWwindow *window, + bool capFrameRate) { return std::make_unique(window, capFrameRate); } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/glfw/glfw_metal_backend.mm b/platform/glfw/glfw_metal_backend.mm index f4edd2acb..92768f57a 100644 --- a/platform/glfw/glfw_metal_backend.mm +++ b/platform/glfw/glfw_metal_backend.mm @@ -9,8 +9,8 @@ GLFWMetalBackend::GLFWMetalBackend(GLFWwindow* window_, [[maybe_unused]] const bool capFrameRate) : window(glfwGetCocoaWindow(window_)), rendererBackend(window) {} -mbgl::gfx::RendererBackend& GLFWMetalBackend::getRendererBackend() { return rendererBackend; } +mln::gfx::RendererBackend& GLFWMetalBackend::getRendererBackend() { return rendererBackend; } -void GLFWMetalBackend::setSize(mbgl::Size size) { rendererBackend.setSize(size); } +void GLFWMetalBackend::setSize(mln::Size size) { rendererBackend.setSize(size); } -mbgl::Size GLFWMetalBackend::getSize() const { return rendererBackend.getSize(); } +mln::Size GLFWMetalBackend::getSize() const { return rendererBackend.getSize(); } diff --git a/platform/glfw/glfw_renderer_frontend.cpp b/platform/glfw/glfw_renderer_frontend.cpp index a79814f01..496f9751c 100644 --- a/platform/glfw/glfw_renderer_frontend.cpp +++ b/platform/glfw/glfw_renderer_frontend.cpp @@ -5,7 +5,7 @@ #include #include -GLFWRendererFrontend::GLFWRendererFrontend(std::unique_ptr renderer_, GLFWView& glfwView_) +GLFWRendererFrontend::GLFWRendererFrontend(std::unique_ptr renderer_, GLFWView& glfwView_) : glfwView(glfwView_), renderer(std::move(renderer_)) { glfwView.setRenderFrontend(this); @@ -18,17 +18,17 @@ void GLFWRendererFrontend::reset() { renderer.reset(); } -void GLFWRendererFrontend::setObserver(mbgl::RendererObserver& observer) { +void GLFWRendererFrontend::setObserver(mln::RendererObserver& observer) { assert(renderer); renderer->setObserver(&observer); } -void GLFWRendererFrontend::update(std::shared_ptr params) { +void GLFWRendererFrontend::update(std::shared_ptr params) { updateParameters = std::move(params); glfwView.invalidate(); } -const mbgl::TaggedScheduler& GLFWRendererFrontend::getThreadPool() const { +const mln::TaggedScheduler& GLFWRendererFrontend::getThreadPool() const { return glfwView.getRendererBackend().getThreadPool(); } @@ -39,7 +39,7 @@ void GLFWRendererFrontend::render() { if (!updateParameters) return; - mbgl::gfx::BackendScope guard{glfwView.getRendererBackend(), mbgl::gfx::BackendScope::ScopeType::Implicit}; + mln::gfx::BackendScope guard{glfwView.getRendererBackend(), mln::gfx::BackendScope::ScopeType::Implicit}; // onStyleImageMissing might be called during a render. The user implemented // method could trigger a call to MLNRenderFrontend#update which overwrites @@ -49,7 +49,7 @@ void GLFWRendererFrontend::render() { renderer->render(updateParameters_); } -mbgl::Renderer* GLFWRendererFrontend::getRenderer() { +mln::Renderer* GLFWRendererFrontend::getRenderer() { assert(renderer); return renderer.get(); } diff --git a/platform/glfw/glfw_renderer_frontend.hpp b/platform/glfw/glfw_renderer_frontend.hpp index 252e26676..8ae971dc5 100644 --- a/platform/glfw/glfw_renderer_frontend.hpp +++ b/platform/glfw/glfw_renderer_frontend.hpp @@ -5,26 +5,26 @@ #include -namespace mbgl { +namespace mln { class Renderer; -} // namespace mbgl +} // namespace mln -class GLFWRendererFrontend : public mbgl::RendererFrontend { +class GLFWRendererFrontend : public mln::RendererFrontend { public: - GLFWRendererFrontend(std::unique_ptr, GLFWView&); + GLFWRendererFrontend(std::unique_ptr, GLFWView&); ~GLFWRendererFrontend() override; void reset() override; - void setObserver(mbgl::RendererObserver&) override; + void setObserver(mln::RendererObserver&) override; - void update(std::shared_ptr) override; - const mbgl::TaggedScheduler& getThreadPool() const override; + void update(std::shared_ptr) override; + const mln::TaggedScheduler& getThreadPool() const override; void render(); - mbgl::Renderer* getRenderer(); + mln::Renderer* getRenderer(); private: GLFWView& glfwView; - std::unique_ptr renderer; - std::shared_ptr updateParameters; + std::unique_ptr renderer; + std::shared_ptr updateParameters; }; diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index c914f7300..b9bcf3130 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -72,20 +72,20 @@ using namespace std::numbers; namespace { const std::string mbglPuckAssetsPath{MLN_ASSETS_PATH}; -mbgl::Color premultiply(mbgl::Color c) { +mln::Color premultiply(mln::Color c) { c.r *= c.a; c.g *= c.a; c.b *= c.a; return c; } -std::array toArray(const mbgl::LatLng &crd) { +std::array toArray(const mln::LatLng &crd) { return {crd.latitude(), crd.longitude(), 0}; } } // namespace #endif // ENABLE_LOCATION_INDICATOR -class SnapshotObserver final : public mbgl::MapSnapshotterObserver { +class SnapshotObserver final : public mln::MapSnapshotterObserver { public: ~SnapshotObserver() override = default; void onDidFinishLoadingStyle() override { @@ -125,7 +125,7 @@ constexpr TileLodProfile nextTileLodProfile(TileLodProfile current) { } } -void cycleTileLodProfile(mbgl::Map &map) { +void cycleTileLodProfile(mln::Map &map) { // TileLodProfile::Default parameters static const auto defaultRadius = map.getTileLodMinRadius(); static const auto defaultScale = map.getTileLodScale(); @@ -141,50 +141,50 @@ void cycleTileLodProfile(mbgl::Map &map) { map.setTileLodScale(defaultScale); map.setTileLodPitchThreshold(defaultTilePitchThreshold); map.setTileLodMode(defaultTileLodMode); - mbgl::Log::Info(mbgl::Event::General, "Tile LOD profile: default"); + mln::Log::Info(mln::Event::General, "Tile LOD profile: default"); break; case TileLodProfile::NoLod: // When LOD is off we set a maximum PitchThreshold map.setTileLodPitchThreshold(std::numbers::pi); - mbgl::Log::Info(mbgl::Event::General, "Tile LOD profile: disabled"); + mln::Log::Info(mln::Event::General, "Tile LOD profile: disabled"); break; case TileLodProfile::Reduced: map.setTileLodMinRadius(2); map.setTileLodScale(1.5); map.setTileLodPitchThreshold(std::numbers::pi / 4); - mbgl::Log::Info(mbgl::Event::General, "Tile LOD profile: reduced"); + mln::Log::Info(mln::Event::General, "Tile LOD profile: reduced"); break; case TileLodProfile::Aggressive: map.setTileLodMinRadius(1); map.setTileLodScale(2); map.setTileLodPitchThreshold(0); - mbgl::Log::Info(mbgl::Event::General, "Tile LOD profile: aggressive"); + mln::Log::Info(mln::Event::General, "Tile LOD profile: aggressive"); break; case TileLodProfile::DistanceBased: map.setTileLodScale(1); map.setTileLodPitchThreshold(0); - map.setTileLodMode(mbgl::TileLodMode::Distance); - mbgl::Log::Info(mbgl::Event::General, "Tile LOD profile: distance-based"); + map.setTileLodMode(mln::TileLodMode::Distance); + mln::Log::Info(mln::Event::General, "Tile LOD profile: distance-based"); break; } map.triggerRepaint(); } -void tileLodZoomShift(mbgl::Map &map, bool positive) { +void tileLodZoomShift(mln::Map &map, bool positive) { constexpr auto tileLodZoomShiftStep = 0.25; auto shift = positive ? tileLodZoomShiftStep : -tileLodZoomShiftStep; shift = map.getTileLodZoomShift() + shift; - shift = mbgl::util::clamp(shift, -2.5, 2.5); - mbgl::Log::Info(mbgl::Event::OpenGL, "Zoom shift: " + std::to_string(shift)); + shift = mln::util::clamp(shift, -2.5, 2.5); + mln::Log::Info(mln::Event::OpenGL, "Zoom shift: " + std::to_string(shift)); map.setTileLodZoomShift(shift); map.triggerRepaint(); } -void addFillExtrusionLayer(mbgl::style::Style &style, bool visible) { +void addFillExtrusionLayer(mln::style::Style &style, bool visible) { MLN_TRACE_FUNC(); - using namespace mbgl::style; - using namespace mbgl::style::expression::dsl; + using namespace mln::style; + using namespace mln::style::expression::dsl; // Satellite-only style does not contain building extrusions data. if (!style.getSource("composite")) { @@ -200,14 +200,14 @@ void addFillExtrusionLayer(mbgl::style::Style &style, bool visible) { extrusionLayer->setSourceLayer("building"); extrusionLayer->setMinZoom(15.0f); extrusionLayer->setFilter(Filter(eq(get("extrude"), literal("true")))); - extrusionLayer->setFillExtrusionColor(PropertyExpression(interpolate(linear(), - number(get("height")), - 0.f, - toColor(literal("#160e23")), - 50.f, - toColor(literal("#00615f")), - 100.f, - toColor(literal("#55e9ff"))))); + extrusionLayer->setFillExtrusionColor(PropertyExpression(interpolate(linear(), + number(get("height")), + 0.f, + toColor(literal("#160e23")), + 50.f, + toColor(literal("#00615f")), + 100.f, + toColor(literal("#55e9ff"))))); extrusionLayer->setFillExtrusionOpacity(0.6f); extrusionLayer->setFillExtrusionHeight(PropertyExpression(get("height"))); extrusionLayer->setFillExtrusionBase(PropertyExpression(get("min_height"))); @@ -216,13 +216,13 @@ void addFillExtrusionLayer(mbgl::style::Style &style, bool visible) { } // namespace void glfwError(int error, const char *description) { - mbgl::Log::Error(mbgl::Event::OpenGL, std::string("GLFW error (") + std::to_string(error) + "): " + description); + mln::Log::Error(mln::Event::OpenGL, std::string("GLFW error (") + std::to_string(error) + "): " + description); } GLFWView::GLFWView(bool fullscreen_, bool benchmark_, - const mbgl::ResourceOptions &resourceOptions, - const mbgl::ClientOptions &clientOptions) + const mln::ResourceOptions &resourceOptions, + const mln::ClientOptions &clientOptions) : fullscreen(fullscreen_), benchmark(benchmark_), snapshotterObserver(std::make_unique()), @@ -242,7 +242,7 @@ GLFWView::GLFWView(bool fullscreen_, #endif if (!glfwInit()) { - mbgl::Log::Error(mbgl::Event::OpenGL, "failed to initialize glfw"); + mln::Log::Error(mln::Event::OpenGL, "failed to initialize glfw"); exit(1); } @@ -258,7 +258,7 @@ GLFWView::GLFWView(bool fullscreen_, glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, GL_TRUE); #endif - if (mbgl::gfx::Backend::GetType() != mbgl::gfx::Backend::Type::OpenGL) { + if (mln::gfx::Backend::GetType() != mln::gfx::Backend::Type::OpenGL) { glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); } else { #if __APPLE__ @@ -288,7 +288,7 @@ GLFWView::GLFWView(bool fullscreen_, window = glfwCreateWindow(width, height, "MapLibre Native", monitor, nullptr); if (!window) { glfwTerminate(); - mbgl::Log::Error(mbgl::Event::OpenGL, "failed to initialize window"); + mln::Log::Error(mln::Event::OpenGL, "failed to initialize window"); exit(1); } @@ -390,7 +390,7 @@ GLFWView::~GLFWView() { glfwTerminate(); } -void GLFWView::setMap(mbgl::Map *map_) { +void GLFWView::setMap(mln::Map *map_) { MLN_TRACE_FUNC(); map = map_; @@ -403,7 +403,7 @@ void GLFWView::setRenderFrontend(GLFWRendererFrontend *rendererFrontend_) { rendererFrontend = rendererFrontend_; } -mbgl::gfx::RendererBackend &GLFWView::getRendererBackend() { +mln::gfx::RendererBackend &GLFWView::getRendererBackend() { MLN_TRACE_FUNC(); return backend->getRendererBackend(); @@ -427,7 +427,7 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, case GLFW_KEY_X: if (!mods) view->map->jumpTo( - mbgl::CameraOptions().withCenter(mbgl::LatLng{}).withZoom(0.0).withBearing(0.0).withPitch(0.0)); + mln::CameraOptions().withCenter(mln::LatLng{}).withZoom(0.0).withBearing(0.0).withPitch(0.0)); break; case GLFW_KEY_O: view->onlineStatusCallback(); @@ -437,8 +437,8 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, break; case GLFW_KEY_N: if (!mods) - view->map->easeTo(mbgl::CameraOptions().withBearing(0.0), - mbgl::AnimationOptions{{mbgl::Milliseconds(500)}}); + view->map->easeTo(mln::CameraOptions().withBearing(0.0), + mln::AnimationOptions{{mln::Milliseconds(500)}}); break; case GLFW_KEY_Z: view->nextOrientation(); @@ -448,8 +448,8 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, {{}, {static_cast(view->getSize().width), static_cast(view->getSize().height)}}); printf("visible point annotations: %zu\n", result.size()); auto features = view->rendererFrontend->getRenderer()->queryRenderedFeatures( - mbgl::ScreenBox{{view->getSize().width * 0.5, view->getSize().height * 0.5}, - {view->getSize().width * 0.5 + 1.0, view->getSize().height * 0.5 + 1}}, + mln::ScreenBox{{view->getSize().width * 0.5, view->getSize().height * 0.5}, + {view->getSize().width * 0.5 + 1.0, view->getSize().height * 0.5 + 1}}, {}); printf("Rendered features at the center of the screen: %zu\n", features.size()); } break; @@ -477,20 +477,20 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, case GLFW_KEY_A: { // XXX Fix precision loss in flyTo: // https://github.com/mapbox/mapbox-gl-native/issues/4298 - static const std::vector places = { - mbgl::LatLng{-16.796665, -179.999983}, // Dateline monument - mbgl::LatLng{12.9810542, 77.6345551}, // Mapbox Bengaluru, India - mbgl::LatLng{-13.15607, -74.21773}, // Mapbox Peru - mbgl::LatLng{37.77572, -122.4158818}, // Mapbox SF, USA - mbgl::LatLng{38.91318, -77.03255}, // Mapbox DC, USA + static const std::vector places = { + mln::LatLng{-16.796665, -179.999983}, // Dateline monument + mln::LatLng{12.9810542, 77.6345551}, // Mapbox Bengaluru, India + mln::LatLng{-13.15607, -74.21773}, // Mapbox Peru + mln::LatLng{37.77572, -122.4158818}, // Mapbox SF, USA + mln::LatLng{38.91318, -77.03255}, // Mapbox DC, USA }; static size_t nextPlace = 0; - mbgl::CameraOptions cameraOptions; + mln::CameraOptions cameraOptions; cameraOptions.center = places[nextPlace++]; cameraOptions.zoom = 20; cameraOptions.pitch = 30; - mbgl::AnimationOptions animationOptions(mbgl::Seconds(10)); + mln::AnimationOptions animationOptions(mln::Seconds(10)); view->map->flyTo(cameraOptions, animationOptions); nextPlace = nextPlace % places.size(); } break; @@ -498,9 +498,9 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, view->show3DExtrusions = true; view->toggle3DExtrusions(view->show3DExtrusions); if (view->animateRouteCallback) break; - view->animateRouteCallback = [](mbgl::Map *routeMap) { + view->animateRouteCallback = [](mln::Map *routeMap) { static mapbox::cheap_ruler::CheapRuler ruler{40.7}; // New York - static mapbox::geojson::geojson route{mapbox::geojson::parse(mbgl::platform::glfw::route)}; + static mapbox::geojson::geojson route{mapbox::geojson::parse(mln::platform::glfw::route)}; const auto &geometry = route.get>(); const auto &lineString = geometry.get>(); @@ -514,14 +514,14 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, auto camera = routeMap->getCameraOptions(); auto point = ruler.along(lineString, routeProgress * routeDistance); - const mbgl::LatLng center{point.y, point.x}; + const mln::LatLng center{point.y, point.x}; auto latLng = *camera.center; double bearing = ruler.bearing({latLng.longitude(), latLng.latitude()}, point); double easing = bearing - *camera.bearing; easing += easing > 180.0 ? -360.0 : easing < -180 ? 360.0 : 0; bearing = *camera.bearing + (easing / 20); routeMap->jumpTo( - mbgl::CameraOptions().withCenter(center).withZoom(18.0).withBearing(bearing).withPitch(60.0)); + mln::CameraOptions().withCenter(center).withZoom(18.0).withBearing(bearing).withPitch(60.0)); }; view->animateRouteCallback(view->map); } break; @@ -529,35 +529,35 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, view->toggle3DExtrusions(!view->show3DExtrusions); break; case GLFW_KEY_D: { - static const std::vector bounds = { - mbgl::LatLngBounds::hull(mbgl::LatLng{-45.0, -170.0}, mbgl::LatLng{45.0, 170.0}), // inside - mbgl::LatLngBounds::hull(mbgl::LatLng{-45.0, -200.0}, mbgl::LatLng{45.0, -160.0}), // left IDL - mbgl::LatLngBounds::hull(mbgl::LatLng{-45.0, 160.0}, mbgl::LatLng{45.0, 200.0}), // right IDL - mbgl::LatLngBounds()}; + static const std::vector bounds = { + mln::LatLngBounds::hull(mln::LatLng{-45.0, -170.0}, mln::LatLng{45.0, 170.0}), // inside + mln::LatLngBounds::hull(mln::LatLng{-45.0, -200.0}, mln::LatLng{45.0, -160.0}), // left IDL + mln::LatLngBounds::hull(mln::LatLng{-45.0, 160.0}, mln::LatLng{45.0, 200.0}), // right IDL + mln::LatLngBounds()}; static size_t nextBound = 0u; - static mbgl::AnnotationID boundAnnotationID = std::numeric_limits::max(); + static mln::AnnotationID boundAnnotationID = std::numeric_limits::max(); - mbgl::LatLngBounds bound = bounds[nextBound++]; + mln::LatLngBounds bound = bounds[nextBound++]; nextBound = nextBound % bounds.size(); - view->map->setBounds(mbgl::BoundOptions().withLatLngBounds(bound)); + view->map->setBounds(mln::BoundOptions().withLatLngBounds(bound)); - if (bound == mbgl::LatLngBounds()) { + if (bound == mln::LatLngBounds()) { view->map->removeAnnotation(boundAnnotationID); - boundAnnotationID = std::numeric_limits::max(); + boundAnnotationID = std::numeric_limits::max(); } else { - mbgl::Polygon rect; + mln::Polygon rect; rect.push_back({ - mbgl::Point{bound.west(), bound.north()}, - mbgl::Point{bound.east(), bound.north()}, - mbgl::Point{bound.east(), bound.south()}, - mbgl::Point{bound.west(), bound.south()}, + mln::Point{bound.west(), bound.north()}, + mln::Point{bound.east(), bound.north()}, + mln::Point{bound.east(), bound.south()}, + mln::Point{bound.west(), bound.south()}, }); - auto boundAnnotation = mbgl::FillAnnotation{ + auto boundAnnotation = mln::FillAnnotation{ rect, 0.5f, {view->makeRandomColor()}, {view->makeRandomColor()}}; - if (boundAnnotationID == std::numeric_limits::max()) { + if (boundAnnotationID == std::numeric_limits::max()) { boundAnnotationID = view->map->addAnnotation(boundAnnotation); } else { view->map->updateAnnotation(boundAnnotationID, boundAnnotation); @@ -568,9 +568,9 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, view->toggleCustomSource(); break; case GLFW_KEY_F: { - using namespace mbgl; - using namespace mbgl::style; - using namespace mbgl::style::expression::dsl; + using namespace mln; + using namespace mln::style; + using namespace mln::style::expression::dsl; auto &style = view->map->getStyle(); if (!style.getSource("states")) { @@ -579,8 +579,8 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, source->setURL(url); style.addSource(std::move(source)); - mbgl::CameraOptions cameraOptions; - cameraOptions.center = mbgl::LatLng{42.619626, -103.523181}; + mln::CameraOptions cameraOptions; + cameraOptions.center = mln::LatLng{42.619626, -103.523181}; cameraOptions.zoom = 3; cameraOptions.pitch = 0; cameraOptions.bearing = 0; @@ -590,53 +590,53 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, auto layer = style.getLayer("state-fills"); if (!layer) { auto fillLayer = std::make_unique("state-fills", "states"); - fillLayer->setFillColor(mbgl::Color{0.0, 0.0, 1.0, 0.5}); + fillLayer->setFillColor(mln::Color{0.0, 0.0, 1.0, 0.5}); fillLayer->setFillOpacity(PropertyExpression( createExpression(R"(["case", ["boolean", ["feature-state", "hover"], false], 1, 0.5])"))); style.addLayer(std::move(fillLayer)); } else { - layer->setVisibility(layer->getVisibility() == mbgl::style::VisibilityType::Visible - ? mbgl::style::VisibilityType::None - : mbgl::style::VisibilityType::Visible); + layer->setVisibility(layer->getVisibility() == mln::style::VisibilityType::Visible + ? mln::style::VisibilityType::None + : mln::style::VisibilityType::Visible); } layer = style.getLayer("state-borders"); if (!layer) { auto borderLayer = std::make_unique("state-borders", "states"); - borderLayer->setLineColor(mbgl::Color{0.0, 0.0, 1.0, 1.0}); + borderLayer->setLineColor(mln::Color{0.0, 0.0, 1.0, 1.0}); borderLayer->setLineWidth(PropertyExpression( createExpression(R"(["case", ["boolean", ["feature-state", "hover"], false], 2, 1])"))); style.addLayer(std::move(borderLayer)); } else { - layer->setVisibility(layer->getVisibility() == mbgl::style::VisibilityType::Visible - ? mbgl::style::VisibilityType::None - : mbgl::style::VisibilityType::Visible); + layer->setVisibility(layer->getVisibility() == mln::style::VisibilityType::Visible + ? mln::style::VisibilityType::None + : mln::style::VisibilityType::Visible); } } break; case GLFW_KEY_F1: { bool success = TestWriter() - .withInitialSize(mbgl::Size(view->width, view->height)) + .withInitialSize(mln::Size(view->width, view->height)) .withStyle(view->map->getStyle()) .withCameraOptions(view->map->getCameraOptions()) .write(view->testDirectory); if (success) { - mbgl::Log::Info(mbgl::Event::General, "Render test created!"); + mln::Log::Info(mln::Event::General, "Render test created!"); } else { - mbgl::Log::Error(mbgl::Event::General, - "Fail to create render test! Base directory does not " - "exist or permission denied."); + mln::Log::Error(mln::Event::General, + "Fail to create render test! Base directory does not " + "exist or permission denied."); } } break; case GLFW_KEY_U: { auto bounds = view->map->getBounds(); - if (bounds.minPitch == mbgl::util::rad2deg(mbgl::util::PITCH_MIN) && - bounds.maxPitch == mbgl::util::rad2deg(mbgl::util::PITCH_MAX)) { - mbgl::Log::Info(mbgl::Event::General, "Limiting pitch bounds to [30, 40] degrees"); - view->map->setBounds(mbgl::BoundOptions().withMinPitch(30).withMaxPitch(40)); + if (bounds.minPitch == mln::util::rad2deg(mln::util::PITCH_MIN) && + bounds.maxPitch == mln::util::rad2deg(mln::util::PITCH_MAX)) { + mln::Log::Info(mln::Event::General, "Limiting pitch bounds to [30, 40] degrees"); + view->map->setBounds(mln::BoundOptions().withMinPitch(30).withMaxPitch(40)); } else { - mbgl::Log::Info(mbgl::Event::General, "Resetting pitch bounds to [0, 60] degrees"); - view->map->setBounds(mbgl::BoundOptions().withMinPitch(0).withMaxPitch(60)); + mln::Log::Info(mln::Event::General, "Resetting pitch bounds to [0, 60] degrees"); + view->map->setBounds(mln::BoundOptions().withMinPitch(0).withMaxPitch(60)); } } break; case GLFW_KEY_H: { @@ -651,7 +651,7 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, } break; case GLFW_KEY_Y: { view->freeCameraDemoPhase = 0; - view->freeCameraDemoStartTime = mbgl::Clock::now(); + view->freeCameraDemoStartTime = mln::Clock::now(); view->invalidate(); } break; case GLFW_KEY_F6: { @@ -708,12 +708,12 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, } } -namespace mbgl { +namespace mln { namespace util { template <> -struct Interpolator { - mbgl::LatLng operator()(const mbgl::LatLng &a, const mbgl::LatLng &b, const double t) { +struct Interpolator { + mln::LatLng operator()(const mln::LatLng &a, const mln::LatLng &b, const double t) { return { interpolate(a.latitude(), b.latitude(), t), interpolate(a.longitude(), b.longitude(), t), @@ -722,28 +722,28 @@ struct Interpolator { }; } // namespace util -} // namespace mbgl +} // namespace mln void GLFWView::updateFreeCameraDemo() { MLN_TRACE_FUNC(); - const mbgl::LatLng trainStartPos = {60.171367, 24.941359}; - const mbgl::LatLng trainEndPos = {60.185147, 24.936668}; - const mbgl::LatLng cameraStartPos = {60.167443, 24.927176}; - const mbgl::LatLng cameraEndPos = {60.185107, 24.933366}; + const mln::LatLng trainStartPos = {60.171367, 24.941359}; + const mln::LatLng trainEndPos = {60.185147, 24.936668}; + const mln::LatLng cameraStartPos = {60.167443, 24.927176}; + const mln::LatLng cameraEndPos = {60.185107, 24.933366}; const double cameraStartAlt = 1000.0; const double cameraEndAlt = 150.0; const double duration = 8.0; // Interpolate between starting and ending points - std::chrono::duration deltaTime = mbgl::Clock::now() - freeCameraDemoStartTime; + std::chrono::duration deltaTime = mln::Clock::now() - freeCameraDemoStartTime; freeCameraDemoPhase = deltaTime.count() / duration; - auto trainPos = mbgl::util::interpolate(trainStartPos, trainEndPos, freeCameraDemoPhase); - auto cameraPos = mbgl::util::interpolate(cameraStartPos, cameraEndPos, freeCameraDemoPhase); - auto cameraAlt = mbgl::util::interpolate(cameraStartAlt, cameraEndAlt, freeCameraDemoPhase); + auto trainPos = mln::util::interpolate(trainStartPos, trainEndPos, freeCameraDemoPhase); + auto cameraPos = mln::util::interpolate(cameraStartPos, cameraEndPos, freeCameraDemoPhase); + auto cameraAlt = mln::util::interpolate(cameraStartAlt, cameraEndAlt, freeCameraDemoPhase); - mbgl::FreeCameraOptions camera; + mln::FreeCameraOptions camera; // Update camera position and focus point on the map with interpolated values camera.setLocation({cameraPos, cameraAlt}); @@ -756,24 +756,21 @@ void GLFWView::updateFreeCameraDemo() { } } -mbgl::Color GLFWView::makeRandomColor() const { +mln::Color GLFWView::makeRandomColor() const { const auto r = static_cast(std::rand()) / static_cast(RAND_MAX); const auto g = static_cast(std::rand()) / static_cast(RAND_MAX); const auto b = static_cast(std::rand()) / static_cast(RAND_MAX); return {r, g, b, 1.0f}; } -mbgl::Point GLFWView::makeRandomPoint() const { +mln::Point GLFWView::makeRandomPoint() const { const double x = width * static_cast(std::rand()) / RAND_MAX; const double y = height * static_cast(std::rand()) / RAND_MAX; - mbgl::LatLng latLng = map->latLngForPixel({x, y}); + mln::LatLng latLng = map->latLngForPixel({x, y}); return {latLng.longitude(), latLng.latitude()}; } -std::unique_ptr GLFWView::makeImage(const std::string &id, - int width, - int height, - float pixelRatio) { +std::unique_ptr GLFWView::makeImage(const std::string &id, int width, int height, float pixelRatio) { MLN_TRACE_FUNC(); const int r = static_cast(255 * (static_cast(std::rand()) / RAND_MAX)); @@ -783,7 +780,7 @@ std::unique_ptr GLFWView::makeImage(const std::string &id, const int w = static_cast(std::ceil(pixelRatio * width)); const int h = static_cast(std::ceil(pixelRatio * height)); - mbgl::PremultipliedImage image({static_cast(w), static_cast(h)}); + mln::PremultipliedImage image({static_cast(w), static_cast(h)}); auto data = reinterpret_cast(image.data.get()); const int dist = (w / 2) * (w / 2); for (int y = 0; y < h; y++) { @@ -799,11 +796,11 @@ std::unique_ptr GLFWView::makeImage(const std::string &id, } } - return std::make_unique(id, std::move(image), pixelRatio); + return std::make_unique(id, std::move(image), pixelRatio); } void GLFWView::nextOrientation() { - using NO = mbgl::NorthOrientation; + using NO = mln::NorthOrientation; switch (map->getMapOptions().northOrientation()) { case NO::Upwards: map->setNorthOrientation(NO::Rightwards); @@ -825,10 +822,10 @@ void GLFWView::addRandomCustomPointAnnotations(int count) { for (int i = 0; i < count; i++) { static int spriteID = 1; - const auto name = std::string{"marker-"} + mbgl::util::toString(spriteID++); + const auto name = std::string{"marker-"} + mln::util::toString(spriteID++); map->addAnnotationImage(makeImage(name, 22, 22, 1)); spriteIDs.push_back(name); - annotationIDs.push_back(map->addAnnotation(mbgl::SymbolAnnotation{makeRandomPoint(), name})); + annotationIDs.push_back(map->addAnnotation(mln::SymbolAnnotation{makeRandomPoint(), name})); } } @@ -836,7 +833,7 @@ void GLFWView::addRandomPointAnnotations(int count) { MLN_TRACE_FUNC(); for (int i = 0; i < count; ++i) { - annotationIDs.push_back(map->addAnnotation(mbgl::SymbolAnnotation{makeRandomPoint(), "default_marker"})); + annotationIDs.push_back(map->addAnnotation(mln::SymbolAnnotation{makeRandomPoint(), "default_marker"})); } } @@ -844,11 +841,11 @@ void GLFWView::addRandomLineAnnotations(int count) { MLN_TRACE_FUNC(); for (int i = 0; i < count; ++i) { - mbgl::LineString lineString; + mln::LineString lineString; for (int j = 0; j < 3; ++j) { lineString.push_back(makeRandomPoint()); } - annotationIDs.push_back(map->addAnnotation(mbgl::LineAnnotation{lineString, 1.0f, 2.0f, {makeRandomColor()}})); + annotationIDs.push_back(map->addAnnotation(mln::LineAnnotation{lineString, 1.0f, 2.0f, {makeRandomColor()}})); } } @@ -856,10 +853,10 @@ void GLFWView::addRandomShapeAnnotations(int count) { MLN_TRACE_FUNC(); for (int i = 0; i < count; ++i) { - mbgl::Polygon triangle; + mln::Polygon triangle; triangle.push_back({makeRandomPoint(), makeRandomPoint(), makeRandomPoint()}); annotationIDs.push_back( - map->addAnnotation(mbgl::FillAnnotation{triangle, 0.5f, {makeRandomColor()}, {makeRandomColor()}})); + map->addAnnotation(mln::FillAnnotation{triangle, 0.5f, {makeRandomColor()}, {makeRandomColor()}})); } } @@ -867,7 +864,7 @@ void GLFWView::addAnimatedAnnotation() { MLN_TRACE_FUNC(); const double started = glfwGetTime(); - animatedAnnotationIDs.push_back(map->addAnnotation(mbgl::SymbolAnnotation{{0, 0}, "default_marker"})); + animatedAnnotationIDs.push_back(map->addAnnotation(mln::SymbolAnnotation{{0, 0}, "default_marker"})); animatedAnnotationAddedTimes.push_back(started); } @@ -881,25 +878,25 @@ void GLFWView::updateAnimatedAnnotations() { const double period = 10; const double x = dt / period * 360 - 180; const double y = std::sin(dt / period * pi * 2.0) * 80; - map->updateAnnotation(animatedAnnotationIDs[i], mbgl::SymbolAnnotation{{x, y}, "default_marker"}); + map->updateAnnotation(animatedAnnotationIDs[i], mln::SymbolAnnotation{{x, y}, "default_marker"}); } } void GLFWView::cycleDebugOptions() { auto debug = map->getDebug(); - if (debug & mbgl::MapDebugOptions::Overdraw) - debug = mbgl::MapDebugOptions::NoDebug; - else if (debug & mbgl::MapDebugOptions::Collision) - debug = mbgl::MapDebugOptions::Overdraw; - else if (debug & mbgl::MapDebugOptions::Timestamps) - debug = debug | mbgl::MapDebugOptions::Collision; - else if (debug & mbgl::MapDebugOptions::ParseStatus) - debug = debug | mbgl::MapDebugOptions::Timestamps; - else if (debug & mbgl::MapDebugOptions::TileBorders) - debug = debug | mbgl::MapDebugOptions::ParseStatus; + if (debug & mln::MapDebugOptions::Overdraw) + debug = mln::MapDebugOptions::NoDebug; + else if (debug & mln::MapDebugOptions::Collision) + debug = mln::MapDebugOptions::Overdraw; + else if (debug & mln::MapDebugOptions::Timestamps) + debug = debug | mln::MapDebugOptions::Collision; + else if (debug & mln::MapDebugOptions::ParseStatus) + debug = debug | mln::MapDebugOptions::Timestamps; + else if (debug & mln::MapDebugOptions::TileBorders) + debug = debug | mln::MapDebugOptions::ParseStatus; else - debug = mbgl::MapDebugOptions::TileBorders; + debug = mln::MapDebugOptions::TileBorders; map->setDebug(debug); } @@ -937,7 +934,7 @@ void GLFWView::toggleCustomDrawableStyle() { const auto &existingLayer = style.getLayer(identifier); if (!existingLayer) { - style.addLayer(std::make_unique( + style.addLayer(std::make_unique( identifier, std::make_unique(MLN_ASSETS_PATH))); } else { style.removeLayer(identifier); @@ -950,30 +947,30 @@ void GLFWView::makeSnapshot(bool withOverlay) { MLN_TRACE_FUNC(); if (!snapshotter || snapshotter->getStyleURL() != map->getStyle().getURL()) { - snapshotter = std::make_unique(map->getMapOptions().size(), - map->getMapOptions().pixelRatio(), - mapResourceOptions, - mapClientOptions, - *snapshotterObserver); + snapshotter = std::make_unique(map->getMapOptions().size(), + map->getMapOptions().pixelRatio(), + mapResourceOptions, + mapClientOptions, + *snapshotterObserver); snapshotter->setStyleURL(map->getStyle().getURL()); } auto snapshot = [&] { snapshotter->setCameraOptions(map->getCameraOptions()); snapshotter->snapshot([](const std::exception_ptr &ptr, - mbgl::PremultipliedImage image, - const mbgl::MapSnapshotter::Attributions &, - const mbgl::MapSnapshotter::PointForFn &, - const mbgl::MapSnapshotter::LatLngForFn &) { + mln::PremultipliedImage image, + const mln::MapSnapshotter::Attributions &, + const mln::MapSnapshotter::PointForFn &, + const mln::MapSnapshotter::LatLngForFn &) { if (!ptr) { std::ostringstream oss; oss << "Made snapshot './snapshot.png' with size w:" << image.size.width << "px h:" << image.size.height << "px"; - mbgl::Log::Info(mbgl::Event::General, oss.str()); + mln::Log::Info(mln::Event::General, oss.str()); std::ofstream file("./snapshot.png", std::ios::out | std::ios::binary); - file << mbgl::encodePNG(image); + file << mln::encodePNG(image); } else { - mbgl::Log::Error(mbgl::Event::General, "Failed to make a snapshot!"); + mln::Log::Error(mln::Event::General, "Failed to make a snapshot!"); } }); }; @@ -1009,10 +1006,10 @@ void GLFWView::onScroll(GLFWwindow *window, double /*xOffset*/, double yOffset) scale = 1.0 / scale; } - view->map->scaleBy(scale, mbgl::ScreenCoordinate{view->lastX, view->lastY}); + view->map->scaleBy(scale, mln::ScreenCoordinate{view->lastX, view->lastY}); #if defined(MLN_RENDER_BACKEND_OPENGL) && !defined(MBGL_LAYER_CUSTOM_DISABLE_ALL) if (view->puck && view->puckFollowsCameraCenter) { - mbgl::LatLng mapCenter = view->map->getCameraOptions().center.value(); + mln::LatLng mapCenter = view->map->getCameraOptions().center.value(); view->puck->setLocation(toArray(mapCenter)); } #endif @@ -1076,12 +1073,12 @@ void GLFWView::onMouseClick(GLFWwindow *window, int button, int action, int modi if (now - view->lastClick < 0.4 /* ms */) { if (modifiers & GLFW_MOD_SHIFT) { view->map->scaleBy(0.5, - mbgl::ScreenCoordinate{view->lastX, view->lastY}, - mbgl::AnimationOptions{{mbgl::Milliseconds(500)}}); + mln::ScreenCoordinate{view->lastX, view->lastY}, + mln::AnimationOptions{{mln::Milliseconds(500)}}); } else { view->map->scaleBy(2.0, - mbgl::ScreenCoordinate{view->lastX, view->lastY}, - mbgl::AnimationOptions{{mbgl::Milliseconds(500)}}); + mln::ScreenCoordinate{view->lastX, view->lastY}, + mln::AnimationOptions{{mln::Milliseconds(500)}}); } } view->lastClick = now; @@ -1097,7 +1094,7 @@ void GLFWView::onMouseMove(GLFWwindow *window, double x, double y) { const double dx = x - view->lastX; const double dy = y - view->lastY; if (dx || dy) { - view->map->moveBy(mbgl::ScreenCoordinate{dx, dy}); + view->map->moveBy(mln::ScreenCoordinate{dx, dy}); } } else if (view->rotating) { view->map->rotateBy({view->lastX, view->lastY}, {x, y}); @@ -1111,16 +1108,16 @@ void GLFWView::onMouseMove(GLFWwindow *window, double x, double y) { view->lastY = y; #if defined(MLN_RENDER_BACKEND_OPENGL) && !defined(MBGL_LAYER_CUSTOM_DISABLE_ALL) if (view->puck && view->puckFollowsCameraCenter) { - mbgl::LatLng mapCenter = view->map->getCameraOptions().center.value(); + mln::LatLng mapCenter = view->map->getCameraOptions().center.value(); view->puck->setLocation(toArray(mapCenter)); } #endif auto &style = view->map->getStyle(); if (style.getLayer("state-fills")) { - auto screenCoordinate = mbgl::ScreenCoordinate{view->lastX, view->lastY}; - const mbgl::RenderedQueryOptions queryOptions({{{"state-fills"}}, {}}); + auto screenCoordinate = mln::ScreenCoordinate{view->lastX, view->lastY}; + const mln::RenderedQueryOptions queryOptions({{{"state-fills"}}, {}}); auto result = view->rendererFrontend->getRenderer()->queryRenderedFeatures(screenCoordinate, queryOptions); - using namespace mbgl; + using namespace mln; FeatureState newState; if (!result.empty()) { @@ -1188,7 +1185,7 @@ void GLFWView::render() { updateAnimatedAnnotations(); - mbgl::gfx::BackendScope scope{backend->getRendererBackend()}; + mln::gfx::BackendScope scope{backend->getRendererBackend()}; rendererFrontend->render(); @@ -1230,14 +1227,14 @@ void GLFWView::run() { }; // Cap frame rate to 60hz if benchmark mode is disabled - auto tickDuration = mbgl::Milliseconds(1000 / 60); + auto tickDuration = mln::Milliseconds(1000 / 60); if (benchmark) { // frameTick.start internally uses libuv which uses milliseconds resolution // tickDuration is set to 1ms in benchmark mode which limits FPS to 1000 // 1000 should more than enough for benchmarking purposes - tickDuration = mbgl::Milliseconds(1); + tickDuration = mln::Milliseconds(1); } - frameTick.start(mbgl::Duration::zero(), tickDuration, callback); + frameTick.start(mln::Duration::zero(), tickDuration, callback); #if defined(__APPLE__) while (!glfwWindowShouldClose(window)) runLoop.run(); #else @@ -1249,7 +1246,7 @@ float GLFWView::getPixelRatio() const { return pixelRatio; } -mbgl::Size GLFWView::getSize() const { +mln::Size GLFWView::getSize() const { return {static_cast(width), static_cast(height)}; } @@ -1271,7 +1268,7 @@ void GLFWView::report(float duration) { std::ostringstream oss; oss.precision(2); oss << "Frame time: " << std::fixed << frameTime << "ms (" << 1000 / frameTime << "fps)"; - mbgl::Log::Info(mbgl::Event::Render, oss.str()); + mln::Log::Info(mln::Event::Render, oss.str()); frames = 0; frameTime = 0; @@ -1319,13 +1316,13 @@ void GLFWView::toggleCustomSource() { MLN_TRACE_FUNC(); if (!map->getStyle().getSource("custom")) { - mbgl::style::CustomGeometrySource::Options options; - options.cancelTileFunction = [](const mbgl::CanonicalTileID &) { + mln::style::CustomGeometrySource::Options options; + options.cancelTileFunction = [](const mln::CanonicalTileID &) { }; - options.fetchTileFunction = [&](const mbgl::CanonicalTileID &tileID) { + options.fetchTileFunction = [&](const mln::CanonicalTileID &tileID) { double gridSpacing = 0.1; - mbgl::FeatureCollection features; - const mbgl::LatLngBounds bounds(tileID); + mln::FeatureCollection features; + const mln::LatLngBounds bounds(tileID); for (double y = ceil(bounds.north() / gridSpacing) * gridSpacing; y >= floor(bounds.south() / gridSpacing) * gridSpacing; y -= gridSpacing) { @@ -1345,25 +1342,25 @@ void GLFWView::toggleCustomSource() { features.emplace_back(gridLine); } - auto source = static_cast(map->getStyle().getSource("custom")); + auto source = static_cast(map->getStyle().getSource("custom")); if (source) { source->setTileData(tileID, features); source->invalidateTile(tileID); } }; - map->getStyle().addSource(std::make_unique("custom", options)); + map->getStyle().addSource(std::make_unique("custom", options)); } auto *layer = map->getStyle().getLayer("grid"); if (!layer) { - auto lineLayer = std::make_unique("grid", "custom"); - lineLayer->setLineColor(mbgl::Color{1.0, 0.0, 0.0, 1.0}); + auto lineLayer = std::make_unique("grid", "custom"); + lineLayer->setLineColor(mln::Color{1.0, 0.0, 0.0, 1.0}); map->getStyle().addLayer(std::move(lineLayer)); } else { - layer->setVisibility(layer->getVisibility() == mbgl::style::VisibilityType::Visible - ? mbgl::style::VisibilityType::None - : mbgl::style::VisibilityType::Visible); + layer->setVisibility(layer->getVisibility() == mln::style::VisibilityType::Visible + ? mln::style::VisibilityType::None + : mln::style::VisibilityType::Visible); } } @@ -1371,59 +1368,59 @@ void GLFWView::toggleLocationIndicatorLayer() { MLN_TRACE_FUNC(); #ifdef ENABLE_LOCATION_INDICATOR - puck = static_cast(map->getStyle().getLayer("puck")); - static const mbgl::LatLng puckLocation{35.683389, 139.76525}; // A location on the crossing of 4 tiles + puck = static_cast(map->getStyle().getLayer("puck")); + static const mln::LatLng puckLocation{35.683389, 139.76525}; // A location on the crossing of 4 tiles if (puck == nullptr) { - auto puckLayer = std::make_unique("puck"); + auto puckLayer = std::make_unique("puck"); puckLayer->setLocationTransition( - mbgl::style::TransitionOptions(mbgl::Duration::zero(), - mbgl::Duration::zero())); // Note: This is used here for demo purpose. - // SDKs should not use this, or else the location - // will "jump" to positions. + mln::style::TransitionOptions(mln::Duration::zero(), + mln::Duration::zero())); // Note: This is used here for demo purpose. + // SDKs should not use this, or else the location + // will "jump" to positions. puckLayer->setLocation(toArray(puckLocation)); puckLayer->setAccuracyRadius(50); puckLayer->setAccuracyRadiusColor( - premultiply(mbgl::Color{0.0f, 1.0f, 0.0f, 0.2f})); // Note: these must be fed premultiplied + premultiply(mln::Color{0.0f, 1.0f, 0.0f, 0.2f})); // Note: these must be fed premultiplied - puckLayer->setBearingTransition(mbgl::style::TransitionOptions(mbgl::Duration::zero(), mbgl::Duration::zero())); - puckLayer->setBearing(mbgl::style::Rotation(0.0)); - puckLayer->setAccuracyRadiusBorderColor(premultiply(mbgl::Color{0.0f, 1.0f, 0.2f, 0.4f})); + puckLayer->setBearingTransition(mln::style::TransitionOptions(mln::Duration::zero(), mln::Duration::zero())); + puckLayer->setBearing(mln::style::Rotation(0.0)); + puckLayer->setAccuracyRadiusBorderColor(premultiply(mln::Color{0.0f, 1.0f, 0.2f, 0.4f})); puckLayer->setTopImageSize(0.18f); puckLayer->setBearingImageSize(0.26f); puckLayer->setShadowImageSize(0.2f); puckLayer->setImageTiltDisplacement(7.0f); // set to 0 for a "flat" puck puckLayer->setPerspectiveCompensation(0.9f); - map->getStyle().addImage(std::make_unique( - "puck.png", mbgl::decodeImage(mbgl::util::read_file(mbglPuckAssetsPath + "puck.png")), 1.0f)); + map->getStyle().addImage(std::make_unique( + "puck.png", mln::decodeImage(mln::util::read_file(mbglPuckAssetsPath + "puck.png")), 1.0f)); - map->getStyle().addImage(std::make_unique( - "puck_shadow.png", mbgl::decodeImage(mbgl::util::read_file(mbglPuckAssetsPath + "puck_shadow.png")), 1.0f)); + map->getStyle().addImage(std::make_unique( + "puck_shadow.png", mln::decodeImage(mln::util::read_file(mbglPuckAssetsPath + "puck_shadow.png")), 1.0f)); - map->getStyle().addImage(std::make_unique( - "puck_hat.png", mbgl::decodeImage(mbgl::util::read_file(mbglPuckAssetsPath + "puck_hat.png")), 1.0f)); + map->getStyle().addImage(std::make_unique( + "puck_hat.png", mln::decodeImage(mln::util::read_file(mbglPuckAssetsPath + "puck_hat.png")), 1.0f)); - puckLayer->setBearingImage(mbgl::style::expression::Image("puck.png")); - puckLayer->setShadowImage(mbgl::style::expression::Image("puck_shadow.png")); - puckLayer->setTopImage(mbgl::style::expression::Image("puck_hat.png")); + puckLayer->setBearingImage(mln::style::expression::Image("puck.png")); + puckLayer->setShadowImage(mln::style::expression::Image("puck_shadow.png")); + puckLayer->setTopImage(mln::style::expression::Image("puck_hat.png")); puck = puckLayer.get(); map->getStyle().addLayer(std::move(puckLayer)); } else { - bool visible = puck->getVisibility() == mbgl::style::VisibilityType::Visible; + bool visible = puck->getVisibility() == mln::style::VisibilityType::Visible; if (visible) { if (!puckFollowsCameraCenter) { - mbgl::LatLng mapCenter = map->getCameraOptions().center.value(); + mln::LatLng mapCenter = map->getCameraOptions().center.value(); puck->setLocation(toArray(mapCenter)); puckFollowsCameraCenter = true; } else { puckFollowsCameraCenter = false; - puck->setVisibility(mbgl::style::VisibilityType(mbgl::style::VisibilityType::None)); + puck->setVisibility(mln::style::VisibilityType(mln::style::VisibilityType::None)); } } else { puck->setLocation(toArray(puckLocation)); - puck->setVisibility(mbgl::style::VisibilityType(mbgl::style::VisibilityType::Visible)); + puck->setVisibility(mln::style::VisibilityType(mln::style::VisibilityType::Visible)); puckFollowsCameraCenter = false; } } @@ -1436,11 +1433,11 @@ void GLFWView::onWillStartRenderingFrame() { MLN_TRACE_FUNC(); #ifdef ENABLE_LOCATION_INDICATOR - puck = static_cast(map->getStyle().getLayer("puck")); + puck = static_cast(map->getStyle().getLayer("puck")); if (puck) { - uint64_t ns = mbgl::Clock::now().time_since_epoch().count(); + uint64_t ns = mln::Clock::now().time_since_epoch().count(); const double bearing = static_cast(ns % 2000000000) / 2000000000.0 * 360.0; - puck->setBearing(mbgl::style::Rotation(bearing)); + puck->setBearing(mln::style::Rotation(bearing)); } #endif } diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp index 51fc5b33d..3430ad3d7 100644 --- a/platform/glfw/glfw_view.hpp +++ b/platform/glfw/glfw_view.hpp @@ -24,27 +24,27 @@ class GLFWBackend; class GLFWRendererFrontend; class SnapshotObserver; -namespace mbgl { +namespace mln { namespace gfx { class RendererBackend; } // namespace gfx -} // namespace mbgl +} // namespace mln -class GLFWView : public mbgl::MapObserver { +class GLFWView : public mln::MapObserver { public: GLFWView(bool fullscreen, bool benchmark, - const mbgl::ResourceOptions &resourceOptions, - const mbgl::ClientOptions &clientOptions); + const mln::ResourceOptions &resourceOptions, + const mln::ClientOptions &clientOptions); ~GLFWView() override; float getPixelRatio() const; - void setMap(mbgl::Map *); + void setMap(mln::Map *); void setRenderFrontend(GLFWRendererFrontend *); - mbgl::gfx::RendererBackend &getRendererBackend(); + mln::gfx::RendererBackend &getRendererBackend(); void setTestDirectory(std::string dir) { testDirectory = std::move(dir); }; @@ -66,14 +66,14 @@ public: void invalidate(); - mbgl::Size getSize() const; + mln::Size getSize() const; - // mbgl::MapObserver implementation + // mln::MapObserver implementation void onDidFinishLoadingStyle() override; void onWillStartRenderingFrame() override; protected: - // mbgl::Backend implementation + // mln::Backend implementation private: // Window callbacks @@ -91,12 +91,9 @@ private: void render(); - mbgl::Color makeRandomColor() const; - mbgl::Point makeRandomPoint() const; - static std::unique_ptr makeImage(const std::string &id, - int width, - int height, - float pixelRatio); + mln::Color makeRandomColor() const; + mln::Point makeRandomPoint() const; + static std::unique_ptr makeImage(const std::string &id, int width, int height, float pixelRatio); void nextOrientation(); @@ -117,23 +114,23 @@ private: void toggleCustomDrawableStyle(); void makeSnapshot(bool withOverlay = false); - mbgl::AnnotationIDs annotationIDs; + mln::AnnotationIDs annotationIDs; std::vector spriteIDs; - mbgl::AnnotationIDs animatedAnnotationIDs; + mln::AnnotationIDs animatedAnnotationIDs; std::vector animatedAnnotationAddedTimes; private: void toggle3DExtrusions(bool visible); - mbgl::Map *map = nullptr; + mln::Map *map = nullptr; GLFWRendererFrontend *rendererFrontend = nullptr; std::unique_ptr backend; std::string testDirectory = "."; double freeCameraDemoPhase = -1; - mbgl::TimePoint freeCameraDemoStartTime; + mln::TimePoint freeCameraDemoStartTime; bool fullscreen = false; const bool benchmark = false; bool tracking = false; @@ -158,21 +155,21 @@ private: std::function pauseResumeCallback; std::function onlineStatusCallback; std::function resetDatabaseCallback; - std::function animateRouteCallback; + std::function animateRouteCallback; - mbgl::util::RunLoop runLoop; - mbgl::util::Timer frameTick; + mln::util::RunLoop runLoop; + mln::util::Timer frameTick; GLFWwindow *window = nullptr; bool dirty = false; std::optional featureID; - std::unique_ptr snapshotter; + std::unique_ptr snapshotter; std::unique_ptr snapshotterObserver; - mbgl::ResourceOptions mapResourceOptions; - mbgl::ClientOptions mapClientOptions; + mln::ResourceOptions mapResourceOptions; + mln::ClientOptions mapClientOptions; #ifdef ENABLE_LOCATION_INDICATOR bool puckFollowsCameraCenter = false; - mbgl::style::LocationIndicatorLayer *puck = nullptr; + mln::style::LocationIndicatorLayer *puck = nullptr; #endif }; diff --git a/platform/glfw/glfw_vulkan_backend.cpp b/platform/glfw/glfw_vulkan_backend.cpp index 650ff38a8..820026086 100644 --- a/platform/glfw/glfw_vulkan_backend.cpp +++ b/platform/glfw/glfw_vulkan_backend.cpp @@ -104,8 +104,8 @@ public: uint32_t getQueueIndex() { return graphicsQueueIndex; } private: - mbgl::vulkan::DynamicLoader dynamicLoader; - mbgl::vulkan::DispatchLoaderDynamic dispatcher; + mln::vulkan::DynamicLoader dynamicLoader; + mln::vulkan::DispatchLoaderDynamic dispatcher; vk::UniqueInstance instance; vk::PhysicalDevice physicalDevice; @@ -115,7 +115,7 @@ private: #endif -class GLFWVulkanRenderableResource final : public mbgl::vulkan::SurfaceRenderableResource { +class GLFWVulkanRenderableResource final : public mln::vulkan::SurfaceRenderableResource { public: explicit GLFWVulkanRenderableResource(GLFWVulkanBackend& backend_, bool capFrameRate) : SurfaceRenderableResource(backend_, @@ -133,7 +133,7 @@ public: if (result != VK_SUCCESS) throw std::runtime_error("Failed to create glfw window surface"); surface = vk::UniqueSurfaceKHR(surface_, - mbgl::vulkan::ObjectDestroy( + mln::vulkan::ObjectDestroy( backendImpl.getInstance().get(), nullptr, backendImpl.getDispatcher())); } @@ -141,13 +141,13 @@ public: }; GLFWVulkanBackend::GLFWVulkanBackend(GLFWwindow* window_, const bool capFrameRate) - : mbgl::vulkan::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::vulkan::Renderable( + : mln::vulkan::RendererBackend(mln::gfx::ContextMode::Unique), + mln::vulkan::Renderable( [window_] { int fbWidth; int fbHeight; glfwGetFramebufferSize(window_, &fbWidth, &fbHeight); - return mbgl::Size{static_cast(fbWidth), static_cast(fbHeight)}; + return mln::Size{static_cast(fbWidth), static_cast(fbHeight)}; }(), std::make_unique(*this, capFrameRate)), window(window_) { @@ -156,19 +156,19 @@ GLFWVulkanBackend::GLFWVulkanBackend(GLFWwindow* window_, const bool capFrameRat GLFWVulkanBackend::~GLFWVulkanBackend() {} -mbgl::Size GLFWVulkanBackend::getSize() const { +mln::Size GLFWVulkanBackend::getSize() const { return size; } -void GLFWVulkanBackend::setSize(const mbgl::Size newSize) { +void GLFWVulkanBackend::setSize(const mln::Size newSize) { size = newSize; - auto& contextImpl = static_cast(*context); + auto& contextImpl = static_cast(*context); contextImpl.requestSurfaceUpdate(); } std::vector GLFWVulkanBackend::getInstanceExtensions() { - auto extensions = mbgl::vulkan::RendererBackend::getInstanceExtensions(); + auto extensions = mln::vulkan::RendererBackend::getInstanceExtensions(); uint32_t glfwExtensionCount = 0; const char** glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount); @@ -185,7 +185,7 @@ void GLFWVulkanBackend::initInstance() { // this method is required to set `instance` to a valid vkInstance instance = vk::UniqueInstance(VkContext::shared().getInstance(), - mbgl::vulkan::ObjectDestroy(nullptr, dispatcher)); + mln::vulkan::ObjectDestroy(nullptr, dispatcher)); // debug builds also require: // - enabling either `VK_EXT_debug_utils` (and updating `debugUtilsEnabled`) or `VK_EXT_debug_report` extension @@ -202,7 +202,7 @@ void GLFWVulkanBackend::initDevice() { physicalDevice = VkContext::shared().getPhysicalDevice(); device = vk::UniqueDevice(VkContext::shared().getDevice(), - mbgl::vulkan::ObjectDestroy(nullptr, dispatcher)); + mln::vulkan::ObjectDestroy(nullptr, dispatcher)); graphicsQueueIndex = presentQueueIndex = VkContext::shared().getQueueIndex(); physicalDeviceFeatures = vk::PhysicalDeviceFeatures(); @@ -210,13 +210,13 @@ void GLFWVulkanBackend::initDevice() { #endif -namespace mbgl { +namespace mln { namespace gfx { template <> -std::unique_ptr Backend::Create(GLFWwindow* window, bool capFrameRate) { +std::unique_ptr Backend::Create(GLFWwindow* window, bool capFrameRate) { return std::make_unique(window, capFrameRate); } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/platform/glfw/glfw_vulkan_backend.hpp b/platform/glfw/glfw_vulkan_backend.hpp index 36ef1c05a..a9aa2834a 100644 --- a/platform/glfw/glfw_vulkan_backend.hpp +++ b/platform/glfw/glfw_vulkan_backend.hpp @@ -12,8 +12,8 @@ struct GLFWwindow; class GLFWVulkanBackend final : public GLFWBackend, - public mbgl::vulkan::RendererBackend, - public mbgl::vulkan::Renderable { + public mln::vulkan::RendererBackend, + public mln::vulkan::Renderable { public: GLFWVulkanBackend(GLFWwindow*, bool capFrameRate); ~GLFWVulkanBackend() override; @@ -22,13 +22,13 @@ public: // GLFWRendererBackend implementation public: - mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; } - mbgl::Size getSize() const override; - void setSize(mbgl::Size) override; + mln::gfx::RendererBackend& getRendererBackend() override { return *this; } + mln::Size getSize() const override; + void setSize(mln::Size) override; - // mbgl::gfx::RendererBackend implementation + // mln::gfx::RendererBackend implementation public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } protected: std::vector getInstanceExtensions() override; diff --git a/platform/glfw/glfw_webgpu_backend.hpp b/platform/glfw/glfw_webgpu_backend.hpp index 872b022eb..74058fa41 100644 --- a/platform/glfw/glfw_webgpu_backend.hpp +++ b/platform/glfw/glfw_webgpu_backend.hpp @@ -24,7 +24,7 @@ class Adapter; // Multiple inheritance: GLFWBackend for window management, // webgpu::RendererBackend for rendering, gfx::Renderable for framebuffer -class GLFWWebGPUBackend final : public GLFWBackend, public mbgl::webgpu::RendererBackend, public mbgl::gfx::Renderable { +class GLFWWebGPUBackend final : public GLFWBackend, public mln::webgpu::RendererBackend, public mln::gfx::Renderable { public: GLFWWebGPUBackend(GLFWwindow* window, bool capFrameRate); ~GLFWWebGPUBackend() override; @@ -33,13 +33,13 @@ public: // GLFWBackend implementation public: - mbgl::gfx::RendererBackend& getRendererBackend() override; - mbgl::Size getSize() const override; - void setSize(mbgl::Size) override; + mln::gfx::RendererBackend& getRendererBackend() override; + mln::Size getSize() const override; + void setSize(mln::Size) override; - // mbgl::gfx::RendererBackend implementation + // mln::gfx::RendererBackend implementation public: - mbgl::gfx::Renderable& getDefaultRenderable() override; + mln::gfx::Renderable& getDefaultRenderable() override; protected: void activate() override; @@ -50,7 +50,7 @@ public: // Override virtual methods from RendererBackend void* getCurrentTextureView() override; void* getDepthStencilView() override; - mbgl::Size getFramebufferSize() const override; + mln::Size getFramebufferSize() const override; private: class SpinLock { @@ -101,7 +101,7 @@ private: // Surface state tracking std::atomic surfaceConfigured{false}; std::atomic surfaceNeedsReconfigure{false}; - mbgl::Size lastConfiguredSize{0, 0}; + mln::Size lastConfiguredSize{0, 0}; // Error recovery std::atomic consecutiveErrors{0}; diff --git a/platform/glfw/glfw_webgpu_backend_impl.ipp b/platform/glfw/glfw_webgpu_backend_impl.ipp index 9dafa0e05..69d381dfc 100644 --- a/platform/glfw/glfw_webgpu_backend_impl.ipp +++ b/platform/glfw/glfw_webgpu_backend_impl.ipp @@ -83,14 +83,14 @@ namespace { #if MLN_WEBGPU_IMPL_DAWN void logUncapturedError(const wgpu::Device&, wgpu::ErrorType type, wgpu::StringView message) { - mbgl::Log::Error(mbgl::Event::Render, + mln::Log::Error(mln::Event::Render, std::string("Dawn validation error [") + std::to_string(static_cast(type)) + "] " + (message.data ? std::string(message.data, message.length) : std::string())); } void logDeviceLost(const wgpu::Device&, wgpu::DeviceLostReason reason, wgpu::StringView message) { - mbgl::Log::Error(mbgl::Event::Render, + mln::Log::Error(mln::Event::Render, std::string("Dawn device lost [") + std::to_string(static_cast(reason)) + "] " + (message.data ? std::string(message.data, message.length) : std::string())); @@ -164,7 +164,7 @@ MTLPixelFormat toMetalPixelFormat(wgpu::TextureFormat format) { // Forward declaration class GLFWWebGPUBackend; -namespace mbgl { +namespace mln { // WebGPU-specific RenderableResource implementation (similar to Metal's) class WebGPURenderableResource final : public webgpu::RenderableResource { @@ -184,7 +184,7 @@ public: backend.swap(); } - const mbgl::webgpu::RendererBackend& getBackend() const override { + const mln::webgpu::RendererBackend& getBackend() const override { return backend; } @@ -219,11 +219,11 @@ private: namespace gfx { template <> -std::unique_ptr Backend::Create(GLFWwindow* window, bool capFrameRate) { +std::unique_ptr Backend::Create(GLFWwindow* window, bool capFrameRate) { return std::make_unique(window, capFrameRate); } } // namespace gfx -} // namespace mbgl +} // namespace mln void GLFWWebGPUBackend::SpinLock::lock() { while (flag.test_and_set(std::memory_order_acquire)) { @@ -237,17 +237,17 @@ void GLFWWebGPUBackend::SpinLock::unlock() { GLFWWebGPUBackend::GLFWWebGPUBackend(GLFWwindow* window_, bool capFrameRate) : GLFWBackend(), - mbgl::webgpu::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable([window_] { + mln::webgpu::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable([window_] { int fbWidth = 0; int fbHeight = 0; if (window_) { glfwGetFramebufferSize(window_, &fbWidth, &fbHeight); } - return mbgl::Size{static_cast(std::max(fbWidth, 0)), + return mln::Size{static_cast(std::max(fbWidth, 0)), static_cast(std::max(fbHeight, 0))}; }(), - std::make_unique(*this)), + std::make_unique(*this)), window(window_), enableVSync(capFrameRate) { @@ -321,14 +321,14 @@ GLFWWebGPUBackend::GLFWWebGPUBackend(GLFWwindow* window_, bool capFrameRate) if (isMatch) { selectedIndex = i; matched = true; - mbgl::Log::Info(mbgl::Event::Render, + mln::Log::Info(mln::Event::Render, std::string("WebGPU: Forcing adapter backend to ") + backendTypeToString(candidate)); break; } } if (!matched) { - mbgl::Log::Warning(mbgl::Event::Render, + mln::Log::Warning(mln::Event::Render, "WebGPU: Requested backend not available, using default adapter"); } } @@ -338,7 +338,7 @@ GLFWWebGPUBackend::GLFWWebGPUBackend(GLFWwindow* window_, bool capFrameRate) { WGPUAdapterInfo info = WGPU_ADAPTER_INFO_INIT; if (wgpuAdapterGetInfo(selectedAdapter.Get(), &info) == WGPUStatus_Success) { - mbgl::Log::Info(mbgl::Event::Render, + mln::Log::Info(mln::Event::Render, std::string("WebGPU: Selected adapter backend = ") + backendTypeToString(info.backendType) + ", name = " + @@ -353,7 +353,7 @@ GLFWWebGPUBackend::GLFWWebGPUBackend(GLFWwindow* window_, bool capFrameRate) { WGPUAdapterInfo info = {}; if (wgpuAdapterGetInfo(static_cast(selectedAdapter), &info) == WGPUStatus_Success) { - mbgl::Log::Info(mbgl::Event::Render, + mln::Log::Info(mln::Event::Render, std::string("WebGPU: Selected adapter backend = ") + backendTypeToString(info.backendType) + ", name = " + @@ -416,7 +416,7 @@ GLFWWebGPUBackend::GLFWWebGPUBackend(GLFWwindow* window_, bool capFrameRate) WGPUDevice rawDevice = selectedAdapter.CreateDevice(&deviceDesc); if (!rawDevice) { // Retry once after delay - mbgl::Log::Warning(mbgl::Event::Render, "Failed to create device, retrying..."); + mln::Log::Warning(mln::Event::Render, "Failed to create device, retrying..."); std::this_thread::sleep_for(std::chrono::milliseconds(100)); rawDevice = selectedAdapter.CreateDevice(&deviceDesc); if (!rawDevice) { @@ -621,7 +621,7 @@ GLFWWebGPUBackend::GLFWWebGPUBackend(GLFWwindow* window_, bool capFrameRate) struct wl_surface* waylandSurface = glfwGetWaylandWindow(window); if (waylandDisplay && waylandSurface) { - mbgl::Log::Warning(mbgl::Event::Render, "Attempting Wayland surface (experimental)"); + mln::Log::Warning(mln::Event::Render, "Attempting Wayland surface (experimental)"); wgpu::SurfaceDescriptorFromWaylandSurface waylandDesc = {}; waylandDesc.display = waylandDisplay; @@ -798,13 +798,13 @@ GLFWWebGPUBackend::~GLFWWebGPUBackend() { } -mbgl::gfx::RendererBackend& GLFWWebGPUBackend::getRendererBackend() { - // We inherit from mbgl::webgpu::RendererBackend which is a mbgl::gfx::RendererBackend +mln::gfx::RendererBackend& GLFWWebGPUBackend::getRendererBackend() { + // We inherit from mln::webgpu::RendererBackend which is a mln::gfx::RendererBackend return *this; } -mbgl::gfx::Renderable& GLFWWebGPUBackend::getDefaultRenderable() { - // We directly inherit from mbgl::gfx::Renderable +mln::gfx::Renderable& GLFWWebGPUBackend::getDefaultRenderable() { + // We directly inherit from mln::gfx::Renderable return *this; } @@ -896,11 +896,11 @@ void GLFWWebGPUBackend::deactivate() { // WebGPU doesn't need explicit context deactivation like OpenGL } -mbgl::Size GLFWWebGPUBackend::getSize() const { +mln::Size GLFWWebGPUBackend::getSize() const { return size; } -void GLFWWebGPUBackend::setSize(mbgl::Size newSize) { +void GLFWWebGPUBackend::setSize(mln::Size newSize) { // Update swap chain size if needed if (size != newSize) { #ifdef __APPLE__ @@ -1066,7 +1066,7 @@ void* GLFWWebGPUBackend::getCurrentTextureView() { #endif } -mbgl::Size GLFWWebGPUBackend::getFramebufferSize() const { +mln::Size GLFWWebGPUBackend::getFramebufferSize() const { return getSize(); } @@ -1204,7 +1204,7 @@ void GLFWWebGPUBackend::createDepthStencilTexture(uint32_t width, uint32_t heigh #endif if (!depthStencilTexture) { - mbgl::Log::Warning(mbgl::Event::Render, "WebGPU: Failed to create depth/stencil texture"); + mln::Log::Warning(mln::Event::Render, "WebGPU: Failed to create depth/stencil texture"); depthStencilFormat = wgpu::TextureFormat::Undefined; setDepthStencilFormat(depthStencilFormat); return; @@ -1233,7 +1233,7 @@ void GLFWWebGPUBackend::createDepthStencilTexture(uint32_t width, uint32_t heigh #endif if (!depthStencilView) { - mbgl::Log::Warning(mbgl::Event::Render, "WebGPU: Failed to create depth/stencil view"); + mln::Log::Warning(mln::Event::Render, "WebGPU: Failed to create depth/stencil view"); depthStencilTexture = nullptr; depthStencilFormat = wgpu::TextureFormat::Undefined; setDepthStencilFormat(depthStencilFormat); diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp index 4b81a0bc0..a960bca9e 100644 --- a/platform/glfw/main.cpp +++ b/platform/glfw/main.cpp @@ -30,7 +30,7 @@ GLFWView* view = nullptr; void quit_handler(int) { if (view) { - mbgl::Log::Info(mbgl::Event::Setup, "waiting for quit..."); + mln::Log::Info(mln::Event::Setup, "waiting for quit..."); view->setShouldClose(); } else { exit(0); @@ -79,7 +79,7 @@ int main(int argc, char* argv[]) { } // Load settings - mbgl::Settings_JSON settings; + mln::Settings_JSON settings; settings.online = !offlineFlag; if (lonValue) settings.longitude = args::get(lonValue); if (latValue) settings.latitude = args::get(latValue); @@ -108,54 +108,54 @@ int main(int argc, char* argv[]) { #endif if (benchmark) { - mbgl::Log::Info(mbgl::Event::General, "BENCHMARK MODE: Some optimizations are disabled."); + mln::Log::Info(mln::Event::General, "BENCHMARK MODE: Some optimizations are disabled."); } // Set access token if present const char* apikeyEnv = getenv("MLN_API_KEY"); const std::string apikey = apikeyValue ? args::get(apikeyValue) : (apikeyEnv ? apikeyEnv : std::string()); - auto mapTilerConfiguration = mbgl::TileServerOptions::MapTilerConfiguration(); - mbgl::ResourceOptions resourceOptions; + auto mapTilerConfiguration = mln::TileServerOptions::MapTilerConfiguration(); + mln::ResourceOptions resourceOptions; resourceOptions.withCachePath(cacheDB).withApiKey(apikey).withTileServerOptions(mapTilerConfiguration); - mbgl::ClientOptions clientOptions; + mln::ClientOptions clientOptions; auto orderedStyles = mapTilerConfiguration.defaultStyles(); GLFWView backend(fullscreen, benchmark, resourceOptions, clientOptions); view = &backend; - std::shared_ptr onlineFileSource = mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::Network, resourceOptions, clientOptions); + std::shared_ptr onlineFileSource = mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::Network, resourceOptions, clientOptions); if (!settings.online) { if (onlineFileSource) { onlineFileSource->setProperty("online-status", false); - mbgl::Log::Warning(mbgl::Event::Setup, "Application is offline. Press `O` to toggle online status."); + mln::Log::Warning(mln::Event::Setup, "Application is offline. Press `O` to toggle online status."); } else { - mbgl::Log::Warning(mbgl::Event::Setup, - "Network resource provider is not available, only local " - "requests are supported."); + mln::Log::Warning(mln::Event::Setup, + "Network resource provider is not available, only local " + "requests are supported."); } } GLFWRendererFrontend rendererFrontend{ - std::make_unique(view->getRendererBackend(), view->getPixelRatio()), *view}; + std::make_unique(view->getRendererBackend(), view->getPixelRatio()), *view}; // Configure action journal options if directory is specified - mbgl::util::ActionJournalOptions actionJournalOptions; + mln::util::ActionJournalOptions actionJournalOptions; if (actionJournalDirValue) { const std::string actionJournalDir = args::get(actionJournalDirValue); actionJournalOptions.enable(true).withPath(actionJournalDir); - mbgl::Log::Info(mbgl::Event::General, "Action journal enabled. Logs will be written to: " + actionJournalDir); + mln::Log::Info(mln::Event::General, "Action journal enabled. Logs will be written to: " + actionJournalDir); } - mbgl::Map map(rendererFrontend, - *view, - mbgl::MapOptions().withSize(view->getSize()).withPixelRatio(view->getPixelRatio()), - resourceOptions, - clientOptions, - actionJournalOptions); + mln::Map map(rendererFrontend, + *view, + mln::MapOptions().withSize(view->getSize()).withPixelRatio(view->getPixelRatio()), + resourceOptions, + clientOptions, + actionJournalOptions); - map.setBounds(mbgl::BoundOptions().withMaxPitch(settings.maxPitch)); + map.setBounds(mln::BoundOptions().withMaxPitch(settings.maxPitch)); backend.setMap(&map); @@ -163,30 +163,30 @@ int main(int argc, char* argv[]) { style = std::string("file://") + style; } - map.jumpTo(mbgl::CameraOptions() - .withCenter(mbgl::LatLng{settings.latitude, settings.longitude}) + map.jumpTo(mln::CameraOptions() + .withCenter(mln::LatLng{settings.latitude, settings.longitude}) .withCenterAltitude(settings.altitude) .withZoom(settings.zoom) .withBearing(settings.bearing) .withPitch(settings.pitch) .withRoll(settings.roll) .withFov(settings.fov)); - map.setDebug(mbgl::MapDebugOptions(settings.debug)); + map.setDebug(mln::MapDebugOptions(settings.debug)); if (testDirValue) view->setTestDirectory(args::get(testDirValue)); view->setOnlineStatusCallback([&settings, onlineFileSource]() { if (!onlineFileSource) { - mbgl::Log::Warning(mbgl::Event::Setup, - "Cannot change online status. Network resource provider is not " - "available."); + mln::Log::Warning(mln::Event::Setup, + "Cannot change online status. Network resource provider is not " + "available."); return; } settings.online = !settings.online; onlineFileSource->setProperty("online-status", settings.online); - mbgl::Log::Info(mbgl::Event::Setup, - std::string("Application is ") + (settings.online ? "online" : "offline") + - ". Press `O` to toggle online status."); + mln::Log::Info(mln::Event::Setup, + std::string("Application is ") + (settings.online ? "online" : "offline") + + ". Press `O` to toggle online status."); }); view->setChangeStyleCallback([&map, &orderedStyles]() { @@ -196,17 +196,17 @@ int main(int argc, char* argv[]) { currentStyleIndex = 0; } - mbgl::util::DefaultStyle newStyle = orderedStyles[currentStyleIndex]; + mln::util::DefaultStyle newStyle = orderedStyles[currentStyleIndex]; map.getStyle().loadURL(newStyle.getUrl()); view->setWindowTitle(newStyle.getName()); - mbgl::Log::Info(mbgl::Event::Setup, "Changed style to: " + newStyle.getName()); + mln::Log::Info(mln::Event::Setup, "Changed style to: " + newStyle.getName()); }); // Resource loader controls top-level request processing and can resume / // pause all managed sources simultaneously. - std::shared_ptr resourceLoader = mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::ResourceLoader, resourceOptions, clientOptions); + std::shared_ptr resourceLoader = mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::ResourceLoader, resourceOptions, clientOptions); view->setPauseResumeCallback([resourceLoader]() { static bool isPaused = false; @@ -220,12 +220,12 @@ int main(int argc, char* argv[]) { }); // Database file source. - auto databaseFileSource = std::static_pointer_cast(std::shared_ptr( - mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Database, resourceOptions, clientOptions))); + auto databaseFileSource = std::static_pointer_cast(std::shared_ptr( + mln::FileSourceManager::get()->getFileSource(mln::FileSourceType::Database, resourceOptions, clientOptions))); view->setResetCacheCallback([databaseFileSource]() { databaseFileSource->resetDatabase([](const std::exception_ptr& ex) { if (ex) { - mbgl::Log::Error(mbgl::Event::Database, "Failed to reset cache: " + mbgl::util::toString(ex)); + mln::Log::Error(mln::Event::Database, "Failed to reset cache: " + mln::util::toString(ex)); } }); }); @@ -247,7 +247,7 @@ int main(int argc, char* argv[]) { view->run(); // Save settings - mbgl::CameraOptions camera = map.getCameraOptions(); + mln::CameraOptions camera = map.getCameraOptions(); settings.latitude = camera.center->latitude(); settings.longitude = camera.center->longitude(); settings.altitude = *camera.centerAltitude; @@ -256,15 +256,15 @@ int main(int argc, char* argv[]) { settings.pitch = *camera.pitch; settings.roll = *camera.roll; settings.fov = *camera.fov; - settings.debug = mbgl::EnumType(map.getDebug()); + settings.debug = mln::EnumType(map.getDebug()); settings.save(); - mbgl::Log::Info(mbgl::Event::General, - "Exit location: --lat=\"" + std::to_string(settings.latitude) + "\" --lon=\"" + - std::to_string(settings.longitude) + "\" --alt=\"" + std::to_string(settings.altitude) + - "\" --zoom=\"" + std::to_string(settings.zoom) + "\" --bearing=\"" + - std::to_string(settings.bearing) + "\" --roll=\"" + std::to_string(settings.roll) + - "\" --fov=\"" + std::to_string(settings.fov) + "\" --maxPitch=\"" + - std::to_string(settings.maxPitch) + "\""); + mln::Log::Info(mln::Event::General, + "Exit location: --lat=\"" + std::to_string(settings.latitude) + "\" --lon=\"" + + std::to_string(settings.longitude) + "\" --alt=\"" + std::to_string(settings.altitude) + + "\" --zoom=\"" + std::to_string(settings.zoom) + "\" --bearing=\"" + + std::to_string(settings.bearing) + "\" --roll=\"" + std::to_string(settings.roll) + + "\" --fov=\"" + std::to_string(settings.fov) + "\" --maxPitch=\"" + + std::to_string(settings.maxPitch) + "\""); view = nullptr; diff --git a/platform/glfw/metal_backend.h b/platform/glfw/metal_backend.h index 11ea485b2..2d0bc28e8 100644 --- a/platform/glfw/metal_backend.h +++ b/platform/glfw/metal_backend.h @@ -7,14 +7,14 @@ #import -class MetalBackend final : public mbgl::mtl::RendererBackend, public mbgl::gfx::Renderable { +class MetalBackend final : public mln::mtl::RendererBackend, public mln::gfx::Renderable { public: MetalBackend(NSWindow *window); - mbgl::gfx::Renderable &getDefaultRenderable() override; + mln::gfx::Renderable &getDefaultRenderable() override; void activate() override; void deactivate() override; void updateAssumedState() override; - void setSize(mbgl::Size size_); - mbgl::Size getSize() const; + void setSize(mln::Size size_); + mln::Size getSize() const; }; diff --git a/platform/glfw/metal_backend.mm b/platform/glfw/metal_backend.mm index f538f4c05..140a860b6 100644 --- a/platform/glfw/metal_backend.mm +++ b/platform/glfw/metal_backend.mm @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { using namespace mtl; @@ -19,19 +19,19 @@ public: swapchain->setDevice(backend.getDevice().get()); } - void setBackendSize(mbgl::Size size_) { + void setBackendSize(mln::Size size_) { size = size_; swapchain->setDrawableSize( {static_cast(size.width), static_cast(size.height)}); buffersInvalid = true; } - mbgl::Size getSize() const { return size; } + mln::Size getSize() const { return size; } void bind() override { surface = NS::TransferPtr(swapchain->nextDrawable()); - auto texSize = mbgl::Size{static_cast(swapchain->drawableSize().width), - static_cast(swapchain->drawableSize().height)}; + auto texSize = mln::Size{static_cast(swapchain->drawableSize().width), + static_cast(swapchain->drawableSize().height)}; commandBuffer = NS::TransferPtr(commandQueue->commandBuffer()); renderPassDescriptor = NS::TransferPtr(MTL::RenderPassDescriptor::renderPassDescriptor()); @@ -107,33 +107,32 @@ private: CAMetalLayerPtr swapchain; gfx::Texture2DPtr depthTexture; gfx::Texture2DPtr stencilTexture; - mbgl::Size size; + mln::Size size; bool buffersInvalid = true; }; -} // namespace mbgl +} // namespace mln MetalBackend::MetalBackend(NSWindow* window) - : mbgl::mtl::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable(mbgl::Size{0, 0}, - std::make_unique(*this)) { + : mln::mtl::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable(mln::Size{0, 0}, std::make_unique(*this)) { window.contentView.layer = (__bridge CALayer*)getDefaultRenderable() - .getResource() + .getResource() .getSwapchain() .get(); window.contentView.wantsLayer = YES; } -mbgl::gfx::Renderable& MetalBackend::getDefaultRenderable() { return *this; } +mln::gfx::Renderable& MetalBackend::getDefaultRenderable() { return *this; } void MetalBackend::activate() {} void MetalBackend::deactivate() {} void MetalBackend::updateAssumedState() {} -void MetalBackend::setSize(mbgl::Size size_) { - getResource().setBackendSize(size_); +void MetalBackend::setSize(mln::Size size_) { + getResource().setBackendSize(size_); } -mbgl::Size MetalBackend::getSize() const { - return getResource().getSize(); +mln::Size MetalBackend::getSize() const { + return getResource().getSize(); } diff --git a/platform/glfw/ny_route.hpp b/platform/glfw/ny_route.hpp index c3d515710..392434441 100644 --- a/platform/glfw/ny_route.hpp +++ b/platform/glfw/ny_route.hpp @@ -1,6 +1,6 @@ #include -namespace mbgl { +namespace mln { namespace platform { namespace glfw { @@ -101,4 +101,4 @@ constexpr const char* route = R"route( } // namespace glfw } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/glfw/settings_json.cpp b/platform/glfw/settings_json.cpp index fe369506b..dc3fc60ed 100644 --- a/platform/glfw/settings_json.cpp +++ b/platform/glfw/settings_json.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { Settings_JSON::Settings_JSON() { load(); @@ -57,4 +57,4 @@ void Settings_JSON::clear() { online = true; } -} // namespace mbgl +} // namespace mln diff --git a/platform/glfw/settings_json.hpp b/platform/glfw/settings_json.hpp index 93ac8897f..c20a08299 100644 --- a/platform/glfw/settings_json.hpp +++ b/platform/glfw/settings_json.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { class Settings_JSON { public: @@ -21,8 +21,8 @@ public: double bearing = 0; double pitch = 0; double roll = 0; - double fov = util::rad2deg(mbgl::util::DEFAULT_FOV); - double maxPitch = util::rad2deg(mbgl::util::DEFAULT_PITCH_MAX); + double fov = util::rad2deg(mln::util::DEFAULT_FOV); + double maxPitch = util::rad2deg(mln::util::DEFAULT_PITCH_MAX); bool axonometric = false; double xSkew = 0.0; double ySkew = 1.0; @@ -31,4 +31,4 @@ public: bool online = true; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/glfw/test_writer.cpp b/platform/glfw/test_writer.cpp index c5ad6db06..289aebbc5 100644 --- a/platform/glfw/test_writer.cpp +++ b/platform/glfw/test_writer.cpp @@ -20,7 +20,7 @@ public: class SetCamera final : public TestOperationSerializer { public: - explicit SetCamera(mbgl::CameraOptions camera_) + explicit SetCamera(mln::CameraOptions camera_) : camera(std::move(camera_)) {} void serialize(Writer& writer) const override { @@ -55,12 +55,12 @@ public: } private: - mbgl::CameraOptions camera; + mln::CameraOptions camera; }; class SetStyle final : public TestOperationSerializer { public: - explicit SetStyle(const mbgl::style::Style& style) + explicit SetStyle(const mln::style::Style& style) : url(style.getURL()) {} void serialize(Writer& writer) const override { @@ -76,7 +76,7 @@ private: class SetInitialSize final : public TestOperationSerializer { public: - explicit SetInitialSize(const mbgl::Size& size) + explicit SetInitialSize(const mln::Size& size) : width(size.width), height(size.height) {} @@ -97,19 +97,19 @@ TestWriter::TestWriter() = default; TestWriter::~TestWriter() = default; -TestWriter& TestWriter::withCameraOptions(const mbgl::CameraOptions& camera) { +TestWriter& TestWriter::withCameraOptions(const mln::CameraOptions& camera) { operations.emplace_back(std::make_unique(camera)); return *this; } -TestWriter& TestWriter::withStyle(const mbgl::style::Style& style) { +TestWriter& TestWriter::withStyle(const mln::style::Style& style) { operations.emplace_back(std::make_unique(style)); return *this; } -TestWriter& TestWriter::withInitialSize(const mbgl::Size& size) { +TestWriter& TestWriter::withInitialSize(const mln::Size& size) { assert(initialSize == nullptr); initialSize = std::make_unique(size); diff --git a/platform/glfw/test_writer.hpp b/platform/glfw/test_writer.hpp index 881b0d16f..67b5f0503 100644 --- a/platform/glfw/test_writer.hpp +++ b/platform/glfw/test_writer.hpp @@ -15,9 +15,9 @@ public: TestWriter(); ~TestWriter(); - TestWriter& withCameraOptions(const mbgl::CameraOptions&); - TestWriter& withStyle(const mbgl::style::Style&); - TestWriter& withInitialSize(const mbgl::Size&); + TestWriter& withCameraOptions(const mln::CameraOptions&); + TestWriter& withStyle(const mln::style::Style&); + TestWriter& withInitialSize(const mln::Size&); bool write(const std::string& dir) const; diff --git a/platform/ios/Integration_Tests/Annotation Tests/MLNAnnotationViewIntegrationTests.mm b/platform/ios/Integration_Tests/Annotation Tests/MLNAnnotationViewIntegrationTests.mm index 56e1dc2f1..8b6a87ea7 100644 --- a/platform/ios/Integration_Tests/Annotation Tests/MLNAnnotationViewIntegrationTests.mm +++ b/platform/ios/Integration_Tests/Annotation Tests/MLNAnnotationViewIntegrationTests.mm @@ -31,7 +31,7 @@ - (MLNMapCamera *)cameraByRotatingToDirection:(CLLocationDirection)degrees aroundAnchorPoint:(CGPoint)anchorPoint; - (MLNMapCamera *)cameraByZoomingToZoomLevel:(double)zoom aroundAnchorPoint:(CGPoint)anchorPoint; -- (MLNMapCamera *)cameraForCameraOptions:(const mbgl::CameraOptions &)cameraOptions; +- (MLNMapCamera *)cameraForCameraOptions:(const mln::CameraOptions &)cameraOptions; @property (nonatomic) UIView *calloutViewForSelectedAnnotation; @end @@ -619,11 +619,11 @@ static const CGPoint kAnnotationRelativeScale = {0.05f, 0.125f}; NSString *activityTitle = [NSString stringWithFormat:@"Zoom to %0.1f", zoom]; [XCTContext runActivityNamed:activityTitle block:^(id _Nonnull activity) { - mbgl::CameraOptions currentCameraOptions; + mln::CameraOptions currentCameraOptions; currentCameraOptions.bearing = angle; currentCameraOptions.anchor = - mbgl::ScreenCoordinate{anchor.x, anchor.y}; + mln::ScreenCoordinate{anchor.x, anchor.y}; currentCameraOptions.zoom = zoom; MLNMapCamera *toCamera = [self.mapView cameraForCameraOptions:currentCameraOptions]; diff --git a/platform/ios/Integration_Tests/Camera Tests/MLNCameraTransitionFinishTests.mm b/platform/ios/Integration_Tests/Camera Tests/MLNCameraTransitionFinishTests.mm index 0f57b8158..ea400e4f0 100644 --- a/platform/ios/Integration_Tests/Camera Tests/MLNCameraTransitionFinishTests.mm +++ b/platform/ios/Integration_Tests/Camera Tests/MLNCameraTransitionFinishTests.mm @@ -83,18 +83,18 @@ // MARK: - camera transitions with NaN values @interface MLNMapView (MLNCameraTransitionFinishNaNTests) -- (mbgl::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera - edgePadding:(UIEdgeInsets)insets; +- (mln::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera + edgePadding:(UIEdgeInsets)insets; @end @interface MLNCameraTransitionNaNZoomMapView : MLNMapView @end @implementation MLNCameraTransitionNaNZoomMapView -- (mbgl::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera - edgePadding:(UIEdgeInsets)insets { - mbgl::CameraOptions options = [super cameraOptionsObjectForAnimatingToCamera:camera - edgePadding:insets]; +- (mln::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera + edgePadding:(UIEdgeInsets)insets { + mln::CameraOptions options = [super cameraOptionsObjectForAnimatingToCamera:camera + edgePadding:insets]; options.zoom = NAN; return options; } diff --git a/platform/ios/Integration_Tests/MBGLIntegrationTests.mm b/platform/ios/Integration_Tests/MBGLIntegrationTests.mm index 5d8ca957a..8130fee03 100644 --- a/platform/ios/Integration_Tests/MBGLIntegrationTests.mm +++ b/platform/ios/Integration_Tests/MBGLIntegrationTests.mm @@ -216,9 +216,9 @@ MLNMapViewImpl *mapViewImpl = [self.mapView viewImpl]; CGFloat scaleFactor = [UIScreen mainScreen].scale; - mbgl::Size renderableSize = mapViewImpl->getRendererBackend().getDefaultRenderable().getSize(); - mbgl::Size viewSize = {static_cast(self.mapView.bounds.size.width * scaleFactor), - static_cast(self.mapView.bounds.size.height * scaleFactor)}; + mln::Size renderableSize = mapViewImpl->getRendererBackend().getDefaultRenderable().getSize(); + mln::Size viewSize = {static_cast(self.mapView.bounds.size.width * scaleFactor), + static_cast(self.mapView.bounds.size.height * scaleFactor)}; // Test that mapView and default renderable have the same size. XCTAssertTrue(renderableSize == viewSize); diff --git a/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm index 7bcb1f724..c15eaedcf 100644 --- a/platform/ios/benchmark/MBXBenchViewController.mm +++ b/platform/ios/benchmark/MBXBenchViewController.mm @@ -20,7 +20,7 @@ frameRenderingTime:(double)frameRenderingTime; @end -class BenchMapObserver : public mbgl::MapObserver { +class BenchMapObserver : public mln::MapObserver { public: BenchMapObserver() = delete; BenchMapObserver(id mapDelegate_) : mapDelegate(mapDelegate_) {} @@ -30,7 +30,7 @@ public: // NSLog(@"Frame encoding time: %4.1f ms", status.renderingStats.encodingTime * 1e3); // NSLog(@"Frame rendering time: %4.1f ms", status.renderingStats.renderingTime * 1e3); - bool fullyRendered = status.mode == mbgl::MapObserver::RenderMode::Full; + bool fullyRendered = status.mode == mln::MapObserver::RenderMode::Full; [mapDelegate mapDidFinishRenderingFrameFullyRendered:fullyRendered frameEncodingTime:status.renderingStats.encodingTime frameRenderingTime:status.renderingStats.renderingTime]; @@ -42,8 +42,8 @@ protected: @interface MBXBenchViewController () { std::unique_ptr observer; - std::unique_ptr frontend; - std::unique_ptr map; + std::unique_ptr frontend; + std::unique_ptr map; } @property (nonatomic) UIImageView *imageView; @@ -96,32 +96,32 @@ protected: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; [self.view addSubview:self.imageView]; - mbgl::Size viewSize = {static_cast(self.view.bounds.size.width), - static_cast(self.view.bounds.size.height)}; + mln::Size viewSize = {static_cast(self.view.bounds.size.width), + static_cast(self.view.bounds.size.height)}; auto pixelRatio = [[UIScreen mainScreen] scale]; observer = std::make_unique(self); - frontend = std::make_unique( - viewSize, pixelRatio, mbgl::gfx::HeadlessBackend::SwapBehaviour::Flush, - mbgl::gfx::ContextMode::Unique, + frontend = std::make_unique( + viewSize, pixelRatio, mln::gfx::HeadlessBackend::SwapBehaviour::Flush, + mln::gfx::ContextMode::Unique, /* localFontFamily */ std::nullopt, /* invalidateOnUpdate */ false); - mbgl::MapOptions mapOptions; - mapOptions.withMapMode(mbgl::MapMode::Continuous) + mln::MapOptions mapOptions; + mapOptions.withMapMode(mln::MapMode::Continuous) .withSize(viewSize) .withPixelRatio(pixelRatio) - .withConstrainMode(mbgl::ConstrainMode::None) - .withViewportMode(mbgl::ViewportMode::Default) + .withConstrainMode(mln::ConstrainMode::None) + .withViewportMode(mln::ViewportMode::Default) .withCrossSourceCollisions(true); - mbgl::TileServerOptions *tileServerOptions = + mln::TileServerOptions *tileServerOptions = [[MLNSettings sharedSettings] tileServerOptionsInternal]; - mbgl::ResourceOptions resourceOptions; + mln::ResourceOptions resourceOptions; resourceOptions.withCachePath(MLNOfflineStorage.sharedOfflineStorage.databasePath.UTF8String) .withAssetPath([NSBundle mainBundle].resourceURL.path.UTF8String) .withTileServerOptions(*tileServerOptions); - mbgl::ClientOptions clientOptions; + mln::ClientOptions clientOptions; auto apiKey = [[MLNSettings sharedSettings] apiKey]; if (apiKey) { @@ -129,9 +129,9 @@ protected: } map = - std::make_unique(*frontend, *observer, mapOptions, resourceOptions, clientOptions); + std::make_unique(*frontend, *observer, mapOptions, resourceOptions, clientOptions); map->setSize(viewSize); - map->setDebug(mbgl::MapDebugOptions::NoDebug); + map->setDebug(mln::MapDebugOptions::NoDebug); map->getStyle().loadURL([url.absoluteString UTF8String]); [self startBenchmarkIteration]; @@ -190,12 +190,12 @@ std::vector>> result; static const int benchmarkDuration = 5; // seconds -namespace mbgl { +namespace mln { extern std::size_t uploadCount, uploadBuildCount, uploadVertextAttrsDirty, uploadInvalidSegments; } - (void)renderFrame { - mbgl::gfx::BackendScope guard{*(frontend->getBackend())}; + mln::gfx::BackendScope guard{*(frontend->getBackend())}; frontend->renderFrame(); @@ -214,20 +214,20 @@ extern std::size_t uploadCount, uploadBuildCount, uploadVertextAttrsDirty, uploa } - (void)startBenchmarkIteration { - if (mbgl::bench::locations.size() > idx) { + if (mln::bench::locations.size() > idx) { if (advancedMetrics == nil) { advancedMetrics = [[BenchmarkAdvancedMetrics alloc] init]; [advancedMetrics start:1]; } - const auto &location = mbgl::bench::locations[idx]; + const auto &location = mln::bench::locations[idx]; - mbgl::CameraOptions cameraOptions; - cameraOptions.center = mbgl::LatLng(location.latitude, location.longitude); + mln::CameraOptions cameraOptions; + cameraOptions.center = mln::LatLng(location.latitude, location.longitude); cameraOptions.zoom = location.zoom; cameraOptions.bearing = location.bearing; - mbgl::AnimationOptions animationOptions; - animationOptions.duration.emplace(std::chrono::duration_cast( + mln::AnimationOptions animationOptions; + animationOptions.duration.emplace(std::chrono::duration_cast( std::chrono::duration(benchmarkDuration))); map->easeTo(cameraOptions, animationOptions); @@ -260,10 +260,10 @@ extern std::size_t uploadCount, uploadBuildCount, uploadVertextAttrsDirty, uploa NSLog(@"Average frame encoding time: %4.2f ms", totalFrameEncodingTime * 1e3 / result.size()); NSLog(@"Average frame rendering time: %4.2f ms", totalFrameRenderingTime * 1e3 / result.size()); - // NSLog(@"Total uploads: %zu", mbgl::uploadCount); - // NSLog(@"Total uploads with dirty vattr: %zu", mbgl::uploadVertextAttrsDirty); - // NSLog(@"Total uploads with invalid segs: %zu", mbgl::uploadInvalidSegments); - // NSLog(@"Total uploads with build: %zu", mbgl::uploadBuildCount); + // NSLog(@"Total uploads: %zu", mln::uploadCount); + // NSLog(@"Total uploads with dirty vattr: %zu", mln::uploadVertextAttrsDirty); + // NSLog(@"Total uploads with invalid segs: %zu", mln::uploadInvalidSegments); + // NSLog(@"Total uploads with build: %zu", mln::uploadBuildCount); [advancedMetrics stop]; @@ -315,7 +315,7 @@ extern std::size_t uploadCount, uploadBuildCount, uploadVertextAttrsDirty, uploa // Report FPS const auto frameEncodingTime = static_cast(totalFrameEncodingTime) / frames; const auto frameRenderingTime = static_cast(totalFrameRenderingTime) / frames; - result.emplace_back(mbgl::bench::locations[idx].name, + result.emplace_back(mln::bench::locations[idx].name, std::make_pair(frameEncodingTime, frameRenderingTime)); NSLog(@"- Frame encoding time: %.1f ms, Frame rendering time: %.1f ms (%d frames)", frameEncodingTime * 1e3, frameRenderingTime * 1e3, frames); diff --git a/platform/ios/benchmark/locations.cpp b/platform/ios/benchmark/locations.cpp index 718a1adef..6055dc4f5 100644 --- a/platform/ios/benchmark/locations.cpp +++ b/platform/ios/benchmark/locations.cpp @@ -1,6 +1,6 @@ #include "locations.hpp" -namespace mbgl { +namespace mln { namespace bench { const std::vector locations = { @@ -23,4 +23,4 @@ const std::vector locations = { }; } -} // namespace mbgl +} // namespace mln diff --git a/platform/ios/benchmark/locations.hpp b/platform/ios/benchmark/locations.hpp index 91cfa11d0..b7c2d0a59 100644 --- a/platform/ios/benchmark/locations.hpp +++ b/platform/ios/benchmark/locations.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace bench { struct Location { @@ -17,4 +17,4 @@ struct Location { extern const std::vector locations; } // namespace bench -} // namespace mbgl +} // namespace mln diff --git a/platform/ios/src/MLNAnnotationView.mm b/platform/ios/src/MLNAnnotationView.mm index 1def8c82e..b3dab2c33 100644 --- a/platform/ios/src/MLNAnnotationView.mm +++ b/platform/ios/src/MLNAnnotationView.mm @@ -158,8 +158,8 @@ // The pitch intensity represents how much the map view is actually pitched compared to // what is possible. The value will range from 0% (not pitched at all) to 100% (pitched as much // as the map view will allow). The map view's maximum pitch is defined in - // `mbgl::util::PITCH_MAX`. - CGFloat pitchIntensity = pitch / MLNDegreesFromRadians(mbgl::util::PITCH_MAX); + // `mln::util::PITCH_MAX`. + CGFloat pitchIntensity = pitch / MLNDegreesFromRadians(mln::util::PITCH_MAX); // The pitch adjusted scale is the inverse proportion of the maximum possible scale reduction // multiplied by the pitch intensity. For example, if the maximum scale reduction is 75% and the diff --git a/platform/ios/src/MLNCompassButton.mm b/platform/ios/src/MLNCompassButton.mm index cf45c9d21..aae4c658c 100644 --- a/platform/ios/src/MLNCompassButton.mm +++ b/platform/ios/src/MLNCompassButton.mm @@ -103,7 +103,7 @@ - (void)updateCompassAnimated:(BOOL)animated { CLLocationDirection direction = self.mapView.direction; - CLLocationDirection plateDirection = mbgl::util::wrap(-direction, 0., 360.); + CLLocationDirection plateDirection = mln::util::wrap(-direction, 0., 360.); self.transform = CGAffineTransformMakeRotation(MLNRadiansFromDegrees(plateDirection)); self.isAccessibilityElement = direction > 0; diff --git a/platform/ios/src/MLNMapProjection.mm b/platform/ios/src/MLNMapProjection.mm index 135c5188b..e31424345 100644 --- a/platform/ios/src/MLNMapProjection.mm +++ b/platform/ios/src/MLNMapProjection.mm @@ -14,24 +14,24 @@ @end @implementation MLNMapProjection { - std::unique_ptr _mbglProjection; + std::unique_ptr _mbglProjection; } - (instancetype)initWithMapView:(MLNMapView *)mapView { if (self = [super init]) { - _mbglProjection = std::make_unique([mapView mbglMap]); + _mbglProjection = std::make_unique([mapView mbglMap]); self.mapFrameSize = mapView.frame.size; } return self; } - (MLNMapCamera *)camera { - mbgl::CameraOptions cameraOptions = _mbglProjection->getCamera(); + mln::CameraOptions cameraOptions = _mbglProjection->getCamera(); CLLocationCoordinate2D centerCoordinate = MLNLocationCoordinate2DFromLatLng(*cameraOptions.center); double zoomLevel = *cameraOptions.zoom; - CLLocationDirection direction = mbgl::util::wrap(*cameraOptions.bearing, 0., 360.); + CLLocationDirection direction = mln::util::wrap(*cameraOptions.bearing, 0., 360.); CGFloat pitch = *cameraOptions.pitch; CLLocationDistance altitude = MLNAltitudeForZoomLevel(zoomLevel, pitch, centerCoordinate.latitude, self.mapFrameSize); @@ -42,7 +42,7 @@ } - (void)setCamera:(MLNMapCamera *_Nonnull)camera withEdgeInsets:(UIEdgeInsets)insets { - mbgl::CameraOptions cameraOptions; + mln::CameraOptions cameraOptions; if (CLLocationCoordinate2DIsValid(camera.centerCoordinate)) { cameraOptions.center = MLNLatLngFromLocationCoordinate2D(camera.centerCoordinate); } @@ -68,8 +68,8 @@ bounds.ne, }; - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); - std::vector latLngs; + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + std::vector latLngs; latLngs.reserve(4); for (NSUInteger i = 0; i < 4; i++) { latLngs.push_back({coordinates[i].latitude, coordinates[i].longitude}); @@ -79,7 +79,7 @@ } - (CLLocationCoordinate2D)convertPoint:(CGPoint)point { - mbgl::ScreenCoordinate screenCoordinate = mbgl::ScreenCoordinate(point.x, point.y); + mln::ScreenCoordinate screenCoordinate = mln::ScreenCoordinate(point.x, point.y); return MLNLocationCoordinate2DFromLatLng( _mbglProjection->latLngForPixel(screenCoordinate).wrapped()); } @@ -89,15 +89,15 @@ return CGPointMake(NAN, NAN); } - mbgl::LatLng latLng = MLNLatLngFromLocationCoordinate2D(coordinate); - mbgl::ScreenCoordinate pixel = _mbglProjection->pixelForLatLng(latLng); + mln::LatLng latLng = MLNLatLngFromLocationCoordinate2D(coordinate); + mln::ScreenCoordinate pixel = _mbglProjection->pixelForLatLng(latLng); return CGPointMake(pixel.x, pixel.y); } - (CLLocationDistance)metersPerPoint { - mbgl::CameraOptions cameraOptions = _mbglProjection->getCamera(); - return mbgl::Projection::getMetersPerPixelAtLatitude(cameraOptions.center->latitude(), - *cameraOptions.zoom); + mln::CameraOptions cameraOptions = _mbglProjection->getCamera(); + return mln::Projection::getMetersPerPixelAtLatitude(cameraOptions.center->latitude(), + *cameraOptions.zoom); } @end diff --git a/platform/ios/src/MLNMapView+Impl.h b/platform/ios/src/MLNMapView+Impl.h index 7c61d9fef..a70d6e801 100644 --- a/platform/ios/src/MLNMapView+Impl.h +++ b/platform/ios/src/MLNMapView+Impl.h @@ -10,14 +10,14 @@ @class MLNMapView; -class MLNMapViewImpl : public mbgl::MapObserver { +class MLNMapViewImpl : public mln::MapObserver { public: static std::unique_ptr Create(MLNMapView*); MLNMapViewImpl(MLNMapView*); virtual ~MLNMapViewImpl() = default; - virtual mbgl::gfx::RendererBackend& getRendererBackend() = 0; + virtual mln::gfx::RendererBackend& getRendererBackend() = 0; // Returns a handle to the OpenGL context object if this view is rendered with OpenGL. virtual EAGLContext* getEAGLContext() { return nullptr; } @@ -56,37 +56,36 @@ public: virtual MLNBackendResource* getObject() = 0; - // mbgl::MapObserver implementation - void onCameraWillChange(mbgl::MapObserver::CameraChangeMode) override; + // mln::MapObserver implementation + void onCameraWillChange(mln::MapObserver::CameraChangeMode) override; void onCameraIsChanging() override; - void onCameraDidChange(mbgl::MapObserver::CameraChangeMode) override; + void onCameraDidChange(mln::MapObserver::CameraChangeMode) override; void onWillStartLoadingMap() override; void onDidFinishLoadingMap() override; - void onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) override; + void onDidFailLoadingMap(mln::MapLoadError mapError, const std::string& what) override; void onWillStartRenderingFrame() override; - void onDidFinishRenderingFrame(const mbgl::MapObserver::RenderFrameStatus&) override; + void onDidFinishRenderingFrame(const mln::MapObserver::RenderFrameStatus&) override; void onWillStartRenderingMap() override; - void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) override; + void onDidFinishRenderingMap(mln::MapObserver::RenderMode) override; void onDidFinishLoadingStyle() override; - void onSourceChanged(mbgl::style::Source& source) override; + void onSourceChanged(mln::style::Source& source) override; void onDidBecomeIdle() override; void onStyleImageMissing(const std::string& imageIdentifier) override; bool onCanRemoveUnusedStyleImage(const std::string& imageIdentifier) override; - void onRegisterShaders(mbgl::gfx::ShaderRegistry&) override; - void onPreCompileShader(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, + void onRegisterShaders(mln::gfx::ShaderRegistry&) override; + void onPreCompileShader(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; - void onPostCompileShader(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, + void onPostCompileShader(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; - void onShaderCompileFailed(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, + void onShaderCompileFailed(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; - void onGlyphsLoaded(const mbgl::FontStack&, const mbgl::GlyphRange&) override; - void onGlyphsError(const mbgl::FontStack&, const mbgl::GlyphRange&, std::exception_ptr) override; - void onGlyphsRequested(const mbgl::FontStack&, const mbgl::GlyphRange&) override; - void onTileAction(mbgl::TileOperation, const mbgl::OverscaledTileID&, - const std::string&) override; - void onSpriteLoaded(const std::optional&) override; - void onSpriteError(const std::optional&, std::exception_ptr) override; - void onSpriteRequested(const std::optional&) override; + void onGlyphsLoaded(const mln::FontStack&, const mln::GlyphRange&) override; + void onGlyphsError(const mln::FontStack&, const mln::GlyphRange&, std::exception_ptr) override; + void onGlyphsRequested(const mln::FontStack&, const mln::GlyphRange&) override; + void onTileAction(mln::TileOperation, const mln::OverscaledTileID&, const std::string&) override; + void onSpriteLoaded(const std::optional&) override; + void onSpriteError(const std::optional&, std::exception_ptr) override; + void onSpriteRequested(const std::optional&) override; void onRenderError(std::exception_ptr) override; protected: diff --git a/platform/ios/src/MLNMapView+Impl.mm b/platform/ios/src/MLNMapView+Impl.mm index aa99aab87..05735f76b 100644 --- a/platform/ios/src/MLNMapView+Impl.mm +++ b/platform/ios/src/MLNMapView+Impl.mm @@ -30,15 +30,15 @@ MLNMapViewImpl::MLNMapViewImpl(MLNMapView* nativeView_) : mapView(nativeView_) { void MLNMapViewImpl::render() { [mapView renderSync]; } -void MLNMapViewImpl::onCameraWillChange(mbgl::MapObserver::CameraChangeMode mode) { - bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; +void MLNMapViewImpl::onCameraWillChange(mln::MapObserver::CameraChangeMode mode) { + bool animated = mode == mln::MapObserver::CameraChangeMode::Animated; [mapView cameraWillChangeAnimated:animated]; } void MLNMapViewImpl::onCameraIsChanging() { [mapView cameraIsChanging]; } -void MLNMapViewImpl::onCameraDidChange(mbgl::MapObserver::CameraChangeMode mode) { - bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; +void MLNMapViewImpl::onCameraDidChange(mln::MapObserver::CameraChangeMode mode) { + bool animated = mode == mln::MapObserver::CameraChangeMode::Animated; [mapView cameraDidChangeAnimated:animated]; } @@ -46,25 +46,25 @@ void MLNMapViewImpl::onWillStartLoadingMap() { [mapView mapViewWillStartLoadingM void MLNMapViewImpl::onDidFinishLoadingMap() { [mapView mapViewDidFinishLoadingMap]; } -void MLNMapViewImpl::onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) { +void MLNMapViewImpl::onDidFailLoadingMap(mln::MapLoadError mapError, const std::string& what) { NSString* description; MLNErrorCode code; switch (mapError) { - case mbgl::MapLoadError::StyleParseError: + case mln::MapLoadError::StyleParseError: code = MLNErrorCodeParseStyleFailed; description = NSLocalizedStringWithDefaultValue( @"PARSE_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style is corrupted.", @"User-friendly error description"); break; - case mbgl::MapLoadError::StyleLoadError: + case mln::MapLoadError::StyleLoadError: code = MLNErrorCodeLoadStyleFailed; description = NSLocalizedStringWithDefaultValue( @"LOAD_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style can’t be loaded.", @"User-friendly error description"); break; - case mbgl::MapLoadError::NotFoundError: + case mln::MapLoadError::NotFoundError: code = MLNErrorCodeNotFound; description = NSLocalizedStringWithDefaultValue( @"STYLE_NOT_FOUND_DESC", nil, nil, @@ -89,22 +89,22 @@ void MLNMapViewImpl::onDidFailLoadingMap(mbgl::MapLoadError mapError, const std: void MLNMapViewImpl::onWillStartRenderingFrame() { [mapView mapViewWillStartRenderingFrame]; } -void MLNMapViewImpl::onDidFinishRenderingFrame(const mbgl::MapObserver::RenderFrameStatus& status) { - const bool fullyRendered = status.mode == mbgl::MapObserver::RenderMode::Full; +void MLNMapViewImpl::onDidFinishRenderingFrame(const mln::MapObserver::RenderFrameStatus& status) { + const bool fullyRendered = status.mode == mln::MapObserver::RenderMode::Full; [mapView mapViewDidFinishRenderingFrameFullyRendered:fullyRendered renderingStats:status.renderingStats]; } void MLNMapViewImpl::onWillStartRenderingMap() { [mapView mapViewWillStartRenderingMap]; } -void MLNMapViewImpl::onDidFinishRenderingMap(mbgl::MapObserver::RenderMode mode) { - bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; +void MLNMapViewImpl::onDidFinishRenderingMap(mln::MapObserver::RenderMode mode) { + bool fullyRendered = mode == mln::MapObserver::RenderMode::Full; [mapView mapViewDidFinishRenderingMapFullyRendered:fullyRendered]; } void MLNMapViewImpl::onDidFinishLoadingStyle() { [mapView mapViewDidFinishLoadingStyle]; } -void MLNMapViewImpl::onSourceChanged(mbgl::style::Source& source) { +void MLNMapViewImpl::onSourceChanged(mln::style::Source& source) { NSString* identifier = @(source.getID().c_str()); MLNSource* nativeSource = [mapView.style sourceWithIdentifier:identifier]; [mapView sourceDidChange:nativeSource]; @@ -122,10 +122,10 @@ bool MLNMapViewImpl::onCanRemoveUnusedStyleImage(const std::string& imageIdentif return [mapView shouldRemoveStyleImage:imageName]; } -void MLNMapViewImpl::onRegisterShaders(mbgl::gfx::ShaderRegistry& shaders) {} +void MLNMapViewImpl::onRegisterShaders(mln::gfx::ShaderRegistry& shaders) {} -void MLNMapViewImpl::onPreCompileShader(mbgl::shaders::BuiltIn shaderID, - mbgl::gfx::Backend::Type backend, +void MLNMapViewImpl::onPreCompileShader(mln::shaders::BuiltIn shaderID, + mln::gfx::Backend::Type backend, const std::string& defines) { NSString* definesCopy = [NSString stringWithUTF8String:defines.c_str()]; [mapView shaderWillCompile:static_cast(shaderID) @@ -133,8 +133,8 @@ void MLNMapViewImpl::onPreCompileShader(mbgl::shaders::BuiltIn shaderID, defines:definesCopy]; } -void MLNMapViewImpl::onPostCompileShader(mbgl::shaders::BuiltIn shaderID, - mbgl::gfx::Backend::Type backend, +void MLNMapViewImpl::onPostCompileShader(mln::shaders::BuiltIn shaderID, + mln::gfx::Backend::Type backend, const std::string& defines) { NSString* definesCopy = [NSString stringWithUTF8String:defines.c_str()]; [mapView shaderDidCompile:static_cast(shaderID) @@ -142,8 +142,8 @@ void MLNMapViewImpl::onPostCompileShader(mbgl::shaders::BuiltIn shaderID, defines:definesCopy]; } -void MLNMapViewImpl::onShaderCompileFailed(mbgl::shaders::BuiltIn shaderID, - mbgl::gfx::Backend::Type backend, +void MLNMapViewImpl::onShaderCompileFailed(mln::shaders::BuiltIn shaderID, + mln::gfx::Backend::Type backend, const std::string& defines) { NSString* definesCopy = [NSString stringWithUTF8String:defines.c_str()]; [mapView shaderDidFailCompile:static_cast(shaderID) @@ -151,8 +151,7 @@ void MLNMapViewImpl::onShaderCompileFailed(mbgl::shaders::BuiltIn shaderID, defines:definesCopy]; } -void MLNMapViewImpl::onGlyphsLoaded(const mbgl::FontStack& fontStack, - const mbgl::GlyphRange& range) { +void MLNMapViewImpl::onGlyphsLoaded(const mln::FontStack& fontStack, const mln::GlyphRange& range) { NSMutableArray* fontStackCopy = [[NSMutableArray alloc] init]; std::for_each(fontStack.begin(), fontStack.end(), ^(const std::string& str) { [fontStackCopy addObject:[NSString stringWithUTF8String:str.c_str()]]; @@ -161,7 +160,7 @@ void MLNMapViewImpl::onGlyphsLoaded(const mbgl::FontStack& fontStack, [mapView glyphsDidLoad:fontStackCopy range:NSMakeRange(range.first, range.second - range.first)]; } -void MLNMapViewImpl::onGlyphsError(const mbgl::FontStack& fontStack, const mbgl::GlyphRange& range, +void MLNMapViewImpl::onGlyphsError(const mln::FontStack& fontStack, const mln::GlyphRange& range, std::exception_ptr error) { NSMutableArray* fontStackCopy = [[NSMutableArray alloc] init]; std::for_each(fontStack.begin(), fontStack.end(), ^(const std::string& str) { @@ -171,8 +170,8 @@ void MLNMapViewImpl::onGlyphsError(const mbgl::FontStack& fontStack, const mbgl: [mapView glyphsDidError:fontStackCopy range:NSMakeRange(range.first, range.second - range.first)]; } -void MLNMapViewImpl::onGlyphsRequested(const mbgl::FontStack& fontStack, - const mbgl::GlyphRange& range) { +void MLNMapViewImpl::onGlyphsRequested(const mln::FontStack& fontStack, + const mln::GlyphRange& range) { NSMutableArray* fontStackCopy = [[NSMutableArray alloc] init]; std::for_each(fontStack.begin(), fontStack.end(), ^(const std::string& str) { [fontStackCopy addObject:[NSString stringWithUTF8String:str.c_str()]]; @@ -181,7 +180,7 @@ void MLNMapViewImpl::onGlyphsRequested(const mbgl::FontStack& fontStack, [mapView glyphsWillLoad:fontStackCopy range:NSMakeRange(range.first, range.second - range.first)]; } -void MLNMapViewImpl::onTileAction(mbgl::TileOperation operation, const mbgl::OverscaledTileID& tile, +void MLNMapViewImpl::onTileAction(mln::TileOperation operation, const mln::OverscaledTileID& tile, const std::string& sourceID) { [mapView tileDidTriggerAction:MLNTileOperation(static_cast(operation)) x:tile.canonical.x @@ -192,7 +191,7 @@ void MLNMapViewImpl::onTileAction(mbgl::TileOperation operation, const mbgl::Ove sourceID:[NSString stringWithUTF8String:sourceID.c_str()]]; } -void MLNMapViewImpl::onSpriteLoaded(const std::optional& spriteID) { +void MLNMapViewImpl::onSpriteLoaded(const std::optional& spriteID) { if (!spriteID.has_value()) { [mapView spriteDidLoad:nil url:nil]; return; @@ -202,7 +201,7 @@ void MLNMapViewImpl::onSpriteLoaded(const std::optional& sp url:[NSString stringWithUTF8String:spriteID.value().spriteURL.c_str()]]; } -void MLNMapViewImpl::onSpriteError(const std::optional& spriteID, +void MLNMapViewImpl::onSpriteError(const std::optional& spriteID, std::exception_ptr error) { if (!spriteID.has_value()) { [mapView spriteDidError:nil url:nil]; @@ -213,7 +212,7 @@ void MLNMapViewImpl::onSpriteError(const std::optional& spr url:[NSString stringWithUTF8String:spriteID.value().spriteURL.c_str()]]; } -void MLNMapViewImpl::onSpriteRequested(const std::optional& spriteID) { +void MLNMapViewImpl::onSpriteRequested(const std::optional& spriteID) { if (!spriteID.has_value()) { [mapView spriteWillLoad:nil url:nil]; return; diff --git a/platform/ios/src/MLNMapView+Metal.h b/platform/ios/src/MLNMapView+Metal.h index e602af621..6bb31e757 100644 --- a/platform/ios/src/MLNMapView+Metal.h +++ b/platform/ios/src/MLNMapView+Metal.h @@ -8,8 +8,8 @@ /// Adapter responsible for bridging calls from mbgl to MLNMapView and Cocoa. class MLNMapViewMetalImpl final : public MLNMapViewImpl, - public mbgl::mtl::RendererBackend, - public mbgl::gfx::Renderable { + public mln::mtl::RendererBackend, + public mln::gfx::Renderable { public: MLNMapViewMetalImpl(MLNMapView*); ~MLNMapViewMetalImpl() override; @@ -17,23 +17,23 @@ public: public: void restoreFramebufferBinding(); - // Implementation of mbgl::gfx::RendererBackend + // Implementation of mln::gfx::RendererBackend public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } private: void activate() override; void deactivate() override; - // End implementation of mbgl::gfx::RendererBackend + // End implementation of mln::gfx::RendererBackend - // Implementation of mbgl::gl::RendererBackend + // Implementation of mln::gl::RendererBackend public: void updateAssumedState() override; - // End implementation of mbgl::gl::Rendererbackend + // End implementation of mln::gl::Rendererbackend // Implementation of MLNMapViewImpl public: - mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; } + mln::gfx::RendererBackend& getRendererBackend() override { return *this; } void setOpaque(bool) override; void display() override; diff --git a/platform/ios/src/MLNMapView+Metal.mm b/platform/ios/src/MLNMapView+Metal.mm index 9fcc93f42..184c180bc 100644 --- a/platform/ios/src/MLNMapView+Metal.mm +++ b/platform/ios/src/MLNMapView+Metal.mm @@ -34,7 +34,7 @@ @end -class MLNMapViewMetalRenderableResource final : public mbgl::mtl::RenderableResource { +class MLNMapViewMetalRenderableResource final : public mln::mtl::RenderableResource { public: MLNMapViewMetalRenderableResource(MLNMapViewMetalImpl& backend_) : backend(backend_), delegate([[MLNMapViewImplDelegate alloc] initWithImpl:&backend]) {} @@ -50,18 +50,18 @@ public: } } - const mbgl::mtl::RendererBackend& getBackend() const override { return backend; } + const mln::mtl::RendererBackend& getBackend() const override { return backend; } - const mbgl::mtl::MTLCommandBufferPtr& getCommandBuffer() const override { + const mln::mtl::MTLCommandBufferPtr& getCommandBuffer() const override { return commandBufferPtr; } - virtual mbgl::mtl::MTLBlitPassDescriptorPtr getUploadPassDescriptor() const override { + virtual mln::mtl::MTLBlitPassDescriptorPtr getUploadPassDescriptor() const override { // Create from render pass descriptor? return NS::TransferPtr(MTL::BlitPassDescriptor::alloc()->init()); } - const mbgl::mtl::MTLRenderPassDescriptorPtr& getRenderPassDescriptor() const override { + const mln::mtl::MTLRenderPassDescriptorPtr& getRenderPassDescriptor() const override { if (!cachedRenderPassDescriptor) { auto* mtlDesc = mtlView.currentRenderPassDescriptor; cachedRenderPassDescriptor = NS::RetainPtr((__bridge MTL::RenderPassDescriptor*)mtlDesc); @@ -88,7 +88,7 @@ public: cachedRenderPassDescriptor.reset(); } - mbgl::Size framebufferSize() { + mln::Size framebufferSize() { assert(mtlView); return {static_cast(mtlView.drawableSize.width), static_cast(mtlView.drawableSize.height)}; @@ -96,8 +96,8 @@ public: private: MLNMapViewMetalImpl& backend; - mbgl::mtl::MTLCommandBufferPtr commandBufferPtr; - mutable mbgl::mtl::MTLRenderPassDescriptorPtr cachedRenderPassDescriptor; + mln::mtl::MTLCommandBufferPtr commandBufferPtr; + mutable mln::mtl::MTLRenderPassDescriptorPtr cachedRenderPassDescriptor; public: MLNMapViewImplDelegate* delegate = nil; @@ -118,8 +118,8 @@ public: MLNMapViewMetalImpl::MLNMapViewMetalImpl(MLNMapView* nativeView_) : MLNMapViewImpl(nativeView_), - mbgl::mtl::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable({0, 0}, std::make_unique(*this)) {} + mln::mtl::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable({0, 0}, std::make_unique(*this)) {} MLNMapViewMetalImpl::~MLNMapViewMetalImpl() = default; diff --git a/platform/ios/src/MLNMapView+OpenGL.h b/platform/ios/src/MLNMapView+OpenGL.h index 6841a22f3..54af0db1d 100644 --- a/platform/ios/src/MLNMapView+OpenGL.h +++ b/platform/ios/src/MLNMapView+OpenGL.h @@ -8,8 +8,8 @@ /// Adapter responsible for bridging calls from mbgl to MLNMapView and Cocoa. class MLNMapViewOpenGLImpl final : public MLNMapViewImpl, - public mbgl::gl::RendererBackend, - public mbgl::gfx::Renderable { + public mln::gl::RendererBackend, + public mln::gfx::Renderable { public: MLNMapViewOpenGLImpl(MLNMapView*); ~MLNMapViewOpenGLImpl() override; @@ -22,26 +22,26 @@ private: void emergencyRecreateGL(); #endif - // Implementation of mbgl::gfx::RendererBackend + // Implementation of mln::gfx::RendererBackend public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } private: void activate() override; void deactivate() override; - // End implementation of mbgl::gfx::RendererBackend + // End implementation of mln::gfx::RendererBackend - // Implementation of mbgl::gl::RendererBackend + // Implementation of mln::gl::RendererBackend public: void updateAssumedState() override; private: - mbgl::gl::ProcAddress getExtensionFunctionPointer(const char* name) override; - // End implementation of mbgl::gl::Rendererbackend + mln::gl::ProcAddress getExtensionFunctionPointer(const char* name) override; + // End implementation of mln::gl::Rendererbackend // Implementation of MLNMapViewImpl public: - mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; } + mln::gfx::RendererBackend& getRendererBackend() override { return *this; } EAGLContext* getEAGLContext() override; void setOpaque(bool) override; diff --git a/platform/ios/src/MLNMapView+OpenGL.mm b/platform/ios/src/MLNMapView+OpenGL.mm index c7d2516e2..0c54a26a8 100644 --- a/platform/ios/src/MLNMapView+OpenGL.mm +++ b/platform/ios/src/MLNMapView+OpenGL.mm @@ -36,7 +36,7 @@ CGFloat contentScaleFactor() { } } // namespace -class MLNMapViewOpenGLRenderableResource final : public mbgl::gl::RenderableResource { +class MLNMapViewOpenGLRenderableResource final : public mln::gl::RenderableResource { public: MLNMapViewOpenGLRenderableResource(MLNMapViewOpenGLImpl& backend_) : backend(backend_), @@ -46,7 +46,7 @@ public: void bind() override { backend.restoreFramebufferBinding(); } - mbgl::Size framebufferSize() { + mln::Size framebufferSize() { assert(glView); return {static_cast(glView.drawableWidth), static_cast(glView.drawableHeight)}; @@ -68,8 +68,8 @@ public: MLNMapViewOpenGLImpl::MLNMapViewOpenGLImpl(MLNMapView* nativeView_) : MLNMapViewImpl(nativeView_), - mbgl::gl::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable({0, 0}, std::make_unique(*this)) {} + mln::gl::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable({0, 0}, std::make_unique(*this)) {} MLNMapViewOpenGLImpl::~MLNMapViewOpenGLImpl() { auto& resource = getResource(); @@ -182,13 +182,13 @@ void MLNMapViewOpenGLImpl::emergencyRecreateGL() { } #endif -mbgl::gl::ProcAddress MLNMapViewOpenGLImpl::getExtensionFunctionPointer(const char* name) { +mln::gl::ProcAddress MLNMapViewOpenGLImpl::getExtensionFunctionPointer(const char* name) { static CFBundleRef framework = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengles")); if (!framework) { throw std::runtime_error("Failed to load OpenGL framework."); } - return reinterpret_cast(CFBundleGetFunctionPointerForName( + return reinterpret_cast(CFBundleGetFunctionPointerForName( framework, (__bridge CFStringRef)[NSString stringWithUTF8String:name])); } diff --git a/platform/ios/src/MLNMapView+WebGPU.h b/platform/ios/src/MLNMapView+WebGPU.h index e900df1b4..9263d7548 100644 --- a/platform/ios/src/MLNMapView+WebGPU.h +++ b/platform/ios/src/MLNMapView+WebGPU.h @@ -6,26 +6,26 @@ /// Adapter responsible for bridging calls from mbgl to MLNMapView and Cocoa (WebGPU backend). class MLNMapViewWebGPUImpl final : public MLNMapViewImpl, - public mbgl::webgpu::RendererBackend, - public mbgl::gfx::Renderable { + public mln::webgpu::RendererBackend, + public mln::gfx::Renderable { public: MLNMapViewWebGPUImpl(MLNMapView*); ~MLNMapViewWebGPUImpl() override; - // Implementation of mbgl::gfx::RendererBackend + // Implementation of mln::gfx::RendererBackend public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } // webgpu::RendererBackend overrides void* getCurrentTextureView() override; void* getDepthStencilView() override; - mbgl::Size getFramebufferSize() const override; + mln::Size getFramebufferSize() const override; void presentSurface(); void markNeedsPresent(); // Implementation of MLNMapViewImpl public: - mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; } + mln::gfx::RendererBackend& getRendererBackend() override { return *this; } void setOpaque(bool) override; void display() override; diff --git a/platform/ios/src/MLNMapView+WebGPU.mm b/platform/ios/src/MLNMapView+WebGPU.mm index 84eff2da1..db447fcde 100644 --- a/platform/ios/src/MLNMapView+WebGPU.mm +++ b/platform/ios/src/MLNMapView+WebGPU.mm @@ -38,7 +38,7 @@ } @end -class MLNMapViewWebGPURenderableResource final : public mbgl::webgpu::RenderableResource { +class MLNMapViewWebGPURenderableResource final : public mln::webgpu::RenderableResource { public: MLNMapViewWebGPURenderableResource(MLNMapViewWebGPUImpl& backend_) : backend(backend_) {} @@ -46,7 +46,7 @@ public: void swap() override { backend.markNeedsPresent(); } - const mbgl::webgpu::RendererBackend& getBackend() const override { return backend; } + const mln::webgpu::RendererBackend& getBackend() const override { return backend; } const WGPUCommandEncoder& getCommandEncoder() const override { assert(false); @@ -94,7 +94,7 @@ public: WGPUTextureView currentTextureView = nullptr; bool needsPresent = false; - mbgl::Size framebufferSize; + mln::Size framebufferSize; MLNWebGPUView* webGPUView = nil; bool presentsWithTransaction = false; @@ -103,8 +103,8 @@ public: MLNMapViewWebGPUImpl::MLNMapViewWebGPUImpl(MLNMapView* nativeView_) : MLNMapViewImpl(nativeView_), - mbgl::webgpu::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable({0, 0}, std::make_unique(*this)), + mln::webgpu::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable({0, 0}, std::make_unique(*this)), impl(std::make_unique()) { #if MLN_WEBGPU_IMPL_DAWN // Required when not using the monolithic Dawn library. @@ -127,7 +127,7 @@ MLNMapViewWebGPUImpl::MLNMapViewWebGPUImpl(MLNMapView* nativeView_) adapters = impl->instance->EnumerateAdapters(); } if (adapters.empty()) { - mbgl::Log::Error(mbgl::Event::Render, "WebGPU iOS: No adapters found"); + mln::Log::Error(mln::Event::Render, "WebGPU iOS: No adapters found"); return; } @@ -150,7 +150,7 @@ MLNMapViewWebGPUImpl::MLNMapViewWebGPUImpl(MLNMapView* nativeView_) wgpu::InstanceDescriptor instanceDesc = {}; impl->instance = wgpu::createInstance(instanceDesc); if (!impl->instance) { - mbgl::Log::Error(mbgl::Event::Render, "WebGPU iOS: Failed to create instance"); + mln::Log::Error(mln::Event::Render, "WebGPU iOS: Failed to create instance"); return; } @@ -160,7 +160,7 @@ MLNMapViewWebGPUImpl::MLNMapViewWebGPUImpl(MLNMapView* nativeView_) impl->adapter = impl->instance.requestAdapter(adapterOpts); if (!impl->adapter) { - mbgl::Log::Error(mbgl::Event::Render, "WebGPU iOS: No adapter found"); + mln::Log::Error(mln::Event::Render, "WebGPU iOS: No adapter found"); return; } @@ -202,7 +202,7 @@ MLNMapViewWebGPUImpl::MLNMapViewWebGPUImpl(MLNMapView* nativeView_) #if MLN_WEBGPU_IMPL_DAWN WGPUDevice rawDevice = selectedAdapter.CreateDevice(&deviceDesc); if (!rawDevice) { - mbgl::Log::Error(mbgl::Event::Render, "WebGPU iOS: Failed to create device"); + mln::Log::Error(mln::Event::Render, "WebGPU iOS: Failed to create device"); return; } @@ -217,7 +217,7 @@ MLNMapViewWebGPUImpl::MLNMapViewWebGPUImpl(MLNMapView* nativeView_) #elif MLN_WEBGPU_IMPL_WGPU impl->device = impl->adapter.requestDevice(deviceDesc); if (!impl->device) { - mbgl::Log::Error(mbgl::Event::Render, "WebGPU iOS: Failed to create device"); + mln::Log::Error(mln::Event::Render, "WebGPU iOS: Failed to create device"); return; } @@ -354,7 +354,7 @@ void MLNMapViewWebGPUImpl::createSurface() { #endif if (!impl->surface) { - mbgl::Log::Error(mbgl::Event::Render, "WebGPU iOS: Failed to create surface"); + mln::Log::Error(mln::Event::Render, "WebGPU iOS: Failed to create surface"); } } @@ -456,7 +456,7 @@ void MLNMapViewWebGPUImpl::createDepthStencilTexture(uint32_t width, uint32_t he wgpuDeviceCreateTexture(static_cast(impl->device), &depthDesc); #endif if (!impl->depthStencilTexture) { - mbgl::Log::Warning(mbgl::Event::Render, "WebGPU iOS: Failed to create depth/stencil texture"); + mln::Log::Warning(mln::Event::Render, "WebGPU iOS: Failed to create depth/stencil texture"); return; } @@ -475,7 +475,7 @@ void MLNMapViewWebGPUImpl::createDepthStencilTexture(uint32_t width, uint32_t he impl->depthStencilView = wgpuTextureCreateView(impl->depthStencilTexture, &viewDesc); if (!impl->depthStencilView) { - mbgl::Log::Warning(mbgl::Event::Render, "WebGPU iOS: Failed to create depth/stencil view"); + mln::Log::Warning(mln::Event::Render, "WebGPU iOS: Failed to create depth/stencil view"); } } @@ -557,7 +557,7 @@ void MLNMapViewWebGPUImpl::presentSurface() { void* MLNMapViewWebGPUImpl::getDepthStencilView() { return impl->depthStencilView; } -mbgl::Size MLNMapViewWebGPUImpl::getFramebufferSize() const { return impl->framebufferSize; } +mln::Size MLNMapViewWebGPUImpl::getFramebufferSize() const { return impl->framebufferSize; } UIView* MLNMapViewWebGPUImpl::getView() { return impl->webGPUView; } diff --git a/platform/ios/src/MLNMapView.mm b/platform/ios/src/MLNMapView.mm index 876b7388f..b3ef52c9f 100644 --- a/platform/ios/src/MLNMapView.mm +++ b/platform/ios/src/MLNMapView.mm @@ -332,7 +332,7 @@ typedef std::unordered_map MLNAnnotation /// Mapping from an annotation object to an annotation tag. typedef std::map, MLNAnnotationTag> MLNAnnotationObjectTagMap; -mbgl::util::UnitBezier MLNUnitBezierForMediaTimingFunction(CAMediaTimingFunction *function) { +mln::util::UnitBezier MLNUnitBezierForMediaTimingFunction(CAMediaTimingFunction *function) { if (!function) { function = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault]; } @@ -455,7 +455,7 @@ public: @end @implementation MLNMapView { - std::unique_ptr _mbglMap; + std::unique_ptr _mbglMap; std::unique_ptr _mbglView; std::unique_ptr _rendererFrontend; @@ -638,7 +638,7 @@ public: self.styleURL = styleURL; } -- (mbgl::Map &)mbglMap { +- (mln::Map &)mbglMap { if (!_mbglMap) { [NSException raise:MLNUnderlyingMapUnavailableException @@ -647,7 +647,7 @@ public: return *_mbglMap; } -- (mbgl::Renderer *)renderer { +- (mln::Renderer *)renderer { return _rendererFrontend->getRenderer(); } @@ -698,40 +698,40 @@ public: config.localFontFamilyName ? std::optional(std::string(config.localFontFamilyName.UTF8String)) : std::nullopt; - auto renderer = std::make_unique(_mbglView->getRendererBackend(), - config.scaleFactor, localFontFamilyName); + auto renderer = std::make_unique(_mbglView->getRendererBackend(), + config.scaleFactor, localFontFamilyName); BOOL enableCrossSourceCollisions = !config.perSourceCollisions; _rendererFrontend = std::make_unique(std::move(renderer), self, _mbglView->getRendererBackend()); - mbgl::MapOptions mapOptions; - mapOptions.withMapMode(mbgl::MapMode::Continuous) + mln::MapOptions mapOptions; + mapOptions.withMapMode(mln::MapMode::Continuous) .withSize(self.size) .withPixelRatio(config.scaleFactor) - .withConstrainMode(mbgl::ConstrainMode::None) - .withViewportMode(mbgl::ViewportMode::Default) + .withConstrainMode(mln::ConstrainMode::None) + .withViewportMode(mln::ViewportMode::Default) .withCrossSourceCollisions(enableCrossSourceCollisions) .withFastPFOREnabled(mlnMapoptions.fastPFOREnabled); - mbgl::TileServerOptions *tileServerOptions = + mln::TileServerOptions *tileServerOptions = [[MLNSettings sharedSettings] tileServerOptionsInternal]; - mbgl::ResourceOptions resourceOptions; + mln::ResourceOptions resourceOptions; resourceOptions.withCachePath(MLNOfflineStorage.sharedOfflineStorage.databasePath.UTF8String) .withAssetPath([NSBundle mainBundle].resourceURL.path.UTF8String) .withTileServerOptions(*tileServerOptions); - mbgl::ClientOptions clientOptions; + mln::ClientOptions clientOptions; auto apiKey = [[MLNSettings sharedSettings] apiKey]; if (apiKey) { resourceOptions.withApiKey([apiKey UTF8String]); } - const mbgl::util::ActionJournalOptions &actionJournalOptions = + const mln::util::ActionJournalOptions &actionJournalOptions = [mlnMapoptions.actionJournalOptions getCoreOptions]; NSAssert(!_mbglMap, @"_mbglMap should be NULL"); - _mbglMap = std::make_unique(*_rendererFrontend, *_mbglView, mapOptions, - resourceOptions, clientOptions, actionJournalOptions); + _mbglMap = std::make_unique(*_rendererFrontend, *_mbglView, mapOptions, resourceOptions, + clientOptions, actionJournalOptions); // start paused if launch into the background if (background) { @@ -975,9 +975,9 @@ public: // set initial position // - mbgl::CameraOptions options; - options.center = mbgl::LatLng(0, 0); - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInset); + mln::CameraOptions options; + options.center = mln::LatLng(0, 0); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInset); options.padding = padding; options.zoom = 0; @@ -993,7 +993,7 @@ public: _dynamicNavigationCameraAnimationDuration = NO; } -- (mbgl::Size)size { +- (mln::Size)size { // check for minimum texture size supported by OpenGL ES 2.0 // CGSize size = CGSizeMake(MAX(self.bounds.size.width, 64), MAX(self.bounds.size.height, 64)); @@ -1005,7 +1005,7 @@ public: MLNReachability *reachability = [notification object]; if (!_isWaitingForRedundantReachableNotification && [reachability isReachable]) { - mbgl::NetworkStatus::Reachable(); + mln::NetworkStatus::Reachable(); } _isWaitingForRedundantReachableNotification = NO; } @@ -1661,8 +1661,8 @@ public: - (void)validateDisplayLink { BOOL isVisible = self.superview && self.window; if (isVisible && !_displayLink) { - if (_mbglMap && self.mbglMap.getMapOptions().constrainMode() == mbgl::ConstrainMode::None) { - self.mbglMap.setConstrainMode(mbgl::ConstrainMode::HeightOnly); + if (_mbglMap && self.mbglMap.getMapOptions().constrainMode() == mln::ConstrainMode::None) { + self.mbglMap.setConstrainMode(mln::ConstrainMode::HeightOnly); } _displayLink = [self.window.screen displayLinkWithTarget:self @@ -1917,8 +1917,8 @@ public: [self.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes]; - if (_mbglMap && self.mbglMap.getMapOptions().constrainMode() == mbgl::ConstrainMode::None) { - self.mbglMap.setConstrainMode(mbgl::ConstrainMode::HeightOnly); + if (_mbglMap && self.mbglMap.getMapOptions().constrainMode() == mln::ConstrainMode::None) { + self.mbglMap.setConstrainMode(mln::ConstrainMode::HeightOnly); } } @@ -2283,8 +2283,8 @@ public: aroundAnchorPoint:centerPoint]; if ([self _shouldChangeFromCamera:oldCamera toCamera:toCamera]) { - self.mbglMap.jumpTo(mbgl::CameraOptions().withZoom(newZoom).withAnchor( - mbgl::ScreenCoordinate{centerPoint.x, centerPoint.y})); + self.mbglMap.jumpTo(mln::CameraOptions().withZoom(newZoom).withAnchor( + mln::ScreenCoordinate{centerPoint.x, centerPoint.y})); // The gesture recognizer only reports the gesture’s current center // point, so use the previous center point to anchor the transition. @@ -2332,8 +2332,8 @@ public: drift = NO; } else { if (drift) { - self.mbglMap.easeTo(mbgl::CameraOptions().withZoom(zoom).withAnchor( - mbgl::ScreenCoordinate{centerPoint.x, centerPoint.y}), + self.mbglMap.easeTo(mln::CameraOptions().withZoom(zoom).withAnchor( + mln::ScreenCoordinate{centerPoint.x, centerPoint.y}), MLNDurationFromTimeInterval(duration)); } } @@ -2401,9 +2401,9 @@ public: aroundAnchorPoint:centerPoint]; if ([self _shouldChangeFromCamera:oldCamera toCamera:toCamera]) { - self.mbglMap.jumpTo(mbgl::CameraOptions() + self.mbglMap.jumpTo(mln::CameraOptions() .withBearing(newDegrees) - .withAnchor(mbgl::ScreenCoordinate{centerPoint.x, centerPoint.y})); + .withAnchor(mln::ScreenCoordinate{centerPoint.x, centerPoint.y})); } [self cameraIsChanging]; @@ -2440,9 +2440,9 @@ public: aroundAnchorPoint:centerPoint]; if ([self _shouldChangeFromCamera:oldCamera toCamera:toCamera]) { - self.mbglMap.easeTo(mbgl::CameraOptions() + self.mbglMap.easeTo(mln::CameraOptions() .withBearing(newDegrees) - .withAnchor(mbgl::ScreenCoordinate{centerPoint.x, centerPoint.y}), + .withAnchor(mln::ScreenCoordinate{centerPoint.x, centerPoint.y}), MLNDurationFromTimeInterval(decelerationRate)); [self notifyGestureDidEndWithDrift:YES]; @@ -2561,8 +2561,8 @@ public: MLNMapCamera *toCamera = [self cameraByZoomingToZoomLevel:newZoom aroundAnchorPoint:gesturePoint]; if ([self _shouldChangeFromCamera:oldCamera toCamera:toCamera]) { - mbgl::ScreenCoordinate center(gesturePoint.x, gesturePoint.y); - self.mbglMap.easeTo(mbgl::CameraOptions().withZoom(newZoom).withAnchor(center), + mln::ScreenCoordinate center(gesturePoint.x, gesturePoint.y); + self.mbglMap.easeTo(mln::CameraOptions().withZoom(newZoom).withAnchor(center), MLNDurationFromTimeInterval(MLNAnimationDuration)); __weak MLNMapView *weakSelf = self; @@ -2596,8 +2596,8 @@ public: MLNMapCamera *toCamera = [self cameraByZoomingToZoomLevel:newZoom aroundAnchorPoint:gesturePoint]; if ([self _shouldChangeFromCamera:oldCamera toCamera:toCamera]) { - mbgl::ScreenCoordinate center(gesturePoint.x, gesturePoint.y); - self.mbglMap.easeTo(mbgl::CameraOptions().withZoom(newZoom).withAnchor(center), + mln::ScreenCoordinate center(gesturePoint.x, gesturePoint.y); + self.mbglMap.easeTo(mln::CameraOptions().withZoom(newZoom).withAnchor(center), MLNDurationFromTimeInterval(MLNAnimationDuration)); __weak MLNMapView *weakSelf = self; @@ -2638,8 +2638,8 @@ public: aroundAnchorPoint:centerPoint]; if ([self _shouldChangeFromCamera:oldCamera toCamera:toCamera]) { - self.mbglMap.jumpTo(mbgl::CameraOptions().withZoom(newZoom).withAnchor( - mbgl::ScreenCoordinate{centerPoint.x, centerPoint.y})); + self.mbglMap.jumpTo(mln::CameraOptions().withZoom(newZoom).withAnchor( + mln::ScreenCoordinate{centerPoint.x, centerPoint.y})); } [self cameraIsChanging]; @@ -2701,8 +2701,8 @@ public: MLNMapCamera *toCamera = [self cameraByTiltingToPitch:pitchNew]; if ([self _shouldChangeFromCamera:oldCamera toCamera:toCamera]) { - self.mbglMap.jumpTo(mbgl::CameraOptions().withPitch(pitchNew).withAnchor( - mbgl::ScreenCoordinate{centerPoint.x, centerPoint.y})); + self.mbglMap.jumpTo(mln::CameraOptions().withPitch(pitchNew).withAnchor( + mln::ScreenCoordinate{centerPoint.x, centerPoint.y})); } [self cameraIsChanging]; @@ -2731,12 +2731,12 @@ public: } - (MLNMapCamera *)cameraByZoomingToZoomLevel:(double)zoom aroundAnchorPoint:(CGPoint)anchorPoint { - mbgl::ScreenCoordinate anchor = mbgl::ScreenCoordinate{anchorPoint.x, anchorPoint.y}; - mbgl::EdgeInsets padding = - mbgl::EdgeInsets(anchor.y, anchor.x, self.size.height - anchor.y, self.size.width - anchor.x); - mbgl::CameraOptions currentCameraOptions = self.mbglMap.getCameraOptions(padding); + mln::ScreenCoordinate anchor = mln::ScreenCoordinate{anchorPoint.x, anchorPoint.y}; + mln::EdgeInsets padding = + mln::EdgeInsets(anchor.y, anchor.x, self.size.height - anchor.y, self.size.width - anchor.x); + mln::CameraOptions currentCameraOptions = self.mbglMap.getCameraOptions(padding); - currentCameraOptions.zoom = mbgl::util::clamp(zoom, self.minimumZoomLevel, self.maximumZoomLevel); + currentCameraOptions.zoom = mln::util::clamp(zoom, self.minimumZoomLevel, self.maximumZoomLevel); currentCameraOptions.anchor = anchor; MLNCoordinateBounds bounds = MLNCoordinateBoundsFromLatLngBounds(self.mbglMap.latLngBoundsForCamera(currentCameraOptions)); @@ -2746,11 +2746,11 @@ public: - (MLNMapCamera *)cameraByRotatingToDirection:(CLLocationDirection)degrees aroundAnchorPoint:(CGPoint)anchorPoint { - mbgl::CameraOptions currentCameraOptions = self.mbglMap.getCameraOptions(); + mln::CameraOptions currentCameraOptions = self.mbglMap.getCameraOptions(); MLNMapCamera *camera; - mbgl::ScreenCoordinate anchor = mbgl::ScreenCoordinate{anchorPoint.x, anchorPoint.y}; + mln::ScreenCoordinate anchor = mln::ScreenCoordinate{anchorPoint.x, anchorPoint.y}; currentCameraOptions.bearing = degrees; currentCameraOptions.anchor = anchor; camera = [self cameraForCameraOptions:currentCameraOptions]; @@ -2759,7 +2759,7 @@ public: } - (MLNMapCamera *)cameraByTiltingToPitch:(CGFloat)pitch { - mbgl::CameraOptions currentCameraOptions = self.mbglMap.getCameraOptions(); + mln::CameraOptions currentCameraOptions = self.mbglMap.getCameraOptions(); MLNMapCamera *camera; @@ -2957,7 +2957,7 @@ static void *windowScreenContext = &windowScreenContext; // match a valid annotation tag, the annotation will be unnecessarily // but safely updated. if (annotation == [self annotationWithTag:annotationTag]) { - const mbgl::Point point = MLNPointFromLocationCoordinate2D(annotation.coordinate); + const mln::Point point = MLNPointFromLocationCoordinate2D(annotation.coordinate); if (annotationTag != MLNAnnotationTagNotFound) { MLNAnnotationContext &annotationContext = @@ -2977,7 +2977,7 @@ static void *windowScreenContext = &windowScreenContext; // disables the view’s animation actions, because it can’t distinguish between moves due to // the viewport changing and moves due to the annotation’s coordinate changing. self.mbglMap.updateAnnotation(annotationTag, - mbgl::SymbolAnnotation{point, symbolName.UTF8String}); + mln::SymbolAnnotation{point, symbolName.UTF8String}); [self updateCalloutView]; } } @@ -3026,21 +3026,21 @@ static void *windowScreenContext = &windowScreenContext; return self.residualDebugMask; } - mbgl::MapDebugOptions options = self.mbglMap.getDebug(); + mln::MapDebugOptions options = self.mbglMap.getDebug(); MLNMapDebugMaskOptions mask = 0; - if (options & mbgl::MapDebugOptions::TileBorders) { + if (options & mln::MapDebugOptions::TileBorders) { mask |= MLNMapDebugTileBoundariesMask; } - if (options & mbgl::MapDebugOptions::ParseStatus) { + if (options & mln::MapDebugOptions::ParseStatus) { mask |= MLNMapDebugTileInfoMask; } - if (options & mbgl::MapDebugOptions::Timestamps) { + if (options & mln::MapDebugOptions::Timestamps) { mask |= MLNMapDebugTimestampsMask; } - if (options & mbgl::MapDebugOptions::Collision) { + if (options & mln::MapDebugOptions::Collision) { mask |= MLNMapDebugCollisionBoxesMask; } - if (options & mbgl::MapDebugOptions::Overdraw) { + if (options & mln::MapDebugOptions::Overdraw) { mask |= MLNMapDebugOverdrawVisualizationMask; } return mask; @@ -3051,21 +3051,21 @@ static void *windowScreenContext = &windowScreenContext; return; } - mbgl::MapDebugOptions options = mbgl::MapDebugOptions::NoDebug; + mln::MapDebugOptions options = mln::MapDebugOptions::NoDebug; if (debugMask & MLNMapDebugTileBoundariesMask) { - options |= mbgl::MapDebugOptions::TileBorders; + options |= mln::MapDebugOptions::TileBorders; } if (debugMask & MLNMapDebugTileInfoMask) { - options |= mbgl::MapDebugOptions::ParseStatus; + options |= mln::MapDebugOptions::ParseStatus; } if (debugMask & MLNMapDebugTimestampsMask) { - options |= mbgl::MapDebugOptions::Timestamps; + options |= mln::MapDebugOptions::Timestamps; } if (debugMask & MLNMapDebugCollisionBoxesMask) { - options |= mbgl::MapDebugOptions::Collision; + options |= mln::MapDebugOptions::Collision; } if (debugMask & MLNMapDebugOverdrawVisualizationMask) { - options |= mbgl::MapDebugOptions::Overdraw; + options |= mln::MapDebugOptions::Overdraw; } self.mbglMap.setDebug(options); } @@ -3088,9 +3088,9 @@ static void *windowScreenContext = &windowScreenContext; double pitch = camera.pitch ? *camera.pitch : 0.0; double bearing = camera.bearing ? *camera.bearing : 0.0; double zoom = camera.zoom ? *camera.zoom : 0.0; - mbgl::LatLng center = camera.center ? *camera.center : mbgl::LatLng(); + mln::LatLng center = camera.center ? *camera.center : mln::LatLng(); - CLLocationDirection heading = mbgl::util::wrap(bearing, 0., 360.); + CLLocationDirection heading = mln::util::wrap(bearing, 0., 360.); CLLocationDistance altitude = MLNAltitudeForZoomLevel(zoom, pitch, 0, self.frame.size); self.camera = [MLNMapCamera cameraLookingAtCenterCoordinate:MLNLocationCoordinate2DFromLatLng(center) @@ -3170,7 +3170,7 @@ static void *windowScreenContext = &windowScreenContext; } - (void)setPrefetchesTiles:(BOOL)prefetchesTiles { - self.mbglMap.setPrefetchZoomDelta(prefetchesTiles ? mbgl::util::DEFAULT_PREFETCH_ZOOM_DELTA : 0); + self.mbglMap.setPrefetchZoomDelta(prefetchesTiles ? mln::util::DEFAULT_PREFETCH_ZOOM_DELTA : 0); } - (BOOL)prefetchesTiles { @@ -3764,8 +3764,8 @@ static void *windowScreenContext = &windowScreenContext; centerPoint = self.userLocationAnnotationViewCenter; } double newZoom = round(self.zoomLevel) + log2(scaleFactor); - self.mbglMap.jumpTo(mbgl::CameraOptions().withZoom(newZoom).withAnchor( - mbgl::ScreenCoordinate{centerPoint.x, centerPoint.y})); + self.mbglMap.jumpTo(mln::CameraOptions().withZoom(newZoom).withAnchor( + mln::ScreenCoordinate{centerPoint.x, centerPoint.y})); [self unrotateIfNeededForGesture]; _accessibilityValueAnnouncementIsPending = YES; @@ -3855,7 +3855,7 @@ static void *windowScreenContext = &windowScreenContext; return; } - mbgl::CameraOptions cameraOptions; + mln::CameraOptions cameraOptions; cameraOptions.center = MLNLatLngFromLocationCoordinate2D(centerCoordinate); cameraOptions.padding = MLNEdgeInsetsFromNSEdgeInsets(insets); cameraOptions.zoom = zoomLevel; @@ -3863,7 +3863,7 @@ static void *windowScreenContext = &windowScreenContext; cameraOptions.bearing = direction; } - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration) { animationOptions.duration.emplace(MLNDurationFromTimeInterval(duration)); animationOptions.easing.emplace(MLNUnitBezierForMediaTimingFunction(function)); @@ -3927,13 +3927,13 @@ static void *windowScreenContext = &windowScreenContext; CGFloat duration = animated ? MLNAnimationDuration : 0; - self.mbglMap.easeTo(mbgl::CameraOptions().withZoom(zoomLevel), + self.mbglMap.easeTo(mln::CameraOptions().withZoom(zoomLevel), MLNDurationFromTimeInterval(duration)); } - (void)setMinimumZoomLevel:(double)minimumZoomLevel { MLNLogDebug(@"Setting minimumZoomLevel: %f", minimumZoomLevel); - self.mbglMap.setBounds(mbgl::BoundOptions().withMinZoom(minimumZoomLevel)); + self.mbglMap.setBounds(mln::BoundOptions().withMinZoom(minimumZoomLevel)); } - (double)minimumZoomLevel { @@ -3942,7 +3942,7 @@ static void *windowScreenContext = &windowScreenContext; - (void)setMaximumZoomLevel:(double)maximumZoomLevel { MLNLogDebug(@"Setting maximumZoomLevel: %f", maximumZoomLevel); - self.mbglMap.setBounds(mbgl::BoundOptions().withMaxZoom(maximumZoomLevel)); + self.mbglMap.setBounds(mln::BoundOptions().withMaxZoom(maximumZoomLevel)); } - (double)maximumZoomLevel { @@ -3950,13 +3950,13 @@ static void *windowScreenContext = &windowScreenContext; } - (void)setMaximumScreenBounds:(MLNCoordinateBounds)maximumScreenBounds { - mbgl::LatLng sw = {maximumScreenBounds.sw.latitude, maximumScreenBounds.sw.longitude}; - mbgl::LatLng ne = {maximumScreenBounds.ne.latitude, maximumScreenBounds.ne.longitude}; - mbgl::BoundOptions newBounds = - mbgl::BoundOptions().withLatLngBounds(mbgl::LatLngBounds::hull(sw, ne)); + mln::LatLng sw = {maximumScreenBounds.sw.latitude, maximumScreenBounds.sw.longitude}; + mln::LatLng ne = {maximumScreenBounds.ne.latitude, maximumScreenBounds.ne.longitude}; + mln::BoundOptions newBounds = + mln::BoundOptions().withLatLngBounds(mln::LatLngBounds::hull(sw, ne)); self.mbglMap.setBounds(newBounds); - self.mbglMap.setConstrainMode(mbgl::ConstrainMode::Screen); + self.mbglMap.setConstrainMode(mln::ConstrainMode::Screen); } - (MLNCoordinateBounds)maximumScreenBounds { @@ -3970,7 +3970,7 @@ static void *windowScreenContext = &windowScreenContext; - (void)setMinimumPitch:(CGFloat)minimumPitch { MLNLogDebug(@"Setting minimumPitch: %f", minimumPitch); - self.mbglMap.setBounds(mbgl::BoundOptions().withMinPitch(minimumPitch)); + self.mbglMap.setBounds(mln::BoundOptions().withMinPitch(minimumPitch)); } - (CGFloat)maximumPitch { @@ -3979,7 +3979,7 @@ static void *windowScreenContext = &windowScreenContext; - (void)setMaximumPitch:(CGFloat)maximumPitch { MLNLogDebug(@"Setting maximumPitch: %f", maximumPitch); - self.mbglMap.setBounds(mbgl::BoundOptions().withMaxPitch(maximumPitch)); + self.mbglMap.setBounds(mln::BoundOptions().withMaxPitch(maximumPitch)); } - (MLNCoordinateBounds)visibleCoordinateBounds { @@ -4097,9 +4097,9 @@ static void *windowScreenContext = &windowScreenContext; return; } - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInset); - std::vector latLngs; + std::vector latLngs; latLngs.reserve(count); for (NSUInteger i = 0; i < count; i++) { latLngs.push_back({coordinates[i].latitude, coordinates[i].longitude}); @@ -4107,10 +4107,10 @@ static void *windowScreenContext = &windowScreenContext; CLLocationDirection cameraDirection = direction >= 0 ? direction : self.direction; - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = self.mbglMap.cameraForLatLngs(latLngs, padding, cameraDirection); - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration > 0) { animationOptions.duration.emplace(MLNDurationFromTimeInterval(duration)); animationOptions.easing.emplace(MLNUnitBezierForMediaTimingFunction(function)); @@ -4157,7 +4157,7 @@ static void *windowScreenContext = &windowScreenContext; } - (CLLocationDirection)direction { - return mbgl::util::wrap(*self.mbglMap.getCameraOptions().bearing, 0., 360.); + return mln::util::wrap(*self.mbglMap.getCameraOptions().bearing, 0., 360.); } - (void)setDirection:(CLLocationDirection)direction animated:(BOOL)animated { @@ -4187,15 +4187,15 @@ static void *windowScreenContext = &windowScreenContext; self.cameraChangeReasonBitmask |= MLNCameraChangeReasonProgrammatic; if (self.userTrackingMode == MLNUserTrackingModeNone) { - self.mbglMap.easeTo(mbgl::CameraOptions().withBearing(direction), + self.mbglMap.easeTo(mln::CameraOptions().withBearing(direction), MLNDurationFromTimeInterval(duration)); } else { CGPoint anchor = self.userLocationAnnotationViewCenter; - mbgl::CameraOptions cameraOptions = mbgl::CameraOptions().withBearing(direction).withAnchor( - mbgl::ScreenCoordinate{anchor.x, anchor.y}); + mln::CameraOptions cameraOptions = mln::CameraOptions().withBearing(direction).withAnchor( + mln::ScreenCoordinate{anchor.x, anchor.y}); - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; animationOptions.duration.emplace(MLNDurationFromTimeInterval(duration)); if (CLLocationCoordinate2DIsValid(center)) { @@ -4227,8 +4227,8 @@ static void *windowScreenContext = &windowScreenContext; } - (UIEdgeInsets)cameraEdgeInsets { - mbgl::CameraOptions cameraOptions = self.mbglMap.getCameraOptions(); - return NSEdgeInsetsFromMLNEdgeInsets(cameraOptions.padding.value_or(mbgl::EdgeInsets())); + mln::CameraOptions cameraOptions = self.mbglMap.getCameraOptions(); + return NSEdgeInsetsFromMLNEdgeInsets(cameraOptions.padding.value_or(mln::EdgeInsets())); } - (MLNMapCamera *)camera { @@ -4294,7 +4294,7 @@ static void *windowScreenContext = &windowScreenContext; edgePadding = MLNEdgeInsetsInsetEdgeInset(edgePadding, self.contentInset); - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration > 0) { animationOptions.duration.emplace(MLNDurationFromTimeInterval(duration)); animationOptions.easing.emplace(MLNUnitBezierForMediaTimingFunction(function)); @@ -4329,8 +4329,8 @@ static void *windowScreenContext = &windowScreenContext; self.cameraChangeReasonBitmask |= MLNCameraChangeReasonProgrammatic; - mbgl::CameraOptions cameraOptions = [self cameraOptionsObjectForAnimatingToCamera:camera - edgePadding:edgePadding]; + mln::CameraOptions cameraOptions = [self cameraOptionsObjectForAnimatingToCamera:camera + edgePadding:edgePadding]; self.mbglMap.easeTo(cameraOptions, animationOptions); [self didChangeValueForKey:@"camera"]; } @@ -4387,7 +4387,7 @@ static void *windowScreenContext = &windowScreenContext; return; } - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration >= 0) { animationOptions.duration = MLNDurationFromTimeInterval(duration); } @@ -4427,8 +4427,8 @@ static void *windowScreenContext = &windowScreenContext; self.cameraChangeReasonBitmask |= MLNCameraChangeReasonProgrammatic; - mbgl::CameraOptions cameraOptions = [self cameraOptionsObjectForAnimatingToCamera:camera - edgePadding:insets]; + mln::CameraOptions cameraOptions = [self cameraOptionsObjectForAnimatingToCamera:camera + edgePadding:insets]; self.mbglMap.flyTo(cameraOptions, animationOptions); [self didChangeValueForKey:@"camera"]; } @@ -4452,9 +4452,9 @@ static void *windowScreenContext = &windowScreenContext; return self.residualCamera; } - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInset); - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = self.mbglMap.cameraForLatLngBounds(MLNLatLngBoundsFromCoordinateBounds(bounds), padding); return [self cameraForCameraOptions:cameraOptions]; } @@ -4466,14 +4466,14 @@ static void *windowScreenContext = &windowScreenContext; return self.residualCamera; } - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInset); MLNMapCamera *currentCamera = self.camera; CGFloat pitch = camera.pitch < 0 ? currentCamera.pitch : camera.pitch; CLLocationDirection direction = camera.heading < 0 ? currentCamera.heading : camera.heading; - mbgl::CameraOptions cameraOptions = self.mbglMap.cameraForLatLngBounds( + mln::CameraOptions cameraOptions = self.mbglMap.cameraForLatLngBounds( MLNLatLngBoundsFromCoordinateBounds(bounds), padding, direction, pitch); return [self cameraForCameraOptions:cameraOptions]; } @@ -4485,14 +4485,14 @@ static void *windowScreenContext = &windowScreenContext; return self.residualCamera; } - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInset); MLNMapCamera *currentCamera = self.camera; CGFloat pitch = camera.pitch < 0 ? currentCamera.pitch : camera.pitch; CLLocationDirection direction = camera.heading < 0 ? currentCamera.heading : camera.heading; - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = self.mbglMap.cameraForGeometry([shape geometryObject], padding, direction, pitch); return [self cameraForCameraOptions:cameraOptions]; @@ -4505,26 +4505,26 @@ static void *windowScreenContext = &windowScreenContext; return self.residualCamera; } - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInset); - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = self.mbglMap.cameraForGeometry([shape geometryObject], padding, direction); return [self cameraForCameraOptions:cameraOptions]; } -- (MLNMapCamera *)cameraForCameraOptions:(const mbgl::CameraOptions &)cameraOptions { +- (MLNMapCamera *)cameraForCameraOptions:(const mln::CameraOptions &)cameraOptions { if (!_mbglMap) { return self.residualCamera; } - mbgl::CameraOptions mapCamera = self.mbglMap.getCameraOptions(); + mln::CameraOptions mapCamera = self.mbglMap.getCameraOptions(); CLLocationCoordinate2D centerCoordinate = MLNLocationCoordinate2DFromLatLng( cameraOptions.center ? *cameraOptions.center : *mapCamera.center); double zoomLevel = cameraOptions.zoom ? *cameraOptions.zoom : self.zoomLevel; CLLocationDirection direction = - cameraOptions.bearing ? mbgl::util::wrap(*cameraOptions.bearing, 0., 360.) : self.direction; + cameraOptions.bearing ? mln::util::wrap(*cameraOptions.bearing, 0., 360.) : self.direction; CGFloat pitch = cameraOptions.pitch ? *cameraOptions.pitch : *mapCamera.pitch; CLLocationDistance altitude = MLNAltitudeForZoomLevel(zoomLevel, pitch, centerCoordinate.latitude, self.frame.size); @@ -4543,9 +4543,9 @@ static void *windowScreenContext = &windowScreenContext; /// Returns a CameraOptions object that specifies parameters for animating to /// the given camera. -- (mbgl::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera - edgePadding:(UIEdgeInsets)insets { - mbgl::CameraOptions options; +- (mln::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera + edgePadding:(UIEdgeInsets)insets { + mln::CameraOptions options; if (CLLocationCoordinate2DIsValid(camera.centerCoordinate)) { options.center = MLNLatLngFromLocationCoordinate2D(camera.centerCoordinate); } @@ -4567,9 +4567,9 @@ static void *windowScreenContext = &windowScreenContext; } /// Converts a point in the view’s coordinate system to a geographic coordinate. -- (mbgl::LatLng)convertPoint:(CGPoint)point toLatLngFromView:(nullable UIView *)view { +- (mln::LatLng)convertPoint:(CGPoint)point toLatLngFromView:(nullable UIView *)view { CGPoint convertedPoint = [self convertPoint:point fromView:view]; - return self.mbglMap.latLngForPixel(mbgl::ScreenCoordinate(convertedPoint.x, convertedPoint.y)) + return self.mbglMap.latLngForPixel(mln::ScreenCoordinate(convertedPoint.x, convertedPoint.y)) .wrapped(); } @@ -4582,8 +4582,8 @@ static void *windowScreenContext = &windowScreenContext; } /// Converts a geographic coordinate to a point in the view’s coordinate system. -- (CGPoint)convertLatLng:(mbgl::LatLng)latLng toPointToView:(nullable UIView *)view { - mbgl::ScreenCoordinate pixel = self.mbglMap.pixelForLatLng(latLng); +- (CGPoint)convertLatLng:(mln::LatLng)latLng toPointToView:(nullable UIView *)view { + mln::ScreenCoordinate pixel = self.mbglMap.pixelForLatLng(latLng); return [self convertPoint:CGPointMake(pixel.x, pixel.y) toView:view]; } @@ -4597,7 +4597,7 @@ static void *windowScreenContext = &windowScreenContext; /// Converts a geographic bounding box to a rectangle in the view’s coordinate /// system. -- (CGRect)convertLatLngBounds:(mbgl::LatLngBounds)bounds toRectToView:(nullable UIView *)view { +- (CGRect)convertLatLngBounds:(mln::LatLngBounds)bounds toRectToView:(nullable UIView *)view { auto northwest = bounds.northwest(); auto northeast = bounds.northeast(); auto southwest = bounds.southwest(); @@ -4612,7 +4612,7 @@ static void *windowScreenContext = &windowScreenContext; southwest.unwrapForShortestPath(center); southeast.unwrapForShortestPath(center); - auto correctedLatLngBounds = mbgl::LatLngBounds::empty(); + auto correctedLatLngBounds = mln::LatLngBounds::empty(); correctedLatLngBounds.extend(northwest); correctedLatLngBounds.extend(northeast); correctedLatLngBounds.extend(southwest); @@ -4627,8 +4627,8 @@ static void *windowScreenContext = &windowScreenContext; /// Converts a rectangle in the given view’s coordinate system to a geographic /// bounding box. -- (mbgl::LatLngBounds)convertRect:(CGRect)rect toLatLngBoundsFromView:(nullable UIView *)view { - auto bounds = mbgl::LatLngBounds::empty(); +- (mln::LatLngBounds)convertRect:(CGRect)rect toLatLngBoundsFromView:(nullable UIView *)view { + auto bounds = mln::LatLngBounds::empty(); auto topLeft = [self convertPoint:{CGRectGetMinX(rect), CGRectGetMinY(rect)} toLatLngFromView:view]; auto topRight = [self convertPoint:{CGRectGetMaxX(rect), CGRectGetMinY(rect)} @@ -4656,12 +4656,12 @@ static void *windowScreenContext = &windowScreenContext; } - (CLLocationDistance)metersPerPointAtLatitude:(CLLocationDegrees)latitude { - return mbgl::Projection::getMetersPerPixelAtLatitude(latitude, self.zoomLevel); + return mln::Projection::getMetersPerPixelAtLatitude(latitude, self.zoomLevel); } - (CLLocationDistance)metersPerPointAtLatitude:(CLLocationDegrees)latitude zoomLevel:(double)zoomLevel { - return mbgl::Projection::getMetersPerPixelAtLatitude(latitude, zoomLevel); + return mln::Projection::getMetersPerPixelAtLatitude(latitude, zoomLevel); } - (MLNMapProjection *)mapProjection { @@ -4863,7 +4863,7 @@ static void *windowScreenContext = &windowScreenContext; annotationImagesForAnnotation[annotationValue] = annotationImage; } - MLNAnnotationTag annotationTag = self.mbglMap.addAnnotation(mbgl::SymbolAnnotation{ + MLNAnnotationTag annotationTag = self.mbglMap.addAnnotation(mln::SymbolAnnotation{ MLNPointFromLocationCoordinate2D(annotation.coordinate), symbolName.UTF8String}); MLNAnnotationContext context; @@ -5010,14 +5010,14 @@ static void *windowScreenContext = &windowScreenContext; return 1.0; } -- (mbgl::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation { +- (mln::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation { UIColor *color = (_delegateHasStrokeColorsForShapeAnnotations ? [self.delegate mapView:self strokeColorForShapeAnnotation:annotation] : self.tintColor); return color.mgl_color; } -- (mbgl::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation { +- (mln::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation { UIColor *color = (_delegateHasFillColorsForShapeAnnotations ? [self.delegate mapView:self fillColorForPolygonAnnotation:annotation] : self.tintColor); @@ -5864,7 +5864,7 @@ static void *windowScreenContext = &windowScreenContext; return; } - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (id annotation in annotations) { if ([annotation conformsToProtocol:@protocol(MLNOverlay)]) { @@ -5919,10 +5919,10 @@ static void *windowScreenContext = &windowScreenContext; toAnnotationsWithImageReuseIdentifier:(NSString *)reuseIdentifier { for (auto &pair : _annotationContextsByAnnotationTag) { if ([pair.second.imageReuseIdentifier isEqualToString:reuseIdentifier]) { - const mbgl::Point point = + const mln::Point point = MLNPointFromLocationCoordinate2D(pair.second.annotation.coordinate); self.mbglMap.updateAnnotation(pair.first, - mbgl::SymbolAnnotation{point, iconIdentifier.UTF8String ?: ""}); + mln::SymbolAnnotation{point, iconIdentifier.UTF8String ?: ""}); } } } @@ -6449,13 +6449,13 @@ static void *windowScreenContext = &windowScreenContext; CLLocationDirection direction = -1; if (self.userTrackingMode == MLNUserTrackingModeFollowWithCourse) { if (CLLocationCoordinate2DIsValid(self.targetCoordinate)) { - mbgl::LatLng userLatLng = MLNLatLngFromLocationCoordinate2D(self.userLocation.coordinate); - mbgl::LatLng targetLatLng = MLNLatLngFromLocationCoordinate2D(self.targetCoordinate); - mbgl::ProjectedMeters userMeters = mbgl::Projection::projectedMetersForLatLng(userLatLng); - mbgl::ProjectedMeters targetMeters = mbgl::Projection::projectedMetersForLatLng(targetLatLng); + mln::LatLng userLatLng = MLNLatLngFromLocationCoordinate2D(self.userLocation.coordinate); + mln::LatLng targetLatLng = MLNLatLngFromLocationCoordinate2D(self.targetCoordinate); + mln::ProjectedMeters userMeters = mln::Projection::projectedMetersForLatLng(userLatLng); + mln::ProjectedMeters targetMeters = mln::Projection::projectedMetersForLatLng(targetLatLng); double angle = atan2(targetMeters.easting() - userMeters.easting(), targetMeters.northing() - userMeters.northing()); - direction = mbgl::util::wrap(MLNDegreesFromRadians(angle), 0., 360.); + direction = mln::util::wrap(MLNDegreesFromRadians(angle), 0., 360.); } else { direction = self.userLocation.location.course; } @@ -6623,7 +6623,7 @@ static void *windowScreenContext = &windowScreenContext; predicate:(NSPredicate *)predicate { MLNLogDebug(@"Querying visibleFeaturesAtPoint: %@ inStyleLayersWithIdentifiers: %@ predicate: %@", NSStringFromCGPoint(point), styleLayerIdentifiers, predicate); - mbgl::ScreenCoordinate screenCoordinate = {point.x, point.y}; + mln::ScreenCoordinate screenCoordinate = {point.x, point.y}; std::optional> optionalLayerIDs; if (styleLayerIdentifiers) { @@ -6636,12 +6636,12 @@ static void *windowScreenContext = &windowScreenContext; optionalLayerIDs = layerIDs; } - std::optional optionalFilter; + std::optional optionalFilter; if (predicate) { optionalFilter = predicate.mgl_filter; } - std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( + std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( screenCoordinate, {optionalLayerIDs, optionalFilter}); return MLNFeaturesFromMBGLFeatures(features); } @@ -6665,7 +6665,7 @@ static void *windowScreenContext = &windowScreenContext; predicate:(NSPredicate *)predicate { MLNLogDebug(@"Querying visibleFeaturesInRect: %@ inStyleLayersWithIdentifiers: %@ predicate: %@", NSStringFromCGRect(rect), styleLayerIdentifiers, predicate); - mbgl::ScreenBox screenBox = { + mln::ScreenBox screenBox = { {CGRectGetMinX(rect), CGRectGetMinY(rect)}, {CGRectGetMaxX(rect), CGRectGetMaxY(rect)}, }; @@ -6681,12 +6681,12 @@ static void *windowScreenContext = &windowScreenContext; optionalLayerIDs = layerIDs; } - std::optional optionalFilter; + std::optional optionalFilter; if (predicate) { optionalFilter = predicate.mgl_filter; } - std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( + std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( screenBox, {optionalLayerIDs, optionalFilter}); return MLNFeaturesFromMBGLFeatures(features); } @@ -6882,7 +6882,7 @@ static void *windowScreenContext = &windowScreenContext; } - (void)mapViewDidFinishRenderingFrameFullyRendered:(BOOL)fullyRendered - renderingStats:(const mbgl::gfx::RenderingStats &)stats { + renderingStats:(const mln::gfx::RenderingStats &)stats { if (!_mbglMap) { return; } @@ -7549,35 +7549,35 @@ static void *windowScreenContext = &windowScreenContext; Adds a plug-in layer that is external to this library */ - (void)addPluginLayerType:(Class)pluginLayerClass { - auto layerManager = mbgl::LayerManager::get(); - auto darwinLayerManager = (mbgl::LayerManagerDarwin *)layerManager; + auto layerManager = mln::LayerManager::get(); + auto darwinLayerManager = (mln::LayerManagerDarwin *)layerManager; MLNPluginLayerCapabilities *capabilities = [pluginLayerClass layerCapabilities]; std::string layerType = [capabilities.layerID UTF8String]; // Default values - mbgl::style::LayerTypeInfo::Source source = mbgl::style::LayerTypeInfo::Source::NotRequired; - mbgl::style::LayerTypeInfo::TileKind tileKind = mbgl::style::LayerTypeInfo::TileKind::NotRequired; - mbgl::style::LayerTypeInfo::FadingTiles fadingTiles = - mbgl::style::LayerTypeInfo::FadingTiles::NotRequired; - mbgl::style::LayerTypeInfo::Layout layout = mbgl::style::LayerTypeInfo::Layout::NotRequired; - mbgl::style::LayerTypeInfo::CrossTileIndex crossTileIndex = - mbgl::style::LayerTypeInfo::CrossTileIndex::NotRequired; + mln::style::LayerTypeInfo::Source source = mln::style::LayerTypeInfo::Source::NotRequired; + mln::style::LayerTypeInfo::TileKind tileKind = mln::style::LayerTypeInfo::TileKind::NotRequired; + mln::style::LayerTypeInfo::FadingTiles fadingTiles = + mln::style::LayerTypeInfo::FadingTiles::NotRequired; + mln::style::LayerTypeInfo::Layout layout = mln::style::LayerTypeInfo::Layout::NotRequired; + mln::style::LayerTypeInfo::CrossTileIndex crossTileIndex = + mln::style::LayerTypeInfo::CrossTileIndex::NotRequired; - mbgl::style::LayerTypeInfo::Pass3D pass3D = mbgl::style::LayerTypeInfo::Pass3D::NotRequired; + mln::style::LayerTypeInfo::Pass3D pass3D = mln::style::LayerTypeInfo::Pass3D::NotRequired; if (capabilities.requiresPass3D) { - pass3D = mbgl::style::LayerTypeInfo::Pass3D::Required; + pass3D = mln::style::LayerTypeInfo::Pass3D::Required; } - auto factory = std::make_unique( + auto factory = std::make_unique( layerType, source, pass3D, layout, fadingTiles, crossTileIndex, tileKind); __weak MLNMapView *weakMapView = self; Class layerClass = pluginLayerClass; factory->setOnLayerCreatedEvent([layerClass, weakMapView, - pluginLayerClass](mbgl::style::PluginLayer *pluginLayer) { + pluginLayerClass](mln::style::PluginLayer *pluginLayer) { // NSLog(@"Creating Plugin Layer: %@", layerClass); MLNPluginLayer *layer = [[layerClass alloc] init]; if (!weakMapView.pluginLayers) { @@ -7591,25 +7591,25 @@ static void *windowScreenContext = &windowScreenContext; pluginLayer->_platformReference = (__bridge void *)layer; MLNPluginLayerCapabilities *capabilities = [pluginLayerClass layerCapabilities]; - auto pluginLayerImpl = (mbgl::style::PluginLayer::Impl *)pluginLayer->baseImpl.get(); + auto pluginLayerImpl = (mln::style::PluginLayer::Impl *)pluginLayer->baseImpl.get(); auto &pm = pluginLayerImpl->_propertyManager; for (MLNPluginLayerProperty *property in capabilities.layerProperties) { - mbgl::style::PluginLayerProperty *p = new mbgl::style::PluginLayerProperty(); + mln::style::PluginLayerProperty *p = new mln::style::PluginLayerProperty(); switch (property.propertyType) { case MLNPluginLayerPropertyTypeSingleFloat: - p->_propertyType = mbgl::style::PluginLayerProperty::PropertyType::SingleFloat; + p->_propertyType = mln::style::PluginLayerProperty::PropertyType::SingleFloat; p->_defaultSingleFloatValue = property.singleFloatDefaultValue; break; case MLNPluginLayerPropertyTypeColor: { - p->_propertyType = mbgl::style::PluginLayerProperty::PropertyType::Color; + p->_propertyType = mln::style::PluginLayerProperty::PropertyType::Color; if (property.colorDefaultValue) { CGFloat r, g, b, a; [property.colorDefaultValue getRed:&r green:&g blue:&b alpha:&a]; - p->_defaultColorValue = mbgl::Color(r, g, b, a); + p->_defaultColorValue = mln::Color(r, g, b, a); } } break; default: - p->_propertyType = mbgl::style::PluginLayerProperty::PropertyType::Unknown; + p->_propertyType = mln::style::PluginLayerProperty::PropertyType::Unknown; break; } p->_propertyName = [property.propertyName UTF8String]; @@ -7617,10 +7617,10 @@ static void *windowScreenContext = &windowScreenContext; } // Set the render function - auto renderFunction = [weakPlugInLayer, weakMapView](mbgl::PaintParameters &paintParameters) { + auto renderFunction = [weakPlugInLayer, weakMapView](mln::PaintParameters &paintParameters) { #if MLN_RENDER_BACKEND_METAL - const mbgl::mtl::RenderPass &renderPass = - static_cast(*paintParameters.renderPass); + const mln::mtl::RenderPass &renderPass = + static_cast(*paintParameters.renderPass); id encoder = (__bridge id)renderPass.getMetalEncoder().get(); #else id encoder = nil; @@ -7628,14 +7628,14 @@ static void *windowScreenContext = &windowScreenContext; MLNMapView *strongMapView = weakMapView; - const mbgl::TransformState &state = paintParameters.state; + const mln::TransformState &state = paintParameters.state; MLNPluginLayerDrawingContext drawingContext; drawingContext.size = CGSizeMake(state.getSize().width, state.getSize().height); drawingContext.centerCoordinate = CLLocationCoordinate2DMake(state.getLatLng().latitude(), state.getLatLng().longitude()); drawingContext.zoomLevel = state.getZoom(); - drawingContext.direction = mbgl::util::rad2deg(-state.getBearing()); + drawingContext.direction = mln::util::rad2deg(-state.getBearing()); drawingContext.pitch = state.getPitch(); drawingContext.fieldOfView = state.getFieldOfView(); drawingContext.projectionMatrix = MLNMatrix4Make(paintParameters.transformParams.projMatrix); @@ -7650,7 +7650,7 @@ static void *windowScreenContext = &windowScreenContext; }; // Set the lambdas - // auto pluginLayerImpl = (mbgl::style::PluginLayer::Impl *)pluginLayer->baseImpl.get(); + // auto pluginLayerImpl = (mln::style::PluginLayer::Impl *)pluginLayer->baseImpl.get(); pluginLayerImpl->setRenderFunction(renderFunction); // Set the update properties function diff --git a/platform/ios/src/MLNMapView_Private.h b/platform/ios/src/MLNMapView_Private.h index f4b312000..477cd5609 100644 --- a/platform/ios/src/MLNMapView_Private.h +++ b/platform/ios/src/MLNMapView_Private.h @@ -3,7 +3,7 @@ #import "MLNTileOperation.h" #import "MLNUserLocationAnnotationView.h" -namespace mbgl { +namespace mln { class Map; class Renderer; @@ -11,7 +11,7 @@ namespace gfx { struct RenderingStats; } -} // namespace mbgl +} // namespace mln class MLNMapViewImpl; @class MLNSource; @@ -22,7 +22,7 @@ FOUNDATION_EXTERN const NSTimeInterval MLNAnimationDuration; /// Minimum size of an annotation’s accessibility element. FOUNDATION_EXTERN const CGSize MLNAnnotationAccessibilityElementMinimumSize; -/// Indicates that a method (that uses `mbgl::Map`) was called after app termination. +/// Indicates that a method (that uses `mln::Map`) was called after app termination. FOUNDATION_EXTERN MLN_EXPORT MLNExceptionName const _Nonnull MLNUnderlyingMapUnavailableException; @interface MLNMapView (Private) @@ -42,7 +42,7 @@ FOUNDATION_EXTERN MLN_EXPORT MLNExceptionName const _Nonnull MLNUnderlyingMapUna - (void)mapViewDidFailLoadingMapWithError:(nonnull NSError *)error; - (void)mapViewWillStartRenderingFrame; - (void)mapViewDidFinishRenderingFrameFullyRendered:(BOOL)fullyRendered - renderingStats:(const mbgl::gfx::RenderingStats &)stats; + renderingStats:(const mln::gfx::RenderingStats &)stats; - (void)mapViewWillStartRenderingMap; - (void)mapViewDidFinishRenderingMapFullyRendered:(BOOL)fullyRendered; - (void)mapViewDidBecomeIdle; @@ -84,8 +84,8 @@ FOUNDATION_EXTERN MLN_EXPORT MLNExceptionName const _Nonnull MLNUnderlyingMapUna /// Synchronously render a frame of the map. - (BOOL)renderSync; -- (mbgl::Map &)mbglMap; -- (nonnull mbgl::Renderer *)renderer; +- (mln::Map &)mbglMap; +- (nonnull mln::Renderer *)renderer; /** Returns whether the map view is currently loading or processing any assets required to render * the map */ diff --git a/platform/ios/src/UIColor+MLNAdditions.h b/platform/ios/src/UIColor+MLNAdditions.h index dda76d9dd..5215223f9 100644 --- a/platform/ios/src/UIColor+MLNAdditions.h +++ b/platform/ios/src/UIColor+MLNAdditions.h @@ -5,13 +5,13 @@ @interface UIColor (MLNAdditions) -- (mbgl::Color)mgl_color; +- (mln::Color)mgl_color; -- (mbgl::style::PropertyValue)mgl_colorPropertyValue; +- (mln::style::PropertyValue)mgl_colorPropertyValue; -- (mbgl::Color)mgl_colorForPremultipliedValue; +- (mln::Color)mgl_colorForPremultipliedValue; -+ (UIColor *)mgl_colorWithColor:(mbgl::Color)color; ++ (UIColor *)mgl_colorWithColor:(mln::Color)color; @end diff --git a/platform/ios/src/UIColor+MLNAdditions.mm b/platform/ios/src/UIColor+MLNAdditions.mm index 6c24f05f7..1763f81ee 100644 --- a/platform/ios/src/UIColor+MLNAdditions.mm +++ b/platform/ios/src/UIColor+MLNAdditions.mm @@ -2,36 +2,36 @@ @implementation UIColor (MLNAdditions) -- (mbgl::Color)mgl_color { +- (mln::Color)mgl_color { CGFloat r, g, b, a; [self getRed:&r green:&g blue:&b alpha:&a]; // UIColor provides non-premultiplied color components, so we have to premultiply each // color component with the alpha value to transform it into a valid - // mbgl::Color which expects premultiplied color components. + // mln::Color which expects premultiplied color components. return {static_cast(r * a), static_cast(g * a), static_cast(b * a), static_cast(a)}; } // Intended to be used when providing colors on the basis of an NSExpression -- (mbgl::Color)mgl_colorForPremultipliedValue { +- (mln::Color)mgl_colorForPremultipliedValue { CGFloat r, g, b, a; [self getRed:&r green:&g blue:&b alpha:&a]; return {static_cast(r), static_cast(g), static_cast(b), static_cast(a)}; } -- (mbgl::style::PropertyValue)mgl_colorPropertyValue { - mbgl::Color color = self.mgl_color; +- (mln::style::PropertyValue)mgl_colorPropertyValue { + mln::Color color = self.mgl_color; return {{color.r, color.g, color.b, color.a}}; } -+ (UIColor *)mgl_colorWithColor:(mbgl::Color)color { ++ (UIColor *)mgl_colorWithColor:(mln::Color)color { // If there is no alpha value, return original color values. if (color.a == 0.0f) { return [UIColor colorWithRed:color.r green:color.g blue:color.b alpha:color.a]; } - // mbgl::Color provides premultiplied color components, so we have to convert color + // mln::Color provides premultiplied color components, so we have to convert color // components to non-premultiplied values to return a valid UIColor object. float red = static_cast((color.r / color.a)); float green = static_cast((color.g / color.a)); diff --git a/platform/ios/src/UIImage+MLNAdditions.h b/platform/ios/src/UIImage+MLNAdditions.h index 0cfc60a0e..56247d234 100644 --- a/platform/ios/src/UIImage+MLNAdditions.h +++ b/platform/ios/src/UIImage+MLNAdditions.h @@ -10,14 +10,14 @@ FOUNDATION_EXTERN MLN_EXPORT MLNExceptionName const MLNResourceNotFoundException @interface UIImage (MLNAdditions) -- (nullable instancetype)initWithMLNStyleImage:(const mbgl::style::Image &)styleImage; +- (nullable instancetype)initWithMLNStyleImage:(const mln::style::Image &)styleImage; -- (nullable instancetype)initWithMLNPremultipliedImage:(const mbgl::PremultipliedImage &&)mbglImage +- (nullable instancetype)initWithMLNPremultipliedImage:(const mln::PremultipliedImage &&)mbglImage scale:(CGFloat)scale; -- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier; +- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier; -- (mbgl::PremultipliedImage)mgl_premultipliedImage; +- (mln::PremultipliedImage)mgl_premultipliedImage; + (UIImage *)mgl_resourceImageNamed:(NSString *)imageName; diff --git a/platform/ios/src/UIImage+MLNAdditions.mm b/platform/ios/src/UIImage+MLNAdditions.mm index eb8870a8c..102bc2af5 100644 --- a/platform/ios/src/UIImage+MLNAdditions.mm +++ b/platform/ios/src/UIImage+MLNAdditions.mm @@ -14,7 +14,7 @@ BOOL MLNEdgeInsetsIsZero(UIEdgeInsets edgeInsets) { @implementation UIImage (MLNAdditions) -- (nullable instancetype)initWithMLNStyleImage:(const mbgl::style::Image &)styleImage { +- (nullable instancetype)initWithMLNStyleImage:(const mln::style::Image &)styleImage { CGImageRef image = CGImageCreateWithMLNPremultipliedImage(styleImage.getImage().clone()); if (!image) { return nil; @@ -45,7 +45,7 @@ BOOL MLNEdgeInsetsIsZero(UIEdgeInsets edgeInsets) { return self; } -- (nullable instancetype)initWithMLNPremultipliedImage:(const mbgl::PremultipliedImage &&)mbglImage +- (nullable instancetype)initWithMLNPremultipliedImage:(const mln::PremultipliedImage &&)mbglImage scale:(CGFloat)scale { CGImageRef image = CGImageCreateWithMLNPremultipliedImage(mbglImage.clone()); if (!image) { @@ -58,8 +58,8 @@ BOOL MLNEdgeInsetsIsZero(UIEdgeInsets edgeInsets) { return self; } -- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier { - mbgl::style::ImageStretches stretchX, stretchY; +- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier { + mln::style::ImageStretches stretchX, stretchY; if (self.resizingMode == UIImageResizingModeStretch) { stretchX.push_back({ self.capInsets.left * self.scale, @@ -71,9 +71,9 @@ BOOL MLNEdgeInsetsIsZero(UIEdgeInsets edgeInsets) { }); } - std::optional imageContent; + std::optional imageContent; if (!MLNEdgeInsetsIsZero(self.capInsets)) { - imageContent = (mbgl::style::ImageContent){ + imageContent = (mln::style::ImageContent){ .left = static_cast(self.capInsets.left * self.scale), .top = static_cast(self.capInsets.top * self.scale), .right = static_cast((self.size.width - self.capInsets.right) * self.scale), @@ -82,12 +82,12 @@ BOOL MLNEdgeInsetsIsZero(UIEdgeInsets edgeInsets) { } BOOL isTemplate = self.renderingMode == UIImageRenderingModeAlwaysTemplate; - return std::make_unique([identifier UTF8String], self.mgl_premultipliedImage, - static_cast(self.scale), isTemplate, stretchX, - stretchY, imageContent); + return std::make_unique([identifier UTF8String], self.mgl_premultipliedImage, + static_cast(self.scale), isTemplate, stretchX, + stretchY, imageContent); } -- (mbgl::PremultipliedImage)mgl_premultipliedImage { +- (mln::PremultipliedImage)mgl_premultipliedImage { return MLNPremultipliedImageFromCGImage(self.CGImage); } diff --git a/platform/ios/test/MLNMapViewCompassViewTests.mm b/platform/ios/test/MLNMapViewCompassViewTests.mm index a4f9470c6..cd0f619c3 100644 --- a/platform/ios/test/MLNMapViewCompassViewTests.mm +++ b/platform/ios/test/MLNMapViewCompassViewTests.mm @@ -91,7 +91,7 @@ for (NSNumber *degrees in @[ @-999, @-359, @-240, @-180, @-90, @-45, @0, @45, @90, @180, @240, @360, @999 ]) { self.mapView.direction = [degrees doubleValue]; - CGFloat wrappedDirection = mbgl::util::wrap(-self.mapView.direction, 0., 360.); + CGFloat wrappedDirection = mln::util::wrap(-self.mapView.direction, 0., 360.); CGAffineTransform rotation = CGAffineTransformMakeRotation(MLNRadiansFromDegrees(wrappedDirection)); XCTAssertTrue( diff --git a/platform/ios/test/MLNMapViewDirectionTests.mm b/platform/ios/test/MLNMapViewDirectionTests.mm index b6c5dd130..564f93b54 100644 --- a/platform/ios/test/MLNMapViewDirectionTests.mm +++ b/platform/ios/test/MLNMapViewDirectionTests.mm @@ -41,7 +41,7 @@ for (NSNumber *degrees in @[ @-999, @-359, @-240, @-180, @-90, @-45, @0, @45, @90, @180, @240, @360, @999 ]) { double inputDegrees = [degrees doubleValue]; - double wrappedDegrees = mbgl::util::wrap(inputDegrees, 0., 360.); + double wrappedDegrees = mln::util::wrap(inputDegrees, 0., 360.); self.mapView.direction = inputDegrees; XCTAssertEqualWithAccuracy(self.mapView.direction, wrappedDegrees, 0.001); @@ -70,7 +70,7 @@ [[UIRotationGestureRecognizerMock alloc] initWithTarget:nil action:nil]; gesture.state = UIGestureRecognizerStateBegan; gesture.rotation = MLNRadiansFromDegrees(30); - CGFloat wrappedRotation = mbgl::util::wrap(-MLNDegreesFromRadians(gesture.rotation), 0., 360.); + CGFloat wrappedRotation = mln::util::wrap(-MLNDegreesFromRadians(gesture.rotation), 0., 360.); // Disabled { @@ -117,7 +117,7 @@ gesture.state = UIGestureRecognizerStateChanged; gesture.rotation = MLNRadiansFromDegrees([degrees doubleValue]); [self.mapView handleRotateGesture:gesture]; - CGFloat wrappedRotation = mbgl::util::wrap(-MLNDegreesFromRadians(gesture.rotation), 0., 360.); + CGFloat wrappedRotation = mln::util::wrap(-MLNDegreesFromRadians(gesture.rotation), 0., 360.); XCTAssertEqualWithAccuracy(self.mapView.direction, wrappedRotation, 0.001, @"Map direction should match gesture rotation for input of %@°.", degrees); diff --git a/platform/ios/test/MLNMapViewGestureRecognizerTests.mm b/platform/ios/test/MLNMapViewGestureRecognizerTests.mm index eee43313f..72a088a9c 100644 --- a/platform/ios/test/MLNMapViewGestureRecognizerTests.mm +++ b/platform/ios/test/MLNMapViewGestureRecognizerTests.mm @@ -70,7 +70,7 @@ - (void)testHandlePinchGestureContentInset { UIEdgeInsets contentInset = UIEdgeInsetsMake(1, 1, 1, 1); self.mapView.contentInset = contentInset; - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); auto cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(padding, cameraPadding, @"MLNMapView's contentInset property should match camera's padding."); @@ -94,7 +94,7 @@ [self.mapView handlePinchGesture:pinchGesture]; XCTAssertNotEqual(padding, cameraPadding); - mbgl::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; + mln::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; pinchGesture.state = UIGestureRecognizerStateChanged; [self.mapView handlePinchGesture:pinchGesture]; @@ -112,7 +112,7 @@ - (void)testHandleRotateGestureContentInset { UIEdgeInsets contentInset = UIEdgeInsetsMake(1, 1, 1, 1); self.mapView.contentInset = contentInset; - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); auto cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(padding, cameraPadding, @"MLNMapView's contentInset property should match camera's padding."); @@ -136,7 +136,7 @@ [self.mapView handleRotateGesture:rotateGesture]; XCTAssertNotEqual(padding, cameraPadding); - mbgl::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; + mln::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; rotateGesture.state = UIGestureRecognizerStateChanged; [self.mapView handleRotateGesture:rotateGesture]; @@ -154,7 +154,7 @@ - (void)testHandleDoubleTapGestureContentInset { UIEdgeInsets contentInset = UIEdgeInsetsMake(1, 1, 1, 1); self.mapView.contentInset = contentInset; - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); auto cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(padding, cameraPadding, @"MLNMapView's contentInset property should match camera's padding."); @@ -176,7 +176,7 @@ doubleTapGesture.mockTappedView = self.mapView; doubleTapGesture.mockTappedPoint = CGPointMake(1.0, 1.0); - mbgl::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; + mln::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; [self.mapView handleDoubleTapGesture:doubleTapGesture]; _doubleTapExpectation = [self expectationWithDescription:@"Double tap gesture animation."]; @@ -195,7 +195,7 @@ - (void)testHandleTwoFingerTapGesture { UIEdgeInsets contentInset = UIEdgeInsetsMake(1, 1, 1, 1); self.mapView.contentInset = contentInset; - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); auto cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(padding, cameraPadding, @"MLNMapView's contentInset property should match camera's padding."); @@ -226,7 +226,7 @@ }); [self waitForExpectationsWithTimeout:10 handler:nil]; - mbgl::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; + mln::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(edgePadding, cameraPadding, @"When a gesture recognizer is performed camera paddings must not be changed."); @@ -235,7 +235,7 @@ - (void)testHandleQuickZoomGesture { UIEdgeInsets contentInset = UIEdgeInsetsMake(1, 1, 1, 1); self.mapView.contentInset = contentInset; - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); auto cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(padding, cameraPadding, @"MLNMapView's contentInset property should match camera's padding."); @@ -270,7 +270,7 @@ }); [self waitForExpectationsWithTimeout:10 handler:nil]; - mbgl::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; + mln::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(edgePadding, cameraPadding, @@ -286,7 +286,7 @@ - (void)testHandleTwoFingerDragGesture { UIEdgeInsets contentInset = UIEdgeInsetsMake(1, 1, 1, 1); self.mapView.contentInset = contentInset; - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.mapView.contentInset); auto cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(padding, cameraPadding, @"MLNMapView's contentInset property should match camera's padding."); @@ -328,7 +328,7 @@ }); [self waitForExpectationsWithTimeout:10 handler:nil]; - mbgl::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; + mln::EdgeInsets edgePadding = MLNEdgeInsetsFromNSEdgeInsets(contentInset) + padding; cameraPadding = self.mapView.mbglMap.getCameraOptions().padding; XCTAssertEqual(edgePadding, cameraPadding, diff --git a/platform/ios/test/MLNMapViewZoomTests.mm b/platform/ios/test/MLNMapViewZoomTests.mm index 7812ce927..bf4cc034a 100644 --- a/platform/ios/test/MLNMapViewZoomTests.mm +++ b/platform/ios/test/MLNMapViewZoomTests.mm @@ -196,7 +196,7 @@ rotate.rotation = MLNRadiansFromDegrees([degrees doubleValue]); [self.mapView handleRotateGesture:rotate]; - CGFloat wrappedRotation = mbgl::util::wrap(-MLNDegreesFromRadians(rotate.rotation), 0., 360.); + CGFloat wrappedRotation = mln::util::wrap(-MLNDegreesFromRadians(rotate.rotation), 0., 360.); // Check that the direction property now matches the gesture's rotation. XCTAssertEqualWithAccuracy(self.mapView.direction, wrappedRotation, 0.001, diff --git a/platform/ios/test/core/ios_test_runner.cpp b/platform/ios/test/core/ios_test_runner.cpp index 5dab40a0a..c57dfc2ee 100644 --- a/platform/ios/test/core/ios_test_runner.cpp +++ b/platform/ios/test/core/ios_test_runner.cpp @@ -17,13 +17,13 @@ bool TestRunner::startTest(const std::string& basePath) { argv.push_back(nullptr); if (chdir(basePath.c_str())) { - mbgl::Log::Error(mbgl::Event::General, "Failed to change the directory to " + basePath); + mln::Log::Error(mln::Event::General, "Failed to change the directory to " + basePath); return false; } - mbgl::Log::Info(mbgl::Event::General, "Start TestRunner"); - int status = mbgl::runTests(static_cast(argv.size()), argv.data()); - mbgl::Log::Info(mbgl::Event::General, "TestRunner finished with status: '" + std::to_string(status) + "'"); + mln::Log::Info(mln::Event::General, "Start TestRunner"); + int status = mln::runTests(static_cast(argv.size()), argv.data()); + mln::Log::Info(mln::Event::General, "TestRunner finished with status: '" + std::to_string(status) + "'"); return status == 0; } diff --git a/platform/linux/src/gl_functions.cpp b/platform/linux/src/gl_functions.cpp index f06e6941a..64b98ce14 100644 --- a/platform/linux/src/gl_functions.cpp +++ b/platform/linux/src/gl_functions.cpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { /* OpenGL ES 2.0 */ @@ -279,4 +279,4 @@ void (*const glTexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei) void (*const glGetInternalformativ)(GLenum, GLenum, GLenum, GLsizei, GLint*) = ::glGetInternalformativ; } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/linux/src/headless_backend_egl.cpp b/platform/linux/src/headless_backend_egl.cpp index 02e517eed..565a7ae3c 100644 --- a/platform/linux/src/headless_backend_egl.cpp +++ b/platform/linux/src/headless_backend_egl.cpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { // This class provides a singleton that contains information about the @@ -34,8 +34,8 @@ public: } if (!eglBindAPI(EGL_OPENGL_ES_API)) { - mbgl::Log::Error(mbgl::Event::OpenGL, - "eglBindAPI(EGL_OPENGL_ES_API) returned error " + std::to_string(eglGetError())); + mln::Log::Error(mln::Event::OpenGL, + "eglBindAPI(EGL_OPENGL_ES_API) returned error " + std::to_string(eglGetError())); throw std::runtime_error("eglBindAPI() failed"); } @@ -75,7 +75,7 @@ public: if (eglContext == EGL_NO_CONTEXT) { std::ostringstream logMsg; logMsg << "eglCreateContext() returned error 0x" << std::hex << eglGetError(); - mbgl::Log::Error(mbgl::Event::OpenGL, logMsg.str()); + mln::Log::Error(mln::Event::OpenGL, logMsg.str()); throw std::runtime_error("Error creating the EGL context object.\n"); } @@ -130,4 +130,4 @@ void HeadlessBackend::createImpl() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/linux/src/headless_backend_glx.cpp b/platform/linux/src/headless_backend_glx.cpp index 2da16e99d..62d23c03f 100644 --- a/platform/linux/src/headless_backend_glx.cpp +++ b/platform/linux/src/headless_backend_glx.cpp @@ -13,7 +13,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { // This class provides a singleton that contains information about the @@ -147,4 +147,4 @@ void HeadlessBackend::createImpl() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/macos/src/MLNMapView+Impl.h b/platform/macos/src/MLNMapView+Impl.h index 1c653d8a1..0764d5b80 100644 --- a/platform/macos/src/MLNMapView+Impl.h +++ b/platform/macos/src/MLNMapView+Impl.h @@ -8,17 +8,17 @@ typedef struct _CGLContextObject* CGLContextObj; -class MLNMapViewImpl : public mbgl::MapObserver { +class MLNMapViewImpl : public mln::MapObserver { public: static std::unique_ptr Create(MLNMapView*); MLNMapViewImpl(MLNMapView*); virtual ~MLNMapViewImpl() = default; - virtual mbgl::gfx::RendererBackend& getRendererBackend() = 0; + virtual mln::gfx::RendererBackend& getRendererBackend() = 0; // We need a static image of what was rendered for printing. - virtual mbgl::PremultipliedImage readStillImage() = 0; + virtual mln::PremultipliedImage readStillImage() = 0; virtual CGLContextObj getCGLContextObj() { return nullptr; } @@ -32,36 +32,35 @@ public: // Called by the view delegate when it's time to render. void render(); - // mbgl::MapObserver implementation - void onCameraWillChange(mbgl::MapObserver::CameraChangeMode) override; + // mln::MapObserver implementation + void onCameraWillChange(mln::MapObserver::CameraChangeMode) override; void onCameraIsChanging() override; - void onCameraDidChange(mbgl::MapObserver::CameraChangeMode) override; + void onCameraDidChange(mln::MapObserver::CameraChangeMode) override; void onWillStartLoadingMap() override; void onDidFinishLoadingMap() override; - void onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) override; + void onDidFailLoadingMap(mln::MapLoadError mapError, const std::string& what) override; void onWillStartRenderingFrame() override; - void onDidFinishRenderingFrame(const mbgl::MapObserver::RenderFrameStatus&) override; + void onDidFinishRenderingFrame(const mln::MapObserver::RenderFrameStatus&) override; void onWillStartRenderingMap() override; - void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) override; + void onDidFinishRenderingMap(mln::MapObserver::RenderMode) override; void onDidFinishLoadingStyle() override; - void onSourceChanged(mbgl::style::Source& source) override; + void onSourceChanged(mln::style::Source& source) override; void onDidBecomeIdle() override; bool onCanRemoveUnusedStyleImage(const std::string& imageIdentifier) override; - void onRegisterShaders(mbgl::gfx::ShaderRegistry&) override; - void onPreCompileShader(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, + void onRegisterShaders(mln::gfx::ShaderRegistry&) override; + void onPreCompileShader(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; - void onPostCompileShader(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, + void onPostCompileShader(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; - void onShaderCompileFailed(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, + void onShaderCompileFailed(mln::shaders::BuiltIn, mln::gfx::Backend::Type, const std::string&) override; - void onGlyphsLoaded(const mbgl::FontStack&, const mbgl::GlyphRange&) override; - void onGlyphsError(const mbgl::FontStack&, const mbgl::GlyphRange&, std::exception_ptr) override; - void onGlyphsRequested(const mbgl::FontStack&, const mbgl::GlyphRange&) override; - void onTileAction(mbgl::TileOperation, const mbgl::OverscaledTileID&, - const std::string&) override; - void onSpriteLoaded(const std::optional&) override; - void onSpriteError(const std::optional&, std::exception_ptr) override; - void onSpriteRequested(const std::optional&) override; + void onGlyphsLoaded(const mln::FontStack&, const mln::GlyphRange&) override; + void onGlyphsError(const mln::FontStack&, const mln::GlyphRange&, std::exception_ptr) override; + void onGlyphsRequested(const mln::FontStack&, const mln::GlyphRange&) override; + void onTileAction(mln::TileOperation, const mln::OverscaledTileID&, const std::string&) override; + void onSpriteLoaded(const std::optional&) override; + void onSpriteError(const std::optional&, std::exception_ptr) override; + void onSpriteRequested(const std::optional&) override; protected: /// Cocoa map view that this adapter bridges to. diff --git a/platform/macos/src/MLNMapView+Impl.mm b/platform/macos/src/MLNMapView+Impl.mm index 923164590..75e24657f 100644 --- a/platform/macos/src/MLNMapView+Impl.mm +++ b/platform/macos/src/MLNMapView+Impl.mm @@ -25,15 +25,15 @@ void MLNMapViewImpl::render() { [mapView renderSync]; } void MLNMapViewImpl::display() { [mapView.layer setNeedsDisplay]; } -void MLNMapViewImpl::onCameraWillChange(mbgl::MapObserver::CameraChangeMode mode) { - bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; +void MLNMapViewImpl::onCameraWillChange(mln::MapObserver::CameraChangeMode mode) { + bool animated = mode == mln::MapObserver::CameraChangeMode::Animated; [mapView cameraWillChangeAnimated:animated]; } void MLNMapViewImpl::onCameraIsChanging() { [mapView cameraIsChanging]; } -void MLNMapViewImpl::onCameraDidChange(mbgl::MapObserver::CameraChangeMode mode) { - bool animated = mode == mbgl::MapObserver::CameraChangeMode::Animated; +void MLNMapViewImpl::onCameraDidChange(mln::MapObserver::CameraChangeMode mode) { + bool animated = mode == mln::MapObserver::CameraChangeMode::Animated; [mapView cameraDidChangeAnimated:animated]; } @@ -41,25 +41,25 @@ void MLNMapViewImpl::onWillStartLoadingMap() { [mapView mapViewWillStartLoadingM void MLNMapViewImpl::onDidFinishLoadingMap() { [mapView mapViewDidFinishLoadingMap]; } -void MLNMapViewImpl::onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) { +void MLNMapViewImpl::onDidFailLoadingMap(mln::MapLoadError mapError, const std::string& what) { NSString* description; MLNErrorCode code; switch (mapError) { - case mbgl::MapLoadError::StyleParseError: + case mln::MapLoadError::StyleParseError: code = MLNErrorCodeParseStyleFailed; description = NSLocalizedStringWithDefaultValue( @"PARSE_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style is corrupted.", @"User-friendly error description"); break; - case mbgl::MapLoadError::StyleLoadError: + case mln::MapLoadError::StyleLoadError: code = MLNErrorCodeLoadStyleFailed; description = NSLocalizedStringWithDefaultValue( @"LOAD_STYLE_FAILED_DESC", nil, nil, @"The map failed to load because the style can't be loaded.", @"User-friendly error description"); break; - case mbgl::MapLoadError::NotFoundError: + case mln::MapLoadError::NotFoundError: code = MLNErrorCodeNotFound; description = NSLocalizedStringWithDefaultValue( @"STYLE_NOT_FOUND_DESC", nil, nil, @@ -83,16 +83,16 @@ void MLNMapViewImpl::onDidFailLoadingMap(mbgl::MapLoadError mapError, const std: void MLNMapViewImpl::onWillStartRenderingFrame() { [mapView mapViewWillStartRenderingFrame]; } -void MLNMapViewImpl::onDidFinishRenderingFrame(const mbgl::MapObserver::RenderFrameStatus& status) { - bool fullyRendered = status.mode == mbgl::MapObserver::RenderMode::Full; +void MLNMapViewImpl::onDidFinishRenderingFrame(const mln::MapObserver::RenderFrameStatus& status) { + bool fullyRendered = status.mode == mln::MapObserver::RenderMode::Full; [mapView mapViewDidFinishRenderingFrameFullyRendered:fullyRendered renderingStats:status.renderingStats]; } void MLNMapViewImpl::onWillStartRenderingMap() { [mapView mapViewWillStartRenderingMap]; } -void MLNMapViewImpl::onDidFinishRenderingMap(mbgl::MapObserver::RenderMode mode) { - bool fullyRendered = mode == mbgl::MapObserver::RenderMode::Full; +void MLNMapViewImpl::onDidFinishRenderingMap(mln::MapObserver::RenderMode mode) { + bool fullyRendered = mode == mln::MapObserver::RenderMode::Full; [mapView mapViewDidFinishRenderingMapFullyRendered:fullyRendered]; } @@ -100,7 +100,7 @@ void MLNMapViewImpl::onDidBecomeIdle() { [mapView mapViewDidBecomeIdle]; } void MLNMapViewImpl::onDidFinishLoadingStyle() { [mapView mapViewDidFinishLoadingStyle]; } -void MLNMapViewImpl::onSourceChanged(mbgl::style::Source& source) { +void MLNMapViewImpl::onSourceChanged(mln::style::Source& source) { NSString* identifier = @(source.getID().c_str()); MLNSource* nativeSource = [mapView.style sourceWithIdentifier:identifier]; [mapView sourceDidChange:nativeSource]; @@ -111,10 +111,10 @@ bool MLNMapViewImpl::onCanRemoveUnusedStyleImage(const std::string& imageIdentif return [mapView shouldRemoveStyleImage:imageName]; } -void MLNMapViewImpl::onRegisterShaders(mbgl::gfx::ShaderRegistry& shaders) {} +void MLNMapViewImpl::onRegisterShaders(mln::gfx::ShaderRegistry& shaders) {} -void MLNMapViewImpl::onPreCompileShader(mbgl::shaders::BuiltIn shaderID, - mbgl::gfx::Backend::Type backend, +void MLNMapViewImpl::onPreCompileShader(mln::shaders::BuiltIn shaderID, + mln::gfx::Backend::Type backend, const std::string& defines) { NSString* definesCopy = [NSString stringWithUTF8String:defines.c_str()]; [mapView shaderWillCompile:static_cast(shaderID) @@ -122,8 +122,8 @@ void MLNMapViewImpl::onPreCompileShader(mbgl::shaders::BuiltIn shaderID, defines:definesCopy]; } -void MLNMapViewImpl::onPostCompileShader(mbgl::shaders::BuiltIn shaderID, - mbgl::gfx::Backend::Type backend, +void MLNMapViewImpl::onPostCompileShader(mln::shaders::BuiltIn shaderID, + mln::gfx::Backend::Type backend, const std::string& defines) { NSString* definesCopy = [NSString stringWithUTF8String:defines.c_str()]; [mapView shaderDidCompile:static_cast(shaderID) @@ -131,8 +131,8 @@ void MLNMapViewImpl::onPostCompileShader(mbgl::shaders::BuiltIn shaderID, defines:definesCopy]; } -void MLNMapViewImpl::onShaderCompileFailed(mbgl::shaders::BuiltIn shaderID, - mbgl::gfx::Backend::Type backend, +void MLNMapViewImpl::onShaderCompileFailed(mln::shaders::BuiltIn shaderID, + mln::gfx::Backend::Type backend, const std::string& defines) { NSString* definesCopy = [NSString stringWithUTF8String:defines.c_str()]; [mapView shaderDidFailCompile:static_cast(shaderID) @@ -140,8 +140,7 @@ void MLNMapViewImpl::onShaderCompileFailed(mbgl::shaders::BuiltIn shaderID, defines:definesCopy]; } -void MLNMapViewImpl::onGlyphsLoaded(const mbgl::FontStack& fontStack, - const mbgl::GlyphRange& range) { +void MLNMapViewImpl::onGlyphsLoaded(const mln::FontStack& fontStack, const mln::GlyphRange& range) { NSMutableArray* fontStackCopy = [[NSMutableArray alloc] init]; std::for_each(fontStack.begin(), fontStack.end(), ^(const std::string& str) { [fontStackCopy addObject:[NSString stringWithUTF8String:str.c_str()]]; @@ -150,7 +149,7 @@ void MLNMapViewImpl::onGlyphsLoaded(const mbgl::FontStack& fontStack, [mapView glyphsDidLoad:fontStackCopy range:NSMakeRange(range.first, range.second - range.first)]; } -void MLNMapViewImpl::onGlyphsError(const mbgl::FontStack& fontStack, const mbgl::GlyphRange& range, +void MLNMapViewImpl::onGlyphsError(const mln::FontStack& fontStack, const mln::GlyphRange& range, std::exception_ptr error) { NSMutableArray* fontStackCopy = [[NSMutableArray alloc] init]; std::for_each(fontStack.begin(), fontStack.end(), ^(const std::string& str) { @@ -160,8 +159,8 @@ void MLNMapViewImpl::onGlyphsError(const mbgl::FontStack& fontStack, const mbgl: [mapView glyphsDidError:fontStackCopy range:NSMakeRange(range.first, range.second - range.first)]; } -void MLNMapViewImpl::onGlyphsRequested(const mbgl::FontStack& fontStack, - const mbgl::GlyphRange& range) { +void MLNMapViewImpl::onGlyphsRequested(const mln::FontStack& fontStack, + const mln::GlyphRange& range) { NSMutableArray* fontStackCopy = [[NSMutableArray alloc] init]; std::for_each(fontStack.begin(), fontStack.end(), ^(const std::string& str) { [fontStackCopy addObject:[NSString stringWithUTF8String:str.c_str()]]; @@ -170,7 +169,7 @@ void MLNMapViewImpl::onGlyphsRequested(const mbgl::FontStack& fontStack, [mapView glyphsWillLoad:fontStackCopy range:NSMakeRange(range.first, range.second - range.first)]; } -void MLNMapViewImpl::onTileAction(mbgl::TileOperation operation, const mbgl::OverscaledTileID& tile, +void MLNMapViewImpl::onTileAction(mln::TileOperation operation, const mln::OverscaledTileID& tile, const std::string& sourceID) { [mapView tileDidTriggerAction:MLNTileOperation(static_cast(operation)) x:tile.canonical.x @@ -181,7 +180,7 @@ void MLNMapViewImpl::onTileAction(mbgl::TileOperation operation, const mbgl::Ove sourceID:[NSString stringWithUTF8String:sourceID.c_str()]]; } -void MLNMapViewImpl::onSpriteLoaded(const std::optional& spriteID) { +void MLNMapViewImpl::onSpriteLoaded(const std::optional& spriteID) { if (!spriteID.has_value()) { [mapView spriteDidLoad:nil url:nil]; return; @@ -191,7 +190,7 @@ void MLNMapViewImpl::onSpriteLoaded(const std::optional& sp url:[NSString stringWithUTF8String:spriteID.value().spriteURL.c_str()]]; } -void MLNMapViewImpl::onSpriteError(const std::optional& spriteID, +void MLNMapViewImpl::onSpriteError(const std::optional& spriteID, std::exception_ptr error) { if (!spriteID.has_value()) { [mapView spriteDidError:nil url:nil]; @@ -202,7 +201,7 @@ void MLNMapViewImpl::onSpriteError(const std::optional& spr url:[NSString stringWithUTF8String:spriteID.value().spriteURL.c_str()]]; } -void MLNMapViewImpl::onSpriteRequested(const std::optional& spriteID) { +void MLNMapViewImpl::onSpriteRequested(const std::optional& spriteID) { if (!spriteID.has_value()) { [mapView spriteWillLoad:nil url:nil]; return; diff --git a/platform/macos/src/MLNMapView+Metal.h b/platform/macos/src/MLNMapView+Metal.h index b2ea4995b..58901b607 100644 --- a/platform/macos/src/MLNMapView+Metal.h +++ b/platform/macos/src/MLNMapView+Metal.h @@ -8,8 +8,8 @@ /// Adapter responsible for bridging calls from mbgl to MLNMapView and Cocoa. class MLNMapViewMetalImpl final : public MLNMapViewImpl, - public mbgl::mtl::RendererBackend, - public mbgl::gfx::Renderable { + public mln::mtl::RendererBackend, + public mln::gfx::Renderable { public: MLNMapViewMetalImpl(MLNMapView*); ~MLNMapViewMetalImpl() override; @@ -17,25 +17,25 @@ public: public: void restoreFramebufferBinding(); - // Implementation of mbgl::gfx::RendererBackend + // Implementation of mln::gfx::RendererBackend public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } private: void activate() override; void deactivate() override; - // End implementation of mbgl::gfx::RendererBackend + // End implementation of mln::gfx::RendererBackend - // Implementation of mbgl::gl::RendererBackend + // Implementation of mln::gl::RendererBackend public: void updateAssumedState() override; - // End implementation of mbgl::gl::Rendererbackend + // End implementation of mln::gl::Rendererbackend // Implementation of MLNMapViewImpl public: - mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; } + mln::gfx::RendererBackend& getRendererBackend() override { return *this; } - mbgl::PremultipliedImage readStillImage() override; + mln::PremultipliedImage readStillImage() override; MLNBackendResource* getObject() override; void display() override; diff --git a/platform/macos/src/MLNMapView+Metal.mm b/platform/macos/src/MLNMapView+Metal.mm index 126cc1482..09134d0f6 100644 --- a/platform/macos/src/MLNMapView+Metal.mm +++ b/platform/macos/src/MLNMapView+Metal.mm @@ -34,7 +34,7 @@ @end -class MLNMapViewMetalRenderableResource final : public mbgl::mtl::RenderableResource { +class MLNMapViewMetalRenderableResource final : public mln::mtl::RenderableResource { public: MLNMapViewMetalRenderableResource(MLNMapViewMetalImpl& backend_) : backend(backend_), delegate([[MLNMapViewImplDelegate alloc] initWithImpl:&backend]) {} @@ -50,18 +50,18 @@ public: } } - const mbgl::mtl::RendererBackend& getBackend() const override { return backend; } + const mln::mtl::RendererBackend& getBackend() const override { return backend; } - const mbgl::mtl::MTLCommandBufferPtr& getCommandBuffer() const override { + const mln::mtl::MTLCommandBufferPtr& getCommandBuffer() const override { return commandBufferPtr; } - virtual mbgl::mtl::MTLBlitPassDescriptorPtr getUploadPassDescriptor() const override { + virtual mln::mtl::MTLBlitPassDescriptorPtr getUploadPassDescriptor() const override { // Create from render pass descriptor? return NS::TransferPtr(MTL::BlitPassDescriptor::alloc()->init()); } - const mbgl::mtl::MTLRenderPassDescriptorPtr& getRenderPassDescriptor() const override { + const mln::mtl::MTLRenderPassDescriptorPtr& getRenderPassDescriptor() const override { if (!cachedRenderPassDescriptor) { auto* mtlDesc = mtlView.currentRenderPassDescriptor; cachedRenderPassDescriptor = NS::RetainPtr((__bridge MTL::RenderPassDescriptor*)mtlDesc); @@ -88,7 +88,7 @@ public: cachedRenderPassDescriptor.reset(); } - mbgl::Size framebufferSize() { + mln::Size framebufferSize() { assert(mtlView); return {static_cast(mtlView.drawableSize.width), static_cast(mtlView.drawableSize.height)}; @@ -96,8 +96,8 @@ public: private: MLNMapViewMetalImpl& backend; - mbgl::mtl::MTLCommandBufferPtr commandBufferPtr; - mutable mbgl::mtl::MTLRenderPassDescriptorPtr cachedRenderPassDescriptor; + mln::mtl::MTLCommandBufferPtr commandBufferPtr; + mutable mln::mtl::MTLRenderPassDescriptorPtr cachedRenderPassDescriptor; public: MLNMapViewImplDelegate* delegate = nil; @@ -113,8 +113,8 @@ public: MLNMapViewMetalImpl::MLNMapViewMetalImpl(MLNMapView* nativeView_) : MLNMapViewImpl(nativeView_), - mbgl::mtl::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable({0, 0}, std::make_unique(*this)) { + mln::mtl::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable({0, 0}, std::make_unique(*this)) { auto& resource = getResource(); if (resource.mtlView) { return; @@ -167,7 +167,7 @@ void MLNMapViewMetalImpl::updateAssumedState() { assumeViewport(0, 0, resource.framebufferSize()); } -mbgl::PremultipliedImage MLNMapViewMetalImpl::readStillImage() { +mln::PremultipliedImage MLNMapViewMetalImpl::readStillImage() { // return readFramebuffer(mapView.framebufferSize); // TODO: RendererBackend::readFramebuffer return {}; } diff --git a/platform/macos/src/MLNMapView+OpenGL.h b/platform/macos/src/MLNMapView+OpenGL.h index fb882b707..0248890b6 100644 --- a/platform/macos/src/MLNMapView+OpenGL.h +++ b/platform/macos/src/MLNMapView+OpenGL.h @@ -5,9 +5,7 @@ #include /// Adapter responsible for bridging calls from mbgl to MLNMapView and Cocoa. -class MLNMapViewOpenGLImpl final : public MLNMapViewImpl, - public mbgl::gl::RendererBackend, - public mbgl::gfx::Renderable { +class MLNMapViewOpenGLImpl final : public MLNMapViewImpl, public mln::gl::RendererBackend, public mln::gfx::Renderable { public: MLNMapViewOpenGLImpl(MLNMapView*); ~MLNMapViewOpenGLImpl() override = default; @@ -15,27 +13,27 @@ public: public: void restoreFramebufferBinding(); - // Implementation of mbgl::gfx::RendererBackend + // Implementation of mln::gfx::RendererBackend public: - mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; } + mln::gfx::Renderable& getDefaultRenderable() override { return *this; } private: void activate() override; void deactivate() override; - // End implementation of mbgl::gfx::RendererBackend + // End implementation of mln::gfx::RendererBackend - // Implementation of mbgl::gl::RendererBackend + // Implementation of mln::gl::RendererBackend public: void updateAssumedState() override; private: - mbgl::gl::ProcAddress getExtensionFunctionPointer(const char* name) override; - // End implementation of mbgl::gl::Rendererbackend + mln::gl::ProcAddress getExtensionFunctionPointer(const char* name) override; + // End implementation of mln::gl::Rendererbackend // Implementation of MLNMapViewImpl public: - mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; } + mln::gfx::RendererBackend& getRendererBackend() override { return *this; } - mbgl::PremultipliedImage readStillImage() override; + mln::PremultipliedImage readStillImage() override; CGLContextObj getCGLContextObj() override; }; diff --git a/platform/macos/src/MLNMapView+OpenGL.mm b/platform/macos/src/MLNMapView+OpenGL.mm index 434cd9c22..722beb827 100644 --- a/platform/macos/src/MLNMapView+OpenGL.mm +++ b/platform/macos/src/MLNMapView+OpenGL.mm @@ -5,7 +5,7 @@ #import -class MLNMapViewOpenGLRenderableResource final : public mbgl::gl::RenderableResource { +class MLNMapViewOpenGLRenderableResource final : public mln::gl::RenderableResource { public: MLNMapViewOpenGLRenderableResource(MLNMapViewOpenGLImpl& backend_) : backend(backend_) {} @@ -24,21 +24,21 @@ public: MLNMapViewOpenGLImpl::MLNMapViewOpenGLImpl(MLNMapView* nativeView_) : MLNMapViewImpl(nativeView_), - mbgl::gl::RendererBackend(mbgl::gfx::ContextMode::Unique), - mbgl::gfx::Renderable(mapView.framebufferSize, - std::make_unique(*this)) { + mln::gl::RendererBackend(mln::gfx::ContextMode::Unique), + mln::gfx::Renderable(mapView.framebufferSize, + std::make_unique(*this)) { // Install the OpenGL layer. Interface Builder’s synchronous drawing means // we can’t display a map, so don’t even bother to have a map layer. mapView.layer = mapView.isTargetingInterfaceBuilder ? [CALayer layer] : [MLNOpenGLLayer layer]; } -mbgl::gl::ProcAddress MLNMapViewOpenGLImpl::getExtensionFunctionPointer(const char* name) { +mln::gl::ProcAddress MLNMapViewOpenGLImpl::getExtensionFunctionPointer(const char* name) { static CFBundleRef framework = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengl")); if (!framework) { throw std::runtime_error("Failed to load OpenGL framework."); } - return reinterpret_cast(CFBundleGetFunctionPointerForName( + return reinterpret_cast(CFBundleGetFunctionPointerForName( framework, (__bridge CFStringRef)[NSString stringWithUTF8String:name])); } @@ -74,7 +74,7 @@ void MLNMapViewOpenGLImpl::restoreFramebufferBinding() { setViewport(0, 0, mapView.framebufferSize); } -mbgl::PremultipliedImage MLNMapViewOpenGLImpl::readStillImage() { +mln::PremultipliedImage MLNMapViewOpenGLImpl::readStillImage() { return readFramebuffer(mapView.framebufferSize); } diff --git a/platform/macos/src/MLNMapView.mm b/platform/macos/src/MLNMapView.mm index e39a4cc81..087fecf64 100644 --- a/platform/macos/src/MLNMapView.mm +++ b/platform/macos/src/MLNMapView.mm @@ -129,7 +129,7 @@ NSImage *MLNDefaultMarkerImage() { } /// Converts a media timing function into a unit bezier object usable in mbgl. -mbgl::util::UnitBezier MLNUnitBezierForMediaTimingFunction(CAMediaTimingFunction *function) { +mln::util::UnitBezier MLNUnitBezierForMediaTimingFunction(CAMediaTimingFunction *function) { if (!function) { function = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault]; } @@ -168,7 +168,7 @@ public: @implementation MLNMapView { /// Cross-platform map view controller. - std::unique_ptr _mbglMap; + std::unique_ptr _mbglMap; std::unique_ptr _mbglView; std::unique_ptr _rendererFrontend; @@ -322,41 +322,41 @@ public: std::optional localFontFamilyName = config.localFontFamilyName ? std::optional(std::string(config.localFontFamilyName.UTF8String)) : std::nullopt; - auto renderer = std::make_unique(_mbglView->getRendererBackend(), - config.scaleFactor, localFontFamilyName); + auto renderer = std::make_unique(_mbglView->getRendererBackend(), + config.scaleFactor, localFontFamilyName); BOOL enableCrossSourceCollisions = !config.perSourceCollisions; _rendererFrontend = std::make_unique(std::move(renderer), self, _mbglView->getRendererBackend(), true); - mbgl::MapOptions mapOptions; - mapOptions.withMapMode(mbgl::MapMode::Continuous) + mln::MapOptions mapOptions; + mapOptions.withMapMode(mln::MapMode::Continuous) .withSize(self.size) .withPixelRatio(config.scaleFactor) - .withConstrainMode(mbgl::ConstrainMode::None) - .withViewportMode(mbgl::ViewportMode::Default) + .withConstrainMode(mln::ConstrainMode::None) + .withViewportMode(mln::ViewportMode::Default) .withCrossSourceCollisions(enableCrossSourceCollisions); auto tileServerOptions = [[MLNSettings sharedSettings] tileServerOptionsInternal]; - mbgl::ResourceOptions resourceOptions; + mln::ResourceOptions resourceOptions; resourceOptions.withTileServerOptions(*tileServerOptions) .withCachePath(MLNOfflineStorage.sharedOfflineStorage.databasePath.UTF8String) .withAssetPath([NSBundle mainBundle].resourceURL.path.UTF8String); - mbgl::ClientOptions clientOptions; + mln::ClientOptions clientOptions; auto apiKey = [[MLNSettings sharedSettings] apiKey]; if (apiKey) { resourceOptions.withApiKey([apiKey UTF8String]); } - const mbgl::util::ActionJournalOptions &actionJournalOptions = + const mln::util::ActionJournalOptions &actionJournalOptions = [mlnMapoptions.actionJournalOptions getCoreOptions]; - _mbglMap = std::make_unique(*_rendererFrontend, *_mbglView, mapOptions, - resourceOptions, clientOptions, actionJournalOptions); + _mbglMap = std::make_unique(*_rendererFrontend, *_mbglView, mapOptions, resourceOptions, + clientOptions, actionJournalOptions); // Notify map object when network reachability status changes. _reachability = [MLNReachability reachabilityForInternetConnection]; _reachability.reachableBlock = ^(MLNReachability *) { - mbgl::NetworkStatus::Reachable(); + mln::NetworkStatus::Reachable(); }; [_reachability startNotifier]; @@ -377,8 +377,8 @@ public: // Jump to Null Island initially. self.automaticallyAdjustsContentInsets = YES; - mbgl::CameraOptions options; - options.center = mbgl::LatLng(0, 0); + mln::CameraOptions options; + options.center = mln::LatLng(0, 0); options.padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); options.zoom = *_mbglMap->getBounds().minZoom; _mbglMap->jumpTo(options); @@ -386,14 +386,14 @@ public: _pendingLongitude = NAN; } -- (mbgl::Size)size { +- (mln::Size)size { // check for minimum texture size supported by OpenGL ES 2.0 // CGSize size = CGSizeMake(MAX(self.bounds.size.width, 64), MAX(self.bounds.size.height, 64)); return {static_cast(size.width), static_cast(size.height)}; } -- (mbgl::Size)framebufferSize { +- (mln::Size)framebufferSize { NSRect bounds = [self convertRectToBacking:self.bounds]; return {static_cast(bounds.size.width), static_cast(bounds.size.height)}; } @@ -639,11 +639,11 @@ public: // match a valid annotation tag, the annotation will be unnecessarily // but safely updated. if (annotation == [self annotationWithTag:annotationTag]) { - const mbgl::Point point = MLNPointFromLocationCoordinate2D(annotation.coordinate); + const mln::Point point = MLNPointFromLocationCoordinate2D(annotation.coordinate); MLNAnnotationImage *annotationImage = [self imageOfAnnotationWithTag:annotationTag]; _mbglMap->updateAnnotation( annotationTag, - mbgl::SymbolAnnotation{point, annotationImage.styleIconIdentifier.UTF8String ?: ""}); + mln::SymbolAnnotation{point, annotationImage.styleIconIdentifier.UTF8String ?: ""}); [self updateAnnotationCallouts]; } } else if ([keyPath isEqualToString:@"coordinates"] && @@ -746,7 +746,7 @@ public: } - (void)setPrefetchesTiles:(BOOL)prefetchesTiles { - _mbglMap->setPrefetchZoomDelta(prefetchesTiles ? mbgl::util::DEFAULT_PREFETCH_ZOOM_DELTA : 0); + _mbglMap->setPrefetchZoomDelta(prefetchesTiles ? mln::util::DEFAULT_PREFETCH_ZOOM_DELTA : 0); } - (BOOL)prefetchesTiles { @@ -785,7 +785,7 @@ public: return _mbglMap->getTileLodZoomShift(); } -- (mbgl::Renderer *)renderer { +- (mln::Renderer *)renderer { return _rendererFrontend->getRenderer(); } @@ -807,8 +807,8 @@ public: self.dormant = NO; } - if (window && _mbglMap->getMapOptions().constrainMode() == mbgl::ConstrainMode::None) { - _mbglMap->setConstrainMode(mbgl::ConstrainMode::HeightOnly); + if (window && _mbglMap->getMapOptions().constrainMode() == mln::ConstrainMode::None) { + _mbglMap->setConstrainMode(mln::ConstrainMode::HeightOnly); } [window addObserver:self @@ -1035,7 +1035,7 @@ public: } - (void)mapViewDidFinishRenderingFrameFullyRendered:(BOOL)fullyRendered - renderingStats:(const mbgl::gfx::RenderingStats &)stats { + renderingStats:(const mln::gfx::RenderingStats &)stats { if (!_mbglMap) { return; } @@ -1277,7 +1277,7 @@ public: } - (CLLocationCoordinate2D)centerCoordinate { - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); return MLNLocationCoordinate2DFromLatLng(*_mbglMap->getCameraOptions(padding).center); } @@ -1296,7 +1296,7 @@ public: completionHandler:(nullable void (^)(void))completion { MLNLogDebug(@"Setting centerCoordinate: %@ animated: %@", MLNStringFromCLLocationCoordinate2D(centerCoordinate), MLNStringFromBOOL(animated)); - mbgl::AnimationOptions animationOptions = + mln::AnimationOptions animationOptions = MLNDurationFromTimeInterval(animated ? MLNAnimationDuration : 0); animationOptions.transitionFinishFn = ^() { [self didChangeValueForKey:@"centerCoordinate"]; @@ -1308,7 +1308,7 @@ public: }; [self willChangeValueForKey:@"centerCoordinate"]; - _mbglMap->easeTo(mbgl::CameraOptions() + _mbglMap->easeTo(mln::CameraOptions() .withCenter(MLNLatLngFromLocationCoordinate2D(centerCoordinate)) .withPadding(MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets)), animationOptions); @@ -1348,7 +1348,7 @@ public: } - (double)zoomLevel { - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); return *_mbglMap->getCameraOptions(padding).zoom; } @@ -1360,7 +1360,7 @@ public: - (void)setZoomLevel:(double)zoomLevel animated:(BOOL)animated { MLNLogDebug(@"Setting zoomLevel: %f animated: %@", zoomLevel, MLNStringFromBOOL(animated)); [self willChangeValueForKey:@"zoomLevel"]; - _mbglMap->easeTo(mbgl::CameraOptions().withZoom(zoomLevel).withPadding( + _mbglMap->easeTo(mln::CameraOptions().withZoom(zoomLevel).withPadding( MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets)), MLNDurationFromTimeInterval(animated ? MLNAnimationDuration : 0)); [self didChangeValueForKey:@"zoomLevel"]; @@ -1370,8 +1370,8 @@ public: [self willChangeValueForKey:@"centerCoordinate"]; [self willChangeValueForKey:@"zoomLevel"]; MLNMapCamera *oldCamera = self.camera; - mbgl::ScreenCoordinate center(point.x, self.bounds.size.height - point.y); - _mbglMap->easeTo(mbgl::CameraOptions().withZoom(zoomLevel).withAnchor(center), + mln::ScreenCoordinate center(point.x, self.bounds.size.height - point.y); + _mbglMap->easeTo(mln::CameraOptions().withZoom(zoomLevel).withAnchor(center), MLNDurationFromTimeInterval(animated ? MLNAnimationDuration : 0)); if ([self.delegate respondsToSelector:@selector(mapView:shouldChangeFromCamera:toCamera:)] && ![self.delegate mapView:self shouldChangeFromCamera:oldCamera toCamera:self.camera]) { @@ -1383,12 +1383,12 @@ public: - (void)setMinimumZoomLevel:(double)minimumZoomLevel { MLNLogDebug(@"Setting minimumZoomLevel: %f", minimumZoomLevel); - _mbglMap->setBounds(mbgl::BoundOptions().withMinZoom(minimumZoomLevel)); + _mbglMap->setBounds(mln::BoundOptions().withMinZoom(minimumZoomLevel)); } - (void)setMaximumZoomLevel:(double)maximumZoomLevel { MLNLogDebug(@"Setting maximumZoomLevel: %f", maximumZoomLevel); - _mbglMap->setBounds(mbgl::BoundOptions().withMaxZoom(maximumZoomLevel)); + _mbglMap->setBounds(mln::BoundOptions().withMaxZoom(maximumZoomLevel)); } - (double)maximumZoomLevel { @@ -1420,7 +1420,7 @@ public: } - (CLLocationDirection)direction { - return mbgl::util::wrap(*_mbglMap->getCameraOptions().bearing, 0., 360.); + return mln::util::wrap(*_mbglMap->getCameraOptions().bearing, 0., 360.); } - (void)setDirection:(CLLocationDirection)direction { @@ -1431,7 +1431,7 @@ public: - (void)setDirection:(CLLocationDirection)direction animated:(BOOL)animated { MLNLogDebug(@"Setting direction: %f animated: %@", direction, MLNStringFromBOOL(animated)); [self willChangeValueForKey:@"direction"]; - _mbglMap->easeTo(mbgl::CameraOptions().withBearing(direction).withPadding( + _mbglMap->easeTo(mln::CameraOptions().withBearing(direction).withPadding( MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets)), MLNDurationFromTimeInterval(animated ? MLNAnimationDuration : 0)); [self didChangeValueForKey:@"direction"]; @@ -1447,7 +1447,7 @@ public: - (void)setMinimumPitch:(CGFloat)minimumPitch { MLNLogDebug(@"Setting minimumPitch: %f", minimumPitch); - _mbglMap->setBounds(mbgl::BoundOptions().withMinPitch(minimumPitch)); + _mbglMap->setBounds(mln::BoundOptions().withMinPitch(minimumPitch)); } - (CGFloat)maximumPitch { @@ -1456,7 +1456,7 @@ public: - (void)setMaximumPitch:(CGFloat)maximumPitch { MLNLogDebug(@"Setting maximumPitch: %f", maximumPitch); - _mbglMap->setBounds(mbgl::BoundOptions().withMaxPitch(maximumPitch)); + _mbglMap->setBounds(mln::BoundOptions().withMaxPitch(maximumPitch)); } + (NSSet *)keyPathsForValuesAffectingCamera { @@ -1465,7 +1465,7 @@ public: } - (MLNMapCamera *)camera { - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); return [self cameraForCameraOptions:_mbglMap->getCameraOptions(padding)]; } @@ -1501,7 +1501,7 @@ public: edgePadding:(NSEdgeInsets)edgePadding completionHandler:(nullable void (^)(void))completion { edgePadding = MLNEdgeInsetsInsetEdgeInset(edgePadding, self.contentInsets); - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration > 0) { animationOptions.duration.emplace(MLNDurationFromTimeInterval(duration)); animationOptions.easing.emplace(MLNUnitBezierForMediaTimingFunction(function)); @@ -1529,8 +1529,8 @@ public: [self willChangeValueForKey:@"camera"]; _mbglMap->cancelTransitions(); - mbgl::CameraOptions cameraOptions = [self cameraOptionsObjectForAnimatingToCamera:camera - edgePadding:edgePadding]; + mln::CameraOptions cameraOptions = [self cameraOptionsObjectForAnimatingToCamera:camera + edgePadding:edgePadding]; _mbglMap->easeTo(cameraOptions, animationOptions); [self didChangeValueForKey:@"camera"]; } @@ -1554,7 +1554,7 @@ public: completionHandler:(nullable void (^)(void))completion { MLNLogDebug(@"Setting flyToCamera: %@ withDuration: %f peakAltitude: %f completionHandler: %@", camera, duration, peakAltitude, completion); - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (duration >= 0) { animationOptions.duration = MLNDurationFromTimeInterval(duration); } @@ -1588,7 +1588,7 @@ public: [self willChangeValueForKey:@"camera"]; _mbglMap->cancelTransitions(); - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = [self cameraOptionsObjectForAnimatingToCamera:camera edgePadding:self.contentInsets]; _mbglMap->flyTo(cameraOptions, animationOptions); [self didChangeValueForKey:@"camera"]; @@ -1596,9 +1596,9 @@ public: /// Returns a CameraOptions object that specifies parameters for animating to /// the given camera. -- (mbgl::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera - edgePadding:(NSEdgeInsets)edgePadding { - mbgl::CameraOptions options; +- (mln::CameraOptions)cameraOptionsObjectForAnimatingToCamera:(MLNMapCamera *)camera + edgePadding:(NSEdgeInsets)edgePadding { + mln::CameraOptions options; options.center = MLNLatLngFromLocationCoordinate2D(camera.centerCoordinate); options.padding = MLNEdgeInsetsFromNSEdgeInsets(edgePadding); options.zoom = MLNZoomLevelForAltitude(camera.altitude, camera.pitch, @@ -1646,11 +1646,11 @@ public: completionHandler:(nullable void (^)(void))completion { _mbglMap->cancelTransitions(); - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = _mbglMap->cameraForLatLngBounds(MLNLatLngBoundsFromCoordinateBounds(bounds), padding); - mbgl::AnimationOptions animationOptions; + mln::AnimationOptions animationOptions; if (animated) { animationOptions.duration = MLNDurationFromTimeInterval(MLNAnimationDuration); } @@ -1679,9 +1679,9 @@ public: - (MLNMapCamera *)cameraThatFitsCoordinateBounds:(MLNCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets { - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = _mbglMap->cameraForLatLngBounds(MLNLatLngBoundsFromCoordinateBounds(bounds), padding); return [self cameraForCameraOptions:cameraOptions]; } @@ -1689,14 +1689,14 @@ public: - (MLNMapCamera *)camera:(MLNMapCamera *)camera fittingCoordinateBounds:(MLNCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets { - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); MLNMapCamera *currentCamera = self.camera; CGFloat pitch = camera.pitch < 0 ? currentCamera.pitch : camera.pitch; CLLocationDirection direction = camera.heading < 0 ? currentCamera.heading : camera.heading; - mbgl::CameraOptions cameraOptions = _mbglMap->cameraForLatLngBounds( + mln::CameraOptions cameraOptions = _mbglMap->cameraForLatLngBounds( MLNLatLngBoundsFromCoordinateBounds(bounds), padding, direction, pitch); return [self cameraForCameraOptions:cameraOptions]; } @@ -1704,14 +1704,14 @@ public: - (MLNMapCamera *)camera:(MLNMapCamera *)camera fittingShape:(MLNShape *)shape edgePadding:(NSEdgeInsets)insets { - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); MLNMapCamera *currentCamera = self.camera; CGFloat pitch = camera.pitch < 0 ? currentCamera.pitch : camera.pitch; CLLocationDirection direction = camera.heading < 0 ? currentCamera.heading : camera.heading; - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = _mbglMap->cameraForGeometry([shape geometryObject], padding, direction, pitch); return [self cameraForCameraOptions:cameraOptions]; @@ -1720,22 +1720,22 @@ public: - (MLNMapCamera *)cameraThatFitsShape:(MLNShape *)shape direction:(CLLocationDirection)direction edgePadding:(NSEdgeInsets)insets { - mbgl::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); + mln::EdgeInsets padding = MLNEdgeInsetsFromNSEdgeInsets(insets); padding += MLNEdgeInsetsFromNSEdgeInsets(self.contentInsets); - mbgl::CameraOptions cameraOptions = + mln::CameraOptions cameraOptions = _mbglMap->cameraForGeometry([shape geometryObject], padding, direction); return [self cameraForCameraOptions:cameraOptions]; } -- (MLNMapCamera *)cameraForCameraOptions:(const mbgl::CameraOptions &)cameraOptions { - mbgl::CameraOptions mapCamera = _mbglMap->getCameraOptions(); +- (MLNMapCamera *)cameraForCameraOptions:(const mln::CameraOptions &)cameraOptions { + mln::CameraOptions mapCamera = _mbglMap->getCameraOptions(); CLLocationCoordinate2D centerCoordinate = MLNLocationCoordinate2DFromLatLng( cameraOptions.center ? *cameraOptions.center : *mapCamera.center); double zoomLevel = cameraOptions.zoom ? *cameraOptions.zoom : self.zoomLevel; CLLocationDirection direction = - cameraOptions.bearing ? mbgl::util::wrap(*cameraOptions.bearing, 0., 360.) : self.direction; + cameraOptions.bearing ? mln::util::wrap(*cameraOptions.bearing, 0., 360.) : self.direction; CGFloat pitch = cameraOptions.pitch ? *cameraOptions.pitch : *mapCamera.pitch; CLLocationDistance altitude = MLNAltitudeForZoomLevel(zoomLevel, pitch, centerCoordinate.latitude, self.frame.size); @@ -1862,16 +1862,16 @@ public: } else if (gestureRecognizer.state == NSGestureRecognizerStateChanged) { MLNMapCamera *oldCamera = self.camera; BOOL didChangeCamera = NO; - mbgl::ScreenCoordinate center(startPoint.x, self.bounds.size.height - startPoint.y); + mln::ScreenCoordinate center(startPoint.x, self.bounds.size.height - startPoint.y); if (self.rotateEnabled) { CLLocationDirection newDirection = _directionAtBeginningOfGesture - delta.x / 10; [self willChangeValueForKey:@"direction"]; - _mbglMap->jumpTo(mbgl::CameraOptions().withBearing(newDirection).withAnchor(center)); + _mbglMap->jumpTo(mln::CameraOptions().withBearing(newDirection).withAnchor(center)); didChangeCamera = YES; [self didChangeValueForKey:@"direction"]; } if (self.pitchEnabled) { - _mbglMap->jumpTo(mbgl::CameraOptions() + _mbglMap->jumpTo(mln::CameraOptions() .withPitch(_pitchAtBeginningOfGesture + delta.y / 5) .withAnchor(center)); didChangeCamera = YES; @@ -1916,13 +1916,13 @@ public: _zoomAtBeginningOfGesture = [self zoomLevel]; } else if (gestureRecognizer.state == NSGestureRecognizerStateChanged) { NSPoint zoomInPoint = [gestureRecognizer locationInView:self]; - mbgl::ScreenCoordinate center(zoomInPoint.x, self.bounds.size.height - zoomInPoint.y); + mln::ScreenCoordinate center(zoomInPoint.x, self.bounds.size.height - zoomInPoint.y); if (gestureRecognizer.magnification > -1) { [self willChangeValueForKey:@"zoomLevel"]; [self willChangeValueForKey:@"centerCoordinate"]; MLNMapCamera *oldCamera = self.camera; _mbglMap->jumpTo( - mbgl::CameraOptions() + mln::CameraOptions() .withZoom(_zoomAtBeginningOfGesture + log2(1 + gestureRecognizer.magnification)) .withAnchor(center)); if ([self.delegate respondsToSelector:@selector(mapView:shouldChangeFromCamera:toCamera:)] && @@ -2007,9 +2007,9 @@ public: MLNMapCamera *oldCamera = self.camera; NSPoint rotationPoint = [gestureRecognizer locationInView:self]; - mbgl::ScreenCoordinate anchor(rotationPoint.x, self.bounds.size.height - rotationPoint.y); + mln::ScreenCoordinate anchor(rotationPoint.x, self.bounds.size.height - rotationPoint.y); _mbglMap->jumpTo( - mbgl::CameraOptions() + mln::CameraOptions() .withBearing(_directionAtBeginningOfGesture + gestureRecognizer.rotationInDegrees) .withAnchor(anchor)); @@ -2358,7 +2358,7 @@ public: [self installAnnotationImage:annotationImage]; } - MLNAnnotationTag annotationTag = _mbglMap->addAnnotation(mbgl::SymbolAnnotation{ + MLNAnnotationTag annotationTag = _mbglMap->addAnnotation(mln::SymbolAnnotation{ MLNPointFromLocationCoordinate2D(annotation.coordinate), symbolName.UTF8String ?: ""}); MLNAnnotationContext context; @@ -2862,7 +2862,7 @@ public: return; } - mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty(); + mln::LatLngBounds bounds = mln::LatLngBounds::empty(); for (id annotation in annotations) { if ([annotation conformsToProtocol:@protocol(MLNOverlay)]) { @@ -3016,14 +3016,14 @@ public: return 1.0; } -- (mbgl::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation { +- (mln::Color)strokeColorForShapeAnnotation:(MLNShape *)annotation { NSColor *color = (_delegateHasStrokeColorsForShapeAnnotations ? [self.delegate mapView:self strokeColorForShapeAnnotation:annotation] : [NSColor selectedMenuItemColor]); return color.mgl_color; } -- (mbgl::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation { +- (mln::Color)fillColorForPolygonAnnotation:(MLNPolygon *)annotation { NSColor *color = (_delegateHasFillColorsForShapeAnnotations ? [self.delegate mapView:self fillColorForPolygonAnnotation:annotation] : [NSColor selectedMenuItemColor]); @@ -3210,7 +3210,7 @@ public: MLNLogDebug(@"Querying visibleFeaturesAtPoint: %@ inStyleLayersWithIdentifiers: %@ predicate: %@", NSStringFromPoint(point), styleLayerIdentifiers, predicate); // Cocoa origin is at the lower-left corner. - mbgl::ScreenCoordinate screenCoordinate = {point.x, NSHeight(self.bounds) - point.y}; + mln::ScreenCoordinate screenCoordinate = {point.x, NSHeight(self.bounds) - point.y}; std::optional> optionalLayerIDs; if (styleLayerIdentifiers) { @@ -3223,12 +3223,12 @@ public: optionalLayerIDs = layerIDs; } - std::optional optionalFilter; + std::optional optionalFilter; if (predicate) { optionalFilter = predicate.mgl_filter; } - std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( + std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( screenCoordinate, {optionalLayerIDs, optionalFilter}); return MLNFeaturesFromMBGLFeatures(features); } @@ -3253,7 +3253,7 @@ public: MLNLogDebug(@"Querying visibleFeaturesInRect: %@ inStyleLayersWithIdentifiers: %@ predicate: %@", NSStringFromRect(rect), styleLayerIdentifiers, predicate); // Cocoa origin is at the lower-left corner. - mbgl::ScreenBox screenBox = { + mln::ScreenBox screenBox = { {NSMinX(rect), NSHeight(self.bounds) - NSMaxY(rect)}, {NSMaxX(rect), NSHeight(self.bounds) - NSMinY(rect)}, }; @@ -3269,12 +3269,12 @@ public: optionalLayerIDs = layerIDs; } - std::optional optionalFilter; + std::optional optionalFilter; if (predicate) { optionalFilter = predicate.mgl_filter; } - std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( + std::vector features = _rendererFrontend->getRenderer()->queryRenderedFeatures( screenBox, {optionalLayerIDs, optionalFilter}); return MLNFeaturesFromMBGLFeatures(features); } @@ -3314,8 +3314,8 @@ public: } /// Converts a geographic coordinate to a point in the view’s coordinate system. -- (NSPoint)convertLatLng:(mbgl::LatLng)latLng toPointToView:(nullable NSView *)view { - mbgl::ScreenCoordinate pixel = _mbglMap->pixelForLatLng(latLng); +- (NSPoint)convertLatLng:(mln::LatLng)latLng toPointToView:(nullable NSView *)view { + mln::ScreenCoordinate pixel = _mbglMap->pixelForLatLng(latLng); // Cocoa origin is at the lower-left corner. pixel.y = NSHeight(self.bounds) - pixel.y; return [self convertPoint:NSMakePoint(pixel.x, pixel.y) toView:view]; @@ -3326,7 +3326,7 @@ public: } /// Converts a point in the view’s coordinate system to a geographic coordinate. -- (mbgl::LatLng)convertPoint:(NSPoint)point toLatLngFromView:(nullable NSView *)view { +- (mln::LatLng)convertPoint:(NSPoint)point toLatLngFromView:(nullable NSView *)view { NSPoint convertedPoint = [self convertPoint:point fromView:view]; return _mbglMap ->latLngForPixel({ @@ -3343,7 +3343,7 @@ public: /// Converts a geographic bounding box to a rectangle in the view’s coordinate /// system. -- (NSRect)convertLatLngBounds:(mbgl::LatLngBounds)bounds toRectToView:(nullable NSView *)view { +- (NSRect)convertLatLngBounds:(mln::LatLngBounds)bounds toRectToView:(nullable NSView *)view { auto northwest = bounds.northwest(); auto northeast = bounds.northeast(); auto southwest = bounds.southwest(); @@ -3358,7 +3358,7 @@ public: southwest.unwrapForShortestPath(center); southeast.unwrapForShortestPath(center); - auto correctedLatLngBounds = mbgl::LatLngBounds::empty(); + auto correctedLatLngBounds = mln::LatLngBounds::empty(); correctedLatLngBounds.extend(northwest); correctedLatLngBounds.extend(northeast); correctedLatLngBounds.extend(southwest); @@ -3377,8 +3377,8 @@ public: /// Converts a rectangle in the given view’s coordinate system to a geographic /// bounding box. -- (mbgl::LatLngBounds)convertRect:(NSRect)rect toLatLngBoundsFromView:(nullable NSView *)view { - auto bounds = mbgl::LatLngBounds::empty(); +- (mln::LatLngBounds)convertRect:(NSRect)rect toLatLngBoundsFromView:(nullable NSView *)view { + auto bounds = mln::LatLngBounds::empty(); auto bottomLeft = [self convertPoint:{NSMinX(rect), NSMinY(rect)} toLatLngFromView:view]; auto bottomRight = [self convertPoint:{NSMaxX(rect), NSMinY(rect)} toLatLngFromView:view]; auto topRight = [self convertPoint:{NSMaxX(rect), NSMaxY(rect)} toLatLngFromView:view]; @@ -3401,60 +3401,60 @@ public: } - (CLLocationDistance)metersPerPointAtLatitude:(CLLocationDegrees)latitude { - return mbgl::Projection::getMetersPerPixelAtLatitude(latitude, self.zoomLevel); + return mln::Projection::getMetersPerPixelAtLatitude(latitude, self.zoomLevel); } // MARK: Debugging - (MLNMapDebugMaskOptions)debugMask { - mbgl::MapDebugOptions options = _mbglMap->getDebug(); + mln::MapDebugOptions options = _mbglMap->getDebug(); MLNMapDebugMaskOptions mask = 0; - if (options & mbgl::MapDebugOptions::TileBorders) { + if (options & mln::MapDebugOptions::TileBorders) { mask |= MLNMapDebugTileBoundariesMask; } - if (options & mbgl::MapDebugOptions::ParseStatus) { + if (options & mln::MapDebugOptions::ParseStatus) { mask |= MLNMapDebugTileInfoMask; } - if (options & mbgl::MapDebugOptions::Timestamps) { + if (options & mln::MapDebugOptions::Timestamps) { mask |= MLNMapDebugTimestampsMask; } - if (options & mbgl::MapDebugOptions::Collision) { + if (options & mln::MapDebugOptions::Collision) { mask |= MLNMapDebugCollisionBoxesMask; } - if (options & mbgl::MapDebugOptions::Overdraw) { + if (options & mln::MapDebugOptions::Overdraw) { mask |= MLNMapDebugOverdrawVisualizationMask; } - if (options & mbgl::MapDebugOptions::StencilClip) { + if (options & mln::MapDebugOptions::StencilClip) { mask |= MLNMapDebugStencilBufferMask; } - if (options & mbgl::MapDebugOptions::DepthBuffer) { + if (options & mln::MapDebugOptions::DepthBuffer) { mask |= MLNMapDebugDepthBufferMask; } return mask; } - (void)setDebugMask:(MLNMapDebugMaskOptions)debugMask { - mbgl::MapDebugOptions options = mbgl::MapDebugOptions::NoDebug; + mln::MapDebugOptions options = mln::MapDebugOptions::NoDebug; if (debugMask & MLNMapDebugTileBoundariesMask) { - options |= mbgl::MapDebugOptions::TileBorders; + options |= mln::MapDebugOptions::TileBorders; } if (debugMask & MLNMapDebugTileInfoMask) { - options |= mbgl::MapDebugOptions::ParseStatus; + options |= mln::MapDebugOptions::ParseStatus; } if (debugMask & MLNMapDebugTimestampsMask) { - options |= mbgl::MapDebugOptions::Timestamps; + options |= mln::MapDebugOptions::Timestamps; } if (debugMask & MLNMapDebugCollisionBoxesMask) { - options |= mbgl::MapDebugOptions::Collision; + options |= mln::MapDebugOptions::Collision; } if (debugMask & MLNMapDebugOverdrawVisualizationMask) { - options |= mbgl::MapDebugOptions::Overdraw; + options |= mln::MapDebugOptions::Overdraw; } if (debugMask & MLNMapDebugStencilBufferMask) { - options |= mbgl::MapDebugOptions::StencilClip; + options |= mln::MapDebugOptions::StencilClip; } if (debugMask & MLNMapDebugDepthBufferMask) { - options |= mbgl::MapDebugOptions::DepthBuffer; + options |= mln::MapDebugOptions::DepthBuffer; } _mbglMap->setDebug(options); } diff --git a/platform/macos/src/MLNMapView_Private.h b/platform/macos/src/MLNMapView_Private.h index d5573544c..d7bea4fc6 100644 --- a/platform/macos/src/MLNMapView_Private.h +++ b/platform/macos/src/MLNMapView_Private.h @@ -3,7 +3,7 @@ #include -namespace mbgl { +namespace mln { class Map; class Renderer; @@ -11,7 +11,7 @@ namespace gfx { struct RenderingStats; } -} // namespace mbgl +} // namespace mln @class MLNSource; @@ -35,7 +35,7 @@ struct RenderingStats; /// The map view’s OpenGL rendering context, if it is backed by an OpenGL based view. @property (readonly, nonatomic, nullable) CGLContextObj context; -- (mbgl::Size)framebufferSize; +- (mln::Size)framebufferSize; /// Map observers - (void)cameraWillChangeAnimated:(BOOL)animated; @@ -46,7 +46,7 @@ struct RenderingStats; - (void)mapViewDidFailLoadingMapWithError:(nonnull NSError *)error; - (void)mapViewWillStartRenderingFrame; - (void)mapViewDidFinishRenderingFrameFullyRendered:(BOOL)fullyRendered - renderingStats:(const mbgl::gfx::RenderingStats &)stats; + renderingStats:(const mln::gfx::RenderingStats &)stats; - (void)mapViewWillStartRenderingMap; - (void)mapViewDidFinishRenderingMapFullyRendered:(BOOL)fullyRendered; - (void)mapViewDidBecomeIdle; @@ -85,6 +85,6 @@ struct RenderingStats; - (BOOL)isTargetingInterfaceBuilder; -- (nonnull mbgl::Renderer *)renderer; +- (nonnull mln::Renderer *)renderer; @end diff --git a/platform/macos/src/NSColor+MLNAdditions.h b/platform/macos/src/NSColor+MLNAdditions.h index 63c3de3ec..dff1d1e95 100644 --- a/platform/macos/src/NSColor+MLNAdditions.h +++ b/platform/macos/src/NSColor+MLNAdditions.h @@ -6,18 +6,18 @@ @interface NSColor (MLNAdditions) /** - Converts the color into an mbgl::Color in sRGB space. + Converts the color into an mln::Color in sRGB space. */ -- (mbgl::Color)mgl_color; +- (mln::Color)mgl_color; -- (mbgl::Color)mgl_colorForPremultipliedValue; +- (mln::Color)mgl_colorForPremultipliedValue; /** - Instantiates `NSColor` from an `mbgl::Color` + Instantiates `NSColor` from an `mln::Color` */ -+ (NSColor *)mgl_colorWithColor:(mbgl::Color)color; ++ (NSColor *)mgl_colorWithColor:(mln::Color)color; -- (mbgl::style::PropertyValue)mgl_colorPropertyValue; +- (mln::style::PropertyValue)mgl_colorPropertyValue; @end diff --git a/platform/macos/src/NSColor+MLNAdditions.mm b/platform/macos/src/NSColor+MLNAdditions.mm index 31d683b54..3e40f4a07 100644 --- a/platform/macos/src/NSColor+MLNAdditions.mm +++ b/platform/macos/src/NSColor+MLNAdditions.mm @@ -2,7 +2,7 @@ @implementation NSColor (MLNAdditions) -- (mbgl::Color)mgl_color { +- (mln::Color)mgl_color { CGFloat r, g, b, a; // The MapLibre Style Spec does not specify a color space, but it is @@ -17,12 +17,12 @@ // NSColor provides non-premultiplied color components, so we have to premultiply each // color component with the alpha value to transform it into a valid - // mbgl::Color which expects premultiplied color components. + // mln::Color which expects premultiplied color components. return {static_cast(r * a), static_cast(g * a), static_cast(b * a), static_cast(a)}; } -- (mbgl::Color)mgl_colorForPremultipliedValue { +- (mln::Color)mgl_colorForPremultipliedValue { CGFloat r, g, b, a; // The MapLibre Style Spec does not specify a color space, but it is @@ -39,7 +39,7 @@ static_cast(a)}; } -+ (NSColor *)mgl_colorWithColor:(mbgl::Color)color { ++ (NSColor *)mgl_colorWithColor:(mln::Color)color { // If there is no alpha value, return original color values. if (color.a == 0.0f) { // macOS 10.12 Sierra and below uses calibrated RGB by default. @@ -50,7 +50,7 @@ } } - // mbgl::Color provides premultiplied color components, so we have to convert color + // mln::Color provides premultiplied color components, so we have to convert color // components to non-premultiplied values to return a valid NSColor object. float red = static_cast((color.r / color.a)); float green = static_cast((color.g / color.a)); @@ -64,8 +64,8 @@ } } -- (mbgl::style::PropertyValue)mgl_colorPropertyValue { - mbgl::Color color = self.mgl_color; +- (mln::style::PropertyValue)mgl_colorPropertyValue { + mln::Color color = self.mgl_color; return {{color.r, color.g, color.b, color.a}}; } diff --git a/platform/macos/src/NSImage+MLNAdditions.h b/platform/macos/src/NSImage+MLNAdditions.h index 607b947a9..c0ee4b0bb 100644 --- a/platform/macos/src/NSImage+MLNAdditions.h +++ b/platform/macos/src/NSImage+MLNAdditions.h @@ -6,13 +6,13 @@ NS_ASSUME_NONNULL_BEGIN @interface NSImage (MLNAdditions) -- (nullable instancetype)initWithMLNPremultipliedImage:(mbgl::PremultipliedImage &&)image; +- (nullable instancetype)initWithMLNPremultipliedImage:(mln::PremultipliedImage &&)image; -- (nullable instancetype)initWithMLNStyleImage:(const mbgl::style::Image &)image; +- (nullable instancetype)initWithMLNStyleImage:(const mln::style::Image &)image; -- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier; +- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier; -- (mbgl::PremultipliedImage)mgl_premultipliedImage; +- (mln::PremultipliedImage)mgl_premultipliedImage; @end diff --git a/platform/macos/src/NSImage+MLNAdditions.mm b/platform/macos/src/NSImage+MLNAdditions.mm index fcd5e7390..5c5800cab 100644 --- a/platform/macos/src/NSImage+MLNAdditions.mm +++ b/platform/macos/src/NSImage+MLNAdditions.mm @@ -9,7 +9,7 @@ BOOL MLNEdgeInsetsIsZero(NSEdgeInsets edgeInsets) { @implementation NSImage (MLNAdditions) -- (nullable instancetype)initWithMLNPremultipliedImage:(mbgl::PremultipliedImage &&)src { +- (nullable instancetype)initWithMLNPremultipliedImage:(mln::PremultipliedImage &&)src { CGImageRef image = CGImageCreateWithMLNPremultipliedImage(std::move(src)); if (!image) { return nil; @@ -20,7 +20,7 @@ BOOL MLNEdgeInsetsIsZero(NSEdgeInsets edgeInsets) { return self; } -- (nullable instancetype)initWithMLNStyleImage:(const mbgl::style::Image &)styleImage { +- (nullable instancetype)initWithMLNStyleImage:(const mln::style::Image &)styleImage { CGImageRef image = CGImageCreateWithMLNPremultipliedImage(styleImage.getImage().clone()); if (!image) { return nil; @@ -48,12 +48,12 @@ BOOL MLNEdgeInsetsIsZero(NSEdgeInsets edgeInsets) { return self; } -- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier { - mbgl::PremultipliedImage cPremultipliedImage = self.mgl_premultipliedImage; +- (std::unique_ptr)mgl_styleImageWithIdentifier:(NSString *)identifier { + mln::PremultipliedImage cPremultipliedImage = self.mgl_premultipliedImage; auto imageWidth = cPremultipliedImage.size.width; float scale = static_cast(imageWidth) / self.size.width; - mbgl::style::ImageStretches stretchX, stretchY; + mln::style::ImageStretches stretchX, stretchY; if (self.resizingMode == NSImageResizingModeStretch) { stretchX.push_back({ self.capInsets.left * scale, @@ -65,9 +65,9 @@ BOOL MLNEdgeInsetsIsZero(NSEdgeInsets edgeInsets) { }); } - std::optional imageContent; + std::optional imageContent; if (!MLNEdgeInsetsIsZero(self.capInsets)) { - imageContent = (mbgl::style::ImageContent){ + imageContent = (mln::style::ImageContent){ .left = static_cast(self.capInsets.left * scale), .top = static_cast(self.capInsets.top * scale), .right = static_cast((self.size.width - self.capInsets.right) * scale), @@ -75,12 +75,12 @@ BOOL MLNEdgeInsetsIsZero(NSEdgeInsets edgeInsets) { }; } - return std::make_unique([identifier UTF8String], - std::move(cPremultipliedImage), scale, - [self isTemplate], stretchX, stretchY, imageContent); + return std::make_unique([identifier UTF8String], + std::move(cPremultipliedImage), scale, + [self isTemplate], stretchX, stretchY, imageContent); } -- (mbgl::PremultipliedImage)mgl_premultipliedImage { +- (mln::PremultipliedImage)mgl_premultipliedImage { CGImageRef ref = [self CGImageForProposedRect:nullptr context:nullptr hints:nullptr]; return MLNPremultipliedImageFromCGImage(ref); } diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md index 940a6804f..c2aa0b148 100644 --- a/platform/node/CHANGELOG.md +++ b/platform/node/CHANGELOG.md @@ -224,7 +224,7 @@ ## 3.4.0 - November 2, 2016 - Fixes Bitrise configuration to automatically publish macOS binaries ([#6789](https://github.com/mapbox/mapbox-gl-native/pull/6789)) -- Switches from using individual thread pools for each `mbgl::Map` object to sharing the built-in Node.js thread pool for NodeMap implementations ([#6687](https://github.com/mapbox/mapbox-gl-native/pull/6687)) +- Switches from using individual thread pools for each `mln::Map` object to sharing the built-in Node.js thread pool for NodeMap implementations ([#6687](https://github.com/mapbox/mapbox-gl-native/pull/6687)) ## 3.3.3 - September 6, 2016 @@ -340,7 +340,7 @@ ## 1.1.3 - June 25, 2015 -- Removes deprecated mbgl::Environment from NodeLogObserver. +- Removes deprecated mln::Environment from NodeLogObserver. ## 1.1.2 - June 22, 2015 @@ -366,7 +366,7 @@ should be handled through `NodeFileSource` now. - Updates build scripts and Travis CI configuration. - Logs Environment ID and thread name when in an Environment scope. -- Refactors NodeLog to implement mbgl::Log::Observer. +- Refactors NodeLog to implement mln::Log::Observer. - Fixes uncaught exception from missing sprites. - Fixes Unicode glyph range end. @@ -382,7 +382,7 @@ ## 1.0.1 - March 19, 2015 -- Adapts NodeFileSource around mbgl::Environment additions. +- Adapts NodeFileSource around mln::Environment additions. - Adapts to minor changes in mapbox-gl-test-suite. - Adds tests for gzipped vector tile handling. - Cleans up documentation. diff --git a/platform/node/src/node_conversion.hpp b/platform/node/src/node_conversion.hpp index 358303d6f..06fd566eb 100644 --- a/platform/node/src/node_conversion.hpp +++ b/platform/node/src/node_conversion.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace style { namespace conversion { @@ -159,4 +159,4 @@ std::optional convert(const v8::Local& value, Error& error, Args&& } // namespace conversion } // namespace style -} // namespace mbgl +} // namespace mln diff --git a/platform/node/src/node_expression.cpp b/platform/node/src/node_expression.cpp index 15269c682..423742235 100644 --- a/platform/node/src/node_expression.cpp +++ b/platform/node/src/node_expression.cpp @@ -9,8 +9,8 @@ #include #include -using namespace mbgl::style; -using namespace mbgl::style::expression; +using namespace mln::style; +using namespace mln::style::expression; namespace node_mbgl { @@ -113,10 +113,10 @@ void NodeExpression::Parse(const Nan::FunctionCallbackInfo& info) { auto expr = info[0]; try { - mbgl::style::conversion::Convertible convertible(expr); + mln::style::conversion::Convertible convertible(expr); if (expr->IsObject() && !expr->IsArray() && expected) { - mbgl::style::conversion::Error error; + mln::style::conversion::Error error; auto func = convertFunctionToExpression(*expected, convertible, error, false); if (func) { return success(std::move(*func)); @@ -125,7 +125,7 @@ void NodeExpression::Parse(const Nan::FunctionCallbackInfo& info) { } ParsingContext ctx = expected ? ParsingContext(*expected) : ParsingContext(); - ParseResult parsed = ctx.parseLayerPropertyExpression(mbgl::style::conversion::Convertible(expr)); + ParseResult parsed = ctx.parseLayerPropertyExpression(mln::style::conversion::Convertible(expr)); if (parsed) { assert(ctx.getErrors().empty()); return success(std::move(*parsed)); @@ -145,7 +145,7 @@ void NodeExpression::New(const Nan::FunctionCallbackInfo& info) { } struct ToValue { - v8::Local operator()(mbgl::NullValue) { + v8::Local operator()(mln::NullValue) { Nan::EscapableHandleScope scope; return scope.Escape(Nan::Null()); } @@ -185,27 +185,27 @@ struct ToValue { v8::Local operator()(const Formatted& formatted) { // This mimics the internal structure of the Formatted class in formatted.js // A better approach might be to use the explicit serialized form - // both here and on the JS side? e.g. toJS(fromExpressionValue(formatted)) - std::unordered_map serialized; - std::vector sections; + // both here and on the JS side? e.g. toJS(fromExpressionValue(formatted)) + std::unordered_map serialized; + std::vector sections; for (const auto& section : formatted.sections) { - std::unordered_map serializedSection; + std::unordered_map serializedSection; serializedSection.emplace("text", section.text); if (section.fontScale) { serializedSection.emplace("scale", *section.fontScale); } else { - serializedSection.emplace("scale", mbgl::NullValue()); + serializedSection.emplace("scale", mln::NullValue()); } if (section.fontStack) { std::string fontStackString; - serializedSection.emplace("fontStack", mbgl::fontStackToString(*section.fontStack)); + serializedSection.emplace("fontStack", mln::fontStackToString(*section.fontStack)); } else { - serializedSection.emplace("fontStack", mbgl::NullValue()); + serializedSection.emplace("fontStack", mln::NullValue()); } if (section.textColor) { serializedSection.emplace("textColor", section.textColor->toObject()); } else { - serializedSection.emplace("textColor", mbgl::NullValue()); + serializedSection.emplace("textColor", mln::NullValue()); } sections.emplace_back(serializedSection); } @@ -214,14 +214,14 @@ struct ToValue { return toJS(serialized); } - v8::Local operator()(const mbgl::Color& color) { + v8::Local operator()(const mln::Color& color) { return operator()(std::vector{static_cast(color.r), static_cast(color.g), static_cast(color.b), static_cast(color.a)}); } - v8::Local operator()(const mbgl::Padding& padding) { + v8::Local operator()(const mln::Padding& padding) { return operator()(std::vector{static_cast(padding.top), static_cast(padding.right), static_cast(padding.bottom), @@ -240,12 +240,12 @@ struct ToValue { v8::Local operator()(const Image& image) { return toJS(image.toValue()); } - v8::Local operator()(const mbgl::VariableAnchorOffsetCollection& variableAnchorOffsets) { + v8::Local operator()(const mln::VariableAnchorOffsetCollection& variableAnchorOffsets) { std::vector components; components.reserve(variableAnchorOffsets.size() * 2); for (const auto& variableAnchorOffset : variableAnchorOffsets) { components.emplace_back( - std::string(mbgl::Enum::toString(variableAnchorOffset.anchorType))); + std::string(mln::Enum::toString(variableAnchorOffset.anchorType))); components.emplace_back(std::vector{static_cast(variableAnchorOffset.offset[0]), static_cast(variableAnchorOffset.offset[1])}); } @@ -279,7 +279,7 @@ void NodeExpression::Evaluate(const Nan::FunctionCallbackInfo& info) Nan::JSON NanJSON; conversion::Error conversionError; - std::optional geoJSON = conversion::convert(info[1], conversionError); + std::optional geoJSON = conversion::convert(info[1], conversionError); if (!geoJSON) { Nan::ThrowTypeError(conversionError.message.c_str()); return; @@ -326,7 +326,7 @@ void NodeExpression::Serialize(const Nan::FunctionCallbackInfo& info) auto* nodeExpr = ObjectWrap::Unwrap(info.Holder()); const std::unique_ptr& expression = nodeExpr->expression; - const mbgl::Value serialized = expression->serialize(); + const mln::Value serialized = expression->serialize(); info.GetReturnValue().Set(toJS(serialized)); } diff --git a/platform/node/src/node_expression.hpp b/platform/node/src/node_expression.hpp index cf1d2c919..68eb21e94 100644 --- a/platform/node/src/node_expression.hpp +++ b/platform/node/src/node_expression.hpp @@ -13,14 +13,14 @@ namespace node_mbgl { -v8::Local toJS(const mbgl::style::expression::Value&); +v8::Local toJS(const mln::style::expression::Value&); class NodeExpression : public Nan::ObjectWrap { public: static void Init(v8::Local); private: - NodeExpression(std::unique_ptr expression_) + NodeExpression(std::unique_ptr expression_) : expression(std::move(expression_)) {}; static void New(const Nan::FunctionCallbackInfo&); @@ -34,7 +34,7 @@ private: static Nan::Persistent constructor; - std::unique_ptr expression; + std::unique_ptr expression; }; } // namespace node_mbgl diff --git a/platform/node/src/node_feature.cpp b/platform/node/src/node_feature.cpp index fa88a1d1f..d346aba60 100644 --- a/platform/node/src/node_feature.cpp +++ b/platform/node/src/node_feature.cpp @@ -4,12 +4,12 @@ namespace node_mbgl { using namespace mapbox::geometry; -using Value = mbgl::Value; -using Feature = mbgl::Feature; -using FeatureIdentifier = mbgl::FeatureIdentifier; -using Geometry = mbgl::Feature::geometry_type; +using Value = mln::Value; +using Feature = mln::Feature; +using FeatureIdentifier = mln::FeatureIdentifier; +using Geometry = mln::Feature::geometry_type; using GeometryCollection = mapbox::geometry::geometry_collection; -using Properties = mbgl::PropertyMap; +using Properties = mln::PropertyMap; template struct ToType { @@ -64,7 +64,7 @@ public: }; struct ToValue { - v8::Local operator()(mbgl::NullValue) { + v8::Local operator()(mln::NullValue) { Nan::EscapableHandleScope scope; return scope.Escape(Nan::Null()); } @@ -88,7 +88,7 @@ struct ToValue { return scope.Escape(Nan::New(t).ToLocalChecked()); } - v8::Local operator()(const std::vector& array) { + v8::Local operator()(const std::vector& array) { Nan::EscapableHandleScope scope; v8::Local result = Nan::New(); for (std::size_t i = 0; i < array.size(); i++) { @@ -97,7 +97,7 @@ struct ToValue { return scope.Escape(result); } - v8::Local operator()(const std::unordered_map& map) { return toJS(map); } + v8::Local operator()(const std::unordered_map& map) { return toJS(map); } }; v8::Local toJS(const Geometry& geometry) { @@ -138,7 +138,7 @@ v8::Local toJS(const Feature& feature) { Nan::Set(result, Nan::New("geometry").ToLocalChecked(), toJS(feature.geometry)); Nan::Set(result, Nan::New("properties").ToLocalChecked(), toJS(feature.properties)); - if (!feature.id.is()) { + if (!feature.id.is()) { Nan::Set(result, Nan::New("id").ToLocalChecked(), FeatureIdentifier::visit(feature.id, ToValue())); } diff --git a/platform/node/src/node_feature.hpp b/platform/node/src/node_feature.hpp index 4a7e6be23..03b16d0ad 100644 --- a/platform/node/src/node_feature.hpp +++ b/platform/node/src/node_feature.hpp @@ -10,9 +10,9 @@ namespace node_mbgl { -v8::Local toJS(const mbgl::Value&); -v8::Local toJS(const mbgl::Feature&); -v8::Local toJS(const mbgl::Feature::geometry_type&); -v8::Local toJS(const mbgl::PropertyMap&); +v8::Local toJS(const mln::Value&); +v8::Local toJS(const mln::Feature&); +v8::Local toJS(const mln::Feature::geometry_type&); +v8::Local toJS(const mln::PropertyMap&); } // namespace node_mbgl diff --git a/platform/node/src/node_logging.cpp b/platform/node/src/node_logging.cpp index e29f6e4e5..4b87e3727 100644 --- a/platform/node/src/node_logging.cpp +++ b/platform/node/src/node_logging.cpp @@ -5,12 +5,12 @@ namespace node_mbgl { struct NodeLogObserver::LogMessage { - mbgl::EventSeverity severity; - mbgl::Event event; + mln::EventSeverity severity; + mln::Event event; int64_t code; std::string text; - LogMessage(mbgl::EventSeverity severity_, mbgl::Event event_, int64_t code_, std::string text_) + LogMessage(mln::EventSeverity severity_, mln::Event event_, int64_t code_, std::string text_) : severity(severity_), event(event_), code(code_), @@ -25,11 +25,11 @@ NodeLogObserver::NodeLogObserver(v8::Local target) Nan::Set(msg, Nan::New("class").ToLocalChecked(), - Nan::New(mbgl::Enum::toString(message.event)).ToLocalChecked()); + Nan::New(mln::Enum::toString(message.event)).ToLocalChecked()); Nan::Set(msg, Nan::New("severity").ToLocalChecked(), - Nan::New(mbgl::Enum::toString(message.severity)).ToLocalChecked()); + Nan::New(mln::Enum::toString(message.severity)).ToLocalChecked()); if (message.code != -1) { Nan::Set(msg, Nan::New("code").ToLocalChecked(), Nan::New(message.code)); @@ -56,7 +56,7 @@ NodeLogObserver::~NodeLogObserver() { queue->stop(); } -bool NodeLogObserver::onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &text) { +bool NodeLogObserver::onRecord(mln::EventSeverity severity, mln::Event event, int64_t code, const std::string &text) { queue->send({severity, event, code, text}); return true; } diff --git a/platform/node/src/node_logging.hpp b/platform/node/src/node_logging.hpp index c03c7a00e..3fde12d43 100644 --- a/platform/node/src/node_logging.hpp +++ b/platform/node/src/node_logging.hpp @@ -17,13 +17,13 @@ template class AsyncQueue; } -class NodeLogObserver : public mbgl::Log::Observer { +class NodeLogObserver : public mln::Log::Observer { public: NodeLogObserver(v8::Local target); ~NodeLogObserver() override; // Log::Observer implementation - bool onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string& text) override; + bool onRecord(mln::EventSeverity severity, mln::Event event, int64_t code, const std::string& text) override; private: Nan::Persistent module; diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index 6a61f4eec..efe9fed7a 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -38,16 +38,16 @@ namespace node_mbgl { struct NodeMap::RenderOptions { double zoom = 0; double bearing = 0; - mbgl::style::Light light; + mln::style::Light light; double pitch = 0; double latitude = 0; double longitude = 0; - mbgl::Size size = {512, 512}; + mln::Size size = {512, 512}; bool axonometric = false; double xSkew = 0; double ySkew = 1; std::vector classes; - mbgl::MapDebugOptions debugOptions = mbgl::MapDebugOptions::NoDebug; + mln::MapDebugOptions debugOptions = mln::MapDebugOptions::NoDebug; }; Nan::Persistent NodeMap::constructor; @@ -57,9 +57,9 @@ static const char* releasedMessage() { return "Map resources have already been released"; } -void NodeMapObserver::onDidFailLoadingMap(mbgl::MapLoadError error, const std::string& description) { +void NodeMapObserver::onDidFailLoadingMap(mln::MapLoadError error, const std::string& description) { switch (error) { - case mbgl::MapLoadError::StyleParseError: + case mln::MapLoadError::StyleParseError: Nan::ThrowError(NodeMap::ParseError(description.c_str())); break; default: @@ -207,9 +207,9 @@ void NodeMap::New(const Nan::FunctionCallbackInfo& info) { if (Nan::Has(options, Nan::New("request").ToLocalChecked()).FromJust() && Nan::Get(options, Nan::New("request").ToLocalChecked()).ToLocalChecked()->IsFunction()) { - mbgl::FileSourceManager::get()->registerFileSourceFactory( - mbgl::FileSourceType::ResourceLoader, - [](const mbgl::ResourceOptions& resourceOptions, const mbgl::ClientOptions&) { + mln::FileSourceManager::get()->registerFileSourceFactory( + mln::FileSourceType::ResourceLoader, + [](const mln::ResourceOptions& resourceOptions, const mln::ClientOptions&) { return std::make_unique( reinterpret_cast(resourceOptions.platformContext())); }); @@ -269,7 +269,7 @@ void NodeMap::Load(const Nan::FunctionCallbackInfo& info) { try { nodeMap->map->getStyle().loadJSON(style); - } catch (const mbgl::util::StyleParseException& ex) { + } catch (const mln::util::StyleParseException& ex) { return Nan::ThrowError(ParseError(ex.what())); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); @@ -333,8 +333,8 @@ NodeMap::RenderOptions NodeMap::ParseOptions(v8::Local obj) { if (Nan::Has(obj, Nan::New("light").ToLocalChecked()).FromJust()) { auto lightObj = Nan::Get(obj, Nan::New("light").ToLocalChecked()).ToLocalChecked(); - mbgl::style::conversion::Error conversionError; - if (auto light = mbgl::style::conversion::convert(lightObj, conversionError)) { + mln::style::conversion::Error conversionError; + if (auto light = mln::style::conversion::convert(lightObj, conversionError)) { options.light = *light; } else { throw std::move(conversionError); @@ -399,27 +399,27 @@ NodeMap::RenderOptions NodeMap::ParseOptions(v8::Local obj) { Nan::To(Nan::Get(obj, Nan::New("debug").ToLocalChecked()).ToLocalChecked()).ToLocalChecked(); if (Nan::Has(debug, Nan::New("tileBorders").ToLocalChecked()).FromJust()) { if (Nan::To(Nan::Get(debug, Nan::New("tileBorders").ToLocalChecked()).ToLocalChecked()).ToChecked()) { - options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::TileBorders; + options.debugOptions = options.debugOptions | mln::MapDebugOptions::TileBorders; } } if (Nan::Has(debug, Nan::New("parseStatus").ToLocalChecked()).FromJust()) { if (Nan::To(Nan::Get(debug, Nan::New("parseStatus").ToLocalChecked()).ToLocalChecked()).ToChecked()) { - options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::ParseStatus; + options.debugOptions = options.debugOptions | mln::MapDebugOptions::ParseStatus; } } if (Nan::Has(debug, Nan::New("timestamps").ToLocalChecked()).FromJust()) { if (Nan::To(Nan::Get(debug, Nan::New("timestamps").ToLocalChecked()).ToLocalChecked()).ToChecked()) { - options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::Timestamps; + options.debugOptions = options.debugOptions | mln::MapDebugOptions::Timestamps; } } if (Nan::Has(debug, Nan::New("collision").ToLocalChecked()).FromJust()) { if (Nan::To(Nan::Get(debug, Nan::New("collision").ToLocalChecked()).ToLocalChecked()).ToChecked()) { - options.debugOptions = options.debugOptions | mbgl::MapDebugOptions::Collision; + options.debugOptions = options.debugOptions | mln::MapDebugOptions::Collision; } } if (Nan::Has(debug, Nan::New("overdraw").ToLocalChecked()).FromJust()) { if (Nan::To(Nan::Get(debug, Nan::New("overdraw").ToLocalChecked()).ToLocalChecked()).ToChecked()) { - options.debugOptions = mbgl::MapDebugOptions::Overdraw; + options.debugOptions = mln::MapDebugOptions::Overdraw; } } } @@ -489,11 +489,11 @@ void NodeMap::Render(const Nan::FunctionCallbackInfo& info) { nodeMap->startRender(options); } - } catch (const mbgl::style::conversion::Error& err) { + } catch (const mln::style::conversion::Error& err) { return Nan::ThrowTypeError(err.message.c_str()); - } catch (const mbgl::util::StyleParseException& ex) { + } catch (const mln::util::StyleParseException& ex) { return Nan::ThrowError(ParseError(ex.what())); - } catch (const mbgl::util::Exception& ex) { + } catch (const mln::util::Exception& ex) { return Nan::ThrowError(ex.what()); } @@ -525,14 +525,14 @@ void NodeMap::startRender(const NodeMap::RenderOptions& options) { frontend->setSize(options.size); map->setSize(options.size); - mbgl::CameraOptions camera; - camera.center = mbgl::LatLng{options.latitude, options.longitude}; + mln::CameraOptions camera; + camera.center = mln::LatLng{options.latitude, options.longitude}; camera.zoom = options.zoom; camera.bearing = options.bearing; camera.pitch = options.pitch; auto projectionOptions = - mbgl::ProjectionMode().withAxonometric(options.axonometric).withXSkew(options.xSkew).withYSkew(options.ySkew); + mln::ProjectionMode().withAxonometric(options.axonometric).withXSkew(options.xSkew).withYSkew(options.ySkew); map->setProjectionMode(projectionOptions); @@ -587,7 +587,7 @@ void NodeMap::renderFinished() { try { std::rethrow_exception(error); assert(false); - } catch (const mbgl::util::StyleParseException& ex) { + } catch (const mln::util::StyleParseException& ex) { err = ParseError(ex.what()); } catch (const std::exception& ex) { err = Nan::Error(ex.what()); @@ -643,7 +643,7 @@ void NodeMap::Release(const Nan::FunctionCallbackInfo& info) { } void NodeMap::release() { - if (!map) throw mbgl::util::Exception(releasedMessage()); + if (!map) throw mln::util::Exception(releasedMessage()); uv_close(reinterpret_cast(async), [](uv_handle_t* h) { delete reinterpret_cast(h); }); @@ -686,16 +686,16 @@ void NodeMap::cancel() { uv_async_init( uv_default_loop(), async, [](uv_async_t* h) { reinterpret_cast(h->data)->renderFinished(); }); - frontend = std::make_unique(mbgl::Size{512, 512}, pixelRatio); - map = std::make_unique(*frontend, - mapObserver, - mbgl::MapOptions() - .withSize(frontend->getSize()) - .withPixelRatio(pixelRatio) - .withMapMode(mode) - .withCrossSourceCollisions(crossSourceCollisions), - mbgl::ResourceOptions().withPlatformContext(reinterpret_cast(this)), - mbgl::ClientOptions()); + frontend = std::make_unique(mln::Size{512, 512}, pixelRatio); + map = std::make_unique(*frontend, + mapObserver, + mln::MapOptions() + .withSize(frontend->getSize()) + .withPixelRatio(pixelRatio) + .withMapMode(mode) + .withCrossSourceCollisions(crossSourceCollisions), + mln::ResourceOptions().withPlatformContext(reinterpret_cast(this)), + mln::ClientOptions()); // FIXME: Reload the style after recreating the map. We need to find // a better way of canceling an ongoing rendering on the core level @@ -707,8 +707,8 @@ void NodeMap::cancel() { } void NodeMap::AddSource(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -737,8 +737,8 @@ void NodeMap::AddSource(const Nan::FunctionCallbackInfo& info) { } void NodeMap::RemoveSource(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -755,8 +755,8 @@ void NodeMap::RemoveSource(const Nan::FunctionCallbackInfo& info) { } void NodeMap::AddLayer(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -776,8 +776,8 @@ void NodeMap::AddLayer(const Nan::FunctionCallbackInfo& info) { } void NodeMap::RemoveLayer(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -794,8 +794,8 @@ void NodeMap::RemoveLayer(const Nan::FunctionCallbackInfo& info) { } void NodeMap::AddImage(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; v8::Local context = info.GetIsolate()->GetCurrentContext(); @@ -861,15 +861,15 @@ void NodeMap::AddImage(const Nan::FunctionCallbackInfo& info) { std::unique_ptr data = std::make_unique(imageLength); std::copy(imageDataBuffer, imageDataBuffer + imageLength, data.get()); - mbgl::UnassociatedImage cImage({imageWidth, imageHeight}, std::move(data)); - mbgl::PremultipliedImage cPremultipliedImage = mbgl::util::premultiply(std::move(cImage)); - nodeMap->map->getStyle().addImage(std::make_unique( + mln::UnassociatedImage cImage({imageWidth, imageHeight}, std::move(data)); + mln::PremultipliedImage cPremultipliedImage = mln::util::premultiply(std::move(cImage)); + nodeMap->map->getStyle().addImage(std::make_unique( *Nan::Utf8String(info[0]), std::move(cPremultipliedImage), pixelRatio, sdf)); } void NodeMap::RemoveImage(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -886,7 +886,7 @@ void NodeMap::RemoveImage(const Nan::FunctionCallbackInfo& info) { } void NodeMap::SetLayerZoomRange(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; + using namespace mln::style; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -903,7 +903,7 @@ void NodeMap::SetLayerZoomRange(const Nan::FunctionCallbackInfo& info return Nan::ThrowTypeError("Second and third arguments must be numbers"); } - mbgl::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0])); + mln::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0])); if (!layer) { return Nan::ThrowTypeError("layer not found"); } @@ -913,8 +913,8 @@ void NodeMap::SetLayerZoomRange(const Nan::FunctionCallbackInfo& info } void NodeMap::SetLayerProperty(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -927,7 +927,7 @@ void NodeMap::SetLayerProperty(const Nan::FunctionCallbackInfo& info) return Nan::ThrowTypeError("First argument must be a string"); } - mbgl::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0])); + mln::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0])); if (!layer) { return Nan::ThrowTypeError("layer not found"); } @@ -945,8 +945,8 @@ void NodeMap::SetLayerProperty(const Nan::FunctionCallbackInfo& info) } void NodeMap::SetFilter(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -959,7 +959,7 @@ void NodeMap::SetFilter(const Nan::FunctionCallbackInfo& info) { return Nan::ThrowTypeError("First argument must be a string"); } - mbgl::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0])); + mln::style::Layer* layer = nodeMap->map->getStyle().getLayer(*Nan::Utf8String(info[0])); if (!layer) { return Nan::ThrowTypeError("layer not found"); } @@ -1026,7 +1026,7 @@ void NodeMap::SetCenter(const Nan::FunctionCallbackInfo& info) { } try { - nodeMap->map->jumpTo(mbgl::CameraOptions().withCenter(mbgl::LatLng{latitude, longitude})); + nodeMap->map->jumpTo(mln::CameraOptions().withCenter(mln::LatLng{latitude, longitude})); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); } @@ -1043,7 +1043,7 @@ void NodeMap::SetZoom(const Nan::FunctionCallbackInfo& info) { } try { - nodeMap->map->jumpTo(mbgl::CameraOptions().withZoom(Nan::To(info[0]).ToChecked())); + nodeMap->map->jumpTo(mln::CameraOptions().withZoom(Nan::To(info[0]).ToChecked())); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); } @@ -1060,7 +1060,7 @@ void NodeMap::SetBearing(const Nan::FunctionCallbackInfo& info) { } try { - nodeMap->map->jumpTo(mbgl::CameraOptions().withBearing(Nan::To(info[0]).ToChecked())); + nodeMap->map->jumpTo(mln::CameraOptions().withBearing(Nan::To(info[0]).ToChecked())); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); } @@ -1077,7 +1077,7 @@ void NodeMap::SetPitch(const Nan::FunctionCallbackInfo& info) { } try { - nodeMap->map->jumpTo(mbgl::CameraOptions().withPitch(Nan::To(info[0]).ToChecked())); + nodeMap->map->jumpTo(mln::CameraOptions().withPitch(Nan::To(info[0]).ToChecked())); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); } @@ -1086,8 +1086,8 @@ void NodeMap::SetPitch(const Nan::FunctionCallbackInfo& info) { } void NodeMap::SetLight(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -1098,7 +1098,7 @@ void NodeMap::SetLight(const Nan::FunctionCallbackInfo& info) { try { Error conversionError; - if (auto light = convert(info[0], conversionError)) { + if (auto light = convert(info[0], conversionError)) { nodeMap->map->getStyle().setLight(std::make_unique(*light)); } else { return Nan::ThrowTypeError(conversionError.message.c_str()); @@ -1119,7 +1119,7 @@ void NodeMap::SetAxonometric(const Nan::FunctionCallbackInfo& info) { } try { - nodeMap->map->setProjectionMode(mbgl::ProjectionMode().withAxonometric(Nan::To(info[0]).ToChecked())); + nodeMap->map->setProjectionMode(mln::ProjectionMode().withAxonometric(Nan::To(info[0]).ToChecked())); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); } @@ -1136,7 +1136,7 @@ void NodeMap::SetXSkew(const Nan::FunctionCallbackInfo& info) { } try { - nodeMap->map->setProjectionMode(mbgl::ProjectionMode().withXSkew(Nan::To(info[0]).ToChecked())); + nodeMap->map->setProjectionMode(mln::ProjectionMode().withXSkew(Nan::To(info[0]).ToChecked())); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); } @@ -1153,7 +1153,7 @@ void NodeMap::SetYSkew(const Nan::FunctionCallbackInfo& info) { } try { - nodeMap->map->setProjectionMode(mbgl::ProjectionMode().withYSkew(Nan::To(info[0]).ToChecked())); + nodeMap->map->setProjectionMode(mln::ProjectionMode().withYSkew(Nan::To(info[0]).ToChecked())); } catch (const std::exception& ex) { return Nan::ThrowError(ex.what()); } @@ -1162,8 +1162,8 @@ void NodeMap::SetYSkew(const Nan::FunctionCallbackInfo& info) { } void NodeMap::SetFeatureState(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl; - using namespace mbgl::style::conversion; + using namespace mln; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -1313,7 +1313,7 @@ void NodeMap::GetFeatureState(const Nan::FunctionCallbackInfo& info) return Nan::ThrowTypeError("GetFeatureState: Requires feature.id property"); } - mbgl::FeatureState state; + mln::FeatureState state; try { nodeMap->frontend->getRenderer()->getFeatureState(state, sourceID, sourceLayerID, featureID); } catch (const std::exception& ex) { @@ -1402,8 +1402,8 @@ void NodeMap::DumpDebugLogs(const Nan::FunctionCallbackInfo& info) { } void NodeMap::QueryRenderedFeatures(const Nan::FunctionCallbackInfo& info) { - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; auto nodeMap = Nan::ObjectWrap::Unwrap(info.Holder()); if (!nodeMap->map) return Nan::ThrowError(releasedMessage()); @@ -1417,7 +1417,7 @@ void NodeMap::QueryRenderedFeatures(const Nan::FunctionCallbackInfo& return Nan::ThrowTypeError("First argument must have two components"); } - mbgl::RenderedQueryOptions queryOptions; + mln::RenderedQueryOptions queryOptions; if (!info[1]->IsNull() && !info[1]->IsUndefined()) { if (!info[1]->IsObject()) { return Nan::ThrowTypeError("options argument must be an object"); @@ -1452,23 +1452,23 @@ void NodeMap::QueryRenderedFeatures(const Nan::FunctionCallbackInfo& } try { - std::vector optional; + std::vector optional; if (Nan::Get(posOrBox, 0).ToLocalChecked()->IsArray()) { auto pos0 = Nan::Get(posOrBox, 0).ToLocalChecked().As(); auto pos1 = Nan::Get(posOrBox, 1).ToLocalChecked().As(); optional = nodeMap->frontend->getRenderer()->queryRenderedFeatures( - mbgl::ScreenBox{{Nan::To(Nan::Get(pos0, 0).ToLocalChecked()).ToChecked(), - Nan::To(Nan::Get(pos0, 1).ToLocalChecked()).ToChecked()}, - {Nan::To(Nan::Get(pos1, 0).ToLocalChecked()).ToChecked(), - Nan::To(Nan::Get(pos1, 1).ToLocalChecked()).ToChecked()}}, + mln::ScreenBox{{Nan::To(Nan::Get(pos0, 0).ToLocalChecked()).ToChecked(), + Nan::To(Nan::Get(pos0, 1).ToLocalChecked()).ToChecked()}, + {Nan::To(Nan::Get(pos1, 0).ToLocalChecked()).ToChecked(), + Nan::To(Nan::Get(pos1, 1).ToLocalChecked()).ToChecked()}}, queryOptions); } else { optional = nodeMap->frontend->getRenderer()->queryRenderedFeatures( - mbgl::ScreenCoordinate{Nan::To(Nan::Get(posOrBox, 0).ToLocalChecked()).ToChecked(), - Nan::To(Nan::Get(posOrBox, 1).ToLocalChecked()).ToChecked()}, + mln::ScreenCoordinate{Nan::To(Nan::Get(posOrBox, 0).ToLocalChecked()).ToChecked(), + Nan::To(Nan::Get(posOrBox, 1).ToLocalChecked()).ToChecked()}, queryOptions); } @@ -1496,9 +1496,9 @@ NodeMap::NodeMap(v8::Local options) if (std::string(*v8::String::Utf8Value( v8::Isolate::GetCurrent(), Nan::Get(options, Nan::New("mode").ToLocalChecked()).ToLocalChecked())) == "tile") { - return mbgl::MapMode::Tile; + return mln::MapMode::Tile; } else { - return mbgl::MapMode::Static; + return mln::MapMode::Static; } }()), crossSourceCollisions([&] { @@ -1510,16 +1510,16 @@ NodeMap::NodeMap(v8::Local options) : true; }()), mapObserver(NodeMapObserver()), - frontend(std::make_unique(mbgl::Size{512, 512}, pixelRatio)), - map(std::make_unique(*frontend, - mapObserver, - mbgl::MapOptions() - .withSize(frontend->getSize()) - .withPixelRatio(pixelRatio) - .withMapMode(mode) - .withCrossSourceCollisions(crossSourceCollisions), - mbgl::ResourceOptions().withPlatformContext(reinterpret_cast(this)), - mbgl::ClientOptions())), + frontend(std::make_unique(mln::Size{512, 512}, pixelRatio)), + map(std::make_unique(*frontend, + mapObserver, + mln::MapOptions() + .withSize(frontend->getSize()) + .withPixelRatio(pixelRatio) + .withMapMode(mode) + .withCrossSourceCollisions(crossSourceCollisions), + mln::ResourceOptions().withPlatformContext(reinterpret_cast(this)), + mln::ClientOptions())), async(new uv_async_t) { async->data = this; uv_async_init( @@ -1533,12 +1533,12 @@ NodeMap::~NodeMap() { try { if (map) release(); } catch (...) { - mbgl::Log::Error(mbgl::Event::General, "Error release the map object when destroying NodeMap"); + mln::Log::Error(mln::Event::General, "Error release the map object when destroying NodeMap"); } } -std::unique_ptr NodeFileSource::request(const mbgl::Resource& resource, - mbgl::FileSource::Callback callback_) { +std::unique_ptr NodeFileSource::request(const mln::Resource& resource, + mln::FileSource::Callback callback_) { assert(nodeMap); Nan::HandleScope scope; @@ -1561,23 +1561,23 @@ std::unique_ptr NodeFileSource::request(const mbgl::Resource return asyncRequest; } -bool NodeFileSource::canRequest(const mbgl::Resource&) const { +bool NodeFileSource::canRequest(const mln::Resource&) const { return true; } -void NodeFileSource::setResourceOptions(mbgl::ResourceOptions options) { +void NodeFileSource::setResourceOptions(mln::ResourceOptions options) { this->_resourceOptions = std::move(options); } -mbgl::ResourceOptions NodeFileSource::getResourceOptions() { +mln::ResourceOptions NodeFileSource::getResourceOptions() { return this->_resourceOptions.clone(); } -void NodeFileSource::setClientOptions(mbgl::ClientOptions options) { +void NodeFileSource::setClientOptions(mln::ClientOptions options) { this->_clientOptions = std::move(options); } -mbgl::ClientOptions NodeFileSource::getClientOptions() { +mln::ClientOptions NodeFileSource::getClientOptions() { return this->_clientOptions.clone(); } diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp index 9f170d327..c8471a56b 100644 --- a/platform/node/src/node_map.hpp +++ b/platform/node/src/node_map.hpp @@ -15,14 +15,14 @@ #include #pragma GCC diagnostic pop -namespace mbgl { +namespace mln { class HeadlessFrontend; -} // namespace mbgl +} // namespace mln namespace node_mbgl { -struct NodeMapObserver : public mbgl::MapObserver { - void onDidFailLoadingMap(mbgl::MapLoadError, const std::string&) final; +struct NodeMapObserver : public mln::MapObserver { + void onDidFailLoadingMap(mln::MapLoadError, const std::string&) final; }; class RenderRequest; @@ -83,14 +83,14 @@ public: static RenderOptions ParseOptions(v8::Local); const float pixelRatio; - mbgl::MapMode mode; + mln::MapMode mode; bool crossSourceCollisions; NodeMapObserver mapObserver; - std::unique_ptr frontend; - std::unique_ptr map; + std::unique_ptr frontend; + std::unique_ptr map; std::exception_ptr error; - mbgl::PremultipliedImage image; + mln::PremultipliedImage image; std::unique_ptr req; // Async for delivering the notifications of render completion. @@ -99,19 +99,19 @@ public: bool loaded = false; }; -struct NodeFileSource : public mbgl::FileSource { +struct NodeFileSource : public mln::FileSource { NodeFileSource(NodeMap* nodeMap_) : nodeMap(nodeMap_) {} ~NodeFileSource() override = default; - std::unique_ptr request(const mbgl::Resource&, mbgl::FileSource::Callback) final; - bool canRequest(const mbgl::Resource&) const override; - void setResourceOptions(mbgl::ResourceOptions) override; - mbgl::ResourceOptions getResourceOptions() override; - void setClientOptions(mbgl::ClientOptions) override; - mbgl::ClientOptions getClientOptions() override; + std::unique_ptr request(const mln::Resource&, mln::FileSource::Callback) final; + bool canRequest(const mln::Resource&) const override; + void setResourceOptions(mln::ResourceOptions) override; + mln::ResourceOptions getResourceOptions() override; + void setClientOptions(mln::ClientOptions) override; + mln::ClientOptions getClientOptions() override; NodeMap* nodeMap; - mbgl::ResourceOptions _resourceOptions; - mbgl::ClientOptions _clientOptions; + mln::ResourceOptions _resourceOptions; + mln::ClientOptions _clientOptions; }; } // namespace node_mbgl diff --git a/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp index 1400fd01e..7016d5be3 100644 --- a/platform/node/src/node_mapbox_gl_native.cpp +++ b/platform/node/src/node_mapbox_gl_native.cpp @@ -28,7 +28,7 @@ void RegisterModule(v8::Local target, v8::Local module) // a) Ensuring that the static local variable is initialized before any // thread contention. b) unreffing an async handle, which otherwise would // keep the default loop running. - static mbgl::util::RunLoop nodeRunLoop; + static mln::util::RunLoop nodeRunLoop; nodeRunLoop.stop(); Nan::SetMethod(target, "setBackendType", SetBackendType); @@ -40,19 +40,19 @@ void RegisterModule(v8::Local target, v8::Local module) // Exports Resource constants. v8::Local resource = Nan::New(); - Nan::Set(resource, Nan::New("Unknown").ToLocalChecked(), Nan::New(mbgl::Resource::Unknown)); + Nan::Set(resource, Nan::New("Unknown").ToLocalChecked(), Nan::New(mln::Resource::Unknown)); - Nan::Set(resource, Nan::New("Style").ToLocalChecked(), Nan::New(mbgl::Resource::Style)); + Nan::Set(resource, Nan::New("Style").ToLocalChecked(), Nan::New(mln::Resource::Style)); - Nan::Set(resource, Nan::New("Source").ToLocalChecked(), Nan::New(mbgl::Resource::Source)); + Nan::Set(resource, Nan::New("Source").ToLocalChecked(), Nan::New(mln::Resource::Source)); - Nan::Set(resource, Nan::New("Tile").ToLocalChecked(), Nan::New(mbgl::Resource::Tile)); + Nan::Set(resource, Nan::New("Tile").ToLocalChecked(), Nan::New(mln::Resource::Tile)); - Nan::Set(resource, Nan::New("Glyphs").ToLocalChecked(), Nan::New(mbgl::Resource::Glyphs)); + Nan::Set(resource, Nan::New("Glyphs").ToLocalChecked(), Nan::New(mln::Resource::Glyphs)); - Nan::Set(resource, Nan::New("SpriteImage").ToLocalChecked(), Nan::New(mbgl::Resource::SpriteImage)); + Nan::Set(resource, Nan::New("SpriteImage").ToLocalChecked(), Nan::New(mln::Resource::SpriteImage)); - Nan::Set(resource, Nan::New("SpriteJSON").ToLocalChecked(), Nan::New(mbgl::Resource::SpriteJSON)); + Nan::Set(resource, Nan::New("SpriteJSON").ToLocalChecked(), Nan::New(mln::Resource::SpriteJSON)); Nan::Set(target, Nan::New("Resource").ToLocalChecked(), resource); @@ -71,7 +71,7 @@ void RegisterModule(v8::Local target, v8::Local module) Nan::SetPrototype(target, Nan::Get(EventEmitter, Nan::New("prototype").ToLocalChecked()).ToLocalChecked()); Nan::CallAsFunction(EventEmitter, target, 0, nullptr); - mbgl::Log::setObserver(std::make_unique(target)); + mln::Log::setObserver(std::make_unique(target)); } NODE_MODULE(mapbox_gl_native, RegisterModule) diff --git a/platform/node/src/node_request.cpp b/platform/node/src/node_request.cpp index 916c7edc2..67e7c100b 100644 --- a/platform/node/src/node_request.cpp +++ b/platform/node/src/node_request.cpp @@ -7,7 +7,7 @@ namespace node_mbgl { -NodeRequest::NodeRequest(mbgl::FileSource::Callback callback_, NodeAsyncRequest* asyncRequest_) +NodeRequest::NodeRequest(mln::FileSource::Callback callback_, NodeAsyncRequest* asyncRequest_) : callback(std::move(callback_)), asyncRequest(asyncRequest_) { asyncRequest->request = this; @@ -42,7 +42,7 @@ void NodeRequest::Init(v8::Local target) { void NodeRequest::New(const Nan::FunctionCallbackInfo& info) { auto target = reinterpret_cast(info[0].As()->Value()); - auto callback = reinterpret_cast(info[1].As()->Value()); + auto callback = reinterpret_cast(info[1].As()->Value()); auto asyncRequest = reinterpret_cast(info[2].As()->Value()); auto request = new NodeRequest(*callback, asyncRequest); @@ -71,7 +71,7 @@ void NodeRequest::HandleCallback(const Nan::FunctionCallbackInfo& inf return info.GetReturnValue().SetUndefined(); } - mbgl::Response response; + mln::Response response; if (info.Length() < 1) { response.noContent = true; @@ -80,12 +80,12 @@ void NodeRequest::HandleCallback(const Nan::FunctionCallbackInfo& inf auto msg = Nan::New("message").ToLocalChecked(); if (Nan::Has(err, msg).FromJust()) { - response.error = std::make_unique( - mbgl::Response::Error::Reason::Other, *Nan::Utf8String(Nan::Get(err, msg).ToLocalChecked())); + response.error = std::make_unique( + mln::Response::Error::Reason::Other, *Nan::Utf8String(Nan::Get(err, msg).ToLocalChecked())); } } else if (info[0]->IsString()) { - response.error = std::make_unique(mbgl::Response::Error::Reason::Other, - *Nan::Utf8String(info[0])); + response.error = std::make_unique(mln::Response::Error::Reason::Other, + *Nan::Utf8String(info[0])); } else if (info.Length() < 2 || !info[1]->IsObject()) { request->unrefRequest(); return Nan::ThrowTypeError("Second argument must be a response object"); @@ -96,7 +96,7 @@ void NodeRequest::HandleCallback(const Nan::FunctionCallbackInfo& inf const double modified = Nan::To(Nan::Get(res, Nan::New("modified").ToLocalChecked()).ToLocalChecked()).FromJust(); if (!std::isnan(modified)) { - response.modified = mbgl::Timestamp{mbgl::Seconds(static_cast(modified / 1000))}; + response.modified = mln::Timestamp{mln::Seconds(static_cast(modified / 1000))}; } } @@ -104,7 +104,7 @@ void NodeRequest::HandleCallback(const Nan::FunctionCallbackInfo& inf const double expires = Nan::To(Nan::Get(res, Nan::New("expires").ToLocalChecked()).ToLocalChecked()).FromJust(); if (!std::isnan(expires)) { - response.expires = mbgl::Timestamp{mbgl::Seconds(static_cast(expires / 1000))}; + response.expires = mln::Timestamp{mln::Seconds(static_cast(expires / 1000))}; } } diff --git a/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp index fa8f8752e..524a1dbb6 100644 --- a/platform/node/src/node_request.hpp +++ b/platform/node/src/node_request.hpp @@ -14,7 +14,7 @@ namespace node_mbgl { class NodeRequest; -struct NodeAsyncRequest : public mbgl::AsyncRequest { +struct NodeAsyncRequest : public mln::AsyncRequest { NodeAsyncRequest(); ~NodeAsyncRequest() override; NodeRequest* request = nullptr; @@ -22,7 +22,7 @@ struct NodeAsyncRequest : public mbgl::AsyncRequest { class NodeRequest : public Nan::ObjectWrap { public: - NodeRequest(mbgl::FileSource::Callback, NodeAsyncRequest*); + NodeRequest(mln::FileSource::Callback, NodeAsyncRequest*); ~NodeRequest() override; static Nan::Persistent constructor; @@ -34,7 +34,7 @@ public: void unrefRequest(); - mbgl::FileSource::Callback callback; + mln::FileSource::Callback callback; NodeAsyncRequest* asyncRequest; Nan::AsyncResource* asyncResource = new Nan::AsyncResource("mbgl:execute"); }; diff --git a/platform/qt/src/mbgl/async_task.cpp b/platform/qt/src/mbgl/async_task.cpp index 3ae29254f..6415be5c8 100644 --- a/platform/qt/src/mbgl/async_task.cpp +++ b/platform/qt/src/mbgl/async_task.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace util { AsyncTask::Impl::Impl(std::function&& fn) @@ -37,4 +37,4 @@ void AsyncTask::send() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/async_task_impl.hpp b/platform/qt/src/mbgl/async_task_impl.hpp index c60830696..6e515f3db 100644 --- a/platform/qt/src/mbgl/async_task_impl.hpp +++ b/platform/qt/src/mbgl/async_task_impl.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class RunLoop; @@ -34,4 +34,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/bidi.cpp b/platform/qt/src/mbgl/bidi.cpp index 0523712b3..2c5d48045 100644 --- a/platform/qt/src/mbgl/bidi.cpp +++ b/platform/qt/src/mbgl/bidi.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { // This stub implementation is stateless and doesn't implement the private // methods used by the ICU BiDi @@ -50,4 +50,4 @@ std::vector BiDi::processStyledText(const StyledText& input, std::se return transformedLines; } -} // end namespace mbgl +} // end namespace mln diff --git a/platform/qt/src/mbgl/gl_functions.cpp b/platform/qt/src/mbgl/gl_functions.cpp index e43246615..b7e2d60b2 100644 --- a/platform/qt/src/mbgl/gl_functions.cpp +++ b/platform/qt/src/mbgl/gl_functions.cpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace platform { /* OpenGL ES 2.0 */ @@ -907,4 +907,4 @@ void (*const glGetInternalformativ)(GLenum, GLenum, GLenum, GLsizei, GLint*) = [ }; } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/headless_backend_qt.cpp b/platform/qt/src/mbgl/headless_backend_qt.cpp index 0a5770be4..d0a1733e0 100644 --- a/platform/qt/src/mbgl/headless_backend_qt.cpp +++ b/platform/qt/src/mbgl/headless_backend_qt.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { class QtBackendImpl final : public HeadlessBackend::Impl { @@ -40,4 +40,4 @@ void HeadlessBackend::createImpl() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/http_file_source.cpp b/platform/qt/src/mbgl/http_file_source.cpp index a1801a63a..1fe50e5d8 100644 --- a/platform/qt/src/mbgl/http_file_source.cpp +++ b/platform/qt/src/mbgl/http_file_source.cpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { HTTPFileSource::Impl::Impl(const ResourceOptions& resourceOptions, const ClientOptions& clientOptions) : m_manager(new QNetworkAccessManager(this)), @@ -139,4 +139,4 @@ ClientOptions HTTPFileSource::getClientOptions() { return impl->getClientOptions(); } -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/http_file_source.hpp b/platform/qt/src/mbgl/http_file_source.hpp index 7ed59526f..a0f43cfe5 100644 --- a/platform/qt/src/mbgl/http_file_source.hpp +++ b/platform/qt/src/mbgl/http_file_source.hpp @@ -14,7 +14,7 @@ #include #include -namespace mbgl { +namespace mln { class HTTPRequest; @@ -44,4 +44,4 @@ private: ClientOptions m_clientOptions; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/http_request.cpp b/platform/qt/src/mbgl/http_request.cpp index 973760a41..a4994b788 100644 --- a/platform/qt/src/mbgl/http_request.cpp +++ b/platform/qt/src/mbgl/http_request.cpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { HTTPRequest::HTTPRequest(HTTPFileSource::Impl* context, const Resource& resource, FileSource::Callback callback) : m_context(context), @@ -71,7 +71,7 @@ void HTTPRequest::handleNetworkReply(QNetworkReply* reply, const QByteArray& dat // Calling `callback` may result in deleting `this`. // Copy data to temporaries first. auto callback = m_callback; - mbgl::Response response; + mln::Response response; using Error = Response::Error; @@ -155,4 +155,4 @@ void HTTPRequest::handleNetworkReply(QNetworkReply* reply, const QByteArray& dat callback(response); } -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/http_request.hpp b/platform/qt/src/mbgl/http_request.hpp index 5486b686c..6e0d90b59 100644 --- a/platform/qt/src/mbgl/http_request.hpp +++ b/platform/qt/src/mbgl/http_request.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { class Response; @@ -30,4 +30,4 @@ private: bool m_handled = false; }; -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/image.cpp b/platform/qt/src/mbgl/image.cpp index e666550b3..9d2a0705e 100644 --- a/platform/qt/src/mbgl/image.cpp +++ b/platform/qt/src/mbgl/image.cpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { std::string encodePNG(const PremultipliedImage& pre) { QImage image(pre.data.get(), pre.size.width, pre.size.height, QImage::Format_ARGB32_Premultiplied); @@ -48,4 +48,4 @@ PremultipliedImage decodeImage(const std::string& string) { return {{static_cast(image.width()), static_cast(image.height())}, std::move(img)}; } -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/local_glyph_rasterizer.cpp b/platform/qt/src/mbgl/local_glyph_rasterizer.cpp index 61ecd7ee4..b88fc9bf4 100644 --- a/platform/qt/src/mbgl/local_glyph_rasterizer.cpp +++ b/platform/qt/src/mbgl/local_glyph_rasterizer.cpp @@ -7,7 +7,7 @@ #include #include #include -namespace mbgl { +namespace mln { // 2x bitmap with 1x logical metrics. constexpr int kLocalGlyphTextureScale = 2; @@ -98,4 +98,4 @@ Glyph LocalGlyphRasterizer::rasterizeGlyph(const FontStack&, GlyphID glyphID) { return glyph; } -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/logging_qt.cpp b/platform/qt/src/mbgl/logging_qt.cpp index acbe9562d..adeb75a3f 100644 --- a/platform/qt/src/mbgl/logging_qt.cpp +++ b/platform/qt/src/mbgl/logging_qt.cpp @@ -3,10 +3,10 @@ #include -namespace mbgl { +namespace mln { void Log::platformRecord(EventSeverity severity, const std::string &msg) { qWarning() << "[" << Enum::toString(severity) << "] " << QString::fromStdString(msg); } -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/number_format.cpp b/platform/qt/src/mbgl/number_format.cpp index f792439c9..c787de0b1 100644 --- a/platform/qt/src/mbgl/number_format.cpp +++ b/platform/qt/src/mbgl/number_format.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace platform { std::string formatNumber(double number, @@ -25,4 +25,4 @@ std::string formatNumber(double number, } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/run_loop.cpp b/platform/qt/src/mbgl/run_loop.cpp index 092e13c92..6aa6da1fd 100644 --- a/platform/qt/src/mbgl/run_loop.cpp +++ b/platform/qt/src/mbgl/run_loop.cpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { void RunLoop::Impl::onReadEvent(int fd) { @@ -91,7 +91,7 @@ void RunLoop::runOnce() { } } -void RunLoop::waitForEmpty([[maybe_unused]] const mbgl::util::SimpleIdentity tag) { +void RunLoop::waitForEmpty([[maybe_unused]] const mln::util::SimpleIdentity tag) { while (true) { std::size_t remaining; { @@ -138,4 +138,4 @@ void RunLoop::removeWatch(int fd) { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/run_loop_impl.hpp b/platform/qt/src/mbgl/run_loop_impl.hpp index c1fe8578e..fd3dffc0b 100644 --- a/platform/qt/src/mbgl/run_loop_impl.hpp +++ b/platform/qt/src/mbgl/run_loop_impl.hpp @@ -10,7 +10,7 @@ #include -namespace mbgl { +namespace mln { namespace util { using WatchCallback = std::function; @@ -36,4 +36,4 @@ public slots: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/sqlite3.cpp b/platform/qt/src/mbgl/sqlite3.cpp index 5446e4a5c..1ed251a7a 100644 --- a/platform/qt/src/mbgl/sqlite3.cpp +++ b/platform/qt/src/mbgl/sqlite3.cpp @@ -144,7 +144,7 @@ void Database::setBusyTimeout(std::chrono::milliseconds timeout) { void DatabaseImpl::setBusyTimeout(std::chrono::milliseconds timeout) { // std::chrono::milliseconds.count() is a long and Qt will cast // internally to int, so we need to make sure the limits apply. - std::string timeoutStr = mbgl::util::toString(timeout.count() & INT_MAX); + std::string timeoutStr = mln::util::toString(timeout.count() & INT_MAX); auto db = QSqlDatabase::database(connectionName); QString connectOptions = db.connectOptions(); @@ -254,7 +254,7 @@ void Query::bind(int offset, uint8_t value) { } template <> -void Query::bind(int offset, mbgl::Timestamp value) { +void Query::bind(int offset, mln::Timestamp value) { bind(offset, std::chrono::system_clock::to_time_t(value)); } @@ -268,7 +268,7 @@ void Query::bind(int offset, std::optional value) { } template <> -void Query::bind(int offset, std::optional value) { +void Query::bind(int offset, std::optional value) { if (value) { bind(offset, *value); } else { @@ -355,7 +355,7 @@ std::vector Query::get(int offset) { } template <> -mbgl::Timestamp Query::get(int offset) { +mln::Timestamp Query::get(int offset) { assert(stmt.impl && stmt.impl->query.isValid()); QVariant value = stmt.impl->query.value(offset); checkQueryError(stmt.impl->query); @@ -399,13 +399,13 @@ std::optional Query::get(int offset) { } template <> -std::optional Query::get(int offset) { +std::optional Query::get(int offset) { assert(stmt.impl && stmt.impl->query.isValid()); QVariant value = stmt.impl->query.value(offset); checkQueryError(stmt.impl->query); if (value.isNull()) return {}; return { - std::chrono::time_point_cast(std::chrono::system_clock::from_time_t(value.value<::time_t>()))}; + std::chrono::time_point_cast(std::chrono::system_clock::from_time_t(value.value<::time_t>()))}; } void Query::reset() { diff --git a/platform/qt/src/mbgl/string_stdlib.cpp b/platform/qt/src/mbgl/string_stdlib.cpp index 570fc1dc1..0cf5a0c16 100644 --- a/platform/qt/src/mbgl/string_stdlib.cpp +++ b/platform/qt/src/mbgl/string_stdlib.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { std::string uppercase(const std::string& str) { @@ -21,4 +21,4 @@ std::string lowercase(const std::string& str) { } } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/thread.cpp b/platform/qt/src/mbgl/thread.cpp index cee03b252..f98321fa6 100644 --- a/platform/qt/src/mbgl/thread.cpp +++ b/platform/qt/src/mbgl/thread.cpp @@ -3,7 +3,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { std::string getCurrentThreadName() { @@ -21,4 +21,4 @@ void attachThread() {} void detachThread() {} } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/thread_local.cpp b/platform/qt/src/mbgl/thread_local.cpp index 88da18079..bad7cc33f 100644 --- a/platform/qt/src/mbgl/thread_local.cpp +++ b/platform/qt/src/mbgl/thread_local.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace util { namespace impl { @@ -37,4 +37,4 @@ void ThreadLocalBase::set(void* ptr) { } // namespace impl } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/timer.cpp b/platform/qt/src/mbgl/timer.cpp index c06157acd..7770e67e1 100644 --- a/platform/qt/src/mbgl/timer.cpp +++ b/platform/qt/src/mbgl/timer.cpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { namespace { @@ -69,4 +69,4 @@ void Timer::stop() { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/timer_impl.hpp b/platform/qt/src/mbgl/timer_impl.hpp index c5d73e12a..f6e20513c 100644 --- a/platform/qt/src/mbgl/timer_impl.hpp +++ b/platform/qt/src/mbgl/timer_impl.hpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace util { class Timer::Impl : public QObject { @@ -28,4 +28,4 @@ private: }; } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/src/mbgl/utf.cpp b/platform/qt/src/mbgl/utf.cpp index a16feaca8..6a201888d 100644 --- a/platform/qt/src/mbgl/utf.cpp +++ b/platform/qt/src/mbgl/utf.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace util { std::u16string convertUTF8ToUTF16(std::string const& utf8) { @@ -14,4 +14,4 @@ std::u16string convertUTF8ToUTF16(std::string const& utf8) { } } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/platform/qt/test/main.cpp b/platform/qt/test/main.cpp index a2145c1ce..1e75166b8 100644 --- a/platform/qt/test/main.cpp +++ b/platform/qt/test/main.cpp @@ -29,5 +29,5 @@ int main(int argc, char *argv[]) { } #endif - return mbgl::runTests(argc, argv); + return mln::runTests(argc, argv); } diff --git a/platform/windows/include/gl_functions_wgl.h b/platform/windows/include/gl_functions_wgl.h index 952dbe5b8..f61e5aa8f 100644 --- a/platform/windows/include/gl_functions_wgl.h +++ b/platform/windows/include/gl_functions_wgl.h @@ -578,7 +578,7 @@ void loadWGL() { } #endif -namespace mbgl { +namespace mln { namespace platform { /* OpenGL ES 2.0 */ @@ -1780,5 +1780,5 @@ const char* (*const wglGetExtensionsStringEXT)() = [](void) { }; } // namespace platform -} // namespace mbgl +} // namespace mln #endif diff --git a/platform/windows/include/thread.h b/platform/windows/include/thread.h index ba325cdef..12ff31d91 100644 --- a/platform/windows/include/thread.h +++ b/platform/windows/include/thread.h @@ -55,13 +55,13 @@ extern DummyClassThread dummyClassThread; THREAD_INFO* GetCurrentThreadInfo(); -namespace mbgl { +namespace mln { namespace platform { std::string getCurrentThreadName(); void setCurrentThreadName(const std::string& name); void makeThreadLowPriority(); void setCurrentThreadPriority(double priority); } // namespace platform -} // namespace mbgl +} // namespace mln #endif diff --git a/platform/windows/src/gl_functions.cpp b/platform/windows/src/gl_functions.cpp index f98e6ab89..bee18a716 100644 --- a/platform/windows/src/gl_functions.cpp +++ b/platform/windows/src/gl_functions.cpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace platform { /* OpenGL ES 2.0 */ @@ -281,4 +281,4 @@ void (*const glTexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei) void (*const glGetInternalformativ)(GLenum, GLenum, GLenum, GLsizei, GLint*) = ::glGetInternalformativ; } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/windows/src/headless_backend_egl.cpp b/platform/windows/src/headless_backend_egl.cpp index 456c47ece..4cc6d60f6 100644 --- a/platform/windows/src/headless_backend_egl.cpp +++ b/platform/windows/src/headless_backend_egl.cpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { // This class provides a singleton that contains information about the @@ -37,7 +37,7 @@ public: if (!eglBindAPI(EGL_OPENGL_ES_API)) { std::ostringstream logMsg; logMsg << "eglBindAPI(EGL_OPENGL_ES_API) returned error " << eglGetError(); - mbgl::Log::Error(mbgl::Event::OpenGL, logMsg.str()); + mln::Log::Error(mln::Event::OpenGL, logMsg.str()); throw std::runtime_error("eglBindAPI() failed"); } @@ -78,7 +78,7 @@ public: std::ostringstream logMsg; logMsg << "eglCreateContext() returned error 0x" << std::setw(4) << std::setfill('0') << std::hex << eglGetError(); - mbgl::Log::Error(mbgl::Event::OpenGL, logMsg.str()); + mln::Log::Error(mln::Event::OpenGL, logMsg.str()); throw std::runtime_error("Error creating the EGL context object.\n"); } @@ -132,4 +132,4 @@ void HeadlessBackend::createImpl() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/windows/src/headless_backend_wgl.cpp b/platform/windows/src/headless_backend_wgl.cpp index 49db16116..496de5b1d 100644 --- a/platform/windows/src/headless_backend_wgl.cpp +++ b/platform/windows/src/headless_backend_wgl.cpp @@ -11,7 +11,7 @@ #include "gl_functions_wgl.h" -namespace mbgl { +namespace mln { namespace gl { // This class provides a singleton that contains information about the @@ -103,10 +103,10 @@ private: bool extensionSupportedWGL(const char* extension) { const char* extensions = NULL; - extensions = mbgl::platform::wglGetExtensionsStringARB(wglGetCurrentDC()); + extensions = mln::platform::wglGetExtensionsStringARB(wglGetCurrentDC()); if (!extensions || !StringInExtensionString(extension, extensions)) - extensions = mbgl::platform::wglGetExtensionsStringEXT(); + extensions = mln::platform::wglGetExtensionsStringEXT(); if (!extensions || !StringInExtensionString(extension, extensions)) extensions = (const char*)wgl_glGetString(GL_EXTENSIONS); @@ -282,29 +282,29 @@ private: renderingWindowDeviceContext = GetDC(renderingWindowHandle); } - if (!mbgl::platform::wglChoosePixelFormatARB(renderingWindowDeviceContext, - std::initializer_list({WGL_SUPPORT_OPENGL_ARB, - GL_TRUE, - WGL_DOUBLE_BUFFER_ARB, - GL_TRUE, - WGL_ACCELERATION_ARB, - WGL_FULL_ACCELERATION_ARB, - WGL_PIXEL_TYPE_ARB, - WGL_TYPE_RGBA_ARB, - WGL_COLOR_BITS_ARB, - 24, - WGL_ALPHA_BITS_ARB, - 8, - WGL_DEPTH_BITS_ARB, - 24, - WGL_STENCIL_BITS_ARB, - 8, - NULL}) - .begin(), - NULL, - 1, - &pixelFormat, - &numFormats)) { + if (!mln::platform::wglChoosePixelFormatARB(renderingWindowDeviceContext, + std::initializer_list({WGL_SUPPORT_OPENGL_ARB, + GL_TRUE, + WGL_DOUBLE_BUFFER_ARB, + GL_TRUE, + WGL_ACCELERATION_ARB, + WGL_FULL_ACCELERATION_ARB, + WGL_PIXEL_TYPE_ARB, + WGL_TYPE_RGBA_ARB, + WGL_COLOR_BITS_ARB, + 24, + WGL_ALPHA_BITS_ARB, + 8, + WGL_DEPTH_BITS_ARB, + 24, + WGL_STENCIL_BITS_ARB, + 8, + NULL}) + .begin(), + NULL, + 1, + &pixelFormat, + &numFormats)) { Log::Error(Event::OpenGL, "Failed to choose pixel format for context"); throw std::runtime_error("Failed to choose pixel format for context"); } @@ -324,7 +324,7 @@ private: } if (wglDisplayConfig.ARB_create_context) { - renderingWindowRenderingContext = mbgl::platform::wglCreateContextAttribsARB( + renderingWindowRenderingContext = mln::platform::wglCreateContextAttribsARB( renderingWindowDeviceContext, NULL, std::initializer_list({WGL_CONTEXT_MAJOR_VERSION_ARB, @@ -433,4 +433,4 @@ void HeadlessBackend::createImpl() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/platform/windows/src/thread.cpp b/platform/windows/src/thread.cpp index 19e7f28a0..f05d5b4fc 100644 --- a/platform/windows/src/thread.cpp +++ b/platform/windows/src/thread.cpp @@ -43,7 +43,7 @@ THREAD_INFO* GetCurrentThreadInfo() { return info; } -namespace mbgl { +namespace mln { namespace platform { std::string getCurrentThreadName() { @@ -87,4 +87,4 @@ void attachThread() {} void detachThread() {} } // namespace platform -} // namespace mbgl +} // namespace mln diff --git a/platform/windows/src/thread_local.cpp b/platform/windows/src/thread_local.cpp index ae5fa65cc..7ed78b462 100644 --- a/platform/windows/src/thread_local.cpp +++ b/platform/windows/src/thread_local.cpp @@ -10,7 +10,7 @@ #define StorageToThreadInfo reinterpret_cast(storage) #define StorageToConstThreadInfo reinterpret_cast(storage) -namespace mbgl { +namespace mln { namespace util { namespace impl { @@ -59,4 +59,4 @@ void ThreadLocalBase::set(void* ptr) { } // namespace impl } // namespace util -} // namespace mbgl +} // namespace mln diff --git a/render-test/file_source.cpp b/render-test/file_source.cpp index 30b1f679e..74c1e5a6f 100644 --- a/render-test/file_source.cpp +++ b/render-test/file_source.cpp @@ -9,7 +9,7 @@ #include "file_source.hpp" -namespace mbgl { +namespace mln { std::atomic_size_t requestCount{0}; std::atomic_size_t transferredSize{0}; @@ -63,11 +63,11 @@ std::unique_ptr ProxyFileSource::request(const Resource& resource, return defaultResourceLoader->request(transformed, [=](Response response) { if (transformed.loadingMethod == Resource::LoadingMethod::CacheOnly && response.noContent) { if (transformed.kind == Resource::Kind::Tile && transformed.tileData) { - mbgl::Log::Info( - mbgl::Event::Database, + mln::Log::Info( + mln::Event::Database, "Resource not found in cache: " + transformed.url + "(" + transformed.tileData->urlTemplate + ")"); } else { - mbgl::Log::Info(mbgl::Event::Database, "Resource not found in cache: " + transformed.url); + mln::Log::Info(mln::Event::Database, "Resource not found in cache: " + transformed.url); } } @@ -123,4 +123,4 @@ size_t ProxyFileSource::getTransferredSize() { return transferredSize; } -} // namespace mbgl +} // namespace mln diff --git a/render-test/file_source.hpp b/render-test/file_source.hpp index c06d22307..f58284128 100644 --- a/render-test/file_source.hpp +++ b/render-test/file_source.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { class ClientOptions; class ResourceOptions; @@ -56,4 +56,4 @@ private: ClientOptions clientOptions; }; -} // namespace mbgl +} // namespace mln diff --git a/render-test/filesystem.hpp b/render-test/filesystem.hpp index 63917c900..1a05c0bbf 100644 --- a/render-test/filesystem.hpp +++ b/render-test/filesystem.hpp @@ -2,8 +2,8 @@ #include -namespace mbgl { +namespace mln { namespace filesystem = std::filesystem; -} // namespace mbgl +} // namespace mln diff --git a/render-test/include/mbgl/render_test.hpp b/render-test/include/mbgl/render_test.hpp index 8f83ece69..bad8cfc3d 100644 --- a/render-test/include/mbgl/render_test.hpp +++ b/render-test/include/mbgl/render_test.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { struct TestStatus { size_t completed; @@ -11,4 +11,4 @@ struct TestStatus { int runRenderTests(int argc, char* argv[], std::function); -} // namespace mbgl +} // namespace mln diff --git a/render-test/ios/ios_test_runner.cpp b/render-test/ios/ios_test_runner.cpp index 2fa7b4dd6..f1fef2403 100644 --- a/render-test/ios/ios_test_runner.cpp +++ b/render-test/ios/ios_test_runner.cpp @@ -18,18 +18,18 @@ bool TestRunner::startTest(const std::string& manifestBasePath) { } argv.push_back(nullptr); - std::function testStatus = [&](mbgl::TestStatus status) { - mbgl::Log::Info(mbgl::Event::General, - "Current finished tests number is '" + std::to_string(status.completed) + "/" + - std::to_string(status.total) + "' "); + std::function testStatus = [&](mln::TestStatus status) { + mln::Log::Info(mln::Event::General, + "Current finished tests number is '" + std::to_string(status.completed) + "/" + + std::to_string(status.total) + "' "); }; - mbgl::Log::Info(mbgl::Event::General, "Start running RenderTestRunner with manifest: '" + manifest + "' "); + mln::Log::Info(mln::Event::General, "Start running RenderTestRunner with manifest: '" + manifest + "' "); - auto result = mbgl::runRenderTests(static_cast(argv.size() - 1), argv.data(), testStatus); + auto result = mln::runRenderTests(static_cast(argv.size() - 1), argv.data(), testStatus); - mbgl::Log::Info(mbgl::Event::General, - "End running RenderTestRunner with manifest: '" + manifest + "' with result value " + - std::to_string(result)); + mln::Log::Info(mln::Event::General, + "End running RenderTestRunner with manifest: '" + manifest + "' with result value " + + std::to_string(result)); return result == 0; }; @@ -43,12 +43,12 @@ bool TestRunner::startTest(const std::string& manifestBasePath) { status = runTestWithManifest(manifestBasePath + "/ios-render-test-runner-metrics.json") && status; #endif } catch (...) { - mbgl::Log::Info(mbgl::Event::General, "Failed with exception"); + mln::Log::Info(mln::Event::General, "Failed with exception"); } - mbgl::Log::Info(mbgl::Event::General, "All tests are finished!"); + mln::Log::Info(mln::Event::General, "All tests are finished!"); if (!status) { - mbgl::Log::Info(mbgl::Event::General, "There are failing test cases"); + mln::Log::Info(mln::Event::General, "There are failing test cases"); } return status; } diff --git a/render-test/manifest_parser.cpp b/render-test/manifest_parser.cpp index 3c458b536..2b370eb23 100644 --- a/render-test/manifest_parser.cpp +++ b/render-test/manifest_parser.cpp @@ -55,14 +55,14 @@ void Manifest::doShuffle(uint32_t seed) { } namespace { -std::vector> parseIgnores(const std::vector& ignoresPaths) { +std::vector> parseIgnores(const std::vector& ignoresPaths) { std::vector> ignores; for (const auto& path : ignoresPaths) { auto maybeIgnores = readJson(path); - if (!maybeIgnores.is()) { + if (!maybeIgnores.is()) { continue; } - for (const auto& property : maybeIgnores.get().GetObject()) { + for (const auto& property : maybeIgnores.get().GetObject()) { const std::string ignore = {property.name.GetString(), property.name.GetStringLength()}; const std::string reason = {property.value.GetString(), property.value.GetStringLength()}; ignores.emplace_back(std::make_pair(ignore, reason)); @@ -75,50 +75,49 @@ std::vector> parseIgnores(const std::vector< // defaultExpectationPath: absolute path that contains the style.json file for testing // testId: Test case id that used for composing expectation path // expectatedPaths: absolute paths that contain possible expected.png/metrics.json files for result checking -std::vector getTestExpectations(const mbgl::filesystem::path& defaultExpectationPath, - const std::string& testId, - std::vector expectatedPaths) { - std::vector expectations{defaultExpectationPath}; +std::vector getTestExpectations(const mln::filesystem::path& defaultExpectationPath, + const std::string& testId, + std::vector expectatedPaths) { + std::vector expectations{defaultExpectationPath}; for (const auto& expectedPath : expectatedPaths) { expectations.emplace_back(expectedPath / testId); } return expectations; } -mbgl::filesystem::path getValidPath(const std::string& manifestPath, const std::string& path) { - const static mbgl::filesystem::path BasePath{manifestPath}; - mbgl::filesystem::path result{path}; +mln::filesystem::path getValidPath(const std::string& manifestPath, const std::string& path) { + const static mln::filesystem::path BasePath{manifestPath}; + mln::filesystem::path result{path}; if (result.is_relative()) { result = BasePath / result; } - if (mbgl::filesystem::exists(result)) { + if (mln::filesystem::exists(result)) { return result.lexically_normal(); } - mbgl::Log::Warning(mbgl::Event::General, "Invalid path is provided inside the manifest file: " + path); - return mbgl::filesystem::path{}; + mln::Log::Warning(mln::Event::General, "Invalid path is provided inside the manifest file: " + path); + return mln::filesystem::path{}; } } // namespace std::optional ManifestParser::parseManifest(const std::string& manifestPath, std::string testFilter) { Manifest manifest; - const auto filePath = mbgl::filesystem::path(manifestPath); + const auto filePath = mln::filesystem::path(manifestPath); manifest.manifestPath = manifestPath.substr(0, manifestPath.find(filePath.filename().generic_string())); auto contents = readJson(filePath); - if (!contents.is()) { - mbgl::Log::Error(mbgl::Event::General, - "Provided manifest file: " + filePath.generic_string() + " is not a valid json"); + if (!contents.is()) { + mln::Log::Error(mln::Event::General, + "Provided manifest file: " + filePath.generic_string() + " is not a valid json"); return std::nullopt; } - auto document = std::move(contents.get()); + auto document = std::move(contents.get()); if (document.HasMember("result_path")) { const auto& resultPathValue = document["result_path"]; if (!resultPathValue.IsString()) { - mbgl::Log::Warning( - mbgl::Event::General, - "Invalid result_path is provided inside the manifest file: " + filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid result_path is provided inside the manifest file: " + filePath.generic_string()); return std::nullopt; } manifest.resultPath = (getValidPath(manifest.manifestPath, resultPathValue.GetString()) / "").generic_string(); @@ -129,8 +128,8 @@ std::optional ManifestParser::parseManifest(const std::string& manifes if (document.HasMember("cache_path")) { const auto& cachePathValue = document["cache_path"]; if (!cachePathValue.IsString()) { - mbgl::Log::Warning(mbgl::Event::General, - "Invalid cache_path is provided inside the manifest file: " + filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid cache_path is provided inside the manifest file: " + filePath.generic_string()); return std::nullopt; } manifest.cachePath = (getValidPath(manifest.manifestPath, ".") / cachePathValue.GetString()).generic_string(); @@ -142,8 +141,8 @@ std::optional ManifestParser::parseManifest(const std::string& manifes if (document.HasMember("access_token")) { const auto& apiKeyValue = document["access_token"]; if (!apiKeyValue.IsString()) { - mbgl::Log::Warning( - mbgl::Event::General, + mln::Log::Warning( + mln::Event::General, "Invalid access_token is provided inside the manifest file: " + filePath.generic_string()); return std::nullopt; } @@ -152,14 +151,14 @@ std::optional ManifestParser::parseManifest(const std::string& manifes return std::nullopt; } } - mbgl::filesystem::path baseTestPath; + mln::filesystem::path baseTestPath; if (document.HasMember("base_test_path")) { const auto& testPathValue = document["base_test_path"]; if (!testPathValue.IsString()) { - mbgl::Log::Warning(mbgl::Event::General, - "Invalid base_test_path is provided inside the manifest " - "file: " + - filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid base_test_path is provided inside the manifest " + "file: " + + filePath.generic_string()); return std::nullopt; } baseTestPath = getValidPath(manifest.manifestPath, testPathValue.GetString()); @@ -167,13 +166,12 @@ std::optional ManifestParser::parseManifest(const std::string& manifes return std::nullopt; } } - mbgl::filesystem::path expectedMetricPath; + mln::filesystem::path expectedMetricPath; if (document.HasMember("metric_path")) { const auto& metricPathValue = document["metric_path"]; if (!metricPathValue.IsString()) { - mbgl::Log::Warning( - mbgl::Event::General, - "Invalid metric_path is provided inside the manifest file: " + filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid metric_path is provided inside the manifest file: " + filePath.generic_string()); return std::nullopt; } expectedMetricPath = getValidPath(manifest.manifestPath, metricPathValue.GetString()); @@ -181,22 +179,22 @@ std::optional ManifestParser::parseManifest(const std::string& manifes return std::nullopt; } } - std::vector expectationPaths{}; + std::vector expectationPaths{}; if (document.HasMember("expectation_paths")) { const auto& expectationPathValue = document["expectation_paths"]; if (!expectationPathValue.IsArray()) { - mbgl::Log::Warning(mbgl::Event::General, - "Provided expectation_paths inside the manifest file: %s is " - "not a valid array" + - filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Provided expectation_paths inside the manifest file: %s is " + "not a valid array" + + filePath.generic_string()); return std::nullopt; } for (const auto& value : expectationPathValue.GetArray()) { if (!value.IsString()) { - mbgl::Log::Warning(mbgl::Event::General, - "Invalid expectation path item is provided inside the " - "manifest file: " + - filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid expectation path item is provided inside the " + "manifest file: " + + filePath.generic_string()); return std::nullopt; } expectationPaths.emplace_back(getValidPath(manifest.manifestPath, value.GetString())); @@ -205,21 +203,21 @@ std::optional ManifestParser::parseManifest(const std::string& manifes } } } - std::vector ignorePaths{}; + std::vector ignorePaths{}; if (document.HasMember("ignore_paths")) { const auto& ignorePathValue = document["ignore_paths"]; if (!ignorePathValue.IsArray()) { - mbgl::Log::Warning(mbgl::Event::General, - "Provided ignore_paths inside the manifest file: " + filePath.generic_string() + - " is not a valid array"); + mln::Log::Warning(mln::Event::General, + "Provided ignore_paths inside the manifest file: " + filePath.generic_string() + + " is not a valid array"); return std::nullopt; } for (const auto& value : ignorePathValue.GetArray()) { if (!value.IsString()) { - mbgl::Log::Warning(mbgl::Event::General, - "Invalid ignore path item is provided inside the manifest " - "file: " + - filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid ignore path item is provided inside the manifest " + "file: " + + filePath.generic_string()); return std::nullopt; } ignorePaths.emplace_back(getValidPath(manifest.manifestPath, value.GetString())); @@ -233,17 +231,17 @@ std::optional ManifestParser::parseManifest(const std::string& manifes if (document.HasMember("probes")) { const auto& probesValue = document["probes"]; if (!probesValue.IsArray()) { - mbgl::Log::Warning( - mbgl::Event::General, + mln::Log::Warning( + mln::Event::General, "Provided probes inside the manifest file: " + filePath.generic_string() + "is not a valid array"); return std::nullopt; } for (const auto& value : probesValue.GetArray()) { if (!value.IsString()) { - mbgl::Log::Warning(mbgl::Event::General, - "Invalid probe type is provided inside the manifest " - "file: " + - filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid probe type is provided inside the manifest " + "file: " + + filePath.generic_string()); return std::nullopt; } manifest.probes.emplace(value.GetString()); @@ -253,8 +251,8 @@ std::optional ManifestParser::parseManifest(const std::string& manifes if (testFilter.empty() && document.HasMember("filter")) { const auto& filterValue = document["filter"]; if (!filterValue.IsString()) { - mbgl::Log::Warning(mbgl::Event::General, - "Invalid filter is provided inside the manifest file: " + filePath.generic_string()); + mln::Log::Warning(mln::Event::General, + "Invalid filter is provided inside the manifest file: " + filePath.generic_string()); return std::nullopt; } @@ -277,19 +275,19 @@ std::optional ManifestParser::parseManifest(const std::string& manifes auto& path = manifest.testRootPath; auto& testPaths = manifest.testPaths; - for (auto& testPath : mbgl::filesystem::recursive_directory_iterator(path)) { + for (auto& testPath : mln::filesystem::recursive_directory_iterator(path)) { // Skip paths that fail regexp search. if (!testFilter.empty() && !std::regex_search(testPath.path().generic_string(), std::regex(testFilter))) { continue; } if (testPath.path().filename() == "style.json") { - const auto defaultExpectationPath{std::move(mbgl::filesystem::path(testPath).remove_filename())}; + const auto defaultExpectationPath{std::move(mln::filesystem::path(testPath).remove_filename())}; const auto rootLength = manifest.testRootPath.length(); auto testId = defaultExpectationPath.generic_string(); testId = testId.substr(rootLength + 1, testId.length() - rootLength - 1); - std::vector expectedMetricPaths{expectedMetricPath}; + std::vector expectedMetricPaths{expectedMetricPath}; #if defined(__ANDROID__) // todo: use `Context.getExternalFilesDir()` or similar via JNI to select an appropriate destination const auto locations = std::vector{ @@ -299,16 +297,16 @@ std::optional ManifestParser::parseManifest(const std::string& manifes }; static bool reportedOnce = false; for (const auto& location : locations) { - // Checking `mbgl::filesystem::status` doesn't accurately reflect whether we can create subdirectories, + // Checking `mln::filesystem::status` doesn't accurately reflect whether we can create subdirectories, // so just try it. (See `TestRunner::checkProbingResults`) try { const auto baselinesPath = location + "/baselines"; - mbgl::filesystem::create_directories(baselinesPath); + mln::filesystem::create_directories(baselinesPath); expectedMetricPaths.emplace_back(baselinesPath); break; - } catch (mbgl::filesystem::filesystem_error& ex) { + } catch (mln::filesystem::filesystem_error& ex) { if (!reportedOnce) { - mbgl::Log::Warning(mbgl::Event::Android, "Not a writable directory: " + std::string(ex.what())); + mln::Log::Warning(mln::Event::Android, "Not a writable directory: " + std::string(ex.what())); } } } diff --git a/render-test/metadata.hpp b/render-test/metadata.hpp index 37efa7f0c..c6792865d 100644 --- a/render-test/metadata.hpp +++ b/render-test/metadata.hpp @@ -12,14 +12,14 @@ #include #include -namespace mbgl { +namespace mln { class Map; class HeadlessFrontend; namespace gfx { struct RenderingStats; } -} // namespace mbgl +} // namespace mln class TestRunnerMapObserver; struct TestStatistics { @@ -34,16 +34,16 @@ struct TestStatistics { struct TestPaths { TestPaths() = default; - TestPaths(mbgl::filesystem::path stylePath_, - std::vector expectations_, - std::vector expectedMetrics_) + TestPaths(mln::filesystem::path stylePath_, + std::vector expectations_, + std::vector expectedMetrics_) : stylePath(std::move(stylePath_)), expectations(std::move(expectations_)), expectedMetrics(std::move(expectedMetrics_)) {} - mbgl::filesystem::path stylePath; - std::vector expectations; - std::vector expectedMetrics; + mln::filesystem::path stylePath; + std::vector expectations; + std::vector expectedMetrics; std::string defaultExpectations() const { assert(!expectations.empty()); @@ -118,7 +118,7 @@ struct GfxProbe { }; GfxProbe() = default; - GfxProbe(const mbgl::gfx::RenderingStats&, const GfxProbe&); + GfxProbe(const mln::gfx::RenderingStats&, const GfxProbe&); int numBuffers; int numDrawCalls; @@ -144,7 +144,7 @@ struct TestMetadata { TestMetadata() = default; TestPaths paths; - mbgl::JSDocument document; + mln::JSDocument document; bool renderTest = true; bool outputsImage = true; bool ignoredTest = false; @@ -154,20 +154,20 @@ struct TestMetadata { // to prevent the unit test fail, and just verify the render result. bool ignoreProbing = true; - mbgl::Size size{512u, 512u}; + mln::Size size{512u, 512u}; std::optional maxPitch; float pixelRatio = 1.0f; double allowed = 0.00015; // diff std::string description; - mbgl::MapMode mapMode = mbgl::MapMode::Static; - mbgl::MapDebugOptions debug = mbgl::MapDebugOptions::NoDebug; + mln::MapMode mapMode = mln::MapMode::Static; + mln::MapDebugOptions debug = mln::MapDebugOptions::NoDebug; bool crossSourceCollisions = true; bool axonometric = false; double xSkew = 0.0; double ySkew = 1.0; - mbgl::ScreenCoordinate queryGeometry{0u, 0u}; - mbgl::ScreenBox queryGeometryBox{{0u, 0u}, {0u, 0u}}; - mbgl::RenderedQueryOptions queryOptions; + mln::ScreenCoordinate queryGeometry{0u, 0u}; + mln::ScreenBox queryGeometryBox{{0u, 0u}, {0u, 0u}}; + mln::RenderedQueryOptions queryOptions; // TODO uint32_t fadeDuration = 0; @@ -200,9 +200,9 @@ struct TestMetadata { class TestContext { public: - virtual mbgl::HeadlessFrontend& getFrontend() = 0; - virtual mbgl::Map& getMap() = 0; - virtual mbgl::FileSource& getFileSource() = 0; + virtual mln::HeadlessFrontend& getFrontend() = 0; + virtual mln::Map& getMap() = 0; + virtual mln::FileSource& getFileSource() = 0; virtual TestRunnerMapObserver& getObserver() = 0; virtual TestMetadata& getMetadata() = 0; diff --git a/render-test/parser.cpp b/render-test/parser.cpp index 66bff0a82..8958b210e 100644 --- a/render-test/parser.cpp +++ b/render-test/parser.cpp @@ -104,23 +104,23 @@ const char* resultsHeaderButtons = R"HTML( )HTML"; -void writeJSON(rapidjson::PrettyWriter& writer, const mbgl::Value& value) { - value.match([&writer](const mbgl::NullValue&) { writer.Null(); }, +void writeJSON(rapidjson::PrettyWriter& writer, const mln::Value& value) { + value.match([&writer](const mln::NullValue&) { writer.Null(); }, [&writer](bool b) { writer.Bool(b); }, [&writer](uint64_t u) { writer.Uint64(u); }, [&writer](int64_t i) { writer.Int64(i); }, [&writer](double d) { d == std::floor(d) ? writer.Int64(static_cast(d)) : writer.Double(d); }, [&writer](const std::string& s) { writer.String(s); }, - [&writer](const std::vector& arr) { + [&writer](const std::vector& arr) { writer.StartArray(); for (const auto& item : arr) { writeJSON(writer, item); } writer.EndArray(); }, - [&writer](const std::unordered_map& obj) { + [&writer](const std::unordered_map& obj) { writer.StartObject(); - std::map sorted(obj.begin(), obj.end()); + std::map sorted(obj.begin(), obj.end()); for (const auto& entry : sorted) { writer.Key(entry.first.c_str()); writeJSON(writer, entry.second); @@ -131,7 +131,7 @@ void writeJSON(rapidjson::PrettyWriter& writer, const m } // namespace -std::string toJSON(const mbgl::Value& value, unsigned indent, bool singleLine) { +std::string toJSON(const mln::Value& value, unsigned indent, bool singleLine) { rapidjson::StringBuffer buffer; rapidjson::PrettyWriter writer(buffer); if (singleLine) { @@ -142,7 +142,7 @@ std::string toJSON(const mbgl::Value& value, unsigned indent, bool singleLine) { return buffer.GetString(); } -std::string toJSON(const std::vector& features, unsigned indent, bool singleLine) { +std::string toJSON(const std::vector& features, unsigned indent, bool singleLine) { rapidjson::CrtAllocator allocator; rapidjson::StringBuffer buffer; rapidjson::PrettyWriter writer(buffer); @@ -152,9 +152,9 @@ std::string toJSON(const std::vector& features, unsigned indent, writer.SetIndent(' ', indent); writer.StartArray(); for (const auto& feature : features) { - mbgl::JSValue result(rapidjson::kObjectType); + mln::JSValue result(rapidjson::kObjectType); result.AddMember("type", "Feature", allocator); - if (!feature.id.is()) { + if (!feature.id.is()) { result.AddMember( "id", mapbox::geojson::identifier::visit(feature.id, mapbox::geojson::to_value{allocator}), allocator); } @@ -171,22 +171,22 @@ std::string toJSON(const std::vector& features, unsigned indent, return buffer.GetString(); } -JSONReply readJson(const mbgl::filesystem::path& jsonPath) { - auto maybeJSON = mbgl::util::readFile(jsonPath.generic_string()); +JSONReply readJson(const mln::filesystem::path& jsonPath) { + auto maybeJSON = mln::util::readFile(jsonPath.generic_string()); if (!maybeJSON) { return {std::string("Unable to open file ") + jsonPath.string()}; } - mbgl::JSDocument document; + mln::JSDocument document; document.Parse<0>(*maybeJSON); if (document.HasParseError()) { - return {mbgl::formatJSONParseError(document)}; + return {mln::formatJSONParseError(document)}; } return {std::move(document)}; } -std::string serializeJsonValue(const mbgl::JSValue& value) { +std::string serializeJsonValue(const mln::JSValue& value) { rapidjson::StringBuffer buffer; buffer.Clear(); rapidjson::Writer writer(buffer); @@ -297,9 +297,9 @@ std::string serializeMetrics(const TestMetrics& metrics) { } namespace { -std::vector readExpectedEntries(const std::regex& regex, const mbgl::filesystem::path& base) { +std::vector readExpectedEntries(const std::regex& regex, const mln::filesystem::path& base) { std::vector expectedEntries; - for (const auto& entry : mbgl::filesystem::directory_iterator(base)) { + for (const auto& entry : mln::filesystem::directory_iterator(base)) { if (entry.is_regular_file()) { const std::string path = entry.path().string(); if (std::regex_match(path, regex)) { @@ -311,33 +311,33 @@ std::vector readExpectedEntries(const std::regex& regex, const mbgl } } // namespace -std::vector readExpectedImageEntries(const mbgl::filesystem::path& base) { +std::vector readExpectedImageEntries(const mln::filesystem::path& base) { static const std::regex regex(".*[/\\\\]expected.*.png"); return readExpectedEntries(regex, base); } -std::vector readExpectedMetricEntries(const mbgl::filesystem::path& base) { +std::vector readExpectedMetricEntries(const mln::filesystem::path& base) { static const std::regex regex(".*[/\\\\]metrics.json"); return readExpectedEntries(regex, base); } -std::vector readExpectedJSONEntries(const mbgl::filesystem::path& base) { +std::vector readExpectedJSONEntries(const mln::filesystem::path& base) { static const std::regex regex(".*[/\\\\]expected.*.json"); return readExpectedEntries(regex, base); } -TestMetrics readExpectedMetrics(const mbgl::filesystem::path& path) { +TestMetrics readExpectedMetrics(const mln::filesystem::path& path) { TestMetrics result; auto maybeJson = readJson(path.string()); - if (!maybeJson.is()) { // NOLINT + if (!maybeJson.is()) { // NOLINT return result; } - const auto& document = maybeJson.get(); + const auto& document = maybeJson.get(); if (document.HasMember("file-size")) { - const mbgl::JSValue& fileSizeValue = document["file-size"]; + const mln::JSValue& fileSizeValue = document["file-size"]; assert(fileSizeValue.IsArray()); for (auto& probeValue : fileSizeValue.GetArray()) { assert(probeValue.IsArray()); @@ -359,7 +359,7 @@ TestMetrics readExpectedMetrics(const mbgl::filesystem::path& path) { } if (document.HasMember("memory")) { - const mbgl::JSValue& memoryValue = document["memory"]; + const mln::JSValue& memoryValue = document["memory"]; assert(memoryValue.IsArray()); for (auto& probeValue : memoryValue.GetArray()) { assert(probeValue.IsArray()); @@ -377,7 +377,7 @@ TestMetrics readExpectedMetrics(const mbgl::filesystem::path& path) { } if (document.HasMember("network")) { - const mbgl::JSValue& networkValue = document["network"]; + const mln::JSValue& networkValue = document["network"]; assert(networkValue.IsArray()); for (auto& probeValue : networkValue.GetArray()) { assert(probeValue.IsArray()); @@ -396,7 +396,7 @@ TestMetrics readExpectedMetrics(const mbgl::filesystem::path& path) { } if (document.HasMember("fps")) { - const mbgl::JSValue& fpsValue = document["fps"]; + const mln::JSValue& fpsValue = document["fps"]; assert(fpsValue.IsArray()); for (auto& probeValue : fpsValue.GetArray()) { assert(probeValue.IsArray()); @@ -413,7 +413,7 @@ TestMetrics readExpectedMetrics(const mbgl::filesystem::path& path) { } if (document.HasMember("gfx")) { - const mbgl::JSValue& gfxValue = document["gfx"]; + const mln::JSValue& gfxValue = document["gfx"]; assert(gfxValue.IsArray()); for (auto& probeValue : gfxValue.GetArray()) { assert(probeValue.IsArray()); @@ -454,49 +454,49 @@ TestMetadata parseTestMetadata(const TestPaths& paths) { metadata.paths = paths; auto maybeJson = readJson(paths.stylePath.string()); - if (!maybeJson.is()) { // NOLINT + if (!maybeJson.is()) { // NOLINT metadata.errorMessage = std::string("Unable to parse: ") + metadata.paths.stylePath.string(); return metadata; } - metadata.document = std::move(maybeJson.get()); + metadata.document = std::move(maybeJson.get()); if (!metadata.document.HasMember("metadata")) { - mbgl::Log::Warning(mbgl::Event::ParseStyle, "Style has no 'metadata': " + paths.stylePath.string()); + mln::Log::Warning(mln::Event::ParseStyle, "Style has no 'metadata': " + paths.stylePath.string()); return metadata; } - const mbgl::JSValue& metadataValue = metadata.document["metadata"]; + const mln::JSValue& metadataValue = metadata.document["metadata"]; if (!metadataValue.HasMember("test")) { - mbgl::Log::Warning(mbgl::Event::ParseStyle, "Style has no 'metadata.test': " + paths.stylePath.string()); + mln::Log::Warning(mln::Event::ParseStyle, "Style has no 'metadata.test': " + paths.stylePath.string()); return metadata; } - const mbgl::JSValue& testValue = metadataValue["test"]; + const mln::JSValue& testValue = metadataValue["test"]; if (testValue.HasMember("mapMode")) { metadata.outputsImage = true; assert(testValue["mapMode"].IsString()); std::string mapModeStr = testValue["mapMode"].GetString(); if (mapModeStr == "tile") { - metadata.mapMode = mbgl::MapMode::Tile; + metadata.mapMode = mln::MapMode::Tile; // In the tile mode, map is showing exactly one tile. - metadata.size = {mbgl::util::tileSize_I, mbgl::util::tileSize_I}; + metadata.size = {mln::util::tileSize_I, mln::util::tileSize_I}; } else if (mapModeStr == "continuous") { - metadata.mapMode = mbgl::MapMode::Continuous; + metadata.mapMode = mln::MapMode::Continuous; metadata.outputsImage = false; } else if (mapModeStr == "static") - metadata.mapMode = mbgl::MapMode::Static; + metadata.mapMode = mln::MapMode::Static; else { - mbgl::Log::Warning(mbgl::Event::ParseStyle, - "Unknown map mode: " + mapModeStr + ". Falling back to static mode"); - metadata.mapMode = mbgl::MapMode::Static; + mln::Log::Warning(mln::Event::ParseStyle, + "Unknown map mode: " + mapModeStr + ". Falling back to static mode"); + metadata.mapMode = mln::MapMode::Static; } } if (testValue.HasMember("width")) { assert(testValue["width"].IsNumber()); - if (metadata.mapMode == mbgl::MapMode::Tile) { - mbgl::Log::Warning(mbgl::Event::ParseStyle, "The 'width' metadata field is ignored in tile map mode"); + if (metadata.mapMode == mln::MapMode::Tile) { + mln::Log::Warning(mln::Event::ParseStyle, "The 'width' metadata field is ignored in tile map mode"); } else { metadata.size.width = testValue["width"].GetInt(); } @@ -504,8 +504,8 @@ TestMetadata parseTestMetadata(const TestPaths& paths) { if (testValue.HasMember("height")) { assert(testValue["height"].IsNumber()); - if (metadata.mapMode == mbgl::MapMode::Tile) { - mbgl::Log::Warning(mbgl::Event::ParseStyle, "The 'height' metadata field is ignored in tile map mode"); + if (metadata.mapMode == mln::MapMode::Tile) { + mln::Log::Warning(mln::Event::ParseStyle, "The 'height' metadata field is ignored in tile map mode"); } else { metadata.size.height = testValue["height"].GetInt(); } @@ -535,15 +535,15 @@ TestMetadata parseTestMetadata(const TestPaths& paths) { // Test operations handled in runner.cpp. if (testValue.HasMember("debug")) { - metadata.debug |= mbgl::MapDebugOptions::TileBorders; + metadata.debug |= mln::MapDebugOptions::TileBorders; } if (testValue.HasMember("collisionDebug")) { - metadata.debug |= mbgl::MapDebugOptions::Collision; + metadata.debug |= mln::MapDebugOptions::Collision; } if (testValue.HasMember("showOverdrawInspector")) { - metadata.debug |= mbgl::MapDebugOptions::Overdraw; + metadata.debug |= mln::MapDebugOptions::Overdraw; } if (testValue.HasMember("crossSourceCollisions")) { @@ -595,8 +595,8 @@ TestMetadata parseTestMetadata(const TestPaths& paths) { metadata.queryOptions.layerIDs = layersVec; } - using namespace mbgl::style; - using namespace mbgl::style::conversion; + using namespace mln::style; + using namespace mln::style::conversion; if (testValue["queryOptions"].HasMember("filter")) { assert(testValue["queryOptions"]["filter"].IsArray()); auto& filterVal = testValue["queryOptions"]["filter"]; @@ -613,7 +613,7 @@ TestMetadata parseTestMetadata(const TestPaths& paths) { return metadata; } -namespace mbgl { +namespace mln { MBGL_DEFINE_ENUM(TileLodMode, {{TileLodMode::Default, "default"}, {TileLodMode::Distance, "distance"}}); } @@ -689,18 +689,18 @@ TestOperations parseTestOperations(TestMetadata& metadata) { }); } else if (operationArray[0].GetString() == sleepOp) { // sleep - mbgl::Duration duration = mbgl::Seconds(3); + mln::Duration duration = mln::Seconds(3); if (operationArray.Size() >= 2u) { - duration = mbgl::Milliseconds(operationArray[1].GetUint()); + duration = mln::Milliseconds(operationArray[1].GetUint()); } result.emplace_back([duration](TestContext&) { - mbgl::util::Timer sleepTimer; + mln::util::Timer sleepTimer; bool sleeping = true; - sleepTimer.start(duration, mbgl::Duration::zero(), [&]() { sleeping = false; }); + sleepTimer.start(duration, mln::Duration::zero(), [&]() { sleeping = false; }); while (sleeping) { - mbgl::util::RunLoop::Get()->runOnce(); + mln::util::RunLoop::Get()->runOnce(); } return true; }); @@ -732,8 +732,8 @@ TestOperations parseTestOperations(TestMetadata& metadata) { std::optional maybeImage; bool requestCompleted = false; - auto req = ctx.getFileSource().request(mbgl::Resource::image("mapbox://render-tests/" + imagePath), - [&](mbgl::Response response) { + auto req = ctx.getFileSource().request(mln::Resource::image("mapbox://render-tests/" + imagePath), + [&](mln::Response response) { if (response.data) { maybeImage = *response.data; } @@ -742,7 +742,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { }); while (!requestCompleted) { - mbgl::util::RunLoop::Get()->runOnce(); + mln::util::RunLoop::Get()->runOnce(); } if (!maybeImage) { @@ -751,7 +751,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { } ctx.getMap().getStyle().addImage( - std::make_unique(imageName, mbgl::decodeImage(*maybeImage), pixelRatio, sdf)); + std::make_unique(imageName, mln::decodeImage(*maybeImage), pixelRatio, sdf)); return true; }); @@ -790,9 +790,9 @@ TestOperations parseTestOperations(TestMetadata& metadata) { const auto& centerArray = operationArray[1].GetArray(); assert(centerArray.Size() == 2u); - mbgl::LatLng center{centerArray[1].GetDouble(), centerArray[0].GetDouble()}; + mln::LatLng center{centerArray[1].GetDouble(), centerArray[0].GetDouble()}; result.emplace_back([center](TestContext& ctx) { - ctx.getMap().jumpTo(mbgl::CameraOptions().withCenter(center)); + ctx.getMap().jumpTo(mln::CameraOptions().withCenter(center)); return true; }); } else if (operationArray[0].GetString() == setZoomOp) { @@ -801,7 +801,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[1].IsNumber()); double zoom = operationArray[1].GetDouble(); result.emplace_back([zoom](TestContext& ctx) { - ctx.getMap().jumpTo(mbgl::CameraOptions().withZoom(zoom)); + ctx.getMap().jumpTo(mln::CameraOptions().withZoom(zoom)); return true; }); } else if (operationArray[0].GetString() == setBearingOp) { @@ -810,7 +810,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[1].IsNumber()); double bearing = operationArray[1].GetDouble(); result.emplace_back([bearing](TestContext& ctx) { - ctx.getMap().jumpTo(mbgl::CameraOptions().withBearing(bearing)); + ctx.getMap().jumpTo(mln::CameraOptions().withBearing(bearing)); return true; }); } else if (operationArray[0].GetString() == setPitchOp) { @@ -819,7 +819,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[1].IsNumber()); double pitch = operationArray[1].GetDouble(); result.emplace_back([pitch](TestContext& ctx) { - ctx.getMap().jumpTo(mbgl::CameraOptions().withPitch(pitch)); + ctx.getMap().jumpTo(mln::CameraOptions().withPitch(pitch)); return true; }); } else if (operationArray[0].GetString() == setRollOp) { @@ -828,7 +828,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[1].IsNumber()); double roll = operationArray[1].GetDouble(); result.emplace_back([roll](TestContext& ctx) { - ctx.getMap().jumpTo(mbgl::CameraOptions().withRoll(roll)); + ctx.getMap().jumpTo(mln::CameraOptions().withRoll(roll)); return true; }); } else if (operationArray[0].GetString() == setCenterAltitudeOp) { @@ -837,7 +837,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[1].IsNumber()); double centerAltitude = operationArray[1].GetDouble(); result.emplace_back([centerAltitude](TestContext& ctx) { - ctx.getMap().jumpTo(mbgl::CameraOptions().withCenterAltitude(centerAltitude)); + ctx.getMap().jumpTo(mln::CameraOptions().withCenterAltitude(centerAltitude)); return true; }); } else if (operationArray[0].GetString() == setFilterOp) { @@ -846,8 +846,8 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[1].IsString()); std::string layerName{operationArray[1].GetString(), operationArray[1].GetStringLength()}; - mbgl::style::conversion::Error error; - auto converted = mbgl::style::conversion::convert(operationArray[2], error); + mln::style::conversion::Error error; + auto converted = mln::style::conversion::convert(operationArray[2], error); result.emplace_back([converted, layerName, error](TestContext& ctx) { if (!converted) { ctx.getMetadata().errorMessage = std::string("Unable to convert filter: ") + error.message; @@ -886,14 +886,14 @@ TestOperations parseTestOperations(TestMetadata& metadata) { // setLight assert(operationArray.Size() >= 2u); assert(operationArray[1].IsObject()); - mbgl::style::conversion::Error error; - auto converted = mbgl::style::conversion::convert(operationArray[1], error); + mln::style::conversion::Error error; + auto converted = mln::style::conversion::convert(operationArray[1], error); if (!converted) { metadata.errorMessage = std::string("Unable to convert light: ") + error.message; return {}; } result.emplace_back([impl = converted->impl](TestContext& ctx) { - ctx.getMap().getStyle().setLight(std::make_unique(impl)); + ctx.getMap().getStyle().setLight(std::make_unique(impl)); return true; }); } else if (operationArray[0].GetString() == addLayerOp) { @@ -901,8 +901,8 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray.Size() >= 2u); assert(operationArray[1].IsObject()); result.emplace_back([json = serializeJsonValue(operationArray[1])](TestContext& ctx) { - mbgl::style::conversion::Error error; - auto converted = mbgl::style::conversion::convertJSON>(json, error); + mln::style::conversion::Error error; + auto converted = mln::style::conversion::convertJSON>(json, error); if (!converted) { ctx.getMetadata().errorMessage = std::string("Unable to convert layer: ") + error.message; return false; @@ -925,8 +925,8 @@ TestOperations parseTestOperations(TestMetadata& metadata) { std::string sourceName = operationArray[1].GetString(); result.emplace_back([sourceName, json = serializeJsonValue(operationArray[2])](TestContext& ctx) { - mbgl::style::conversion::Error error; - auto converted = mbgl::style::conversion::convertJSON>( + mln::style::conversion::Error error; + auto converted = mln::style::conversion::convertJSON>( json, error, sourceName); if (!converted) { ctx.getMetadata().errorMessage = std::string("Unable to convert source: ") + error.message; @@ -958,9 +958,9 @@ TestOperations parseTestOperations(TestMetadata& metadata) { ctx.getMetadata().errorMessage = std::string("Layer not found: ") + layerName; return false; } - mbgl::JSDocument d; + mln::JSDocument d; d.Parse(json.c_str(), json.length()); - const mbgl::JSValue* propertyValue = &d; + const mln::JSValue* propertyValue = &d; layer->setProperty(propertyName, propertyValue); return true; }); @@ -976,7 +976,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(!path.empty()); float tolerance = static_cast(operationArray[3].GetDouble()); - mbgl::filesystem::path filePath(path); + mln::filesystem::path filePath(path); bool compressed = false; if (operationArray.Size() == 5) { @@ -989,15 +989,15 @@ TestOperations parseTestOperations(TestMetadata& metadata) { filePath = metadata.paths.defaultExpectations() / filePath; } result.emplace_back([filePath, path, mark, tolerance, compressed](TestContext& ctx) { - if (!mbgl::filesystem::exists(filePath)) { + if (!mln::filesystem::exists(filePath)) { ctx.getMetadata().errorMessage = std::string("File not found: ") + path; return false; } size_t size = 0; if (compressed) { - size = mbgl::util::compress(*mbgl::util::readFile(filePath.generic_string())).size(); + size = mln::util::compress(*mln::util::readFile(filePath.generic_string())).size(); } else { - size = mbgl::filesystem::file_size(filePath); + size = mln::filesystem::file_size(filePath); } ctx.getMetadata().metrics.fileSize.emplace(std::piecewise_construct, @@ -1043,7 +1043,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { } else if (operationArray[0].GetString() == networkProbeStartOp) { // probeNetworkStart result.emplace_back([](TestContext&) { - mbgl::ProxyFileSource::setTrackingActive(true); + mln::ProxyFileSource::setTrackingActive(true); return true; }); } else if (operationArray[0].GetString() == networkProbeOp) { @@ -1055,14 +1055,14 @@ TestOperations parseTestOperations(TestMetadata& metadata) { ctx.getMetadata().metrics.network.emplace( std::piecewise_construct, std::forward_as_tuple(std::move(mark)), - std::forward_as_tuple(mbgl::ProxyFileSource::getRequestCount(), - mbgl::ProxyFileSource::getTransferredSize())); + std::forward_as_tuple(mln::ProxyFileSource::getRequestCount(), + mln::ProxyFileSource::getTransferredSize())); return true; }); } else if (operationArray[0].GetString() == networkProbeEndOp) { // probeNetworkEnd result.emplace_back([](TestContext&) { - mbgl::ProxyFileSource::setTrackingActive(false); + mln::ProxyFileSource::setTrackingActive(false); return true; }); } else if (operationArray[0].GetString() == setFeatureStateOp) { @@ -1071,8 +1071,8 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[1].IsObject()); assert(operationArray[2].IsObject()); - using namespace mbgl; - using namespace mbgl::style::conversion; + using namespace mln; + using namespace mln::style::conversion; std::string sourceID; std::optional sourceLayer; @@ -1093,7 +1093,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { if (featureOptions["id"].IsString()) { featureID = featureOptions["id"].GetString(); } else if (featureOptions["id"].IsNumber()) { - featureID = mbgl::util::toString(featureOptions["id"].GetUint64()); + featureID = mln::util::toString(featureOptions["id"].GetUint64()); } } const JSValue* state = &operationArray[2]; @@ -1164,7 +1164,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { if (featureOptions["id"].IsString()) { featureID = featureOptions["id"].GetString(); } else if (featureOptions["id"].IsNumber()) { - featureID = mbgl::util::toString(featureOptions["id"].GetUint64()); + featureID = mln::util::toString(featureOptions["id"].GetUint64()); } } result.emplace_back([sourceID, sourceLayer, featureID](TestContext& ctx) { @@ -1174,7 +1174,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { } catch (const std::exception&) { return false; } - mbgl::FeatureState state; + mln::FeatureState state; frontend.getRenderer()->getFeatureState(state, sourceID, sourceLayer, featureID); return true; }); @@ -1199,7 +1199,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { if (featureOptions["id"].IsString()) { featureID = featureOptions["id"].GetString(); } else if (featureOptions["id"].IsNumber()) { - featureID = mbgl::util::toString(featureOptions["id"].GetUint64()); + featureID = mln::util::toString(featureOptions["id"].GetUint64()); } } @@ -1226,17 +1226,17 @@ TestOperations parseTestOperations(TestMetadata& metadata) { assert(operationArray[3].IsArray()); // start [lat, lng, zoom] assert(operationArray[4].IsArray()); // end [lat, lng, zoom] - if (metadata.mapMode != mbgl::MapMode::Continuous) { + if (metadata.mapMode != mln::MapMode::Continuous) { metadata.errorMessage = "Map mode must be Continuous for " + panGestureOp + " operation"; return {}; } std::string mark = operationArray[1].GetString(); int duration = static_cast(operationArray[2].GetFloat()); - mbgl::LatLng startPos, endPos; + mln::LatLng startPos, endPos; double startZoom, endZoom; - auto parsePosition = [](auto arr) -> std::tuple { + auto parsePosition = [](auto arr) -> std::tuple { assert(arr.Size() >= 3); return {{arr[1].GetDouble(), arr[0].GetDouble()}, arr[2].GetDouble()}; }; @@ -1250,7 +1250,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { auto& frontend = ctx.getFrontend(); std::vector samples; // Jump to the starting point of the segment and make sure there's something to render - map.jumpTo(mbgl::CameraOptions().withCenter(startPos).withZoom(startZoom)); + map.jumpTo(mln::CameraOptions().withCenter(startPos).withZoom(startZoom)); observer.reset(); while (!observer.finishRenderingMap) { @@ -1263,13 +1263,13 @@ TestOperations parseTestOperations(TestMetadata& metadata) { float totalTime = 0.0; bool transitionFinished = false; - mbgl::AnimationOptions animationOptions(mbgl::Milliseconds(duration * 1000)); - animationOptions.minZoom = mbgl::util::min(startZoom, endZoom); + mln::AnimationOptions animationOptions(mln::Milliseconds(duration * 1000)); + animationOptions.minZoom = mln::util::min(startZoom, endZoom); animationOptions.transitionFinishFn = [&]() { transitionFinished = true; }; - map.flyTo(mbgl::CameraOptions().withCenter(endPos).withZoom(endZoom), animationOptions); + map.flyTo(mln::CameraOptions().withCenter(endPos).withZoom(endZoom), animationOptions); while (!transitionFinished) { frames++; @@ -1286,7 +1286,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { // Use 1% of the longest frames to compute the minimum fps std::sort(samples.begin(), samples.end()); - int sampleCount = mbgl::util::max(1, (int)samples.size() / 100); + int sampleCount = mln::util::max(1, (int)samples.size() / 100); for (auto it = samples.rbegin(); it != samples.rbegin() + sampleCount; it++) minFrameTime += *it; float minOnePcFps = sampleCount / minFrameTime; @@ -1318,7 +1318,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { auto& frontend = ctx.getFrontend(); // Render the map and fetch rendering stats try { - mbgl::gfx::RenderingStats stats = frontend.render(ctx.getMap()).stats; + mln::gfx::RenderingStats stats = frontend.render(ctx.getMap()).stats; ctx.activeGfxProbe = GfxProbe(stats, ctx.activeGfxProbe); } catch (const std::exception&) { return false; @@ -1373,7 +1373,7 @@ TestOperations parseTestOperations(TestMetadata& metadata) { // setTileLodMode assert(operationArray.Size() == 2u); assert(operationArray[1].IsString()); - mbgl::TileLodMode mode = mbgl::Enum::toEnum(operationArray[1].GetString()).value(); + mln::TileLodMode mode = mln::Enum::toEnum(operationArray[1].GetString()).value(); result.emplace_back([mode](TestContext& ctx) { ctx.getMap().setTileLodMode(mode); return true; @@ -1409,17 +1409,17 @@ std::string createResultItem(const TestMetadata& metadata, bool hasFailedTests) if (!metadata.renderErrored) { if (metadata.outputsImage) { if (metadata.renderTest) { - html.append("\n"); - html.append("\n"); } else { - html.append("\n"); } } @@ -1436,7 +1436,7 @@ std::string createResultItem(const TestMetadata& metadata, bool hasFailedTests) if (metadata.difference != 0.0) { if (metadata.renderTest) { - html.append("

Diff: " + mbgl::util::toString(metadata.difference) + + html.append("

Diff: " + mln::util::toString(metadata.difference) + "

\n"); } else { html.append("

Diff: " + metadata.diff + "

\n"); @@ -1460,7 +1460,7 @@ std::string createResultPage(const TestStatistics& stats, // Header if (unsuccessful) { resultsPage.append(R"HTML(

)HTML"); - resultsPage.append(mbgl::util::toString(unsuccessful) + " tests failed."); + resultsPage.append(mln::util::toString(unsuccessful) + " tests failed."); } else { resultsPage.append(R"HTML(

)HTML"); resultsPage.append("All tests passed!"); @@ -1470,18 +1470,18 @@ std::string createResultPage(const TestStatistics& stats, // stats resultsPage.append(R"HTML(

)HTML"); if (stats.ignoreFailedTests) { - resultsPage.append(mbgl::util::toString(stats.ignoreFailedTests) + " ignored failed, "); + resultsPage.append(mln::util::toString(stats.ignoreFailedTests) + " ignored failed, "); } if (stats.ignorePassedTests) { - resultsPage.append(mbgl::util::toString(stats.ignorePassedTests) + " ignored passed, "); + resultsPage.append(mln::util::toString(stats.ignorePassedTests) + " ignored passed, "); } if (stats.erroredTests) { - resultsPage.append(mbgl::util::toString(stats.erroredTests) + " errored, "); + resultsPage.append(mln::util::toString(stats.erroredTests) + " errored, "); } if (stats.failedTests) { - resultsPage.append(mbgl::util::toString(stats.failedTests) + " failed, "); + resultsPage.append(mln::util::toString(stats.failedTests) + " failed, "); } - resultsPage.append(mbgl::util::toString(stats.passedTests) + " passed.\n"); + resultsPage.append(mln::util::toString(stats.passedTests) + " passed.\n"); resultsPage.append("

\n"); // Test sequence @@ -1508,7 +1508,7 @@ std::string createResultPage(const TestStatistics& stats, // Shuffle if (shuffle) { - resultsPage.append("

Shuffle seed: " + mbgl::util::toString(seed) + "

\n"); + resultsPage.append("

Shuffle seed: " + mln::util::toString(seed) + "

\n"); } resultsPage.append("\n"); diff --git a/render-test/parser.hpp b/render-test/parser.hpp index ec55c2d53..3781508b6 100644 --- a/render-test/parser.hpp +++ b/render-test/parser.hpp @@ -12,25 +12,25 @@ class Manifest; using ErrorMessage = std::string; -using JSONReply = mbgl::variant; +using JSONReply = mln::variant; -JSONReply readJson(const mbgl::filesystem::path&); -std::string serializeJsonValue(const mbgl::JSValue&); +JSONReply readJson(const mln::filesystem::path&); +std::string serializeJsonValue(const mln::JSValue&); std::string serializeMetrics(const TestMetrics&); -std::vector readExpectedImageEntries(const mbgl::filesystem::path& base); -std::vector readExpectedMetricEntries(const mbgl::filesystem::path& base); -std::vector readExpectedJSONEntries(const mbgl::filesystem::path& base); +std::vector readExpectedImageEntries(const mln::filesystem::path& base); +std::vector readExpectedMetricEntries(const mln::filesystem::path& base); +std::vector readExpectedJSONEntries(const mln::filesystem::path& base); -TestMetrics readExpectedMetrics(const mbgl::filesystem::path& path); +TestMetrics readExpectedMetrics(const mln::filesystem::path& path); TestMetadata parseTestMetadata(const TestPaths& paths); TestOperations parseTestOperations(TestMetadata& metadata); std::string createResultPage(const TestStatistics&, const std::vector&, bool shuffle, uint32_t seed); -std::string toJSON(const mbgl::Value& value, unsigned indent, bool singleLine); -std::string toJSON(const std::vector& features, unsigned indent, bool singleLine); +std::string toJSON(const mln::Value& value, unsigned indent, bool singleLine); +std::string toJSON(const std::vector& features, unsigned indent, bool singleLine); namespace TestOperationNames { extern const std::string waitOp; diff --git a/render-test/render_test.cpp b/render-test/render_test.cpp index d427f3fcb..c2d87dc53 100644 --- a/render-test/render_test.cpp +++ b/render-test/render_test.cpp @@ -94,26 +94,26 @@ ArgumentsTuple parseArguments(int argc, char** argv) { } catch (const args::Help&) { std::ostringstream stream; stream << argumentParser; - mbgl::Log::Info(mbgl::Event::General, stream.str()); + mln::Log::Info(mln::Event::General, stream.str()); exit(0); } catch (const args::ParseError& e) { std::ostringstream stream; stream << argumentParser; - mbgl::Log::Info(mbgl::Event::General, stream.str()); - mbgl::Log::Error(mbgl::Event::General, e.what()); + mln::Log::Info(mln::Event::General, stream.str()); + mln::Log::Error(mln::Event::General, e.what()); exit(1); } catch (const args::ValidationError& e) { std::ostringstream stream; stream << argumentParser; - mbgl::Log::Info(mbgl::Event::General, stream.str()); - mbgl::Log::Error(mbgl::Event::General, e.what()); + mln::Log::Info(mln::Event::General, stream.str()); + mln::Log::Error(mln::Event::General, e.what()); exit(2); } - mbgl::filesystem::path manifestPath = args::get(testPathValue); - if (!mbgl::filesystem::exists(manifestPath) || !manifestPath.has_filename()) { - mbgl::Log::Error(mbgl::Event::General, - "Provided test manifest file path '" + manifestPath.string() + "' does not exist"); + mln::filesystem::path manifestPath = args::get(testPathValue); + if (!mln::filesystem::exists(manifestPath) || !manifestPath.has_filename()) { + mln::Log::Error(mln::Event::General, + "Provided test manifest file path '" + manifestPath.string() + "' does not exist"); exit(3); } @@ -183,7 +183,7 @@ void runWithAlternateSources(TestRunner& runner, TestMetadata& metadata, bool& e } } } // namespace -namespace mbgl { +namespace mln { int runRenderTests(int argc, char** argv, std::function testStatus) { int returnCode = 0; @@ -205,7 +205,7 @@ int runRenderTests(int argc, char** argv, std::function testSt if (!manifestData) { exit(5); } - mbgl::util::RunLoop runLoop; + mln::util::RunLoop runLoop; TestRunner runner(std::move(*manifestData), updateResults); if (shuffle) { printf(ANSI_COLOR_YELLOW "Shuffle seed: %d" ANSI_COLOR_RESET "\n", seed); @@ -216,7 +216,7 @@ int runRenderTests(int argc, char** argv, std::function testSt #if MLN_RENDER_BACKEND_METAL printf(ANSI_COLOR_YELLOW "Using GPU Expression Evaluation" ANSI_COLOR_RESET "\n"); - mbgl::gfx::Backend::setEnableGPUExpressionEval(true); + mln::gfx::Backend::setEnableGPUExpressionEval(true); #endif // MLN_RENDER_BACKEND_METAL const auto& manifest = runner.getManifest(); @@ -247,7 +247,7 @@ int runRenderTests(int argc, char** argv, std::function testSt bool shouldIgnore = false; std::string ignoreReason; - const mbgl::filesystem::path ignoreName(id); + const mln::filesystem::path ignoreName(id); const auto it = std::find_if( ignores.cbegin(), ignores.cend(), [&ignoreName](auto pair) { return pair.first == ignoreName; }); if (it != ignores.end()) { @@ -255,7 +255,7 @@ int runRenderTests(int argc, char** argv, std::function testSt ignoreReason = it->second; if (ignoreReason.starts_with("skip")) { printf(ANSI_COLOR_GRAY "* skipped %s (%s)" ANSI_COLOR_RESET "\n", id.c_str(), ignoreReason.c_str()); - mbgl::Log::Info(mbgl::Event::General, "* skipped " + id + "(" + ignoreReason + ")"); + mln::Log::Info(mln::Event::General, "* skipped " + id + "(" + ignoreReason + ")"); continue; } } @@ -280,14 +280,14 @@ int runRenderTests(int argc, char** argv, std::function testSt color = "#E8A408"; stats.ignorePassedTests++; printf(ANSI_COLOR_YELLOW "* ignore %s (%s)" ANSI_COLOR_RESET "\n", id.c_str(), ignoreReason.c_str()); - mbgl::Log::Info(mbgl::Event::General, "* ignore " + id + " (" + ignoreReason + ")"); + mln::Log::Info(mln::Event::General, "* ignore " + id + " (" + ignoreReason + ")"); } else { status = "ignored failed"; color = "#9E9E9E"; stats.ignoreFailedTests++; printf( ANSI_COLOR_LIGHT_GRAY "* ignore %s (%s)" ANSI_COLOR_RESET "\n", id.c_str(), ignoreReason.c_str()); - mbgl::Log::Info(mbgl::Event::General, "* ignore " + id + " (" + ignoreReason + ")"); + mln::Log::Info(mln::Event::General, "* ignore " + id + " (" + ignoreReason + ")"); } } else { // Only fail the bots on render errors, this is a CI limitation that @@ -304,7 +304,7 @@ int runRenderTests(int argc, char** argv, std::function testSt color = "green"; stats.passedTests++; printf(ANSI_COLOR_GREEN "* passed %s" ANSI_COLOR_RESET "\n", id.c_str()); - mbgl::Log::Info(mbgl::Event::General, "* passed " + id); + mln::Log::Info(mln::Event::General, "* passed " + id); } else if (errored) { status = "errored"; color = "red"; @@ -312,15 +312,15 @@ int runRenderTests(int argc, char** argv, std::function testSt returnCode = 2; printf(ANSI_COLOR_RED "* errored %s" ANSI_COLOR_RESET "\n", id.c_str()); printf(ANSI_COLOR_RED "* error: %s" ANSI_COLOR_RESET "\n", metadata.errorMessage.c_str()); - mbgl::Log::Info(mbgl::Event::General, "* errored " + id); - mbgl::Log::Info(mbgl::Event::General, "* error " + metadata.errorMessage); + mln::Log::Info(mln::Event::General, "* errored " + id); + mln::Log::Info(mln::Event::General, "* error " + metadata.errorMessage); } else { status = "failed"; color = "red"; stats.failedTests++; returnCode = 3; printf(ANSI_COLOR_RED "* failed %s" ANSI_COLOR_RESET "\n", id.c_str()); - mbgl::Log::Info(mbgl::Event::General, "* failed " + id); + mln::Log::Info(mln::Event::General, "* failed " + id); } } @@ -330,10 +330,10 @@ int runRenderTests(int argc, char** argv, std::function testSt } } - const std::string manifestName = mbgl::filesystem::path(manifestPath).stem().generic_string(); + const std::string manifestName = mln::filesystem::path(manifestPath).stem().generic_string(); const std::string resultPath = manifest.getResultPath() + "/" + manifestName + ".html"; std::string resultsHTML = createResultPage(stats, metadatas, shuffle, seed); - mbgl::util::write_file(resultPath, resultsHTML); + mln::util::write_file(resultPath, resultsHTML); const uint32_t count = stats.erroredTests + stats.failedTests + stats.ignoreFailedTests + stats.ignorePassedTests + stats.passedTests; @@ -342,37 +342,36 @@ int runRenderTests(int argc, char** argv, std::function testSt printf(ANSI_COLOR_GREEN "%u passed (%.1lf%%)" ANSI_COLOR_RESET "\n", stats.passedTests, 100.0 * stats.passedTests / count); - mbgl::Log::Info(mbgl::Event::General, std::to_string(stats.passedTests) + " passed tests"); + mln::Log::Info(mln::Event::General, std::to_string(stats.passedTests) + " passed tests"); } if (stats.ignorePassedTests) { printf(ANSI_COLOR_YELLOW "%u passed but were ignored (%.1lf%%)" ANSI_COLOR_RESET "\n", stats.ignorePassedTests, 100.0 * stats.ignorePassedTests / count); - mbgl::Log::Info(mbgl::Event::General, - std::to_string(stats.ignorePassedTests) + " passed tests but were ignored"); + mln::Log::Info(mln::Event::General, std::to_string(stats.ignorePassedTests) + " passed tests but were ignored"); } if (stats.ignoreFailedTests) { printf(ANSI_COLOR_LIGHT_GRAY "%u ignored (%.1lf%%)" ANSI_COLOR_RESET "\n", stats.ignoreFailedTests, 100.0 * stats.ignoreFailedTests / count); - mbgl::Log::Info(mbgl::Event::General, std::to_string(stats.ignoreFailedTests) + " ignored tests"); + mln::Log::Info(mln::Event::General, std::to_string(stats.ignoreFailedTests) + " ignored tests"); } if (stats.failedTests) { printf(ANSI_COLOR_RED "%u failed (%.1lf%%)" ANSI_COLOR_RESET "\n", stats.failedTests, 100.0 * stats.failedTests / count); - mbgl::Log::Info(mbgl::Event::General, std::to_string(stats.failedTests) + " failed tests"); + mln::Log::Info(mln::Event::General, std::to_string(stats.failedTests) + " failed tests"); } if (stats.erroredTests) { printf(ANSI_COLOR_RED "%u errored (%.1lf%%)" ANSI_COLOR_RESET "\n", stats.erroredTests, 100.0 * stats.erroredTests / count); - mbgl::Log::Info(mbgl::Event::General, std::to_string(stats.erroredTests) + " errored tests"); + mln::Log::Info(mln::Event::General, std::to_string(stats.erroredTests) + " errored tests"); } - printf("Results at: %s\n", mbgl::filesystem::canonical(resultPath).generic_string().c_str()); + printf("Results at: %s\n", mln::filesystem::canonical(resultPath).generic_string().c_str()); return returnCode; } -} // namespace mbgl +} // namespace mln diff --git a/render-test/runner.cpp b/render-test/runner.cpp index c476751fa..4a6f783a4 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -34,10 +34,10 @@ #include #include -using namespace mbgl; +using namespace mln; using namespace TestOperationNames; -GfxProbe::GfxProbe(const mbgl::gfx::RenderingStats& stats, const GfxProbe& prev) +GfxProbe::GfxProbe(const mln::gfx::RenderingStats& stats, const GfxProbe& prev) : numBuffers(stats.numBuffers), numDrawCalls(stats.numDrawCalls), numFrameBuffers(stats.numFrameBuffers), @@ -99,18 +99,18 @@ TestRunner::TestRunner(Manifest manifest_, UpdateResults updateResults_) void TestRunner::registerProxyFileSource() { static std::once_flag registerProxyFlag; std::call_once(registerProxyFlag, [] { - auto* fileSourceManager = mbgl::FileSourceManager::get(); + auto* fileSourceManager = mln::FileSourceManager::get(); auto resourceLoaderFactory = fileSourceManager->unRegisterFileSourceFactory( - mbgl::FileSourceType::ResourceLoader); - auto factory = [defaultFactory = std::move(resourceLoaderFactory)](const mbgl::ResourceOptions& resourceOptions, - const mbgl::ClientOptions& clientOptions) { + mln::FileSourceType::ResourceLoader); + auto factory = [defaultFactory = std::move(resourceLoaderFactory)](const mln::ResourceOptions& resourceOptions, + const mln::ClientOptions& clientOptions) { assert(defaultFactory); std::shared_ptr fileSource = defaultFactory(resourceOptions, clientOptions); return std::make_unique(std::move(fileSource), resourceOptions, clientOptions); }; - fileSourceManager->registerFileSourceFactory(mbgl::FileSourceType::ResourceLoader, std::move(factory)); + fileSourceManager->registerFileSourceFactory(mln::FileSourceType::ResourceLoader, std::move(factory)); }); } @@ -122,13 +122,13 @@ void TestRunner::doShuffle(uint32_t seed) { manifest.doShuffle(seed); } -void TestRunner::checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, - std::vector&& features, +void TestRunner::checkQueryTestResults(mln::PremultipliedImage&& actualImage, + std::vector&& features, TestMetadata& metadata) { const std::string& base = metadata.paths.defaultExpectations(); - const std::vector& expectations = metadata.paths.expectations; + const std::vector& expectations = metadata.paths.expectations; - metadata.actual = mbgl::encodePNG(actualImage); + metadata.actual = mln::encodePNG(actualImage); if (actualImage.size.isEmpty()) { metadata.errorMessage = "Invalid size for actual image"; @@ -145,22 +145,22 @@ void TestRunner::checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, } if (updateResults == UpdateResults::PLATFORM) { - mbgl::filesystem::create_directories(expectations.back()); - mbgl::util::write_file(expectations.back().string() + "/expected.json", metadata.actualJson); + mln::filesystem::create_directories(expectations.back()); + mln::util::write_file(expectations.back().string() + "/expected.json", metadata.actualJson); metadata.renderErrored++; return; } else if (updateResults == UpdateResults::DEFAULT) { - mbgl::util::write_file(base + "/expected.json", metadata.actualJson); + mln::util::write_file(base + "/expected.json", metadata.actualJson); metadata.renderErrored++; return; } - mbgl::util::write_file(base + "/actual.json", metadata.actualJson); + mln::util::write_file(base + "/actual.json", metadata.actualJson); std::vector expectedJsonPaths; - mbgl::filesystem::path expectedMetricsPath; + mln::filesystem::path expectedMetricsPath; for (auto rit = expectations.rbegin(); rit != expectations.rend(); ++rit) { - if (mbgl::filesystem::exists(*rit)) { + if (mln::filesystem::exists(*rit)) { expectedJsonPaths = readExpectedJSONEntries(*rit); if (!expectedJsonPaths.empty()) break; } @@ -174,10 +174,10 @@ void TestRunner::checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, for (const auto& entry : expectedJsonPaths) { auto maybeExpectedJson = readJson(entry); - if (maybeExpectedJson.is()) { - auto& expected = maybeExpectedJson.get(); + if (maybeExpectedJson.is()) { + auto& expected = maybeExpectedJson.get(); - mbgl::JSDocument actual; + mln::JSDocument actual; actual.Parse<0>(metadata.actualJson); if (actual.HasParseError()) { metadata.errorMessage = "Error parsing actual JSON for: " + metadata.paths.stylePath.string(); @@ -204,12 +204,12 @@ void TestRunner::checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, } } -void TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, TestMetadata& metadata) { +void TestRunner::checkRenderTestResults(mln::PremultipliedImage&& actualImage, TestMetadata& metadata) { const std::string& base = metadata.paths.defaultExpectations(); - const std::vector& expectations = metadata.paths.expectations; + const std::vector& expectations = metadata.paths.expectations; if (metadata.outputsImage) { - metadata.actual = mbgl::encodePNG(actualImage); + metadata.actual = mln::encodePNG(actualImage); if (actualImage.size.isEmpty()) { metadata.errorMessage = "Invalid size for actual image"; @@ -218,25 +218,25 @@ void TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, } if (updateResults == UpdateResults::PLATFORM) { - mbgl::filesystem::create_directories(expectations.back()); - mbgl::util::write_file(expectations.back().string() + "/expected.png", mbgl::encodePNG(actualImage)); + mln::filesystem::create_directories(expectations.back()); + mln::util::write_file(expectations.back().string() + "/expected.png", mln::encodePNG(actualImage)); metadata.renderErrored++; return; } else if (updateResults == UpdateResults::DEFAULT) { - mbgl::util::write_file(base + "/expected.png", mbgl::encodePNG(actualImage)); + mln::util::write_file(base + "/expected.png", mln::encodePNG(actualImage)); metadata.renderErrored++; return; } - mbgl::util::write_file(base + "/actual.png", metadata.actual); + mln::util::write_file(base + "/actual.png", metadata.actual); - mbgl::PremultipliedImage expectedImage{actualImage.size}; - mbgl::PremultipliedImage imageDiff{actualImage.size}; + mln::PremultipliedImage expectedImage{actualImage.size}; + mln::PremultipliedImage imageDiff{actualImage.size}; double pixels = 0.0; std::vector expectedImagesPaths; for (auto rit = expectations.rbegin(); rit != expectations.rend(); ++rit) { - if (mbgl::filesystem::exists(*rit)) { + if (mln::filesystem::exists(*rit)) { expectedImagesPaths = readExpectedImageEntries(*rit); if (!expectedImagesPaths.empty()) break; } @@ -249,7 +249,7 @@ void TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, } for (const auto& entry : expectedImagesPaths) { - std::optional maybeExpectedImage = mbgl::util::readFile(entry); + std::optional maybeExpectedImage = mln::util::readFile(entry); if (!maybeExpectedImage) { metadata.errorMessage = "Failed to load expected image " + entry; metadata.renderErrored++; @@ -258,7 +258,7 @@ void TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, metadata.expected = *maybeExpectedImage; - expectedImage = mbgl::decodeImage(*maybeExpectedImage); + expectedImage = mln::decodeImage(*maybeExpectedImage); pixels = static_cast(mapbox::pixelmatch(actualImage.data.get(), expectedImage.data.get(), @@ -268,9 +268,9 @@ void TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, 0.1285) // Defined in GL JS ); - metadata.diff = mbgl::encodePNG(imageDiff); + metadata.diff = mln::encodePNG(imageDiff); - mbgl::util::write_file(base + "/diff.png", metadata.diff); + mln::util::write_file(base + "/diff.png", metadata.diff); metadata.difference = pixels / expectedImage.size.area(); if (metadata.difference <= metadata.allowed) { @@ -286,13 +286,13 @@ void TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, void TestRunner::checkProbingResults(TestMetadata& resultMetadata) { if (resultMetadata.metrics.isEmpty()) return; - const auto writeMetrics = [&resultMetadata](const mbgl::filesystem::path& path, + const auto writeMetrics = [&resultMetadata](const mln::filesystem::path& path, const std::string& message = std::string()) { try { - mbgl::filesystem::create_directories(path); - mbgl::util::write_file((path / "metrics.json").generic_string(), serializeMetrics(resultMetadata.metrics)); + mln::filesystem::create_directories(path); + mln::util::write_file((path / "metrics.json").generic_string(), serializeMetrics(resultMetadata.metrics)); resultMetadata.errorMessage += message; - } catch (mbgl::filesystem::filesystem_error& ex) { + } catch (mln::filesystem::filesystem_error& ex) { const auto msg = "Failed to write metrics. path='" + path.string() + "' err='" + ex.what() + "' msg=" + message; resultMetadata.errorMessage += msg; @@ -300,7 +300,7 @@ void TestRunner::checkProbingResults(TestMetadata& resultMetadata) { } }; - const std::vector& expectedMetrics = resultMetadata.paths.expectedMetrics; + const std::vector& expectedMetrics = resultMetadata.paths.expectedMetrics; if (updateResults == UpdateResults::METRICS) { writeMetrics(expectedMetrics.back(), " Updated expected metrics."); resultMetadata.metricsErrored++; @@ -311,7 +311,7 @@ void TestRunner::checkProbingResults(TestMetadata& resultMetadata) { // the test style will only be checked in the very end. std::vector expectedMetricsPaths; for (auto rit = expectedMetrics.rbegin(); rit != expectedMetrics.rend(); ++rit) { - if (mbgl::filesystem::exists(*rit)) { + if (mln::filesystem::exists(*rit)) { expectedMetricsPaths = readExpectedMetricEntries(*rit); if (!expectedMetricsPaths.empty()) break; } @@ -659,7 +659,7 @@ void resetContext(const TestMetadata& metadata, TestContext& ctx) { ctx.getFrontend().setSize(metadata.size); auto& map = ctx.getMap(); map.setSize(metadata.size); - map.setProjectionMode(mbgl::ProjectionMode() + map.setProjectionMode(mln::ProjectionMode() .withAxonometric(metadata.axonometric) .withXSkew(metadata.xSkew) .withYSkew(metadata.ySkew)); @@ -690,15 +690,15 @@ uint32_t getImageTileOffset(const std::set& dims, uint32_t dim, float } // namespace TestRunner::Impl::Impl(const TestMetadata& metadata, - const mbgl::ResourceOptions& resourceOptions, - const mbgl::ClientOptions& clientOptions) + const mln::ResourceOptions& resourceOptions, + const mln::ClientOptions& clientOptions) : observer(std::make_unique()), frontend(metadata.size, metadata.pixelRatio, swapBehavior(metadata.mapMode)), - fileSource(mbgl::FileSourceManager::get()->getFileSource( - mbgl::FileSourceType::ResourceLoader, resourceOptions, clientOptions)), + fileSource(mln::FileSourceManager::get()->getFileSource( + mln::FileSourceType::ResourceLoader, resourceOptions, clientOptions)), map(frontend, *observer, - mbgl::MapOptions() + mln::MapOptions() .withMapMode(metadata.mapMode) .withSize(metadata.size) .withPixelRatio(metadata.pixelRatio) @@ -752,15 +752,14 @@ void TestRunner::run(TestMetadata& metadata) { } } - std::string key = mbgl::util::toString(uint32_t(metadata.mapMode)) + "/" + - mbgl::util::toString(metadata.pixelRatio) + "/" + - mbgl::util::toString(uint32_t(metadata.crossSourceCollisions)); + std::string key = mln::util::toString(uint32_t(metadata.mapMode)) + "/" + mln::util::toString(metadata.pixelRatio) + + "/" + mln::util::toString(uint32_t(metadata.crossSourceCollisions)); if (maps.find(key) == maps.end()) { maps[key] = std::make_unique( metadata, - mbgl::ResourceOptions().withCachePath(manifest.getCachePath()).withApiKey(manifest.getApiKey()), - mbgl::ClientOptions()); + mln::ResourceOptions().withCachePath(manifest.getCachePath()).withApiKey(manifest.getApiKey()), + mln::ClientOptions()); } ctx.runnerImpl = maps[key].get(); @@ -908,7 +907,7 @@ void TestRunner::run(TestMetadata& metadata) { appendLabelCutOffResults(metadata, cutOffLabelsReport, duplicationsReport); checkRenderTestResults(std::move(result.image), metadata); } else { - std::vector features; + std::vector features; assert(metadata.document["metadata"]["test"]["queryGeometry"].IsArray()); if (metadata.document["metadata"]["test"]["queryGeometry"][0].IsNumber() && metadata.document["metadata"]["test"]["queryGeometry"][1].IsNumber()) { @@ -933,7 +932,7 @@ void TestRunner::appendLabelCutOffResults(TestMetadata& resultMetadata, } } -mbgl::HeadlessFrontend::RenderResult TestRunner::runTest(TestMetadata& metadata, TestContext& ctx) { +mln::HeadlessFrontend::RenderResult TestRunner::runTest(TestMetadata& metadata, TestContext& ctx) { HeadlessFrontend::RenderResult result{}; for (const auto& operation : parseTestOperations(metadata)) { if (!operation(ctx)) return result; diff --git a/render-test/runner.hpp b/render-test/runner.hpp index fd8b5d210..e1a32068d 100644 --- a/render-test/runner.hpp +++ b/render-test/runner.hpp @@ -12,10 +12,10 @@ class TestRunnerMapObserver; struct TestMetadata; -class TestRunnerMapObserver : public mbgl::MapObserver { +class TestRunnerMapObserver : public mln::MapObserver { public: TestRunnerMapObserver() = default; - void onDidFailLoadingMap(mbgl::MapLoadError, const std::string&) override { mapLoadFailure = true; } + void onDidFailLoadingMap(mln::MapLoadError, const std::string&) override { mapLoadFailure = true; } void onDidFinishRenderingMap(RenderMode mode) override final { if (!finishRenderingMap) finishRenderingMap = mode == RenderMode::Full; @@ -53,23 +53,23 @@ public: void doShuffle(uint32_t seed); private: - mbgl::HeadlessFrontend::RenderResult runTest(TestMetadata& metadata, TestContext& ctx); - void checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, - std::vector&& features, + mln::HeadlessFrontend::RenderResult runTest(TestMetadata& metadata, TestContext& ctx); + void checkQueryTestResults(mln::PremultipliedImage&& actualImage, + std::vector&& features, TestMetadata&); - void checkRenderTestResults(mbgl::PremultipliedImage&& image, TestMetadata&); + void checkRenderTestResults(mln::PremultipliedImage&& image, TestMetadata&); void checkProbingResults(TestMetadata&); void appendLabelCutOffResults(TestMetadata&, const std::string&, const std::string&); void registerProxyFileSource(); struct Impl { - Impl(const TestMetadata&, const mbgl::ResourceOptions&, const mbgl::ClientOptions&); + Impl(const TestMetadata&, const mln::ResourceOptions&, const mln::ClientOptions&); ~Impl(); std::unique_ptr observer; - mbgl::HeadlessFrontend frontend; - std::shared_ptr fileSource; - mbgl::Map map; + mln::HeadlessFrontend frontend; + std::shared_ptr fileSource; + mln::Map map; }; std::unordered_map> maps; Manifest manifest; diff --git a/scripts/lldb-types b/scripts/lldb-types index fd6ae3383..e21180d84 100644 --- a/scripts/lldb-types +++ b/scripts/lldb-types @@ -1,15 +1,15 @@ -type summary add "mbgl::CanonicalTileID" --summary-string "${var.z%u}/${var.x}/${var.y}" -type summary add "mbgl::UnwrappedTileID" --summary-string "${var.canonical}+${var.wrap}" -type summary add "mbgl::OverscaledTileID" --summary-string "${var.canonical}=>${var.overscaledZ%u}" +type summary add "mln::CanonicalTileID" --summary-string "${var.z%u}/${var.x}/${var.y}" +type summary add "mln::UnwrappedTileID" --summary-string "${var.canonical}+${var.wrap}" +type summary add "mln::OverscaledTileID" --summary-string "${var.canonical}=>${var.overscaledZ%u}" -type summary add -e -x "^mbgl::Range<.+>$" --summary-string "${var.min%d} ⇒ ${var.max%d}" -type summary add -e -x "^mbgl::Rect<.+>$" --summary-string "Size: ${var.w%d}×${var.h%d} — Offset: ${var.x}/${var.y}" -type summary add "mbgl::Size" --summary-string "${var.width}/${var.height}" -type summary add "mbgl::LatLng" --summary-string "${var.lat}/${var.lon}" +type summary add -e -x "^mln::Range<.+>$" --summary-string "${var.min%d} ⇒ ${var.max%d}" +type summary add -e -x "^mln::Rect<.+>$" --summary-string "Size: ${var.w%d}×${var.h%d} — Offset: ${var.x}/${var.y}" +type summary add "mln::Size" --summary-string "${var.width}/${var.height}" +type summary add "mln::LatLng" --summary-string "${var.lat}/${var.lon}" -type summary add "mbgl::Color" --summary-string "${var.r}, ${var.g}, ${var.b}, ${var.a}" +type summary add "mln::Color" --summary-string "${var.r}, ${var.g}, ${var.b}, ${var.a}" -type summary add -e -x "^mbgl::Point<.+>$" --summary-string "${var.x}/${var.y}" +type summary add -e -x "^mln::Point<.+>$" --summary-string "${var.x}/${var.y}" type summary add -e -x "^mapbox::geometry::point<.+>$" --summary-string "${var.x}/${var.y}" -type summary add -e -x "^mbgl::optional<.+>$" --python-script "return valobj.GetChildAtIndex(0).GetChildAtIndex(0).GetChildAtIndex(1).GetValue() if valobj.GetChildMemberWithName('__engaged_').unsigned > 0 else ''" +type summary add -e -x "^mln::optional<.+>$" --python-script "return valobj.GetChildAtIndex(0).GetChildAtIndex(0).GetChildAtIndex(1).GetValue() if valobj.GetChildMemberWithName('__engaged_').unsigned > 0 else ''" diff --git a/shaders/generate_shader_code.mjs b/shaders/generate_shader_code.mjs index 7e7873ca3..005ed3f1a 100644 --- a/shaders/generate_shader_code.mjs +++ b/shaders/generate_shader_code.mjs @@ -254,7 +254,7 @@ JSON.parse(fs.readFileSync(path.join(shaderRoot, "manifest.json"))) #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { template <> @@ -265,7 +265,7 @@ struct ShaderSource { }; } // namespace shaders -} // namespace mbgl +} // namespace mln `); generatedHeaders.push("#include "); shaderNames.push(elem.name); @@ -289,7 +289,7 @@ fs.writeFileSync(path.join(outputRoot, "shader_source.hpp"), #pragma once #include -namespace mbgl { +namespace mln { namespace shaders { /// @brief This enum is used with the ShaderSource template to select @@ -316,7 +316,7 @@ struct ShaderSource { }; } // namespace shaders -} // namespace mbgl +} // namespace mln `); // Generate shader_source.cpp @@ -325,7 +325,7 @@ fs.writeFileSync(path.join(cppOutputRoot, "shader_source.cpp"), #include #include -namespace mbgl { +namespace mln { using namespace shaders; @@ -333,7 +333,7 @@ MBGL_DEFINE_ENUM(BuiltIn, { {BuiltIn::None, "None"},${shaderNames.map(name => `\n{BuiltIn::` + name + `, "` + name + `"}`)} }); -} // namespace mbgl +} // namespace mln `); console.log("Shaders generated!"); diff --git a/src/mbgl/actor/mailbox.cpp b/src/mbgl/actor/mailbox.cpp index b499a2890..470eb5083 100644 --- a/src/mbgl/actor/mailbox.cpp +++ b/src/mbgl/actor/mailbox.cpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { Mailbox::Mailbox() = default; @@ -167,4 +167,4 @@ void Mailbox::scheduleToRecieve(const std::optional& tag) } } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp index f7c623dd5..9fa5cf630 100644 --- a/src/mbgl/actor/scheduler.cpp +++ b/src/mbgl/actor/scheduler.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { std::function Scheduler::bindOnce(std::function fn) { assert(fn); @@ -67,4 +67,4 @@ std::shared_ptr Scheduler::GetSequenced() { } } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/algorithm/update_renderables.hpp b/src/mbgl/algorithm/update_renderables.hpp index 701e9a405..e48fa1553 100644 --- a/src/mbgl/algorithm/update_renderables.hpp +++ b/src/mbgl/algorithm/update_renderables.hpp @@ -7,7 +7,7 @@ #include #include -namespace mbgl { +namespace mln { namespace algorithm { template #include -namespace mbgl { +namespace mln { namespace algorithm { template @@ -140,4 +140,4 @@ void updateTileMasks(RenderableTilesMap& renderables) { } } // namespace algorithm -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index 351a2ae3a..9f4578723 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -28,7 +28,7 @@ return result; \ } -namespace mbgl { +namespace mln { using namespace style; @@ -270,4 +270,4 @@ double AnnotationManager::getTopOffsetPixelsForImage(const std::string& id_) { return it != images.end() ? -(it->second.getImage().size.height / it->second.getPixelRatio()) / 2 : 0.0; } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp index e1451a970..d7cc247a0 100644 --- a/src/mbgl/annotation/annotation_manager.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { class LatLngBounds; class AnnotationTile; @@ -94,4 +94,4 @@ private: // Do not add members here, see `WeakPtrFactory` }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/annotation_source.cpp b/src/mbgl/annotation/annotation_source.cpp index 7c55c412b..9503c3166 100644 --- a/src/mbgl/annotation/annotation_source.cpp +++ b/src/mbgl/annotation/annotation_source.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { using namespace style; @@ -24,7 +24,7 @@ std::optional AnnotationSource::Impl::getAttribution() const { return {}; } -bool AnnotationSource::supportsLayerType(const mbgl::style::LayerTypeInfo* info) const { +bool AnnotationSource::supportsLayerType(const mln::style::LayerTypeInfo* info) const { return !std::strcmp(info->type, "line") || !std::strcmp(info->type, "symbol") || !std::strcmp(info->type, "fill"); } @@ -32,4 +32,4 @@ Mutable AnnotationSource::createMutable() const noexcept { return staticMutableCast(makeMutable(impl())); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/annotation_source.hpp b/src/mbgl/annotation/annotation_source.hpp index 471e2348d..cdbc224f6 100644 --- a/src/mbgl/annotation/annotation_source.hpp +++ b/src/mbgl/annotation/annotation_source.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { // NOTE: Any derived class must invalidate `weakFactory` in the destructor class AnnotationSource final : public style::Source { @@ -18,7 +18,7 @@ protected: private: void loadDescription(FileSource&) final; - bool supportsLayerType(const mbgl::style::LayerTypeInfo*) const override; + bool supportsLayerType(const mln::style::LayerTypeInfo*) const override; mapbox::base::WeakPtr makeWeakPtr() override { return weakFactory.makeWeakPtr(); } mapbox::base::WeakPtrFactory weakFactory{this}; // Do not add members here, see `WeakPtrFactory` @@ -31,4 +31,4 @@ public: std::optional getAttribution() const final; }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index 40f4ab04c..05702c693 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID, const TileParameters& parameters, @@ -118,4 +118,4 @@ std::unique_ptr AnnotationTileData::addLayer(const std::str return std::make_unique(it->second); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index d63e6f34d..b6f986e57 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { class AnnotationManager; class TileParameters; @@ -64,4 +64,4 @@ private: std::unordered_map> layers; }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/fill_annotation_impl.cpp b/src/mbgl/annotation/fill_annotation_impl.cpp index bc9ba63b2..9c99d0d62 100644 --- a/src/mbgl/annotation/fill_annotation_impl.cpp +++ b/src/mbgl/annotation/fill_annotation_impl.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { using namespace style; @@ -33,4 +33,4 @@ const ShapeAnnotationGeometry& FillAnnotationImpl::geometry() const { return annotation.geometry; } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/fill_annotation_impl.hpp b/src/mbgl/annotation/fill_annotation_impl.hpp index 98f992151..ea241326a 100644 --- a/src/mbgl/annotation/fill_annotation_impl.hpp +++ b/src/mbgl/annotation/fill_annotation_impl.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class FillAnnotationImpl : public ShapeAnnotationImpl { public: @@ -16,4 +16,4 @@ private: const FillAnnotation annotation; }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/line_annotation_impl.cpp b/src/mbgl/annotation/line_annotation_impl.cpp index 74fb00a04..bfe1dc354 100644 --- a/src/mbgl/annotation/line_annotation_impl.cpp +++ b/src/mbgl/annotation/line_annotation_impl.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { using namespace style; @@ -34,4 +34,4 @@ const ShapeAnnotationGeometry& LineAnnotationImpl::geometry() const { return annotation.geometry; } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/line_annotation_impl.hpp b/src/mbgl/annotation/line_annotation_impl.hpp index 108787c42..6b523dfab 100644 --- a/src/mbgl/annotation/line_annotation_impl.hpp +++ b/src/mbgl/annotation/line_annotation_impl.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class LineAnnotationImpl : public ShapeAnnotationImpl { public: @@ -16,4 +16,4 @@ private: const LineAnnotation annotation; }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp index 10d74e55e..7f5573df5 100644 --- a/src/mbgl/annotation/render_annotation_source.cpp +++ b/src/mbgl/annotation/render_annotation_source.cpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { using namespace style; @@ -60,4 +60,4 @@ std::vector RenderAnnotationSource::querySourceFeatures(const SourceQue return {}; } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index f8065b922..e8a17cc18 100644 --- a/src/mbgl/annotation/render_annotation_source.hpp +++ b/src/mbgl/annotation/render_annotation_source.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { class RenderAnnotationSource final : public RenderTileSource { public: @@ -28,4 +28,4 @@ private: const AnnotationSource::Impl& impl() const; }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp index 798143830..8c506d061 100644 --- a/src/mbgl/annotation/shape_annotation_impl.cpp +++ b/src/mbgl/annotation/shape_annotation_impl.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { using namespace style; @@ -55,4 +55,4 @@ void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, Annotati } } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/shape_annotation_impl.hpp b/src/mbgl/annotation/shape_annotation_impl.hpp index b18c2ab84..18014d7da 100644 --- a/src/mbgl/annotation/shape_annotation_impl.hpp +++ b/src/mbgl/annotation/shape_annotation_impl.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { class AnnotationTileData; class CanonicalTileID; @@ -31,10 +31,10 @@ public: }; struct CloseShapeAnnotation { - ShapeAnnotationGeometry operator()(const mbgl::LineString &geom) const { return geom; } - ShapeAnnotationGeometry operator()(const mbgl::MultiLineString &geom) const { return geom; } - ShapeAnnotationGeometry operator()(const mbgl::Polygon &geom) const { - mbgl::Polygon closed = geom; + ShapeAnnotationGeometry operator()(const mln::LineString &geom) const { return geom; } + ShapeAnnotationGeometry operator()(const mln::MultiLineString &geom) const { return geom; } + ShapeAnnotationGeometry operator()(const mln::Polygon &geom) const { + mln::Polygon closed = geom; for (auto &ring : closed) { if (!ring.empty() && ring.front() != ring.back()) { ring.emplace_back(ring.front()); @@ -42,8 +42,8 @@ struct CloseShapeAnnotation { } return closed; } - ShapeAnnotationGeometry operator()(const mbgl::MultiPolygon &geom) const { - mbgl::MultiPolygon closed = geom; + ShapeAnnotationGeometry operator()(const mln::MultiPolygon &geom) const { + mln::MultiPolygon closed = geom; for (auto &polygon : closed) { for (auto &ring : polygon) { if (!ring.empty() && ring.front() != ring.back()) { @@ -55,4 +55,4 @@ struct CloseShapeAnnotation { } }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/symbol_annotation_impl.cpp b/src/mbgl/annotation/symbol_annotation_impl.cpp index 44ad7b4b7..80631ac17 100644 --- a/src/mbgl/annotation/symbol_annotation_impl.cpp +++ b/src/mbgl/annotation/symbol_annotation_impl.cpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { SymbolAnnotationImpl::SymbolAnnotationImpl(AnnotationID id_, SymbolAnnotation annotation_) : id(id_), @@ -20,4 +20,4 @@ void SymbolAnnotationImpl::updateLayer(const CanonicalTileID& tileID, Annotation layer.addFeature(id, FeatureType::Point, GeometryCollection{{{{tilePoint}}}}, featureProperties); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/annotation/symbol_annotation_impl.hpp b/src/mbgl/annotation/symbol_annotation_impl.hpp index 9b26b7cff..4e57aecfb 100644 --- a/src/mbgl/annotation/symbol_annotation_impl.hpp +++ b/src/mbgl/annotation/symbol_annotation_impl.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { class AnnotationTileLayer; class CanonicalTileID; @@ -27,7 +27,7 @@ public: const SymbolAnnotation annotation; }; -} // namespace mbgl +} // namespace mln namespace boost { namespace geometry { @@ -36,62 +36,62 @@ namespace geometry { namespace traits { template <> -struct tag { +struct tag { using type = point_tag; }; template <> -struct dimension : boost::mpl::int_<2> {}; +struct dimension : boost::mpl::int_<2> {}; template <> -struct coordinate_type { +struct coordinate_type { using type = double; }; template <> -struct coordinate_system { +struct coordinate_system { using type = boost::geometry::cs::cartesian; }; template <> -struct access { - static inline double get(mbgl::LatLng const& p) { return p.longitude(); } +struct access { + static inline double get(mln::LatLng const& p) { return p.longitude(); } }; template <> -struct access { - static inline double get(mbgl::LatLng const& p) { return p.latitude(); } +struct access { + static inline double get(mln::LatLng const& p) { return p.latitude(); } }; template <> -struct tag { +struct tag { using type = box_tag; }; template <> -struct point_type { - using type = mbgl::LatLng; +struct point_type { + using type = mln::LatLng; }; template -struct indexed_access { - using ct = coordinate_type::type; - static inline ct get(mbgl::LatLngBounds const& b) { return geometry::get(b.southwest()); } - static inline void set(mbgl::LatLngBounds& b, ct const& value) { geometry::set(b.southwest(), value); } +struct indexed_access { + using ct = coordinate_type::type; + static inline ct get(mln::LatLngBounds const& b) { return geometry::get(b.southwest()); } + static inline void set(mln::LatLngBounds& b, ct const& value) { geometry::set(b.southwest(), value); } }; template -struct indexed_access { - using ct = coordinate_type::type; - static inline ct get(mbgl::LatLngBounds const& b) { return geometry::get(b.northeast()); } - static inline void set(mbgl::LatLngBounds& b, ct const& value) { geometry::set(b.northeast(), value); } +struct indexed_access { + using ct = coordinate_type::type; + static inline ct get(mln::LatLngBounds const& b) { return geometry::get(b.northeast()); } + static inline void set(mln::LatLngBounds& b, ct const& value) { geometry::set(b.northeast(), value); } }; } // namespace traits -// Tell Boost Geometry how to access a std::shared_ptr object. +// Tell Boost Geometry how to access a std::shared_ptr object. namespace index { template <> -struct indexable> { - using result_type = mbgl::LatLng; - mbgl::LatLng operator()(const std::shared_ptr& v) const { - const mbgl::Point& p = v->annotation.geometry; +struct indexable> { + using result_type = mln::LatLng; + mln::LatLng operator()(const std::shared_ptr& v) const { + const mln::Point& p = v->annotation.geometry; return {p.y, p.x}; } }; diff --git a/src/mbgl/geometry/anchor.hpp b/src/mbgl/geometry/anchor.hpp index 89cc4456a..4eba83425 100644 --- a/src/mbgl/geometry/anchor.hpp +++ b/src/mbgl/geometry/anchor.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { class Anchor { public: @@ -22,4 +22,4 @@ public: using Anchors = std::vector; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/geometry/dem_data.cpp b/src/mbgl/geometry/dem_data.cpp index 1bb6eb93c..79a87af61 100644 --- a/src/mbgl/geometry/dem_data.cpp +++ b/src/mbgl/geometry/dem_data.cpp @@ -1,7 +1,7 @@ #include #include -namespace mbgl { +namespace mln { DEMData::DEMData(const PremultipliedImage& _image, Tileset::RasterEncoding _encoding) : dim(_image.size.height), @@ -102,4 +102,4 @@ const std::array& DEMData::getUnpackVector() const { return encoding == Tileset::RasterEncoding::Terrarium ? unpackTerrarium : unpackMapbox; } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/geometry/dem_data.hpp b/src/mbgl/geometry/dem_data.hpp index d63915d8a..275bc5575 100644 --- a/src/mbgl/geometry/dem_data.hpp +++ b/src/mbgl/geometry/dem_data.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { class DEMData { public: @@ -38,4 +38,4 @@ private: } }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp index c3eced507..05faac5a0 100644 --- a/src/mbgl/geometry/feature_index.cpp +++ b/src/mbgl/geometry/feature_index.cpp @@ -18,20 +18,20 @@ #include namespace { -mbgl::LatLng screenCoordinateToLatLng(mbgl::ScreenCoordinate point, - const mbgl::TransformState& state, - mbgl::LatLng::WrapMode wrapMode = mbgl::LatLng::Wrapped) { +mln::LatLng screenCoordinateToLatLng(mln::ScreenCoordinate point, + const mln::TransformState& state, + mln::LatLng::WrapMode wrapMode = mln::LatLng::Wrapped) { point.y = state.getSize().height - point.y; return state.screenCoordinateToLatLng(point, wrapMode); } -mbgl::Point project(const mbgl::LatLng& coordinate, const mbgl::TransformState& state) { - mbgl::LatLng unwrappedLatLng = coordinate.wrapped(); - unwrappedLatLng.unwrapForShortestPath(state.getLatLng(mbgl::LatLng::Wrapped)); - return mbgl::Projection::project(unwrappedLatLng, state.getScale()); +mln::Point project(const mln::LatLng& coordinate, const mln::TransformState& state) { + mln::LatLng unwrappedLatLng = coordinate.wrapped(); + unwrappedLatLng.unwrapForShortestPath(state.getLatLng(mln::LatLng::Wrapped)); + return mln::Projection::project(unwrappedLatLng, state.getScale()); } } // namespace -namespace mbgl { +namespace mln { constexpr auto expectedUniqueLayerIDs = 10; constexpr auto expectedUniqueLeaderIDs = 30; @@ -337,23 +337,23 @@ void FeatureIndex::setBucketLayerIDs(const std::string& bucketLeaderID, const st DynamicFeatureIndex::~DynamicFeatureIndex() = default; void DynamicFeatureIndex::query(std::unordered_map>& result, - const mbgl::ScreenLineString& queryGeometry, + const mln::ScreenLineString& queryGeometry, const TransformState& state) const { if (features.empty()) return; - mbgl::GeometryBBox queryBox = DefaultWithinBBox; + mln::GeometryBBox queryBox = DefaultWithinBBox; for (const auto& p : queryGeometry) { const LatLng c = screenCoordinateToLatLng(p, state); const Point pm = project(c, state); const Point coord = {int64_t(pm.x), int64_t(pm.y)}; - mbgl::updateBBox(queryBox, coord); + mln::updateBBox(queryBox, coord); } for (const auto& f : features) { // hit testing - mbgl::GeometryBBox featureBox = DefaultWithinBBox; - for (const auto& p : f.envelope->front()) mbgl::updateBBox(featureBox, p); + mln::GeometryBBox featureBox = DefaultWithinBBox; + for (const auto& p : f.envelope->front()) mln::updateBBox(featureBox, p); - const bool hit = mbgl::boxWithinBox(featureBox, queryBox) || mbgl::boxWithinBox(queryBox, featureBox); + const bool hit = mln::boxWithinBox(featureBox, queryBox) || mln::boxWithinBox(queryBox, featureBox); if (hit) { assert(f.feature); result[f.feature->sourceLayer].push_back(*f.feature); @@ -366,4 +366,4 @@ void DynamicFeatureIndex::insert(std::shared_ptr feature, features.push_back({std::move(feature), std::move(envelope)}); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp index 2b7c02a60..9bca51577 100644 --- a/src/mbgl/geometry/feature_index.hpp +++ b/src/mbgl/geometry/feature_index.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { class RenderedQueryOptions; class RenderLayer; @@ -90,7 +90,7 @@ class DynamicFeatureIndex { public: ~DynamicFeatureIndex(); void query(std::unordered_map>& result, - const mbgl::ScreenLineString& queryGeometry, + const mln::ScreenLineString& queryGeometry, const TransformState& state) const; void insert(std::shared_ptr feature, std::shared_ptr> envelope); @@ -160,7 +160,7 @@ private: GridIndex grid; unsigned int sortIndex = 0; - // mbgl::unordered_* cannot be used here, as we rely on holding references to elements: + // mln::unordered_* cannot be used here, as we rely on holding references to elements: // 22.2.7 Unordered associative containers [unord.req] // The insert and emplace members shall not affect the validity of references to // container elements, but may invalidate all iterators to the container. @@ -168,4 +168,4 @@ private: std::unordered_set uniqueLayerIDs; std::unique_ptr tileData; }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp index 95a373175..573670acc 100644 --- a/src/mbgl/geometry/line_atlas.cpp +++ b/src/mbgl/geometry/line_atlas.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace { size_t getDashPatternHash(const std::vector& dasharray, const LinePatternCap patternCap) { @@ -261,4 +261,4 @@ void LineAtlas::upload(gfx::UploadPass& uploadPass) { needsUpload.clear(); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp index ca3a73524..afaf5b34f 100644 --- a/src/mbgl/geometry/line_atlas.hpp +++ b/src/mbgl/geometry/line_atlas.hpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class UploadPass; @@ -80,4 +80,4 @@ private: std::vector needsUpload; }; -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/attribute.cpp b/src/mbgl/gfx/attribute.cpp index f83eafacd..59be8fc07 100644 --- a/src/mbgl/gfx/attribute.cpp +++ b/src/mbgl/gfx/attribute.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { std::optional offsetAttributeBinding(const std::optional& binding, @@ -19,4 +19,4 @@ std::optional offsetAttributeBinding(const std::optional #include -#define MBGL_DEFINE_ATTRIBUTE(type_, n_, name_) \ - struct name_ { \ - using Type = ::mbgl::gfx::AttributeType; \ - static constexpr auto name() { \ - return #name_; \ - } \ +#define MBGL_DEFINE_ATTRIBUTE(type_, n_, name_) \ + struct name_ { \ + using Type = ::mln::gfx::AttributeType; \ + static constexpr auto name() { \ + return #name_; \ + } \ } #if defined(_MSC_VER) && !defined(__clang__) @@ -25,7 +25,7 @@ #define MBGL_VERTEX_ALIGN __attribute__((aligned(4))) #endif -namespace mbgl { +namespace mln { namespace gfx { template @@ -330,4 +330,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/collision_drawable_data.hpp b/src/mbgl/gfx/collision_drawable_data.hpp index aeed40da1..7448ad35f 100644 --- a/src/mbgl/gfx/collision_drawable_data.hpp +++ b/src/mbgl/gfx/collision_drawable_data.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { struct CollisionDrawableData : public DrawableData { @@ -21,4 +21,4 @@ struct CollisionDrawableData : public DrawableData { using UniqueCollisionDrawableData = std::unique_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/color_relief_drawable_data.hpp b/src/mbgl/gfx/color_relief_drawable_data.hpp index a8f197a6a..a8cef661a 100644 --- a/src/mbgl/gfx/color_relief_drawable_data.hpp +++ b/src/mbgl/gfx/color_relief_drawable_data.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { /** @@ -23,4 +23,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/cull_face_mode.hpp b/src/mbgl/gfx/cull_face_mode.hpp index 214289cde..bd79753ab 100644 --- a/src/mbgl/gfx/cull_face_mode.hpp +++ b/src/mbgl/gfx/cull_face_mode.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class CullFaceMode { @@ -21,4 +21,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/drawable.cpp b/src/mbgl/gfx/drawable.cpp index 82d053f08..29ff9ac17 100644 --- a/src/mbgl/gfx/drawable.cpp +++ b/src/mbgl/gfx/drawable.cpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { struct Drawable::Impl { @@ -24,7 +24,7 @@ struct Drawable::Impl { Drawable::Drawable(std::string name_) : name(name_), - renderPass(mbgl::RenderPass::Opaque), + renderPass(mln::RenderPass::Opaque), depthType(DepthMaskType::ReadOnly), impl(std::make_unique()) {} @@ -91,4 +91,4 @@ void Drawable::setRenderTile(Immutable> renderTiles_, co } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/drawable_atlases_tweaker.cpp b/src/mbgl/gfx/drawable_atlases_tweaker.cpp index adf0c0fa3..605cb687d 100644 --- a/src/mbgl/gfx/drawable_atlases_tweaker.cpp +++ b/src/mbgl/gfx/drawable_atlases_tweaker.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { void DrawableAtlasesTweaker::setupTextures(gfx::Drawable& drawable, const bool linearFilterForIcons) { @@ -46,4 +46,4 @@ void DrawableAtlasesTweaker::execute(gfx::Drawable& drawable, PaintParameters& p } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/drawable_builder.cpp b/src/mbgl/gfx/drawable_builder.cpp index 8f193ad24..a3558860b 100644 --- a/src/mbgl/gfx/drawable_builder.cpp +++ b/src/mbgl/gfx/drawable_builder.cpp @@ -7,13 +7,13 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { DrawableBuilder::DrawableBuilder(std::string name_) : name(std::move(name_)), vertexAttrId(0), - renderPass(mbgl::RenderPass::Opaque), + renderPass(mln::RenderPass::Opaque), impl(std::make_unique()) {} DrawableBuilder::~DrawableBuilder() = default; @@ -310,4 +310,4 @@ void DrawableBuilder::addWideVectorPolylineGlobal(const LineString& coor } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/drawable_builder_impl.cpp b/src/mbgl/gfx/drawable_builder_impl.cpp index 98c54f74a..e290c57a4 100644 --- a/src/mbgl/gfx/drawable_builder_impl.cpp +++ b/src/mbgl/gfx/drawable_builder_impl.cpp @@ -9,7 +9,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { using namespace shaders; @@ -127,9 +127,9 @@ void DrawableBuilder::Impl::addWideVectorPolylineLocal(gfx::DrawableBuilder& /*b } } -mbgl::Point DrawableBuilder::Impl::addWideVectorPolylineGlobal(gfx::DrawableBuilder& /*builder*/, - const LineString& coordinates, - const gfx::PolylineGeneratorOptions& options) { +mln::Point DrawableBuilder::Impl::addWideVectorPolylineGlobal(gfx::DrawableBuilder& /*builder*/, + const LineString& coordinates, + const gfx::PolylineGeneratorOptions& options) { constexpr int32_t zoom = 0; // get center @@ -138,7 +138,7 @@ mbgl::Point DrawableBuilder::Impl::addWideVectorPolylineGlobal(gfx::Draw Point minPoint{maxd, maxd}, maxPoint{mind, mind}; for (const auto& coord : coordinates) { auto merc = Projection::project(LatLng(coord.y, coord.x), zoom); - Point pSource{merc.x * mbgl::util::EXTENT, merc.y * mbgl::util::EXTENT}; + Point pSource{merc.x * mln::util::EXTENT, merc.y * mln::util::EXTENT}; minPoint.x = std::min(pSource.x, minPoint.x); minPoint.y = std::min(pSource.y, minPoint.y); maxPoint.x = std::max(pSource.x, maxPoint.x); @@ -152,7 +152,7 @@ mbgl::Point DrawableBuilder::Impl::addWideVectorPolylineGlobal(gfx::Draw int index = 0; for (const auto& coord : coordinates) { auto merc = Projection::project(LatLng(coord.y, coord.x), zoom); - Point pSource{merc.x * mbgl::util::EXTENT, merc.y * mbgl::util::EXTENT}; + Point pSource{merc.x * mln::util::EXTENT, merc.y * mln::util::EXTENT}; pSource.x -= pCenter.x; pSource.y -= pCenter.y; VertexTriWideVecInstance data; @@ -294,8 +294,8 @@ bool DrawableBuilder::Impl::checkAndSetMode(Mode target) { return "Unknown"; // Handle unknown enum values if needed } }; - mbgl::Log::Error( - mbgl::Event::General, + mln::Log::Error( + mln::Event::General, "DrawableBuilder mode mismatch. Target is "s + to_string(target) + ", current is " + to_string(mode)); // the builder is building in a different mode @@ -308,4 +308,4 @@ bool DrawableBuilder::Impl::checkAndSetMode(Mode target) { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/drawable_builder_impl.hpp b/src/mbgl/gfx/drawable_builder_impl.hpp index 4992360a8..95c4cf592 100644 --- a/src/mbgl/gfx/drawable_builder_impl.hpp +++ b/src/mbgl/gfx/drawable_builder_impl.hpp @@ -15,7 +15,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class DrawableBuilder::Impl { @@ -65,9 +65,9 @@ public: const GeometryCoordinates& coordinates, const gfx::PolylineGeneratorOptions& options); - mbgl::Point addWideVectorPolylineGlobal(gfx::DrawableBuilder& builder, - const LineString& coordinates, - const gfx::PolylineGeneratorOptions& options); + mln::Point addWideVectorPolylineGlobal(gfx::DrawableBuilder& builder, + const LineString& coordinates, + const gfx::PolylineGeneratorOptions& options); void setupForWideVectors(gfx::Context&, gfx::DrawableBuilder&); @@ -100,4 +100,4 @@ private: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/drawable_custom_layer_host_tweaker.cpp b/src/mbgl/gfx/drawable_custom_layer_host_tweaker.cpp index 43874735f..a5df39643 100644 --- a/src/mbgl/gfx/drawable_custom_layer_host_tweaker.cpp +++ b/src/mbgl/gfx/drawable_custom_layer_host_tweaker.cpp @@ -16,11 +16,11 @@ #include -namespace mbgl { +namespace mln { namespace gfx { void DrawableCustomLayerHostTweaker::execute([[maybe_unused]] gfx::Drawable& drawable, - mbgl::PaintParameters& paintParameters) { + mln::PaintParameters& paintParameters) { // custom drawing auto& context = paintParameters.context; context.resetState(paintParameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), @@ -48,4 +48,4 @@ void DrawableCustomLayerHostTweaker::execute([[maybe_unused]] gfx::Drawable& dra } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/dynamic_texture.cpp b/src/mbgl/gfx/dynamic_texture.cpp index 5dfa10a0b..7b78e8322 100644 --- a/src/mbgl/gfx/dynamic_texture.cpp +++ b/src/mbgl/gfx/dynamic_texture.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { DynamicTexture::DynamicTexture(Size size, TexturePixelType pixelType) @@ -76,4 +76,4 @@ bool DynamicTexture::removeTexture(const TextureHandle& texHandle) { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/dynamic_texture_atlas.cpp b/src/mbgl/gfx/dynamic_texture_atlas.cpp index 6ddf720ce..e2ec1489b 100644 --- a/src/mbgl/gfx/dynamic_texture_atlas.cpp +++ b/src/mbgl/gfx/dynamic_texture_atlas.cpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { constexpr const uint16_t extraPadding = 1; @@ -260,4 +260,4 @@ void DynamicTextureAtlas::removeUnusedDynamicTextures() { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/fill_generator.cpp b/src/mbgl/gfx/fill_generator.cpp index 1669b6b0e..780624b9f 100644 --- a/src/mbgl/gfx/fill_generator.cpp +++ b/src/mbgl/gfx/fill_generator.cpp @@ -18,18 +18,18 @@ namespace mapbox { namespace util { template <> -struct nth<0, mbgl::GeometryCoordinate> { - static int64_t get(const mbgl::GeometryCoordinate& t) { return t.x; }; +struct nth<0, mln::GeometryCoordinate> { + static int64_t get(const mln::GeometryCoordinate& t) { return t.x; }; }; template <> -struct nth<1, mbgl::GeometryCoordinate> { - static int64_t get(const mbgl::GeometryCoordinate& t) { return t.y; }; +struct nth<1, mln::GeometryCoordinate> { + static int64_t get(const mln::GeometryCoordinate& t) { return t.y; }; }; } // namespace util } // namespace mapbox -namespace mbgl { +namespace mln { namespace gfx { struct GeometryTooLongException : std::exception {}; @@ -245,4 +245,4 @@ void generateFillAndOutineBuffers(const GeometryCollection& geometry, } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/gpu_expression.cpp b/src/mbgl/gfx/gpu_expression.cpp index d4691e44c..2d7493440 100644 --- a/src/mbgl/gfx/gpu_expression.cpp +++ b/src/mbgl/gfx/gpu_expression.cpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { using namespace style::expression; @@ -184,4 +184,4 @@ Color GPUExpression::evaluateColor(const float zoom) const { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/hillshade_prepare_drawable_data.hpp b/src/mbgl/gfx/hillshade_prepare_drawable_data.hpp index 76b973531..3290eb1ea 100644 --- a/src/mbgl/gfx/hillshade_prepare_drawable_data.hpp +++ b/src/mbgl/gfx/hillshade_prepare_drawable_data.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { @@ -24,4 +24,4 @@ public: using UniqueHillshadePrepareDrawableData = std::unique_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/image_drawable_data.hpp b/src/mbgl/gfx/image_drawable_data.hpp index 340105708..33285ee23 100644 --- a/src/mbgl/gfx/image_drawable_data.hpp +++ b/src/mbgl/gfx/image_drawable_data.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { @@ -20,4 +20,4 @@ public: using UniqueImageDrawableData = std::unique_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/index_buffer.hpp b/src/mbgl/gfx/index_buffer.hpp index 081ad3988..16b5d1bbd 100644 --- a/src/mbgl/gfx/index_buffer.hpp +++ b/src/mbgl/gfx/index_buffer.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class IndexBufferResource { @@ -33,4 +33,4 @@ protected: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/index_vector.hpp b/src/mbgl/gfx/index_vector.hpp index 07d3c75e3..16a058d7e 100644 --- a/src/mbgl/gfx/index_vector.hpp +++ b/src/mbgl/gfx/index_vector.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { struct IndexBufferBase { @@ -109,4 +109,4 @@ public: using IndexVectorBasePtr = std::shared_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/line_drawable_data.hpp b/src/mbgl/gfx/line_drawable_data.hpp index 3210801b8..885547685 100644 --- a/src/mbgl/gfx/line_drawable_data.hpp +++ b/src/mbgl/gfx/line_drawable_data.hpp @@ -5,7 +5,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { @@ -20,4 +20,4 @@ public: using UniqueLineDrawableData = std::unique_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/offscreen_texture.hpp b/src/mbgl/gfx/offscreen_texture.hpp index 7b4a10f33..abb920a28 100644 --- a/src/mbgl/gfx/offscreen_texture.hpp +++ b/src/mbgl/gfx/offscreen_texture.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Texture; @@ -26,4 +26,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/polyline_generator.cpp b/src/mbgl/gfx/polyline_generator.cpp index bdc863ead..ea2c9c16c 100644 --- a/src/mbgl/gfx/polyline_generator.cpp +++ b/src/mbgl/gfx/polyline_generator.cpp @@ -12,7 +12,7 @@ using namespace std::numbers; -namespace mbgl { +namespace mln { namespace gfx { namespace { @@ -640,4 +640,4 @@ template class PolylineGenerator; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/render_pass.hpp b/src/mbgl/gfx/render_pass.hpp index 41abcbfdd..2fb74324e 100644 --- a/src/mbgl/gfx/render_pass.hpp +++ b/src/mbgl/gfx/render_pass.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class RenderPassDescriptor { @@ -40,4 +40,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/renderer_backend.cpp b/src/mbgl/gfx/renderer_backend.cpp index 20d2b85d3..8e82bfa19 100644 --- a/src/mbgl/gfx/renderer_backend.cpp +++ b/src/mbgl/gfx/renderer_backend.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { RendererBackend::RendererBackend(const ContextMode contextMode_) @@ -23,4 +23,4 @@ gfx::Context& RendererBackend::getContext() { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/rendering_stats.cpp b/src/mbgl/gfx/rendering_stats.cpp index 2a572c9cc..bea6c6114 100644 --- a/src/mbgl/gfx/rendering_stats.cpp +++ b/src/mbgl/gfx/rendering_stats.cpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { bool RenderingStats::isZero() const { @@ -123,7 +123,7 @@ void RenderingStatsView::create(style::Style& style) { return; } - mbgl::FeatureCollection features; + mln::FeatureCollection features; mapbox::geojson::feature feature; feature.geometry = mapbox::geometry::geometry(Point{0, 0}); @@ -148,11 +148,11 @@ void RenderingStatsView::create(style::Style& style) { infoLayer->setTextColor(options.textColor); infoLayer->setTextSize(options.textSize); infoLayer->setTextMaxWidth(300.0f); - infoLayer->setTextJustify(mbgl::style::TextJustifyType::Left); - infoLayer->setTextAnchor(mbgl::style::SymbolAnchorType::TopRight); + infoLayer->setTextJustify(mln::style::TextJustifyType::Left); + infoLayer->setTextAnchor(mln::style::SymbolAnchorType::TopRight); - const float translation = mbgl::util::EXTENT / 2.0f - 100.0f; - infoLayer->setTextTranslateAnchor(mbgl::style::TranslateAnchorType::Viewport); + const float translation = mln::util::EXTENT / 2.0f - 100.0f; + infoLayer->setTextTranslateAnchor(mln::style::TranslateAnchorType::Viewport); infoLayer->setTextTranslate(std::array{translation, translation}); style.addLayer(std::move(infoLayer)); @@ -164,8 +164,8 @@ void RenderingStatsView::destroy(style::Style& style) { style.removeSource(sourceID); } -mbgl::style::SymbolLayer* RenderingStatsView::getLayer(style::Style& style) { - return static_cast(style.getLayer(layerID)); +mln::style::SymbolLayer* RenderingStatsView::getLayer(style::Style& style) { + return static_cast(style.getLayer(layerID)); } namespace { @@ -279,7 +279,7 @@ void RenderingStatsView::update(style::Style& style, const gfx::RenderingStats& printNumber(ss, "Stencil buffer clears", stats.stencilClears, true); printNumber(ss, "Stencil buffer updates", stats.stencilUpdates, options.verbose); - layer->setTextField(mbgl::style::expression::Formatted(ss.str().c_str())); + layer->setTextField(mln::style::expression::Formatted(ss.str().c_str())); frameCount = 0; encodingTime = 0.0; @@ -288,4 +288,4 @@ void RenderingStatsView::update(style::Style& style, const gfx::RenderingStats& } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/shader_group.cpp b/src/mbgl/gfx/shader_group.cpp index 2859d646b..ef9eddb1f 100644 --- a/src/mbgl/gfx/shader_group.cpp +++ b/src/mbgl/gfx/shader_group.cpp @@ -1,7 +1,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { bool ShaderGroup::isShader(const std::string& shaderName) const noexcept { @@ -48,4 +48,4 @@ bool ShaderGroup::registerShader(std::shared_ptr&& shader, const std::st } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/shader_registry.cpp b/src/mbgl/gfx/shader_registry.cpp index 93d012543..eb0c1656b 100644 --- a/src/mbgl/gfx/shader_registry.cpp +++ b/src/mbgl/gfx/shader_registry.cpp @@ -1,7 +1,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { ShaderRegistry::ShaderRegistry() @@ -47,4 +47,4 @@ bool ShaderRegistry::registerShaderGroup(ShaderGroupPtr&& shader, const std::str } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/symbol_drawable_data.hpp b/src/mbgl/gfx/symbol_drawable_data.hpp index fd7e3be04..2cb3ab586 100644 --- a/src/mbgl/gfx/symbol_drawable_data.hpp +++ b/src/mbgl/gfx/symbol_drawable_data.hpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { namespace style { enum class SymbolType : uint8_t; } // namespace style @@ -44,4 +44,4 @@ struct SymbolDrawableData : public DrawableData { using UniqueSymbolDrawableData = std::unique_ptr; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/uniform.hpp b/src/mbgl/gfx/uniform.hpp index 3ce9f278b..cb6bfe02b 100644 --- a/src/mbgl/gfx/uniform.hpp +++ b/src/mbgl/gfx/uniform.hpp @@ -29,7 +29,7 @@ } \ } -namespace mbgl { +namespace mln { namespace gfx { template @@ -46,4 +46,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/uniform_buffer.cpp b/src/mbgl/gfx/uniform_buffer.cpp index 5f357b999..fe806de87 100644 --- a/src/mbgl/gfx/uniform_buffer.cpp +++ b/src/mbgl/gfx/uniform_buffer.cpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { std::shared_ptr UniformBufferArray::nullref = nullptr; @@ -53,4 +53,4 @@ void UniformBufferArray::createOrUpdate( } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/upload_pass.hpp b/src/mbgl/gfx/upload_pass.hpp index 8804dde54..f944da843 100644 --- a/src/mbgl/gfx/upload_pass.hpp +++ b/src/mbgl/gfx/upload_pass.hpp @@ -15,7 +15,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class Conext; @@ -99,4 +99,4 @@ public: }; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/vertex_attribute.cpp b/src/mbgl/gfx/vertex_attribute.cpp index 4fbf4d3af..f82782638 100644 --- a/src/mbgl/gfx/vertex_attribute.cpp +++ b/src/mbgl/gfx/vertex_attribute.cpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { namespace { @@ -129,4 +129,4 @@ void VertexAttributeArray::clear() { } } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gfx/vertex_vector.hpp b/src/mbgl/gfx/vertex_vector.hpp index c1debf9a3..201a0fc63 100644 --- a/src/mbgl/gfx/vertex_vector.hpp +++ b/src/mbgl/gfx/vertex_vector.hpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { struct VertexBufferBase { @@ -128,4 +128,4 @@ template using VertexVectorPtr = std::shared_ptr>; } // namespace gfx -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/attribute.cpp b/src/mbgl/gl/attribute.cpp index e4fdf6fb7..0b3b7da2d 100644 --- a/src/mbgl/gl/attribute.cpp +++ b/src/mbgl/gl/attribute.cpp @@ -1,7 +1,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -16,4 +16,4 @@ std::optional queryLocation(ProgramID id, const char* name) { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/attribute.hpp b/src/mbgl/gl/attribute.hpp index c69102680..c63c02420 100644 --- a/src/mbgl/gl/attribute.hpp +++ b/src/mbgl/gl/attribute.hpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using AttributeBindingArray = std::vector>; @@ -130,4 +130,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/buffer_allocator.cpp b/src/mbgl/gl/buffer_allocator.cpp index 975af80c6..4ca45089b 100644 --- a/src/mbgl/gl/buffer_allocator.cpp +++ b/src/mbgl/gl/buffer_allocator.cpp @@ -6,7 +6,7 @@ #include -namespace mbgl { +namespace mln { using namespace platform; @@ -518,4 +518,4 @@ int32_t UniformBufferAllocator::getBufferID(size_t bufferIndex) const noexcept { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/command_encoder.cpp b/src/mbgl/gl/command_encoder.cpp index 56c96dd85..1d5ef915e 100644 --- a/src/mbgl/gl/command_encoder.cpp +++ b/src/mbgl/gl/command_encoder.cpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { CommandEncoder::~CommandEncoder() { @@ -56,4 +56,4 @@ void CommandEncoder::popDebugGroup() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/command_encoder.hpp b/src/mbgl/gl/command_encoder.hpp index c594bc1fc..44ea39ab4 100644 --- a/src/mbgl/gl/command_encoder.hpp +++ b/src/mbgl/gl/command_encoder.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { class Context; @@ -30,4 +30,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp index 5e7749013..a500a4f0a 100644 --- a/src/mbgl/gl/context.cpp +++ b/src/mbgl/gl/context.cpp @@ -29,7 +29,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -615,7 +615,7 @@ gfx::VertexAttributeArrayPtr Context::createVertexAttributeArray() const { return std::make_shared(); } -void Context::clear(std::optional color, std::optional depth, std::optional stencil) { +void Context::clear(std::optional color, std::optional depth, std::optional stencil) { MLN_TRACE_FUNC(); MLN_TRACE_FUNC_GL(); @@ -883,4 +883,4 @@ Texture2DPool& Context::getTexturePool() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp index 0d654c4ba..a46d01895 100644 --- a/src/mbgl/gl/context.hpp +++ b/src/mbgl/gl/context.hpp @@ -25,7 +25,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using ProcAddress = void (*)(); @@ -72,7 +72,7 @@ public: return {size, readFramebuffer(size, format, flip)}; } - void clear(std::optional color, std::optional depth, std::optional stencil); + void clear(std::optional color, std::optional depth, std::optional stencil); void setDepthMode(const gfx::DepthMode&); void setStencilMode(const gfx::StencilMode&); @@ -255,4 +255,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/debugging_extension.cpp b/src/mbgl/gl/debugging_extension.cpp index e979f82b9..c9489f649 100644 --- a/src/mbgl/gl/debugging_extension.cpp +++ b/src/mbgl/gl/debugging_extension.cpp @@ -1,7 +1,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { namespace extension { @@ -73,34 +73,34 @@ void Debugging::DebugCallback(GLenum source, } std::string strSeverity; - mbgl::EventSeverity evtSeverity; + mln::EventSeverity evtSeverity; switch (severity) { case GL_DEBUG_SEVERITY_HIGH: strSeverity = "DEBUG_SEVERITY_HIGH"; - evtSeverity = mbgl::EventSeverity::Error; + evtSeverity = mln::EventSeverity::Error; break; case GL_DEBUG_SEVERITY_MEDIUM: strSeverity = "DEBUG_SEVERITY_MEDIUM"; - evtSeverity = mbgl::EventSeverity::Warning; + evtSeverity = mln::EventSeverity::Warning; break; case GL_DEBUG_SEVERITY_LOW: strSeverity = "DEBUG_SEVERITY_LOW"; - evtSeverity = mbgl::EventSeverity::Info; + evtSeverity = mln::EventSeverity::Info; break; case GL_DEBUG_SEVERITY_NOTIFICATION: strSeverity = "DEBUG_SEVERITY_NOTIFICATION"; - evtSeverity = mbgl::EventSeverity::Debug; + evtSeverity = mln::EventSeverity::Debug; break; default: strSource = "(unknown)"; - evtSeverity = mbgl::EventSeverity::Debug; + evtSeverity = mln::EventSeverity::Debug; break; } const std::string logMsg = "GL_" + strSource + " GL_" + strType + " " + std::to_string(id) + " GL_" + strSeverity + " - " + message; - mbgl::Log::Record(evtSeverity, mbgl::Event::OpenGL, logMsg); + mln::Log::Record(evtSeverity, mln::Event::OpenGL, logMsg); } } // namespace extension } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/debugging_extension.hpp b/src/mbgl/gl/debugging_extension.hpp index f7295a51b..28f3450e4 100644 --- a/src/mbgl/gl/debugging_extension.hpp +++ b/src/mbgl/gl/debugging_extension.hpp @@ -48,7 +48,7 @@ #define GL_RENDERBUFFER 0x8D41 #define GL_FRAMEBUFFER 0x8D40 -namespace mbgl { +namespace mln { namespace gl { namespace extension { @@ -107,4 +107,4 @@ public: } // namespace extension } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/draw_scope_resource.hpp b/src/mbgl/gl/draw_scope_resource.hpp index 298aaf29b..92f71863b 100644 --- a/src/mbgl/gl/draw_scope_resource.hpp +++ b/src/mbgl/gl/draw_scope_resource.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class DrawScopeResource : public gfx::DrawScopeResource { @@ -15,4 +15,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/drawable_gl.cpp b/src/mbgl/gl/drawable_gl.cpp index 7d1710bf9..ba45c8fd1 100644 --- a/src/mbgl/gl/drawable_gl.cpp +++ b/src/mbgl/gl/drawable_gl.cpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { DrawableGL::DrawableGL(std::string name_) @@ -37,7 +37,7 @@ void DrawableGL::draw(PaintParameters& parameters) const { } } if (!shader || context.program.getCurrentValue() == 0) { - mbgl::Log::Warning(Event::General, "Missing shader for drawable " + util::toString(getID()) + "/" + getName()); + mln::Log::Warning(Event::General, "Missing shader for drawable " + util::toString(getID()) + "/" + getName()); assert(false); return; } @@ -138,7 +138,7 @@ struct IndexBufferGL : public gfx::IndexBufferBase { : buffer(std::move(buffer_)) {} ~IndexBufferGL() override = default; - std::unique_ptr buffer; + std::unique_ptr buffer; }; void DrawableGL::upload(gfx::UploadPass& uploadPass) { @@ -281,4 +281,4 @@ void DrawableGL::unbindTextures() const { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/drawable_gl_builder.cpp b/src/mbgl/gl/drawable_gl_builder.cpp index 78547195c..6d9e1eb67 100644 --- a/src/mbgl/gl/drawable_gl_builder.cpp +++ b/src/mbgl/gl/drawable_gl_builder.cpp @@ -8,7 +8,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { gfx::UniqueDrawable DrawableGLBuilder::createDrawable() const { @@ -47,4 +47,4 @@ void DrawableGLBuilder::init() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/drawable_gl_impl.hpp b/src/mbgl/gl/drawable_gl_impl.hpp index a972ac6cd..c034bc217 100644 --- a/src/mbgl/gl/drawable_gl_impl.hpp +++ b/src/mbgl/gl/drawable_gl_impl.hpp @@ -16,7 +16,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -64,4 +64,4 @@ protected: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/dynamic_texture.cpp b/src/mbgl/gl/dynamic_texture.cpp index 097f1d180..b5efcbcb4 100644 --- a/src/mbgl/gl/dynamic_texture.cpp +++ b/src/mbgl/gl/dynamic_texture.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { DynamicTexture::DynamicTexture(Context& context, Size size, gfx::TexturePixelType pixelType) @@ -46,4 +46,4 @@ bool DynamicTexture::removeTexture(const gfx::TextureHandle& texHandle) { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/enum.cpp b/src/mbgl/gl/enum.cpp index a9adb0ac6..2378a8002 100644 --- a/src/mbgl/gl/enum.cpp +++ b/src/mbgl/gl/enum.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { template <> @@ -477,4 +477,4 @@ platform::GLenum Enum::to(const gfx::RenderbufferPix } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/enum.hpp b/src/mbgl/gl/enum.hpp index f662fd851..33bad48c2 100644 --- a/src/mbgl/gl/enum.hpp +++ b/src/mbgl/gl/enum.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { template @@ -23,4 +23,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/extension.hpp b/src/mbgl/gl/extension.hpp index 9186fab72..17f485f54 100644 --- a/src/mbgl/gl/extension.hpp +++ b/src/mbgl/gl/extension.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using ProcAddress = void (*)(); @@ -27,4 +27,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/fence.cpp b/src/mbgl/gl/fence.cpp index 350939e6c..e5e8f91c8 100644 --- a/src/mbgl/gl/fence.cpp +++ b/src/mbgl/gl/fence.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -66,4 +66,4 @@ bool Fence::isSignaled() const { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/fence.hpp b/src/mbgl/gl/fence.hpp index 9edb413ca..eb83792c6 100644 --- a/src/mbgl/gl/fence.hpp +++ b/src/mbgl/gl/fence.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class Fence { @@ -19,4 +19,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/framebuffer.hpp b/src/mbgl/gl/framebuffer.hpp index 91ed467b4..bc617bd18 100644 --- a/src/mbgl/gl/framebuffer.hpp +++ b/src/mbgl/gl/framebuffer.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class Framebuffer { @@ -13,4 +13,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/index_buffer_resource.cpp b/src/mbgl/gl/index_buffer_resource.cpp index 0212527f1..d986b649f 100644 --- a/src/mbgl/gl/index_buffer_resource.cpp +++ b/src/mbgl/gl/index_buffer_resource.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { IndexBufferResource::IndexBufferResource(UniqueBuffer&& buffer_, int byteSize_) @@ -35,4 +35,4 @@ IndexBufferResource::~IndexBufferResource() noexcept { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/index_buffer_resource.hpp b/src/mbgl/gl/index_buffer_resource.hpp index 5cbb20239..0b181868b 100644 --- a/src/mbgl/gl/index_buffer_resource.hpp +++ b/src/mbgl/gl/index_buffer_resource.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class IndexBufferResource : public gfx::IndexBufferResource { @@ -16,4 +16,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/layer_group_gl.cpp b/src/mbgl/gl/layer_group_gl.cpp index 08ec7b234..ba3d3c4da 100644 --- a/src/mbgl/gl/layer_group_gl.cpp +++ b/src/mbgl/gl/layer_group_gl.cpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -208,4 +208,4 @@ void LayerGroupGL::render(RenderOrchestrator&, PaintParameters& parameters) { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/object.cpp b/src/mbgl/gl/object.cpp index 78588f9a1..b690b5a5f 100644 --- a/src/mbgl/gl/object.cpp +++ b/src/mbgl/gl/object.cpp @@ -3,7 +3,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { namespace detail { @@ -48,4 +48,4 @@ void RenderbufferDeleter::operator()(RenderbufferID id) const { } // namespace detail } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/object.hpp b/src/mbgl/gl/object.hpp index 9598e0c59..7dba023df 100644 --- a/src/mbgl/gl/object.hpp +++ b/src/mbgl/gl/object.hpp @@ -4,7 +4,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { class Context; @@ -57,4 +57,4 @@ using UniqueFramebuffer = std_experimental::unique_resource; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/offscreen_texture.cpp b/src/mbgl/gl/offscreen_texture.cpp index 90f71b414..e2220bd96 100644 --- a/src/mbgl/gl/offscreen_texture.cpp +++ b/src/mbgl/gl/offscreen_texture.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class OffscreenTextureResource final : public gl::RenderableResource { @@ -77,4 +77,4 @@ const gfx::Texture2DPtr& OffscreenTexture::getTexture() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/offscreen_texture.hpp b/src/mbgl/gl/offscreen_texture.hpp index 13cec4c11..368c1d471 100644 --- a/src/mbgl/gl/offscreen_texture.hpp +++ b/src/mbgl/gl/offscreen_texture.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class Context; @@ -21,4 +21,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/render_pass.cpp b/src/mbgl/gl/render_pass.cpp index 30aa25e83..2be0567eb 100644 --- a/src/mbgl/gl/render_pass.cpp +++ b/src/mbgl/gl/render_pass.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { RenderPass::RenderPass(gl::CommandEncoder& commandEncoder_, @@ -26,4 +26,4 @@ void RenderPass::popDebugGroup() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/render_pass.hpp b/src/mbgl/gl/render_pass.hpp index 85a56243a..b357bc83d 100644 --- a/src/mbgl/gl/render_pass.hpp +++ b/src/mbgl/gl/render_pass.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gfx { class CommandEncoder; @@ -28,4 +28,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/renderbuffer_resource.cpp b/src/mbgl/gl/renderbuffer_resource.cpp index 372aadb58..e651f0545 100644 --- a/src/mbgl/gl/renderbuffer_resource.cpp +++ b/src/mbgl/gl/renderbuffer_resource.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { RenderbufferResource::~RenderbufferResource() noexcept { @@ -10,4 +10,4 @@ RenderbufferResource::~RenderbufferResource() noexcept { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/renderbuffer_resource.hpp b/src/mbgl/gl/renderbuffer_resource.hpp index 396ec138a..10564e91d 100644 --- a/src/mbgl/gl/renderbuffer_resource.hpp +++ b/src/mbgl/gl/renderbuffer_resource.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class RenderbufferResource final : public gfx::RenderbufferResource { @@ -17,4 +17,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/renderer_backend.cpp b/src/mbgl/gl/renderer_backend.cpp index 2cdd406eb..fb35cb0bc 100644 --- a/src/mbgl/gl/renderer_backend.cpp +++ b/src/mbgl/gl/renderer_backend.cpp @@ -12,7 +12,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { RendererBackend::RendererBackend(const gfx::ContextMode contextMode_) @@ -155,4 +155,4 @@ void RendererBackend::initShaders(gfx::ShaderRegistry& shaders, const ProgramPar } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/resource_pool.cpp b/src/mbgl/gl/resource_pool.cpp index 86ea1b780..920c0e9cb 100644 --- a/src/mbgl/gl/resource_pool.cpp +++ b/src/mbgl/gl/resource_pool.cpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -283,4 +283,4 @@ size_t Texture2DPool::storage(TextureID id) const { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/resource_pool.hpp b/src/mbgl/gl/resource_pool.hpp index 2532c3cd4..3bf743b19 100644 --- a/src/mbgl/gl/resource_pool.hpp +++ b/src/mbgl/gl/resource_pool.hpp @@ -10,7 +10,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class Context; @@ -119,4 +119,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/state.hpp b/src/mbgl/gl/state.hpp index 3809da036..74322bff4 100644 --- a/src/mbgl/gl/state.hpp +++ b/src/mbgl/gl/state.hpp @@ -2,7 +2,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { // Wraps a piece of OpenGL state and remember its value to avoid redundant state @@ -59,4 +59,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/texture2d.cpp b/src/mbgl/gl/texture2d.cpp index 8378b6fb8..00cdef5f9 100644 --- a/src/mbgl/gl/texture2d.cpp +++ b/src/mbgl/gl/texture2d.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { Texture2D::Texture2D(gl::Context& context_) @@ -31,7 +31,7 @@ Texture2D& Texture2D::setFormat(gfx::TexturePixelType pixelFormat_, gfx::Texture return *this; } -Texture2D& Texture2D::setSize(mbgl::Size size_) noexcept { +Texture2D& Texture2D::setSize(mln::Size size_) noexcept { size = size_; storageDirty = true; return *this; @@ -203,4 +203,4 @@ void Texture2D::upload() { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/timestamp_query_extension.cpp b/src/mbgl/gl/timestamp_query_extension.cpp index a986870ce..3ac6bfa58 100644 --- a/src/mbgl/gl/timestamp_query_extension.cpp +++ b/src/mbgl/gl/timestamp_query_extension.cpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { namespace extension { @@ -119,4 +119,4 @@ void loadTimeStampQueryExtension(const GlContexsLoader &loadExtension) { } // namespace extension } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/timestamp_query_extension.hpp b/src/mbgl/gl/timestamp_query_extension.hpp index 411187bc4..72ff5a1a2 100644 --- a/src/mbgl/gl/timestamp_query_extension.hpp +++ b/src/mbgl/gl/timestamp_query_extension.hpp @@ -13,7 +13,7 @@ #define GL_TIMESTAMP 0x8E28 #define GL_GPU_DISJOINT 0x8FBB -namespace mbgl { +namespace mln { namespace gl { namespace extension { @@ -38,4 +38,4 @@ void loadTimeStampQueryExtension(const GlContexsLoader &loadExtension); } // namespace extension } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/types.hpp b/src/mbgl/gl/types.hpp index 0ff5094af..4df365407 100644 --- a/src/mbgl/gl/types.hpp +++ b/src/mbgl/gl/types.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { // Mapping based on https://www.opengl.org/wiki/OpenGL_Type @@ -59,4 +59,4 @@ enum class UniformDataType : uint32_t { }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/uniform.cpp b/src/mbgl/gl/uniform.cpp index 484bf7b7f..f016707b7 100644 --- a/src/mbgl/gl/uniform.cpp +++ b/src/mbgl/gl/uniform.cpp @@ -7,7 +7,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -200,4 +200,4 @@ bool verifyUniform>(const ActiveUniform& uniform) { #endif } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index 28c643ec6..1d3709d06 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -13,7 +13,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { template @@ -99,4 +99,4 @@ public: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/uniform_buffer_gl.cpp b/src/mbgl/gl/uniform_buffer_gl.cpp index af3bf4b76..9870cf98a 100644 --- a/src/mbgl/gl/uniform_buffer_gl.cpp +++ b/src/mbgl/gl/uniform_buffer_gl.cpp @@ -9,7 +9,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -183,4 +183,4 @@ void UniformBufferArrayGL::unbind() const { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/upload_pass.cpp b/src/mbgl/gl/upload_pass.cpp index ac456e11f..cafab53df 100644 --- a/src/mbgl/gl/upload_pass.cpp +++ b/src/mbgl/gl/upload_pass.cpp @@ -16,7 +16,7 @@ #include -namespace mbgl { +namespace mln { namespace gl { using namespace platform; @@ -286,4 +286,4 @@ const gfx::Context& UploadPass::getContext() const { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/upload_pass.hpp b/src/mbgl/gl/upload_pass.hpp index 99aceb44e..bf03afb75 100644 --- a/src/mbgl/gl/upload_pass.hpp +++ b/src/mbgl/gl/upload_pass.hpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class CommandEncoder; @@ -62,4 +62,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/value.cpp b/src/mbgl/gl/value.cpp index 0aa200e00..f3dfb15ec 100644 --- a/src/mbgl/gl/value.cpp +++ b/src/mbgl/gl/value.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { namespace value { @@ -666,4 +666,4 @@ PixelStoreUnpack::Type PixelStoreUnpack::Get() { } // namespace value } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/value.hpp b/src/mbgl/gl/value.hpp index e5f951fce..d93ef370e 100644 --- a/src/mbgl/gl/value.hpp +++ b/src/mbgl/gl/value.hpp @@ -12,7 +12,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class Context; @@ -289,4 +289,4 @@ struct PixelStoreUnpack { } // namespace value } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/vertex_array.cpp b/src/mbgl/gl/vertex_array.cpp index 014fbbb96..a3e523bbe 100644 --- a/src/mbgl/gl/vertex_array.cpp +++ b/src/mbgl/gl/vertex_array.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { void VertexArray::bind(Context& context, const gfx::IndexBuffer& indexBuffer, const AttributeBindingArray& bindings) { @@ -22,4 +22,4 @@ void VertexArray::bind(Context& context, const gfx::IndexBuffer& indexBuffer, co } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/vertex_array.hpp b/src/mbgl/gl/vertex_array.hpp index 0179664e5..6a3eca757 100644 --- a/src/mbgl/gl/vertex_array.hpp +++ b/src/mbgl/gl/vertex_array.hpp @@ -8,7 +8,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gfx { class IndexBuffer; @@ -77,4 +77,4 @@ private: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/vertex_attribute_gl.cpp b/src/mbgl/gl/vertex_attribute_gl.cpp index f99d19543..4ba8d7437 100644 --- a/src/mbgl/gl/vertex_attribute_gl.cpp +++ b/src/mbgl/gl/vertex_attribute_gl.cpp @@ -11,7 +11,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class VertexAttributeArrayGL; @@ -182,4 +182,4 @@ const std::vector& VertexAttributeGL::getRaw(gfx::VertexAttribute& } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/vertex_buffer_resource.cpp b/src/mbgl/gl/vertex_buffer_resource.cpp index e66ad9766..d8271fa10 100644 --- a/src/mbgl/gl/vertex_buffer_resource.cpp +++ b/src/mbgl/gl/vertex_buffer_resource.cpp @@ -2,7 +2,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { VertexBufferResource::VertexBufferResource(UniqueBuffer&& buffer_, int byteSize_) @@ -35,4 +35,4 @@ VertexBufferResource::~VertexBufferResource() noexcept { } } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/gl/vertex_buffer_resource.hpp b/src/mbgl/gl/vertex_buffer_resource.hpp index d7ec725d0..31b248b57 100644 --- a/src/mbgl/gl/vertex_buffer_resource.hpp +++ b/src/mbgl/gl/vertex_buffer_resource.hpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { namespace gl { class VertexBufferResource : public gfx::VertexBufferResource { @@ -26,4 +26,4 @@ protected: }; } // namespace gl -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/layermanager/background_layer_factory.cpp b/src/mbgl/layermanager/background_layer_factory.cpp index fddcf4929..9b776efd4 100644 --- a/src/mbgl/layermanager/background_layer_factory.cpp +++ b/src/mbgl/layermanager/background_layer_factory.cpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { const style::LayerTypeInfo* BackgroundLayerFactory::getTypeInfo() const noexcept { return style::BackgroundLayer::Impl::staticTypeInfo(); @@ -21,4 +21,4 @@ std::unique_ptr BackgroundLayerFactory::createRenderLayer(Immutable return std::make_unique(staticImmutableCast(impl)); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/layermanager/circle_layer_factory.cpp b/src/mbgl/layermanager/circle_layer_factory.cpp index 509c2e7e3..eec661baa 100644 --- a/src/mbgl/layermanager/circle_layer_factory.cpp +++ b/src/mbgl/layermanager/circle_layer_factory.cpp @@ -6,7 +6,7 @@ #include #include -namespace mbgl { +namespace mln { const style::LayerTypeInfo* CircleLayerFactory::getTypeInfo() const noexcept { return style::CircleLayer::Impl::staticTypeInfo(); @@ -31,4 +31,4 @@ std::unique_ptr CircleLayerFactory::createRenderLayer(Immutable(impl))); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/layermanager/color_relief_layer_factory.cpp b/src/mbgl/layermanager/color_relief_layer_factory.cpp index f5b516b54..580fddadc 100644 --- a/src/mbgl/layermanager/color_relief_layer_factory.cpp +++ b/src/mbgl/layermanager/color_relief_layer_factory.cpp @@ -4,7 +4,7 @@ #include #include -namespace mbgl { +namespace mln { const style::LayerTypeInfo* ColorReliefLayerFactory::getTypeInfo() const noexcept { return style::ColorReliefLayer::Impl::staticTypeInfo(); @@ -24,4 +24,4 @@ std::unique_ptr ColorReliefLayerFactory::createRenderLayer(Immutabl return std::make_unique(staticImmutableCast(impl)); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/layermanager/custom_drawable_layer_factory.cpp b/src/mbgl/layermanager/custom_drawable_layer_factory.cpp index 6ccb613c3..6aa9dd5f6 100644 --- a/src/mbgl/layermanager/custom_drawable_layer_factory.cpp +++ b/src/mbgl/layermanager/custom_drawable_layer_factory.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { const style::LayerTypeInfo* CustomDrawableLayerFactory::getTypeInfo() const noexcept { return style::CustomDrawableLayer::Impl::staticTypeInfo(); @@ -20,4 +20,4 @@ std::unique_ptr CustomDrawableLayerFactory::createRenderLayer( return std::make_unique(staticImmutableCast(impl)); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/layermanager/custom_layer_factory.cpp b/src/mbgl/layermanager/custom_layer_factory.cpp index df57b3fe6..273730d16 100644 --- a/src/mbgl/layermanager/custom_layer_factory.cpp +++ b/src/mbgl/layermanager/custom_layer_factory.cpp @@ -3,7 +3,7 @@ #include #include -namespace mbgl { +namespace mln { const style::LayerTypeInfo* CustomLayerFactory::getTypeInfo() const noexcept { return style::CustomLayer::Impl::staticTypeInfo(); @@ -19,4 +19,4 @@ std::unique_ptr CustomLayerFactory::createRenderLayer(Immutable(staticImmutableCast(impl)); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp b/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp index 82b1519d2..6a6a82586 100644 --- a/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp +++ b/src/mbgl/layermanager/fill_extrusion_layer_factory.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { const style::LayerTypeInfo* FillExtrusionLayerFactory::getTypeInfo() const noexcept { return style::FillExtrusionLayer::Impl::staticTypeInfo(); @@ -36,4 +36,4 @@ std::unique_ptr FillExtrusionLayerFactory::createRenderLayer(Immuta return std::unique_ptr(new (std::nothrow) RenderFillExtrusionLayer(std::move(renderImpl))); } -} // namespace mbgl +} // namespace mln diff --git a/src/mbgl/layermanager/fill_layer_factory.cpp b/src/mbgl/layermanager/fill_layer_factory.cpp index 2bc931169..6992b8e9a 100644 --- a/src/mbgl/layermanager/fill_layer_factory.cpp +++ b/src/mbgl/layermanager/fill_layer_factory.cpp @@ -5,7 +5,7 @@ #include #include -namespace mbgl { +namespace mln { const style::LayerTypeInfo* FillLayerFactory::getTypeInfo() const noexcept { return style::FillLayer::Impl::staticTypeInfo(); @@ -39,4 +39,4 @@ std::unique_ptr FillLayerFactory::createRenderLayer(Immutable