From cd8ecaf3331cc37c5500f73b36ba2c3f88b4beb8 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 17 Dec 2021 23:27:48 -0600 Subject: [PATCH] Updating to latest version of maplibre-gl --- external/mapbox-gl-native | 2 +- external/mapbox-gl-native.cmake | 3 --- scwx-qt/source/scwx/qt/map/map_widget.cpp | 23 ++++++++++++----------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/external/mapbox-gl-native b/external/mapbox-gl-native index 26537793..8c0f3839 160000 --- a/external/mapbox-gl-native +++ b/external/mapbox-gl-native @@ -1 +1 @@ -Subproject commit 26537793eccb95960b333d49d0d6fc89fb7eb237 +Subproject commit 8c0f3839d13bdb4f42de3b856b723df9c2af5623 diff --git a/external/mapbox-gl-native.cmake b/external/mapbox-gl-native.cmake index b1831df5..3a6c156d 100644 --- a/external/mapbox-gl-native.cmake +++ b/external/mapbox-gl-native.cmake @@ -13,14 +13,12 @@ set(MBGL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/include PARENT set_target_properties(mbgl-qt PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(mbgl-test-runner PROPERTIES EXCLUDE_FROM_ALL True) -set_target_properties(mbgl-vendor-icu PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(mbgl-benchmark PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-render-test PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-test PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-vendor-benchmark PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-vendor-googletest PROPERTIES FOLDER mbgl/exclude) -set_target_properties(mbgl-vendor-icu PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-core-license PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-qt PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-qt-docs PROPERTIES FOLDER mbgl/exclude) @@ -30,5 +28,4 @@ set_target_properties(mbgl-core PROPERTIES FOLDER mbgl) set_target_properties(mbgl-vendor-csscolorparser PROPERTIES FOLDER mbgl) set_target_properties(mbgl-vendor-nunicode PROPERTIES FOLDER mbgl) set_target_properties(mbgl-vendor-parsedate PROPERTIES FOLDER mbgl) -set_target_properties(mbgl-vendor-sqlite PROPERTIES FOLDER mbgl) set_target_properties(qmapboxgl PROPERTIES FOLDER mbgl) diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp index dd44658f..0bad5ae5 100644 --- a/scwx-qt/source/scwx/qt/map/map_widget.cpp +++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp @@ -196,7 +196,8 @@ void MapWidget::SelectRadarProduct(common::Level2Product product) radarProductView.get(), &view::RadarProductView::SweepComputed, this, - [&]() { + [&]() + { RadarRangeLayer::Update(p->map_, radarProductView->range()); update(); emit RadarSweepUpdated(); @@ -279,13 +280,13 @@ void MapWidget::AddLayers() p->overlayLayer_ = std::make_shared(p->context_); p->colorTableLayer_ = std::make_shared(p->context_); - // QMapboxGL::addCustomLayer will take ownership of the QScopedPointer - QScopedPointer pHost( - new LayerWrapper(p->radarProductLayer_)); - QScopedPointer pOverlayHost( - new LayerWrapper(p->overlayLayer_)); - QScopedPointer pColorTableHost( - new LayerWrapper(p->colorTableLayer_)); + // QMapboxGL::addCustomLayer will take ownership of the std::unique_ptr + std::unique_ptr pHost = + std::make_unique(p->radarProductLayer_); + std::unique_ptr pOverlayHost = + std::make_unique(p->overlayLayer_); + std::unique_ptr pColorTableHost = + std::make_unique(p->colorTableLayer_); QString before = "ferry"; @@ -300,11 +301,11 @@ void MapWidget::AddLayers() } } - p->map_->addCustomLayer("radar", pHost, before); + p->map_->addCustomLayer("radar", std::move(pHost), before); RadarRangeLayer::Add( p->map_, p->context_->radarProductView_->range(), before); - p->map_->addCustomLayer("overlay", pOverlayHost); - p->map_->addCustomLayer("colorTable", pColorTableHost); + p->map_->addCustomLayer("overlay", std::move(pOverlayHost)); + p->map_->addCustomLayer("colorTable", std::move(pColorTableHost)); } void MapWidget::keyPressEvent(QKeyEvent* ev)