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

Handle null level 2 metadata records

Browse source
This commit is contained in:
Dan Paulat 2022-02-15 22:00:29 -06:00
parent 505b424de4
commit e237e086f0
3 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/data

@ -1 +1 @@
Subproject commit 45539a5b0ecfc6baaaf7355b6b9542cc31ed9ecd Subproject commit 29c40b6024935ac9e2c76bd092e2a1dd05c3f307

10
test/source/scwx/wsr88d/ar2v_file.test.cpp
View file

@ -19,5 +19,15 @@ TEST(ar2v_file, klsx)
EXPECT_EQ(fileValid, true); EXPECT_EQ(fileValid, true);
} }
TEST(ar2v_file, tstl)
{
Ar2vFile file;
bool fileValid =
file.LoadFile(std::string(SCWX_TEST_DATA_DIR) +
"/nexrad/level2/Level2_TSTL_20220213_2357.ar2v");
EXPECT_EQ(fileValid, true);
}
} // namespace wsr88d } // namespace wsr88d
} // namespace scwx } // namespace scwx

28
wxdata/source/scwx/wsr88d/ar2v_file.cpp
View file

@ -329,18 +329,6 @@ void Ar2vFileImpl::ParseLDMRecord(std::istream& is)
while (!is.eof()) while (!is.eof())
{ {
rda::Level2MessageInfo msgInfo = rda::Level2MessageFactory::Create(is);
if (!msgInfo.headerValid)
{
// Invalid message
break;
}
if (msgInfo.messageValid)
{
HandleMessage(msgInfo.message);
}
off_t offset = 0; off_t offset = 0;
uint16_t nextSize = 0u; uint16_t nextSize = 0u;
do do
@ -361,6 +349,22 @@ void Ar2vFileImpl::ParseLDMRecord(std::istream& is)
BOOST_LOG_TRIVIAL(trace) BOOST_LOG_TRIVIAL(trace)
<< logPrefix_ << "Next record offset by " << offset << " bytes"; << logPrefix_ << "Next record offset by " << offset << " bytes";
} }
else if (is.eof())
{
break;
}
rda::Level2MessageInfo msgInfo = rda::Level2MessageFactory::Create(is);
if (!msgInfo.headerValid)
{
// Invalid message
break;
}
if (msgInfo.messageValid)
{
HandleMessage(msgInfo.message);
}
} }
} }