Merge pull request #340 from dpaulat/feature/dependency-bump-2024-01

Dependency bump 2024-01
dpaulat · Jan 11, 2025 · db95a11 · db95a11
2 parents 7a064c7 + 84d88f5
commit db95a11
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/clang-tidy-comments.yml b/.github/workflows/clang-tidy-comments.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
 
     steps:
       - name: Post Comments

diff --git a/conanfile.py b/conanfile.py
@@ -12,20 +12,20 @@ class SupercellWxConan(ConanFile):
                   "geographiclib/2.4",
                   "geos/3.13.0",
                   "glew/2.2.0",
-                  "glm/cci.20230113",
+                  "glm/1.0.1",
                   "gtest/1.15.0",
                   "libcurl/8.11.1",
                   "libpng/1.6.45",
-                  "libxml2/2.12.7",
+                  "libxml2/2.13.4",
                   "openssl/3.3.2",
                   "re2/20240702",
                   "spdlog/1.15.0",
-                  "sqlite3/3.47.1",
-                  "vulkan-loader/1.3.243.0",
+                  "sqlite3/3.47.2",
+                  "vulkan-loader/1.3.290.0",
                   "zlib/1.3.1")
     generators = ("CMakeDeps")
-    default_options = {"geos/*:shared"      : True,
-                       "libiconv/*:shared"  : True}
+    default_options = {"geos/*:shared"     : True,
+                       "libiconv/*:shared" : True}
 
     def configure(self):
         if self.settings.os == "Windows":

diff --git a/external/aws-sdk-cpp b/external/aws-sdk-cpp
diff --git a/external/maplibre-native b/external/maplibre-native
diff --git a/external/maplibre-native-qt b/external/maplibre-native-qt
diff --git a/external/stb b/external/stb
diff --git a/scwx-qt/source/scwx/qt/map/map_provider.cpp b/scwx-qt/source/scwx/qt/map/map_provider.cpp
@@ -149,6 +149,9 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
           {.name_ {"Landscape"},
            .url_ {"https://api.maptiler.com/maps/landscape/style.json"},
            .drawBelow_ {"Runway"}},
+          {.name_ {"Ocean"},
+           .url_ {"https://api.maptiler.com/maps/ocean/style.json"},
+           .drawBelow_ {"Landform labels"}},
           {.name_ {"Outdoor"},
            .url_ {"https://api.maptiler.com/maps/outdoor-v2/style.json"},
            .drawBelow_ {"aeroway_runway", "Aeroway"}},
@@ -167,6 +170,9 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
            .url_ {"https://api.maptiler.com/maps/ch-swisstopo-lbm-vivid/"
                   "style.json"},
            .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
+          {.name_ {"Toner"},
+           .url_ {"https://api.maptiler.com/maps/toner-v2/style.json"},
+           .drawBelow_ {"Bridge"}},
           {.name_ {"Topo"},
            .url_ {"https://api.maptiler.com/maps/topo-v2/style.json"},
            .drawBelow_ {"aeroway_runway", "Runway"}},

diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp
@@ -1573,8 +1573,8 @@ void MapWidget::paintGL()
 
    // Render QMapLibre Map
    p->map_->resize(size());
-   p->map_->setFramebufferObject(defaultFramebufferObject(),
-                                 size() * pixelRatio());
+   p->map_->setOpenGLFramebufferObject(defaultFramebufferObject(),
+                                       size() * pixelRatio());
    p->map_->render();
 
    // Perform mouse picking
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ on: @@
     jobs:
       build:
         runs-on: ubuntu-latest
+        if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
         steps:
           - name: Post Comments
