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

Update Archive II processing to better handle older data sets

Browse source
This commit is contained in:
Dan Paulat 2024-01-27 01:17:34 -06:00
parent fdd09011f4
commit 243a7c870c
4 changed files with 110 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

32
wxdata/source/scwx/wsr88d/rda/level2_message_factory.cpp
View file

@ -70,6 +70,30 @@ Level2MessageInfo Level2MessageFactory::Create(std::istream& is,
info.headerValid = header.Parse(is);
info.messageValid = info.headerValid;
std::uint16_t segment = 0;
std::uint16_t totalSegments = 0;
std::size_t dataSize = 0;
if (info.headerValid)
{
if (header.message_size() == 65535)
{
segment = 1;
totalSegments = 1;
dataSize =
(static_cast<std::size_t>(header.number_of_message_segments())
<< 16) +
header.message_segment_number();
}
else
{
segment = header.message_segment_number();
totalSegments = header.number_of_message_segments();
dataSize = static_cast<std::size_t>(header.message_size()) * 2 -
Level2MessageHeader::SIZE;
}
}
if (info.headerValid && create_.find(header.message_type()) == create_.end())
{
logger_->warn("Unknown message type: {}",
@ -79,10 +103,7 @@ Level2MessageInfo Level2MessageFactory::Create(std::istream& is,
if (info.messageValid)
{
uint16_t segment = header.message_segment_number();
uint16_t totalSegments = header.number_of_message_segments();
uint8_t messageType = header.message_type();
size_t dataSize = header.message_size() * 2 - Level2MessageHeader::SIZE;
std::uint8_t messageType = header.message_type();
std::istream* messageStream = nullptr;
@ -165,8 +186,7 @@ Level2MessageInfo Level2MessageFactory::Create(std::istream& is,
else if (info.headerValid)
{
// Seek to the end of the current message
is.seekg(header.message_size() * 2 - rda::Level2MessageHeader::SIZE,
std::ios_base::cur);
is.seekg(dataSize, std::ios_base::cur);
}
if (info.message == nullptr)

5
wxdata/source/scwx/wsr88d/rda/level2_message_header.cpp
View file

@ -130,7 +130,10 @@ bool Level2MessageHeader::Parse(std::istream& is)
{
if (p->messageSize_ < 9)
{
logger_->warn("Invalid message size: {}", p->messageSize_);
if (p->messageSize_ != 0)
{
logger_->warn("Invalid message size: {}", p->messageSize_);
}
headerValid = false;
}
if (p->millisecondsOfDay_ > 86'399'999u)