diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index 3aa17d92..d064488b 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -120,7 +120,7 @@ public: std::string mapProviderApiKey = map::GetMapProviderApiKey(mapProvider_); - settings_.resetToTemplate(mapProviderInfo.settingsTemplate_); + settings_.setProviderTemplate(mapProviderInfo.providerTemplate_); settings_.setApiKey(QString {mapProviderApiKey.c_str()}); settings_.setCacheDatabasePath(QString {cacheDbPath.c_str()}); settings_.setCacheDatabaseMaximumSize(20 * 1024 * 1024); diff --git a/scwx-qt/source/scwx/qt/map/map_provider.cpp b/scwx-qt/source/scwx/qt/map/map_provider.cpp index b27870d7..6517e49c 100644 --- a/scwx-qt/source/scwx/qt/map/map_provider.cpp +++ b/scwx-qt/source/scwx/qt/map/map_provider.cpp @@ -26,8 +26,8 @@ static const std::unordered_map mapProviderInfo_ { MapProviderInfo { .mapProvider_ {MapProvider::Mapbox}, .cacheDbName_ {"mbgl-cache.db"}, - .settingsTemplate_ { - QMapLibre::Settings::SettingsTemplate::MapboxSettings}, + .providerTemplate_ { + QMapLibre::Settings::ProviderTemplate::MapboxProvider}, .mapStyles_ {{.name_ {"Streets"}, .url_ {"mapbox://styles/mapbox/streets-v11"}, .drawBelow_ {mapboxDrawBelow_}}, @@ -50,8 +50,8 @@ static const std::unordered_map mapProviderInfo_ { MapProviderInfo { .mapProvider_ {MapProvider::MapTiler}, .cacheDbName_ {"maptiler-cache.db"}, - .settingsTemplate_ { - QMapLibre::Settings::SettingsTemplate::MapTilerSettings}, + .providerTemplate_ { + QMapLibre::Settings::ProviderTemplate::MapTilerProvider}, .mapStyles_ { {.name_ {"Satellite"}, .url_ {"maptiler://maps/hybrid"}, diff --git a/scwx-qt/source/scwx/qt/map/map_provider.hpp b/scwx-qt/source/scwx/qt/map/map_provider.hpp index 9b89f4d4..cec68e92 100644 --- a/scwx-qt/source/scwx/qt/map/map_provider.hpp +++ b/scwx-qt/source/scwx/qt/map/map_provider.hpp @@ -34,7 +34,7 @@ struct MapProviderInfo { MapProvider mapProvider_ {MapProvider::Unknown}; std::string cacheDbName_ {}; - QMapLibre::Settings::SettingsTemplate settingsTemplate_ {}; + QMapLibre::Settings::ProviderTemplate providerTemplate_ {}; std::vector mapStyles_ {}; };