Skip to content

Commit

Permalink
Update to the latest version of MapLibre Core (OpenGL 2 branch) (#135)
Browse files Browse the repository at this point in the history
  • Loading branch information
ntadej authored May 20, 2024
1 parent 020e3bc commit 08baedf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/map.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ void Map::removeSource(const QString &id) {
void Map::addCustomLayer(const QString &id, std::unique_ptr<CustomLayerHostInterface> host, const QString &before) {
class HostWrapper final : public mbgl::style::CustomLayerHost {
public:
std::unique_ptr<CustomLayerHostInterface> ptr{};
std::unique_ptr<CustomLayerHostInterface> ptr;
explicit HostWrapper(std::unique_ptr<CustomLayerHostInterface> p)
: ptr(std::move(p)) {}

Expand Down
2 changes: 1 addition & 1 deletion vendor/maplibre-native
Submodule maplibre-native updated 89 files
+1 −1 .github/actions/qt5-build/entrypoint.sh
+1 −1 .github/actions/qt6-build/entrypoint.sh
+7 −16 .github/workflows/linux-ci.yml
+24 −14 .github/workflows/node-ci.yml
+79 −57 .github/workflows/node-release.yml
+14 −10 .github/workflows/qt-ci.yml
+1 −0 .nvmrc
+1 −0 CHANGELOG.md
+10 −2 CMakeLists.txt
+1 −1 benchmark/CMakeLists.txt
+1 −1 expression-test/CMakeLists.txt
+3 −1 include/mbgl/style/expression/expression.hpp
+41 −0 include/mbgl/style/expression/index_of.hpp
+39 −0 include/mbgl/style/expression/slice.hpp
+35 −0 metrics/android-render-test-runner/render-tests/sprites/array-default-only/metrics.json
+35 −0 metrics/android-render-test-runner/render-tests/sprites/array-multiple/metrics.json
+10 −0 metrics/ignores/platform-linux.json
+26 −0 metrics/integration/expression-tests/index-of/assert-array/test.json
+24 −0 metrics/integration/expression-tests/index-of/assert-string/test.json
+46 −0 metrics/integration/expression-tests/index-of/basic-array/test.json
+32 −0 metrics/integration/expression-tests/index-of/basic-string/test.json
+28 −0 metrics/integration/expression-tests/index-of/invalid-haystack/test.json
+25 −0 metrics/integration/expression-tests/index-of/invalid-needle/test.json
+51 −0 metrics/integration/expression-tests/index-of/with-from-index/test.json
+19 −0 metrics/integration/expression-tests/slice/array-one-index/test.json
+31 −0 metrics/integration/expression-tests/slice/array-two-indexes/test.json
+40 −0 metrics/integration/expression-tests/slice/invalid-inputs/test.json
+19 −0 metrics/integration/expression-tests/slice/string-one-index/test.json
+20 −0 metrics/integration/expression-tests/slice/string-two-indexes/test.json
+ metrics/integration/render-tests/sprites/array-default-only/expected.png
+56 −0 metrics/integration/render-tests/sprites/array-default-only/style.json
+ metrics/integration/render-tests/sprites/array-multiple/expected.png
+79 −0 metrics/integration/render-tests/sprites/array-multiple/style.json
+35 −0 metrics/linux-gcc8-release/render-tests/sprites/array-default-only/metrics.json
+35 −0 metrics/linux-gcc8-release/render-tests/sprites/array-multiple/metrics.json
+35 −0 metrics/macos-xcode11-release/render-tests/sprites/array-default-only/metrics.json
+35 −0 metrics/macos-xcode11-release/render-tests/sprites/array-multiple/metrics.json
+1,926 −1,298 package-lock.json
+15 −16 package.json
+2 −0 platform/android/CHANGELOG.md
+52 −0 platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
+41 −0 platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.kt
+11 −8 platform/default/src/mbgl/storage/offline_download.cpp
+1 −0 platform/default/src/mbgl/util/async_task.cpp
+17 −2 platform/default/src/mbgl/util/image.cpp
+1 −0 platform/default/src/mbgl/util/run_loop.cpp
+2 −0 platform/default/src/mbgl/util/timer.cpp
+26 −0 platform/default/src/mbgl/util/webp_reader.cpp
+1 −1 platform/glfw/CMakeLists.txt
+1 −1 platform/linux/README.md
+4 −0 platform/linux/linux.cmake
+71 −60 platform/node/CHANGELOG.md
+13 −0 platform/node/RELEASE.md
+5 −1 platform/qt/qt.cmake
+1 −1 platform/windows/Get-VendorPackages.ps1
+4 −0 platform/windows/windows.cmake
+1 −1 render-test/CMakeLists.txt
+1 −0 render-test/parser.cpp
+1 −1 src/mbgl/map/map_impl.cpp
+36 −28 src/mbgl/sprite/sprite_loader.cpp
+6 −3 src/mbgl/sprite/sprite_loader.hpp
+3 −2 src/mbgl/sprite/sprite_loader_observer.hpp
+19 −3 src/mbgl/sprite/sprite_parser.cpp
+3 −1 src/mbgl/sprite/sprite_parser.hpp
+34 −0 src/mbgl/style/conversion/sprite.cpp
+21 −0 src/mbgl/style/conversion/sprite.hpp
+138 −0 src/mbgl/style/expression/index_of.cpp
+38 −36 src/mbgl/style/expression/parsing_context.cpp
+156 −0 src/mbgl/style/expression/slice.cpp
+39 −5 src/mbgl/style/parser.cpp
+3 −2 src/mbgl/style/parser.hpp
+14 −0 src/mbgl/style/sprite.cpp
+18 −0 src/mbgl/style/sprite.hpp
+40 −8 src/mbgl/style/style_impl.cpp
+4 −3 src/mbgl/style/style_impl.hpp
+2 −2 src/mbgl/text/glyph_manager.cpp
+1 −1 test/CMakeLists.txt
+ test/fixtures/image/tile.webp
+8 −0 test/fixtures/style_parser/sprites-missing-fields.info.json
+4 −0 test/fixtures/style_parser/sprites-missing-fields.style.json
+7 −0 test/fixtures/style_parser/sprites-not-same-ids.info.json
+11 −0 test/fixtures/style_parser/sprites-not-same-ids.style.json
+2 −1 test/renderer/image_manager.test.cpp
+2 −1 test/renderer/pattern_atlas.test.cpp
+5 −3 test/sprite/sprite_loader.test.cpp
+13 −13 test/sprite/sprite_parser.test.cpp
+2 −0 test/storage/main_resource_loader.test.cpp
+57 −0 test/style/style_parser.test.cpp
+8 −0 test/util/image.test.cpp

0 comments on commit 08baedf

Please sign in to comment.