From 49800c014b90e23adaaf681de087e547b56fde29 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 21 May 2024 23:12:27 -0500 Subject: [PATCH] Trim spaces from API key before using Fixes #211 --- scwx-qt/source/scwx/qt/map/map_provider.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scwx-qt/source/scwx/qt/map/map_provider.cpp b/scwx-qt/source/scwx/qt/map/map_provider.cpp index 1648bdc5..283f94ac 100644 --- a/scwx-qt/source/scwx/qt/map/map_provider.cpp +++ b/scwx-qt/source/scwx/qt/map/map_provider.cpp @@ -203,19 +203,28 @@ std::string GetMapProviderName(MapProvider mapProvider) std::string GetMapProviderApiKey(MapProvider mapProvider) { + std::string apiKey {}; + switch (mapProvider) { case MapProvider::Mapbox: - return settings::GeneralSettings::Instance().mapbox_api_key().GetValue(); + apiKey = + settings::GeneralSettings::Instance().mapbox_api_key().GetValue(); + break; case MapProvider::MapTiler: - return settings::GeneralSettings::Instance() - .maptiler_api_key() - .GetValue(); + apiKey = + settings::GeneralSettings::Instance().maptiler_api_key().GetValue(); + break; default: - return "?"; + apiKey = "?"; + break; } + + boost::trim(apiKey); + + return apiKey; } const MapProviderInfo& GetMapProviderInfo(MapProvider mapProvider)