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

Updating level 3 support from message factory, adding additional test messages

Browse source
This commit is contained in:
Dan Paulat 2022-01-13 22:35:20 -06:00
parent 9117b32a29
commit a76103650e
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/data

@ -1 +1 @@
Subproject commit 5de70eccee20d5d8358acb4ebcc209259658fddd Subproject commit c1d6d76c56f75d8f68b6d7dd8f223b0a199c6e36

8
test/source/scwx/wsr88d/level3_file.test.cpp
View file

@ -22,8 +22,11 @@ TEST_P(ValidFileTest, ValidFile)
bool fileValid = file.LoadFile(std::string(SCWX_TEST_DATA_DIR) + bool fileValid = file.LoadFile(std::string(SCWX_TEST_DATA_DIR) +
"/nexrad/level3/" + filename); "/nexrad/level3/" + filename);
auto message = file.message();
EXPECT_EQ(fileValid, true); EXPECT_EQ(fileValid, true);
ASSERT_NE(message, nullptr);
EXPECT_EQ(message->header().message_code(), param.first);
} }
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
@ -31,8 +34,12 @@ INSTANTIATE_TEST_SUITE_P(
ValidFileTest, ValidFileTest,
testing::Values( testing::Values(
std::pair<int16_t, std::string> {2, "KLSX_NXUS63_GSMLSX_202112110238"}, std::pair<int16_t, std::string> {2, "KLSX_NXUS63_GSMLSX_202112110238"},
std::pair<int16_t, std::string> {19, "KLSX_SDUS53_N0RLSX_202105041639"},
std::pair<int16_t, std::string> {20, "KLSX_SDUS73_N0ZLSX_202105042031"},
std::pair<int16_t, std::string> {27, "KLSX_SDUS53_N0VLSX_202105042201"},
std::pair<int16_t, std::string> {30, "KLSX_SDUS63_NSWLSX_202112110135"}, std::pair<int16_t, std::string> {30, "KLSX_SDUS63_NSWLSX_202112110135"},
std::pair<int16_t, std::string> {32, "KLSX_SDUS53_DHRLSX_202112110215"}, std::pair<int16_t, std::string> {32, "KLSX_SDUS53_DHRLSX_202112110215"},
std::pair<int16_t, std::string> {34, "KLSX_SDUS63_NC1LSX_202101011756"},
std::pair<int16_t, std::string> {37, "KLSX_SDUS53_NCRLSX_202112110215"}, std::pair<int16_t, std::string> {37, "KLSX_SDUS53_NCRLSX_202112110215"},
std::pair<int16_t, std::string> {38, "KLSX_SDUS63_NCZLSX_202112110130"}, std::pair<int16_t, std::string> {38, "KLSX_SDUS63_NCZLSX_202112110130"},
std::pair<int16_t, std::string> {41, "KLSX_SDUS73_NETLSX_202112110152"}, std::pair<int16_t, std::string> {41, "KLSX_SDUS73_NETLSX_202112110152"},
@ -66,6 +73,7 @@ INSTANTIATE_TEST_SUITE_P(
std::pair<int16_t, std::string> {166, "KLSX_SDUS83_N1MLSX_202112110200"}, std::pair<int16_t, std::string> {166, "KLSX_SDUS83_N1MLSX_202112110200"},
std::pair<int16_t, std::string> {169, "KLSX_SDUS83_OHALSX_202112110109"}, std::pair<int16_t, std::string> {169, "KLSX_SDUS83_OHALSX_202112110109"},
std::pair<int16_t, std::string> {170, "KLSX_SDUS83_DAALSX_202112110135"}, std::pair<int16_t, std::string> {170, "KLSX_SDUS83_DAALSX_202112110135"},
std::pair<int16_t, std::string> {171, "KLSX_SDUS33_PTALSX_202101201007"},
std::pair<int16_t, std::string> {172, "KLSX_SDUS83_DTALSX_202112110209"}, std::pair<int16_t, std::string> {172, "KLSX_SDUS83_DTALSX_202112110209"},
std::pair<int16_t, std::string> {173, "KLSX_SDUS83_DU3LSX_202112110209"}, std::pair<int16_t, std::string> {173, "KLSX_SDUS83_DU3LSX_202112110209"},
std::pair<int16_t, std::string> {174, "KLSX_SDUS83_DODLSX_202112110244"}, std::pair<int16_t, std::string> {174, "KLSX_SDUS83_DODLSX_202112110244"},

4
wxdata/source/scwx/wsr88d/rpg/level3_message_factory.cpp
View file

@ -33,6 +33,8 @@ static const std::unordered_map<int16_t, CreateLevel3MessageFunction> //
{30, GraphicProductMessage::Create}, {30, GraphicProductMessage::Create},
{31, GraphicProductMessage::Create}, {31, GraphicProductMessage::Create},
{32, GraphicProductMessage::Create}, {32, GraphicProductMessage::Create},
{33, GraphicProductMessage::Create},
{34, GraphicProductMessage::Create},
{37, GraphicProductMessage::Create}, {37, GraphicProductMessage::Create},
{38, GraphicProductMessage::Create}, {38, GraphicProductMessage::Create},
{41, GraphicProductMessage::Create}, {41, GraphicProductMessage::Create},
@ -50,7 +52,6 @@ static const std::unordered_map<int16_t, CreateLevel3MessageFunction> //
{66, GraphicProductMessage::Create}, {66, GraphicProductMessage::Create},
{67, GraphicProductMessage::Create}, {67, GraphicProductMessage::Create},
{74, RadarCodedMessage::Create}, {74, RadarCodedMessage::Create},
{75, TabularProductMessage::Create},
{77, TabularProductMessage::Create}, {77, TabularProductMessage::Create},
{78, GraphicProductMessage::Create}, {78, GraphicProductMessage::Create},
{79, GraphicProductMessage::Create}, {79, GraphicProductMessage::Create},
@ -75,7 +76,6 @@ static const std::unordered_map<int16_t, CreateLevel3MessageFunction> //
{109, GraphicProductMessage::Create}, {109, GraphicProductMessage::Create},
{110, GraphicProductMessage::Create}, {110, GraphicProductMessage::Create},
{111, GraphicProductMessage::Create}, {111, GraphicProductMessage::Create},
{113, GraphicProductMessage::Create},
{132, GraphicProductMessage::Create}, {132, GraphicProductMessage::Create},
{133, GraphicProductMessage::Create}, {133, GraphicProductMessage::Create},
{134, GraphicProductMessage::Create}, {134, GraphicProductMessage::Create},