diff --git a/test/source/scwx/provider/iem_warnings_provider.test.cpp b/test/source/scwx/provider/iem_api_provider.test.cpp similarity index 84% rename from test/source/scwx/provider/iem_warnings_provider.test.cpp rename to test/source/scwx/provider/iem_api_provider.test.cpp index 471ac9d0..68cb59ae 100644 --- a/test/source/scwx/provider/iem_warnings_provider.test.cpp +++ b/test/source/scwx/provider/iem_api_provider.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include @@ -7,12 +7,12 @@ namespace scwx namespace provider { -TEST(IemWarningsProviderTest, ListTextProducts) +TEST(IemApiProviderTest, ListTextProducts) { using namespace std::chrono; using sys_days = time_point; - IemWarningsProvider provider {}; + IemApiProvider provider {}; auto date = sys_days {2023y / March / 25d}; @@ -30,14 +30,14 @@ TEST(IemWarningsProviderTest, ListTextProducts) } } -TEST(IemWarningsProviderTest, LoadTextProducts) +TEST(IemApiProviderTest, LoadTextProducts) { static const std::vector productIds { "202303250016-KMEG-WFUS54-TORMEG", "202303252015-KFFC-WFUS52-TORFFC", "202303311942-KLZK-WWUS54-SVSLZK"}; - IemWarningsProvider provider {}; + IemApiProvider provider {}; auto textProducts = provider.LoadTextProducts(productIds); diff --git a/test/test.cmake b/test/test.cmake index 17141e0c..64b6c69e 100644 --- a/test/test.cmake +++ b/test/test.cmake @@ -19,7 +19,7 @@ set(SRC_GR_TESTS source/scwx/gr/placefile.test.cpp) set(SRC_NETWORK_TESTS source/scwx/network/dir_list.test.cpp) set(SRC_PROVIDER_TESTS source/scwx/provider/aws_level2_data_provider.test.cpp source/scwx/provider/aws_level3_data_provider.test.cpp - source/scwx/provider/iem_warnings_provider.test.cpp + source/scwx/provider/iem_api_provider.test.cpp source/scwx/provider/warnings_provider.test.cpp) set(SRC_QT_CONFIG_TESTS source/scwx/qt/config/county_database.test.cpp source/scwx/qt/config/radar_site.test.cpp) diff --git a/wxdata/include/scwx/provider/iem_warnings_provider.hpp b/wxdata/include/scwx/provider/iem_api_provider.hpp similarity index 64% rename from wxdata/include/scwx/provider/iem_warnings_provider.hpp rename to wxdata/include/scwx/provider/iem_api_provider.hpp index 35c6bbad..33a82bcf 100644 --- a/wxdata/include/scwx/provider/iem_warnings_provider.hpp +++ b/wxdata/include/scwx/provider/iem_api_provider.hpp @@ -11,17 +11,17 @@ namespace scwx::provider /** * @brief Warnings Provider */ -class IemWarningsProvider +class IemApiProvider { public: - explicit IemWarningsProvider(); - ~IemWarningsProvider(); + explicit IemApiProvider(); + ~IemApiProvider(); - IemWarningsProvider(const IemWarningsProvider&) = delete; - IemWarningsProvider& operator=(const IemWarningsProvider&) = delete; + IemApiProvider(const IemApiProvider&) = delete; + IemApiProvider& operator=(const IemApiProvider&) = delete; - IemWarningsProvider(IemWarningsProvider&&) noexcept; - IemWarningsProvider& operator=(IemWarningsProvider&&) noexcept; + IemApiProvider(IemApiProvider&&) noexcept; + IemApiProvider& operator=(IemApiProvider&&) noexcept; static std::vector ListTextProducts(std::chrono::sys_time date, diff --git a/wxdata/source/scwx/provider/iem_warnings_provider.cpp b/wxdata/source/scwx/provider/iem_api_provider.cpp similarity index 89% rename from wxdata/source/scwx/provider/iem_warnings_provider.cpp rename to wxdata/source/scwx/provider/iem_api_provider.cpp index 4bbd339a..96d1489e 100644 --- a/wxdata/source/scwx/provider/iem_warnings_provider.cpp +++ b/wxdata/source/scwx/provider/iem_api_provider.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -10,7 +10,7 @@ namespace scwx::provider { -static const std::string logPrefix_ = "scwx::provider::iem_warnings_provider"; +static const std::string logPrefix_ = "scwx::provider::iem_api_provider"; static const auto logger_ = util::Logger::Create(logPrefix_); static const std::string kBaseUrl_ = "https://mesonet.agron.iastate.edu/api/1"; @@ -18,7 +18,7 @@ static const std::string kBaseUrl_ = "https://mesonet.agron.iastate.edu/api/1"; static const std::string kListNwsTextProductsEndpoint_ = "/nws/afos/list.json"; static const std::string kNwsTextProductEndpoint_ = "/nwstext/"; -class IemWarningsProvider::Impl +class IemApiProvider::Impl { public: explicit Impl() = default; @@ -29,15 +29,15 @@ public: Impl& operator=(const Impl&&) = delete; }; -IemWarningsProvider::IemWarningsProvider() : p(std::make_unique()) {} -IemWarningsProvider::~IemWarningsProvider() = default; +IemApiProvider::IemApiProvider() : p(std::make_unique()) {} +IemApiProvider::~IemApiProvider() = default; -IemWarningsProvider::IemWarningsProvider(IemWarningsProvider&&) noexcept = +IemApiProvider::IemApiProvider(IemApiProvider&&) noexcept = default; -IemWarningsProvider& -IemWarningsProvider::operator=(IemWarningsProvider&&) noexcept = default; +IemApiProvider& +IemApiProvider::operator=(IemApiProvider&&) noexcept = default; -std::vector IemWarningsProvider::ListTextProducts( +std::vector IemApiProvider::ListTextProducts( std::chrono::sys_time date, std::optional cccc, std::optional pil) @@ -137,7 +137,7 @@ std::vector IemWarningsProvider::ListTextProducts( } std::vector> -IemWarningsProvider::LoadTextProducts( +IemApiProvider::LoadTextProducts( const std::vector& textProducts) { auto parameters = cpr::Parameters {{"nolimit", "true"}}; diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index 92de3bf0..468f124b 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -61,14 +61,14 @@ set(SRC_NETWORK source/scwx/network/cpr.cpp set(HDR_PROVIDER include/scwx/provider/aws_level2_data_provider.hpp include/scwx/provider/aws_level3_data_provider.hpp include/scwx/provider/aws_nexrad_data_provider.hpp - include/scwx/provider/iem_warnings_provider.hpp + include/scwx/provider/iem_api_provider.hpp include/scwx/provider/nexrad_data_provider.hpp include/scwx/provider/nexrad_data_provider_factory.hpp include/scwx/provider/warnings_provider.hpp) set(SRC_PROVIDER source/scwx/provider/aws_level2_data_provider.cpp source/scwx/provider/aws_level3_data_provider.cpp source/scwx/provider/aws_nexrad_data_provider.cpp - source/scwx/provider/iem_warnings_provider.cpp + source/scwx/provider/iem_api_provider.cpp source/scwx/provider/nexrad_data_provider.cpp source/scwx/provider/nexrad_data_provider_factory.cpp source/scwx/provider/warnings_provider.cpp)