drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 21:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[desktop] Disable traffic switch and TrafficManager initialization."

Browse Source 
This reverts commit 16ad61f4c8ebd22bdc282496122db49a5243f02f.
This commit is contained in:
mvglasow
2025-04-29 23:45:55 +03:00
parent 6f2f61b30a
commit 932dda6552
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
map/framework.cpp
View File

@@ -7,7 +7,9 @@
#include "ge0/url_generator.hpp" #include "ge0/url_generator.hpp"
#include "routing/index_router.hpp"
#include "routing/route.hpp" #include "routing/route.hpp"
#include "routing/routing_helpers.hpp"
#include "routing/speed_camera_prohibition.hpp" #include "routing/speed_camera_prohibition.hpp"
#include "routing_common/num_mwm_id.hpp" #include "routing_common/num_mwm_id.hpp"
@@ -18,12 +20,15 @@
#include "storage/storage.hpp" #include "storage/storage.hpp"
#include "storage/country_info_getter.hpp" #include "storage/country_info_getter.hpp"
#include "storage/routing_helpers.hpp"
#include "storage/storage_helpers.hpp" #include "storage/storage_helpers.hpp"
#include "drape_frontend/color_constants.hpp" #include "drape_frontend/color_constants.hpp"
#include "drape_frontend/gps_track_point.hpp" #include "drape_frontend/gps_track_point.hpp"
#include "drape_frontend/visual_params.hpp" #include "drape_frontend/visual_params.hpp"
#include "editor/editable_data_source.hpp"
#include "descriptions/loader.hpp" #include "descriptions/loader.hpp"
#include "indexer/categories_holder.hpp" #include "indexer/categories_holder.hpp"
@@ -39,6 +44,7 @@
#include "indexer/scales.hpp" #include "indexer/scales.hpp"
#include "indexer/transliteration_loader.hpp" #include "indexer/transliteration_loader.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/localization.hpp" #include "platform/localization.hpp"
#include "platform/measurement_utils.hpp" #include "platform/measurement_utils.hpp"
#include "platform/mwm_version.hpp" #include "platform/mwm_version.hpp"
@@ -61,6 +67,7 @@
#include "base/logging.hpp" #include "base/logging.hpp"
#include "base/math.hpp" #include "base/math.hpp"
#include "base/stl_helpers.hpp"
#include "base/string_utils.hpp" #include "base/string_utils.hpp"
#include "std/target_os.hpp" #include "std/target_os.hpp"
@@ -364,10 +371,9 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
editor.SetDelegate(make_unique<search::EditorDelegate>(m_featuresFetcher.GetDataSource())); editor.SetDelegate(make_unique<search::EditorDelegate>(m_featuresFetcher.GetDataSource()));
editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); }); editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); });
/// @todo Uncomment when we will integrate a traffic provider. m_trafficManager.SetCurrentDataVersion(m_storage.GetCurrentDataVersion());
// m_trafficManager.SetCurrentDataVersion(m_storage.GetCurrentDataVersion()); m_trafficManager.SetSimplifiedColorScheme(LoadTrafficSimplifiedColors());
// m_trafficManager.SetSimplifiedColorScheme(LoadTrafficSimplifiedColors()); m_trafficManager.SetEnabled(LoadTrafficEnabled());
// m_trafficManager.SetEnabled(LoadTrafficEnabled());
m_isolinesManager.SetEnabled(LoadIsolinesEnabled()); m_isolinesManager.SetEnabled(LoadIsolinesEnabled());

5
qt/mainwindow.cpp
View File

@@ -876,9 +876,8 @@ void MainWindow::SetLayerEnabled(LayerType type, bool enable)
switch (type) switch (type)
{ {
case LayerType::TRAFFIC: case LayerType::TRAFFIC:
/// @todo Uncomment when we will integrate a traffic provider. frm.GetTrafficManager().SetEnabled(enable);
// frm.GetTrafficManager().SetEnabled(enable); frm.SaveTrafficEnabled(enable);
// frm.SaveTrafficEnabled(enable);
break; break;
case LayerType::TRANSIT: case LayerType::TRANSIT:
frm.GetTransitManager().EnableTransitSchemeMode(enable); frm.GetTransitManager().EnableTransitSchemeMode(enable);