Index volume scan by time, change internal data structure from unordered to ordered map

wxdata/include/scwx/util/time.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <chrono>
+
+namespace scwx
+{
+namespace util
+{
+
+std::chrono::system_clock::time_point TimePoint(uint16_t modifiedJulianDate,
+                                                uint32_t milliseconds);
+
+} // namespace util
+} // namespace scwx

wxdata/include/scwx/wsr88d/ar2v_file.hpp

@@ -3,9 +3,9 @@
 #include <scwx/wsr88d/rda/digital_radar_data.hpp>
 #include <scwx/wsr88d/rda/volume_coverage_pattern_data.hpp>
 
+#include <chrono>
 #include <memory>
 #include <string>
-#include <unordered_map>
 
 namespace scwx
 {
@@ -31,9 +31,14 @@ public:
    Ar2vFile(Ar2vFile&&) noexcept;
    Ar2vFile& operator=(Ar2vFile&&) noexcept;
 
-   std::unordered_map<
-      uint16_t,
-      std::unordered_map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
+   uint32_t julian_date() const;
+   uint32_t milliseconds() const;
+
+   std::chrono::system_clock::time_point start_time() const;
+   std::chrono::system_clock::time_point end_time() const;
+
+   std::map<uint16_t,
+            std::map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
                                                          radar_data() const;
    std::shared_ptr<const rda::VolumeCoveragePatternData> vcp_data() const;
 

wxdata/source/scwx/util/time.cpp

@@ -0,0 +1,20 @@
+#include <scwx/util/time.hpp>
+
+namespace scwx
+{
+namespace util
+{
+
+std::chrono::system_clock::time_point
+TimePoint(uint16_t modifiedJulianDate, uint32_t milliseconds)
+{
+   using namespace std::chrono;
+   using sys_days       = time_point<system_clock, days>;
+   constexpr auto epoch = sys_days {1969y / December / 31d};
+
+   return epoch + (modifiedJulianDate * 24h) +
+          std::chrono::milliseconds {milliseconds};
+}
+
+} // namespace qt
+} // namespace scwx

wxdata/source/scwx/wsr88d/ar2v_file.cpp

@@ -2,6 +2,7 @@
 #include <scwx/wsr88d/rda/message_factory.hpp>
 #include <scwx/wsr88d/rda/types.hpp>
 #include <scwx/util/rangebuf.hpp>
+#include <scwx/util/time.hpp>
 
 #include <fstream>
 #include <sstream>
@@ -37,7 +38,6 @@ public:
    void LoadLDMRecords(std::ifstream& f);
    void ParseLDMRecords();
    void ProcessRadarData(std::shared_ptr<rda::DigitalRadarData> message);
-   void ProcessVcpData();
 
    std::string tapeFilename_;
    std::string extensionNumber_;
@@ -48,9 +48,8 @@ public:
    size_t numRecords_;
 
    std::shared_ptr<rda::VolumeCoveragePatternData> vcpData_;
-   std::unordered_map<
-      uint16_t,
-      std::unordered_map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
+   std::map<uint16_t,
+            std::map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
       radarData_;
 
    std::list<std::stringstream> rawRecords_;
@@ -62,9 +61,37 @@ Ar2vFile::~Ar2vFile() = default;
 Ar2vFile::Ar2vFile(Ar2vFile&&) noexcept = default;
 Ar2vFile& Ar2vFile::operator=(Ar2vFile&&) noexcept = default;
 
-std::unordered_map<
-   uint16_t,
-   std::unordered_map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
+uint32_t Ar2vFile::julian_date() const
+{
+   return p->julianDate_;
+}
+
+uint32_t Ar2vFile::milliseconds() const
+{
+   return p->milliseconds_;
+}
+std::chrono::system_clock::time_point Ar2vFile::start_time() const
+{
+   return util::TimePoint(p->julianDate_, p->milliseconds_);
+}
+
+std::chrono::system_clock::time_point Ar2vFile::end_time() const
+{
+   std::chrono::system_clock::time_point endTime {};
+
+   if (p->radarData_.size() > 0)
+   {
+      std::shared_ptr<rda::DigitalRadarData> lastRadial =
+         p->radarData_.crbegin()->second.crbegin()->second;
+
+      endTime = util::TimePoint(lastRadial->modified_julian_date(),
+                                lastRadial->collection_time());
+   }
+
+   return endTime;
+}
+
+std::map<uint16_t, std::map<uint16_t, std::shared_ptr<rda::DigitalRadarData>>>
 Ar2vFile::radar_data() const
 {
    return p->radarData_;
@@ -245,7 +272,6 @@ void Ar2vFileImpl::HandleMessage(std::shared_ptr<rda::Message>& message)
    case static_cast<uint8_t>(rda::MessageId::VolumeCoveragePatternData):
       vcpData_ =
          std::static_pointer_cast<rda::VolumeCoveragePatternData>(message);
-      ProcessVcpData();
       break;
 
    case static_cast<uint8_t>(rda::MessageId::DigitalRadarData):
@@ -266,23 +292,5 @@ void Ar2vFileImpl::ProcessRadarData(
    radarData_[elevationIndex][azimuthIndex] = message;
 }
 
-void Ar2vFileImpl::ProcessVcpData()
-{
-   uint16_t numberOfElevationCuts = vcpData_->number_of_elevation_cuts();
-   radarData_.reserve(numberOfElevationCuts);
-
-   for (uint16_t e = 0; e < numberOfElevationCuts; ++e)
-   {
-      if (vcpData_->half_degree_azimuth(e))
-      {
-         radarData_[e].reserve(720);
-      }
-      else
-      {
-         radarData_[e].reserve(360);
-      }
-   }
-}
-
 } // namespace wsr88d
 } // namespace scwx

wxdata/wxdata.cmake

@@ -12,9 +12,11 @@ set(HDR_UTIL include/scwx/util/iterator.hpp
              include/scwx/util/rangebuf.hpp
              include/scwx/util/streams.hpp
              include/scwx/util/threads.hpp
+             include/scwx/util/time.hpp
              include/scwx/util/vectorbuf.hpp)
 set(SRC_UTIL source/scwx/util/rangebuf.cpp
              source/scwx/util/streams.cpp
+             source/scwx/util/time.cpp
              source/scwx/util/vectorbuf.cpp)
 set(HDR_WSR88D include/scwx/wsr88d/ar2v_file.hpp)
 set(SRC_WSR88D source/scwx/wsr88d/ar2v_file.cpp)