diff --git a/3party/CMake-MetalShaderSupport b/3party/CMake-MetalShaderSupport index 989857d2e..84209c32e 160000 --- a/3party/CMake-MetalShaderSupport +++ b/3party/CMake-MetalShaderSupport @@ -1 +1 @@ -Subproject commit 989857d2e5e54869c35ad06fb21a67d12a2dbc67 +Subproject commit 84209c32e50966ee4dca66f7b7eebacd934c87fb diff --git a/3party/gflags b/3party/gflags index a738fdf93..52e94563e 160000 --- a/3party/gflags +++ b/3party/gflags @@ -1 +1 @@ -Subproject commit a738fdf9338412f83ab3f26f31ac11ed3f3ec4bd +Subproject commit 52e94563eba1968783864942fedf6e87e3c611f4 diff --git a/3party/jansson/jansson b/3party/jansson/jansson index 61fc3d0e2..96d160df9 160000 --- a/3party/jansson/jansson +++ b/3party/jansson/jansson @@ -1 +1 @@ -Subproject commit 61fc3d0e28e1a35410af42e329cd977095ec32d2 +Subproject commit 96d160df90016066d04d493d1d69639474ba4f20 diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index 02e31905b..d3684b2eb 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -282,10 +282,9 @@ void MainWindow::CreateNavigationBar() m_layers = new PopupMenuHolder(this); - /// @todo Uncomment when we will integrate a traffic provider. - // m_layers->addAction(QIcon(":/navig64/traffic.png"), tr("Traffic"), - // std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRAFFIC), true); - // m_layers->setChecked(LayerType::TRAFFIC, m_pDrawWidget->GetFramework().LoadTrafficEnabled()); + m_layers->addAction(QIcon(":/navig64/traffic.png"), tr("Traffic"), + std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRAFFIC), true); + m_layers->setChecked(LayerType::TRAFFIC, m_pDrawWidget->GetFramework().LoadTrafficEnabled()); m_layers->addAction(QIcon(":/navig64/subway.png"), tr("Public transport"), std::bind(&MainWindow::OnLayerEnabled, this, LayerType::TRANSIT), true); @@ -876,11 +875,11 @@ void MainWindow::SetLayerEnabled(LayerType type, bool enable) auto & frm = m_pDrawWidget->GetFramework(); switch (type) { - // @todo Uncomment when we will integrate a traffic provider. - // case LayerType::TRAFFIC: - // frm.GetTrafficManager().SetEnabled(enable); - // frm.SaveTrafficEnabled(enable); - // break; + case LayerType::TRAFFIC: + /// @todo Uncomment when we will integrate a traffic provider. + // frm.GetTrafficManager().SetEnabled(enable); + // frm.SaveTrafficEnabled(enable); + break; case LayerType::TRANSIT: frm.GetTransitManager().EnableTransitSchemeMode(enable); frm.SaveTransitSchemeEnabled(enable); diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp index 6ea00a517..e3073e9e9 100644 --- a/qt/mainwindow.hpp +++ b/qt/mainwindow.hpp @@ -50,9 +50,8 @@ class MainWindow : public QMainWindow, location::LocationObserver enum LayerType : uint8_t { - /// @todo Uncomment when we will integrate a traffic provider. - // TRAFFIC = 0, - TRANSIT = 0, // Metro scheme + TRAFFIC = 0, + TRANSIT, // Metro scheme ISOLINES, OUTDOORS, };