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

Allow a 1 character bulletin ID in the WMO header

Browse source
This commit is contained in:
Dan Paulat 2025-04-06 15:18:36 -05:00
parent 53ade7fc53
commit 05ff080d78
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
wxdata/source/scwx/awips/wmo_header.cpp
View file

@ -19,7 +19,8 @@ static const std::string logPrefix_ = "scwx::awips::wmo_header";
static const auto logger_ = util::Logger::Create(logPrefix_); static const auto logger_ = util::Logger::Create(logPrefix_);
static constexpr std::size_t kWmoHeaderMinLineLength_ = 18; static constexpr std::size_t kWmoHeaderMinLineLength_ = 18;
static constexpr std::size_t kWmoIdentifierLength_ = 6; static constexpr std::size_t kWmoIdentifierLengthMin_ = 5;
static constexpr std::size_t kWmoIdentifierLengthMax_ = 6;
static constexpr std::size_t kIcaoLength_ = 4; static constexpr std::size_t kIcaoLength_ = 4;
static constexpr std::size_t kDateTimeLength_ = 6; static constexpr std::size_t kDateTimeLength_ = 6;
static constexpr std::size_t kAwipsIdentifierLineLength_ = 6; static constexpr std::size_t kAwipsIdentifierLineLength_ = 6;
@ -271,7 +272,8 @@ bool WmoHeader::Parse(std::istream& is)
logger_->warn("Invalid number of WMO tokens"); logger_->warn("Invalid number of WMO tokens");
headerValid = false; headerValid = false;
} }
else if (wmoTokenList[0].size() != kWmoIdentifierLength_) else if (wmoTokenList[0].size() < kWmoIdentifierLengthMin_ ||
wmoTokenList[0].size() > kWmoIdentifierLengthMax_)
{ {
logger_->warn("WMO identifier malformed"); logger_->warn("WMO identifier malformed");
headerValid = false; headerValid = false;
@ -296,9 +298,9 @@ bool WmoHeader::Parse(std::istream& is)
{ {
p->dataType_ = wmoTokenList[0].substr(0, 2); p->dataType_ = wmoTokenList[0].substr(0, 2);
p->geographicDesignator_ = wmoTokenList[0].substr(2, 2); p->geographicDesignator_ = wmoTokenList[0].substr(2, 2);
p->bulletinId_ = wmoTokenList[0].substr(4, 2); p->bulletinId_ = wmoTokenList[0].substr(4, wmoTokenList[0].size() - 4);
p->icao_ = wmoTokenList[1]; p->icao_ = wmoTokenList[1];
p->dateTime_ = wmoTokenList[2]; p->dateTime_ = wmoTokenList[2];
p->CalculateAbsoluteDateTime(); p->CalculateAbsoluteDateTime();