blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 20:50:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating to latest version of maplibre-gl

Browse source
This commit is contained in:
Dan Paulat 2021-12-17 23:27:48 -06:00
parent 337296ac3c
commit cd8ecaf333
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/mapbox-gl-native vendored

@ -1 +1 @@
Subproject commit 26537793eccb95960b333d49d0d6fc89fb7eb237 Subproject commit 8c0f3839d13bdb4f42de3b856b723df9c2af5623

3
external/mapbox-gl-native.cmake vendored
View file

@ -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-qt PROPERTIES EXCLUDE_FROM_ALL True)
set_target_properties(mbgl-test-runner 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-benchmark PROPERTIES FOLDER mbgl/exclude)
set_target_properties(mbgl-render-test 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-test PROPERTIES FOLDER mbgl/exclude)
set_target_properties(mbgl-vendor-benchmark 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-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-core-license PROPERTIES FOLDER mbgl/exclude)
set_target_properties(mbgl-qt PROPERTIES FOLDER mbgl/exclude) set_target_properties(mbgl-qt PROPERTIES FOLDER mbgl/exclude)
set_target_properties(mbgl-qt-docs 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-csscolorparser PROPERTIES FOLDER mbgl)
set_target_properties(mbgl-vendor-nunicode 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-parsedate PROPERTIES FOLDER mbgl)
set_target_properties(mbgl-vendor-sqlite PROPERTIES FOLDER mbgl)
set_target_properties(qmapboxgl PROPERTIES FOLDER mbgl) set_target_properties(qmapboxgl PROPERTIES FOLDER mbgl)

23
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -196,7 +196,8 @@ void MapWidget::SelectRadarProduct(common::Level2Product product)
radarProductView.get(), radarProductView.get(),
&view::RadarProductView::SweepComputed, &view::RadarProductView::SweepComputed,
this, this,
[&]() { [&]()
{
RadarRangeLayer::Update(p->map_, radarProductView->range()); RadarRangeLayer::Update(p->map_, radarProductView->range());
update(); update();
emit RadarSweepUpdated(); emit RadarSweepUpdated();
@ -279,13 +280,13 @@ void MapWidget::AddLayers()
p->overlayLayer_ = std::make_shared<OverlayLayer>(p->context_); p->overlayLayer_ = std::make_shared<OverlayLayer>(p->context_);
p->colorTableLayer_ = std::make_shared<ColorTableLayer>(p->context_); p->colorTableLayer_ = std::make_shared<ColorTableLayer>(p->context_);
// QMapboxGL::addCustomLayer will take ownership of the QScopedPointer // QMapboxGL::addCustomLayer will take ownership of the std::unique_ptr
QScopedPointer<QMapbox::CustomLayerHostInterface> pHost( std::unique_ptr<QMapbox::CustomLayerHostInterface> pHost =
new LayerWrapper(p->radarProductLayer_)); std::make_unique<LayerWrapper>(p->radarProductLayer_);
QScopedPointer<QMapbox::CustomLayerHostInterface> pOverlayHost( std::unique_ptr<QMapbox::CustomLayerHostInterface> pOverlayHost =
new LayerWrapper(p->overlayLayer_)); std::make_unique<LayerWrapper>(p->overlayLayer_);
QScopedPointer<QMapbox::CustomLayerHostInterface> pColorTableHost( std::unique_ptr<QMapbox::CustomLayerHostInterface> pColorTableHost =
new LayerWrapper(p->colorTableLayer_)); std::make_unique<LayerWrapper>(p->colorTableLayer_);
QString before = "ferry"; 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( RadarRangeLayer::Add(
p->map_, p->context_->radarProductView_->range(), before); p->map_, p->context_->radarProductView_->range(), before);
p->map_->addCustomLayer("overlay", pOverlayHost); p->map_->addCustomLayer("overlay", std::move(pOverlayHost));
p->map_->addCustomLayer("colorTable", pColorTableHost); p->map_->addCustomLayer("colorTable", std::move(pColorTableHost));
} }
void MapWidget::keyPressEvent(QKeyEvent* ev) void MapWidget::keyPressEvent(QKeyEvent* ev)