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

Rename DigitalRadarData to DigitalRadarDataGeneric to align with message type 31 name

Browse source
This commit is contained in:
Dan Paulat 2024-01-18 23:50:46 -06:00
parent 6f73c19be8
commit bfd7963d4c
6 changed files with 79 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
wxdata/include/scwx/wsr88d/ar2v_file.hpp
View file

@ -1,7 +1,7 @@
#pragma once
#include <scwx/wsr88d/nexrad_file.hpp>
#include <scwx/wsr88d/rda/digital_radar_data.hpp>
#include <scwx/wsr88d/rda/digital_radar_data_generic.hpp>
#include <scwx/wsr88d/rda/volume_coverage_pattern_data.hpp>
#include <chrono>
@ -26,7 +26,7 @@ public:
explicit Ar2vFile();
~Ar2vFile();
Ar2vFile(const Ar2vFile&) = delete;
Ar2vFile(const Ar2vFile&) = delete;
Ar2vFile& operator=(const Ar2vFile&) = delete;
Ar2vFile(Ar2vFile&&) noexcept;

37
wxdata/include/scwx/wsr88d/rda/digital_radar_data.hpp → wxdata/include/scwx/wsr88d/rda/digital_radar_data_generic.hpp
View file

@ -34,10 +34,11 @@ class MomentDataBlockImpl;
class RadialDataBlockImpl;
class VolumeDataBlockImpl;
class DigitalRadarData;
class DigitalRadarDataImpl;
class DigitalRadarDataGeneric;
class DigitalRadarDataGenericImpl;
typedef std::map<uint16_t, std::shared_ptr<DigitalRadarData>> ElevationScan;
typedef std::map<uint16_t, std::shared_ptr<DigitalRadarDataGeneric>>
ElevationScan;
class DataBlock
{
@ -46,7 +47,7 @@ protected:
const std::string& dataName);
~DataBlock();
DataBlock(const DataBlock&) = delete;
DataBlock(const DataBlock&) = delete;
DataBlock& operator=(const DataBlock&) = delete;
DataBlock(DataBlock&&) noexcept;
@ -63,7 +64,7 @@ public:
const std::string& dataName);
~ElevationDataBlock();
ElevationDataBlock(const ElevationDataBlock&) = delete;
ElevationDataBlock(const ElevationDataBlock&) = delete;
ElevationDataBlock& operator=(const ElevationDataBlock&) = delete;
ElevationDataBlock(ElevationDataBlock&&) noexcept;
@ -87,7 +88,7 @@ public:
const std::string& dataName);
~MomentDataBlock();
MomentDataBlock(const MomentDataBlock&) = delete;
MomentDataBlock(const MomentDataBlock&) = delete;
MomentDataBlock& operator=(const MomentDataBlock&) = delete;
MomentDataBlock(MomentDataBlock&&) noexcept;
@ -123,7 +124,7 @@ public:
const std::string& dataName);
~RadialDataBlock();
RadialDataBlock(const RadialDataBlock&) = delete;
RadialDataBlock(const RadialDataBlock&) = delete;
RadialDataBlock& operator=(const RadialDataBlock&) = delete;
RadialDataBlock(RadialDataBlock&&) noexcept;
@ -149,7 +150,7 @@ public:
const std::string& dataName);
~VolumeDataBlock();
VolumeDataBlock(const VolumeDataBlock&) = delete;
VolumeDataBlock(const VolumeDataBlock&) = delete;
VolumeDataBlock& operator=(const VolumeDataBlock&) = delete;
VolumeDataBlock(VolumeDataBlock&&) noexcept;
@ -170,17 +171,17 @@ private:
bool Parse(std::istream& is);
};
class DigitalRadarData : public Level2Message
class DigitalRadarDataGeneric : public Level2Message
{
public:
explicit DigitalRadarData();
~DigitalRadarData();
explicit DigitalRadarDataGeneric();
~DigitalRadarDataGeneric();
DigitalRadarData(const DigitalRadarData&) = delete;
DigitalRadarData& operator=(const DigitalRadarData&) = delete;
DigitalRadarDataGeneric(const DigitalRadarDataGeneric&) = delete;
DigitalRadarDataGeneric& operator=(const DigitalRadarDataGeneric&) = delete;
DigitalRadarData(DigitalRadarData&&) noexcept;
DigitalRadarData& operator=(DigitalRadarData&&) noexcept;
DigitalRadarDataGeneric(DigitalRadarDataGeneric&&) noexcept;
DigitalRadarDataGeneric& operator=(DigitalRadarDataGeneric&&) noexcept;
std::string radar_identifier() const;
uint32_t collection_time() const;
@ -205,11 +206,11 @@ public:
bool Parse(std::istream& is);
static std::shared_ptr<DigitalRadarData> Create(Level2MessageHeader&& header,
std::istream& is);
static std::shared_ptr<DigitalRadarDataGeneric>
Create(Level2MessageHeader&& header, std::istream& is);
private:
std::unique_ptr<DigitalRadarDataImpl> p;
std::unique_ptr<DigitalRadarDataGenericImpl> p;
};
} // namespace rda