@@ Expand Down @@
+1 −0		.clang-tidy
+12 −10		.github/workflows/Android.yml
+6 −4		.github/workflows/Linux.yml
+4 −2		.github/workflows/Windows.yml
+41 −0		.github/workflows/docs-test.yml
+5 −2		.github/workflows/gh-pages-docs.yml
+21 −11		.github/workflows/iOS.yml
+7 −5		.github/workflows/macOS.yml
+97 −0		.github/workflows/source-tarball.yml
+1 −0		.gitignore
+2 −2		.pre-commit-config.yaml
+30 −0		CHANGELOG.md
+14 −1		CMakeLists.txt
+19 −30		README.md
+93 −0		cmake/presets/Linux.json
+212 −0		docs/Building.md
+29 −0		docs/Documentation.md
+23 −16		docs/Doxyfile
+0 −8		docs/MAINPAGE.md
+8 −3		docs/README.md
+128 −0		docs/Usage.md
+ −		docs/config/favicon.ico
+0 −0		docs/config/footer.html
+0 −0		docs/config/header.html
+0 −0		docs/config/logo.svg
+1 −1		docs/doxygen-awesome-css
+57 −0		docs/examples/example_Style.qml
+26 −0		docs/examples/snippets_Map.qml
+72 −0		docs/examples/snippets_Style.qml
+20 −0		docs/location/LayerParameter.qml
+14 −0		docs/location/QMapLibreLocation.dox
+18 −0		docs/location/SourceParameter.qml
+41 −0		docs/location/Style.qml
+15 −0		docs/location/StyleParameter.qml
+0 −9		examples/quick/minimal.pro
+4 −0		src/core/CMakeLists.txt
+3 −0		src/core/conversion_p.hpp
+17 −6		src/core/map.cpp
+1 −1		src/core/map.hpp
+4 −0		src/core/map_observer.cpp
+1 −1		src/core/map_p.hpp
+4 −0		src/core/map_renderer.cpp
+6 −0		src/core/settings.cpp
+61 −0		src/core/style/filter_parameter.cpp
+38 −0		src/core/style/filter_parameter.hpp
+61 −0		src/core/style/image_parameter.cpp
+37 −0		src/core/style/image_parameter.hpp
+17 −5		src/core/style/image_style_change.cpp
+5 −3		src/core/style/image_style_change_p.hpp
+2 −0		src/core/style/layer_parameter.cpp
+12 −3		src/core/style/layer_style_change.cpp
+4 −2		src/core/style/layer_style_change_p.hpp
+2 −0		src/core/style/source_parameter.cpp
+5 −2		src/core/style/source_style_change.cpp
+37 −8		src/core/style/style_change.cpp
+4 −0		src/core/style/style_change_utils.cpp
+14 −1		src/core/style/style_parameter.cpp
+1 −0		src/core/style/style_parameter.hpp
+159 −26		src/core/types.cpp
+2 −0		src/location/plugins/CMakeLists.txt
+12 −0		src/location/plugins/declarative_filter_parameter.cpp
+36 −0		src/location/plugins/declarative_filter_parameter.hpp
+12 −0		src/location/plugins/declarative_image_parameter.cpp
+36 −0		src/location/plugins/declarative_image_parameter.hpp
+24 −0		src/location/plugins/declarative_source_parameter.cpp
+2 −0		src/location/plugins/declarative_source_parameter.hpp
+1 −1		src/location/qgeomap.cpp
+1 −1		src/location/texture_node.cpp
+59 −2		src/widgets/gl_widget.cpp
+1 −1		test/core/map_tester.cpp
+6 −0		test/qml/CMakeLists.txt
+91 −6		test/qml/qt6/tst_style_parameters.qml
+1 −1		test/widgets/gl_tester.cpp
+15 −0		.github/ISSUE_TEMPLATE/1-stb_image-doesn-t-load-specific-image-correctly.md
+0 −0		.github/ISSUE_TEMPLATE/2-bug_report.md
+0 −0		.github/ISSUE_TEMPLATE/3-feature_request.md
+1 −0		.github/ISSUE_TEMPLATE/config.yml
+3 −0		.gitignore
+9 −7		README.md
+2 −1		stb_c_lexer.h
+178 −177		stb_image.h
+1,041 −743		stb_image_resize2.h
+8 −6		stb_truetype.h
+259 −0		tests/pngsuite/ref_results.csv
+4 −0		tests/stb.dsp
+47 −0		tests/test_png_paeth.c
+75 −0		tests/test_png_regress.c
+1 −1		tests/test_vorbis.c
+4 −2		tools/README.header.md