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

Provide year/month hint to WMO header parser based on filename

Browse source
This commit is contained in:
Dan Paulat 2025-02-18 23:33:58 -06:00
parent 46972e8769
commit a6ba312f6b
4 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wxdata/include/scwx/awips/text_product_file.hpp
View file

@ -29,7 +29,7 @@ public:
std::shared_ptr<TextProductMessage> message(size_t i) const;
bool LoadFile(const std::string& filename);
bool LoadData(std::istream& is);
bool LoadData(std::string_view filename, std::istream& is);
private:
std::unique_ptr<TextProductFileImpl> p;

29
wxdata/source/scwx/awips/text_product_file.cpp
View file

@ -3,6 +3,8 @@
#include <fstream>
#include <re2/re2.h>
namespace scwx
{
namespace awips
@ -59,16 +61,34 @@ bool TextProductFile::LoadFile(const std::string& filename)
if (fileValid)
{
fileValid = LoadData(f);
fileValid = LoadData(filename, f);
}
return fileValid;
}
bool TextProductFile::LoadData(std::istream& is)
bool TextProductFile::LoadData(std::string_view filename, std::istream& is)
{
static constexpr LazyRE2 kDateTimePattern_ = {
R"(((?:19|20)\d{2}))" // Year (YYYY)
R"((0[1-9]|1[0-2]))" // Month (MM)
R"((0[1-9]|[12]\d|3[01]))" // Day (DD)
R"(_?)" // Optional separator (not captured)
R"(([01]\d|2[0-3]))" // Hour (HH)
};
logger_->trace("Loading Data");
// Attempt to parse the date from the filename
std::optional<std::chrono::year_month> yearMonth;
int year {};
unsigned int month {};
if (RE2::PartialMatch(filename, *kDateTimePattern_, &year, &month))
{
yearMonth = std::chrono::year {year} / std::chrono::month {month};
}
while (!is.eof())
{
std::shared_ptr<TextProductMessage> message =
@ -88,6 +108,11 @@ bool TextProductFile::LoadData(std::istream& is)
if (!duplicate)
{
if (yearMonth.has_value())
{
message->wmo_header()->SetDateHint(yearMonth.value());
}
p->messages_.push_back(message);
}
}

3
wxdata/source/scwx/provider/iem_api_provider.cpp
View file

@ -163,10 +163,11 @@ IemApiProvider::LoadTextProducts(const std::vector<std::string>& textProducts)
if (response.status_code == cpr::status::HTTP_OK)
{
// Load file
auto productId = asyncResponse.first;
std::shared_ptr<awips::TextProductFile> textProductFile {
std::make_shared<awips::TextProductFile>()};
std::istringstream responseBody {response.text};
if (textProductFile->LoadData(responseBody))
if (textProductFile->LoadData(productId, responseBody))
{
textProductFiles.push_back(textProductFile);
}

2
wxdata/source/scwx/provider/warnings_provider.cpp
View file

@ -176,7 +176,7 @@ WarningsProvider::LoadUpdatedFiles(
std::shared_ptr<awips::TextProductFile> textProductFile {
std::make_shared<awips::TextProductFile>()};
std::istringstream responseBody {response.text};
if (textProductFile->LoadData(responseBody))
if (textProductFile->LoadData(filename, responseBody))
{
updatedFiles.push_back(textProductFile);
}