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

General GCC compilation fixes

Browse source
This commit is contained in:
Dan Paulat 2023-04-17 18:37:23 -05:00
parent c7aba95233
commit 023688b746
19 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
wxdata/source/scwx/provider/aws_level3_data_provider.cpp
View file

@ -158,13 +158,15 @@ void AwsLevel3DataProvider::Impl::ListProducts()
logger_->debug("ListProducts()");
static const std::string delimiter {"_"};
// Prefix format: GGG_
const std::string prefix = fmt::format("{0}_", siteId_);
Aws::S3::Model::ListObjectsV2Request request;
request.SetBucket(bucketName_);
request.SetPrefix(prefix);
request.SetDelimiter("_");
request.SetDelimiter(delimiter);
auto outcome = self_->client()->ListObjectsV2(request);

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

@ -33,35 +33,35 @@ class Ar2vFileImpl
{
public:
explicit Ar2vFileImpl() :
tapeFilename_(),
extensionNumber_(),
tapeFilename_ {},
extensionNumber_ {},
julianDate_ {0},
milliseconds_ {0},
icao_(),
rawRecords_(),
icao_ {},
vcpData_ {nullptr},
radarData_ {},
index_ {} {};
index_ {},
rawRecords_ {} {};
~Ar2vFileImpl() = default;
size_t DecompressLDMRecords(std::istream& is);
void HandleMessage(std::shared_ptr<rda::Level2Message>& message);
void IndexFile();
void ParseLDMRecords();
void ParseLDMRecord(std::istream& is);
void ProcessRadarData(std::shared_ptr<rda::DigitalRadarData> message);
std::size_t DecompressLDMRecords(std::istream& is);
void HandleMessage(std::shared_ptr<rda::Level2Message>& message);
void IndexFile();
void ParseLDMRecords();
void ParseLDMRecord(std::istream& is);
void ProcessRadarData(std::shared_ptr<rda::DigitalRadarData> message);
std::string tapeFilename_;
std::string extensionNumber_;
uint32_t julianDate_;
uint32_t milliseconds_;
std::string icao_;
std::string tapeFilename_;
std::string extensionNumber_;
std::uint32_t julianDate_;
std::uint32_t milliseconds_;
std::string icao_;
std::shared_ptr<rda::VolumeCoveragePatternData> vcpData_;
std::map<uint16_t, std::shared_ptr<rda::ElevationScan>> radarData_;
std::shared_ptr<rda::VolumeCoveragePatternData> vcpData_;
std::map<std::uint16_t, std::shared_ptr<rda::ElevationScan>> radarData_;
std::map<rda::DataBlockType,
std::map<uint16_t, std::shared_ptr<rda::ElevationScan>>>
std::map<std::uint16_t, std::shared_ptr<rda::ElevationScan>>>
index_;
std::list<std::stringstream> rawRecords_;
@ -70,7 +70,7 @@ public:
Ar2vFile::Ar2vFile() : p(std::make_unique<Ar2vFileImpl>()) {}
Ar2vFile::~Ar2vFile() = default;
Ar2vFile::Ar2vFile(Ar2vFile&&) noexcept = default;
Ar2vFile::Ar2vFile(Ar2vFile&&) noexcept = default;
Ar2vFile& Ar2vFile::operator=(Ar2vFile&&) noexcept = default;
uint32_t Ar2vFile::julian_date() const

4
wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp
View file

@ -43,7 +43,7 @@ DataBlock::DataBlock(const std::string& dataBlockType,
}
DataBlock::~DataBlock() = default;
DataBlock::DataBlock(DataBlock&&) noexcept = default;
DataBlock::DataBlock(DataBlock&&) noexcept = default;
DataBlock& DataBlock::operator=(DataBlock&&) noexcept = default;
class MomentDataBlockImpl
@ -198,7 +198,7 @@ bool MomentDataBlock::Parse(std::istream& is)
p->scale_ = awips::Message::SwapFloat(p->scale_);
p->offset_ = awips::Message::SwapFloat(p->offset_);
if (p->numberOfDataMomentGates_ >= 0 && p->numberOfDataMomentGates_ <= 1840)
if (p->numberOfDataMomentGates_ <= 1840)
{
if (p->dataWordSize_ == 8)
{

6
wxdata/source/scwx/wsr88d/rpg/digital_radial_data_array_packet.cpp
View file

@ -64,7 +64,7 @@ DigitalRadialDataArrayPacket::DigitalRadialDataArrayPacket() :
DigitalRadialDataArrayPacket::~DigitalRadialDataArrayPacket() = default;
DigitalRadialDataArrayPacket::DigitalRadialDataArrayPacket(
DigitalRadialDataArrayPacket&&) noexcept = default;
DigitalRadialDataArrayPacket&&) noexcept = default;
DigitalRadialDataArrayPacket& DigitalRadialDataArrayPacket::operator=(
DigitalRadialDataArrayPacket&&) noexcept = default;
@ -158,13 +158,13 @@ bool DigitalRadialDataArrayPacket::Parse(std::istream& is)
logger_->warn("Invalid packet code: {}", p->packetCode_);
blockValid = false;
}
if (p->indexOfFirstRangeBin_ < 0 || p->indexOfFirstRangeBin_ > 230)
if (p->indexOfFirstRangeBin_ > 230)
{
logger_->warn("Invalid index of first range bin: {}",
p->indexOfFirstRangeBin_);
blockValid = false;
}
if (p->numberOfRangeBins_ < 0 || p->numberOfRangeBins_ > 1840)
if (p->numberOfRangeBins_ > 1840)
{
logger_->warn("Invalid number of range bins: {}",
p->numberOfRangeBins_);

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

@ -102,11 +102,11 @@ bool VectorArrowDataPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes
// in a vector
size_t vectorCount = p->lengthOfBlock_ / 10;
std::size_t vectorCount = p->lengthOfBlock_ / 10;
p->arrow_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++)
for (std::size_t v = 0; v < vectorCount && !is.eof(); v++)
{
VectorArrow& arrow = p->arrow_[v];

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

@ -101,11 +101,11 @@ bool WindBarbDataPacket::Parse(std::istream& is)
// The number of vectors is equal to the size divided by the number of bytes
// in a vector
size_t vectorCount = p->lengthOfBlock_ / 10;
std::size_t vectorCount = p->lengthOfBlock_ / 10;
p->windBarb_.resize(vectorCount);
for (int v = 0; v < vectorCount && !is.eof(); v++)
for (std::size_t v = 0; v < vectorCount && !is.eof(); v++)
{
WindBarb& windBarb = p->windBarb_[v];