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

Refactor SettingsTemplate to ProviderTemplate

Browse source
This commit is contained in:
Dan Paulat 2024-02-27 23:46:34 -06:00
parent 1fd52f771c
commit e23c6c2624
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -120,7 +120,7 @@ public:
std::string mapProviderApiKey = map::GetMapProviderApiKey(mapProvider_); std::string mapProviderApiKey = map::GetMapProviderApiKey(mapProvider_);
settings_.resetToTemplate(mapProviderInfo.settingsTemplate_); settings_.setProviderTemplate(mapProviderInfo.providerTemplate_);
settings_.setApiKey(QString {mapProviderApiKey.c_str()}); settings_.setApiKey(QString {mapProviderApiKey.c_str()});
settings_.setCacheDatabasePath(QString {cacheDbPath.c_str()}); settings_.setCacheDatabasePath(QString {cacheDbPath.c_str()});
settings_.setCacheDatabaseMaximumSize(20 * 1024 * 1024); settings_.setCacheDatabaseMaximumSize(20 * 1024 * 1024);

8
scwx-qt/source/scwx/qt/map/map_provider.cpp
View file

@ -26,8 +26,8 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
MapProviderInfo { MapProviderInfo {
.mapProvider_ {MapProvider::Mapbox}, .mapProvider_ {MapProvider::Mapbox},
.cacheDbName_ {"mbgl-cache.db"}, .cacheDbName_ {"mbgl-cache.db"},
.settingsTemplate_ { .providerTemplate_ {
QMapLibre::Settings::SettingsTemplate::MapboxSettings}, QMapLibre::Settings::ProviderTemplate::MapboxProvider},
.mapStyles_ {{.name_ {"Streets"}, .mapStyles_ {{.name_ {"Streets"},
.url_ {"mapbox://styles/mapbox/streets-v11"}, .url_ {"mapbox://styles/mapbox/streets-v11"},
.drawBelow_ {mapboxDrawBelow_}}, .drawBelow_ {mapboxDrawBelow_}},
@ -50,8 +50,8 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
MapProviderInfo { MapProviderInfo {
.mapProvider_ {MapProvider::MapTiler}, .mapProvider_ {MapProvider::MapTiler},
.cacheDbName_ {"maptiler-cache.db"}, .cacheDbName_ {"maptiler-cache.db"},
.settingsTemplate_ { .providerTemplate_ {
QMapLibre::Settings::SettingsTemplate::MapTilerSettings}, QMapLibre::Settings::ProviderTemplate::MapTilerProvider},
.mapStyles_ { .mapStyles_ {
{.name_ {"Satellite"}, {.name_ {"Satellite"},
.url_ {"maptiler://maps/hybrid"}, .url_ {"maptiler://maps/hybrid"},

2
scwx-qt/source/scwx/qt/map/map_provider.hpp
View file

@ -34,7 +34,7 @@ struct MapProviderInfo
{ {
MapProvider mapProvider_ {MapProvider::Unknown}; MapProvider mapProvider_ {MapProvider::Unknown};
std::string cacheDbName_ {}; std::string cacheDbName_ {};
QMapLibre::Settings::SettingsTemplate settingsTemplate_ {}; QMapLibre::Settings::ProviderTemplate providerTemplate_ {};
std::vector<MapStyle> mapStyles_ {}; std::vector<MapStyle> mapStyles_ {};
}; };