From 4ba0c5e3ba42305a3d352be69647a39703bcf435 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 10 Jan 2025 23:40:27 -0600 Subject: [PATCH 1/6] Update conan dependencies to latest, missed by renovate --- conanfile.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index edc03b3c..10c6e716 100644 --- 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": From 5be46de20a8d31203717a4a429b041127689ae6e Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 11 Jan 2025 00:06:17 -0600 Subject: [PATCH 2/6] Update aws-sdk-cpp to 1.11.483 --- external/aws-sdk-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/aws-sdk-cpp b/external/aws-sdk-cpp index c95e71a9..8e41fd05 160000 --- a/external/aws-sdk-cpp +++ b/external/aws-sdk-cpp @@ -1 +1 @@ -Subproject commit c95e71a9d23bba0c2f6c6a7bc37ae63b7351e8b7 +Subproject commit 8e41fd058ce06a3f7b67d657a7f644f7a38af509 From c7be1d37e0830fedf5836ec344ac8e65de2ed24d Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 11 Jan 2025 00:06:50 -0600 Subject: [PATCH 3/6] Update stb to 5c20573 (2024-11-09) --- external/stb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/stb b/external/stb index beebb24b..5c205738 160000 --- a/external/stb +++ b/external/stb @@ -1 +1 @@ -Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7 +Subproject commit 5c205738c191bcb0abc65c4febfa9bd25ff35234 From a792538e296bc4c58802b868b4529894aa7eec6b Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 11 Jan 2025 01:06:54 -0600 Subject: [PATCH 4/6] Rebase maplibre-native updates onto 9f02e29 (2025-01-10) --- external/maplibre-native | 2 +- external/maplibre-native-qt | 2 +- scwx-qt/source/scwx/qt/map/map_widget.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external/maplibre-native b/external/maplibre-native index 3d4ca3fd..a77cb6b2 160000 --- a/external/maplibre-native +++ b/external/maplibre-native @@ -1 +1 @@ -Subproject commit 3d4ca3fdf07c50db3002b11bff93c81ec380e493 +Subproject commit a77cb6b2d1cde3a5f2c147e25245aa019aacb74b diff --git a/external/maplibre-native-qt b/external/maplibre-native-qt index 805ccf62..3939a82a 160000 --- a/external/maplibre-native-qt +++ b/external/maplibre-native-qt @@ -1 +1 @@ -Subproject commit 805ccf6204a546e43fed599631ad5d698f68ae86 +Subproject commit 3939a82ab9c2ff8bc2746e58ab9727cd12caef2c diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp index ab7b0cf6..bfe0908c 100644 --- 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 From c78fd097a1e122ea4a543609ccb8c72cddc2eee9 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 11 Jan 2025 01:24:34 -0600 Subject: [PATCH 5/6] Adding Ocean and Toner MapTiler styles --- scwx-qt/source/scwx/qt/map/map_provider.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scwx-qt/source/scwx/qt/map/map_provider.cpp b/scwx-qt/source/scwx/qt/map/map_provider.cpp index 4b9964f9..4a6b7fb7 100644 --- 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 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 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"}}, From 84d88f5040e3537258645335e355c0304ae832a0 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 11 Jan 2025 01:27:01 -0600 Subject: [PATCH 6/6] Don't run clang-tidy-comments on a canceled job --- .github/workflows/clang-tidy-comments.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/clang-tidy-comments.yml b/.github/workflows/clang-tidy-comments.yml index accdbeca..7328430f 100644 --- 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