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

[traffic] Read HttpTrafficSource parameters from config

Browse Source 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
This commit is contained in:
mvglasow
2025-07-22 22:28:10 +03:00
parent 75c7d146af
commit 7283e4ecb4
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
map/framework.cpp
View File

@@ -103,6 +103,8 @@ std::string_view constexpr kAllow3dKey = "Allow3d";
std::string_view constexpr kAllow3dBuildingsKey = "Buildings3d"; std::string_view constexpr kAllow3dBuildingsKey = "Buildings3d";
std::string_view constexpr kAllowAutoZoom = "AutoZoom"; std::string_view constexpr kAllowAutoZoom = "AutoZoom";
std::string_view constexpr kTrafficEnabledKey = "TrafficEnabled"; std::string_view constexpr kTrafficEnabledKey = "TrafficEnabled";
std::string_view constexpr kTrafficHttpEnabledKey = "TrafficHttpEnabled";
std::string_view constexpr kTrafficHttpUrlKey = "TrafficHttpUrl";
std::string_view constexpr kTransitSchemeEnabledKey = "TransitSchemeEnabled"; std::string_view constexpr kTransitSchemeEnabledKey = "TransitSchemeEnabled";
std::string_view constexpr kIsolinesEnabledKey = "IsolinesEnabled"; std::string_view constexpr kIsolinesEnabledKey = "IsolinesEnabled";
std::string_view constexpr kOutdoorsEnabledKey = "OutdoorsEnabled"; std::string_view constexpr kOutdoorsEnabledKey = "OutdoorsEnabled";
@@ -394,15 +396,14 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
LoadMapsSync(); LoadMapsSync();
m_trafficManager.SetEnabled(LoadTrafficEnabled()); m_trafficManager.SetEnabled(LoadTrafficEnabled());
if (!params.m_trafficTestMode && LoadTrafficHttpEnabled())
// TODO handle invalid URLs
traffxml::HttpTraffSource::Create(m_trafficManager, LoadTrafficHttpUrl());
/* /*
* MockTraffSource for debugging purposes. * MockTraffSource for debugging purposes.
* TODO Replace with a real source, parametrized and conditionally loaded, once we have one.
*/ */
//traffxml::MockTraffSource::Create(m_trafficManager); //traffxml::MockTraffSource::Create(m_trafficManager);
// For testing purposes, HttpTraffSource pointing to a hardcoded local instance
traffxml::HttpTraffSource::Create(m_trafficManager, "http://traff:8080/subscription-manager");
} }
Framework::~Framework() Framework::~Framework()
@@ -2588,6 +2589,32 @@ void Framework::SaveTrafficEnabled(bool trafficEnabled)
settings::Set(kTrafficEnabledKey, trafficEnabled); settings::Set(kTrafficEnabledKey, trafficEnabled);
} }
bool Framework::LoadTrafficHttpEnabled()
{
bool enabled;
if (!settings::Get(kTrafficHttpEnabledKey, enabled))
enabled = false;
return enabled;
}
void Framework::SaveTrafficHttpEnabled(bool trafficHttpEnabled)
{
settings::Set(kTrafficHttpEnabledKey, trafficHttpEnabled);
}
std::string Framework::LoadTrafficHttpUrl()
{
std::string url;
if (!settings::Get(kTrafficHttpUrlKey, url))
url = "";
return url;
}
void Framework::SaveTrafficHttpUrl(std::string trafficHttpUrl)
{
settings::Set(kTrafficHttpUrlKey, trafficHttpUrl);
}
bool Framework::LoadTrafficSimplifiedColors() bool Framework::LoadTrafficSimplifiedColors()
{ {
bool simplified; bool simplified;

6
map/framework.hpp
View File

@@ -740,6 +740,12 @@ public:
bool LoadTrafficEnabled(); bool LoadTrafficEnabled();
void SaveTrafficEnabled(bool trafficEnabled); void SaveTrafficEnabled(bool trafficEnabled);
bool LoadTrafficHttpEnabled();
void SaveTrafficHttpEnabled(bool trafficHttpEnabled);
std::string LoadTrafficHttpUrl();
void SaveTrafficHttpUrl(std::string trafficHttpUrl);
bool LoadTrafficSimplifiedColors(); bool LoadTrafficSimplifiedColors();
void SaveTrafficSimplifiedColors(bool simplified); void SaveTrafficSimplifiedColors(bool simplified);