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

Add NEXRAD data provider function to get time points by date

Browse source
This commit is contained in:
Dan Paulat 2023-05-16 22:42:09 -05:00
parent 3bee6f65e5
commit a9f5a766cc
4 changed files with 83 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
wxdata/include/scwx/provider/aws_nexrad_data_provider.hpp
View file

@ -20,23 +20,26 @@ public:
const std::string& region);
virtual ~AwsNexradDataProvider();
AwsNexradDataProvider(const AwsNexradDataProvider&) = delete;
AwsNexradDataProvider(const AwsNexradDataProvider&) = delete;
AwsNexradDataProvider& operator=(const AwsNexradDataProvider&) = delete;
AwsNexradDataProvider(AwsNexradDataProvider&&) noexcept;
AwsNexradDataProvider& operator=(AwsNexradDataProvider&&) noexcept;
size_t cache_size() const;
size_t cache_size() const override;
std::chrono::system_clock::time_point last_modified() const;
std::chrono::seconds update_period() const;
std::chrono::system_clock::time_point last_modified() const override;
std::chrono::seconds update_period() const override;
std::string FindKey(std::chrono::system_clock::time_point time);
std::string FindLatestKey();
std::string FindKey(std::chrono::system_clock::time_point time) override;
std::string FindLatestKey() override;
std::vector<std::chrono::system_clock::time_point>
GetTimePointsByDate(std::chrono::system_clock::time_point date) override;
std::pair<size_t, size_t>
ListObjects(std::chrono::system_clock::time_point date);
std::shared_ptr<wsr88d::NexradFile> LoadObjectByKey(const std::string& key);
std::pair<size_t, size_t> Refresh();
ListObjects(std::chrono::system_clock::time_point date) override;
std::shared_ptr<wsr88d::NexradFile>
LoadObjectByKey(const std::string& key) override;
std::pair<size_t, size_t> Refresh() override;
protected:
std::shared_ptr<Aws::S3::S3Client> client();

11
wxdata/include/scwx/provider/nexrad_data_provider.hpp
View file

@ -101,6 +101,17 @@ public:
virtual std::chrono::system_clock::time_point
GetTimePointByKey(const std::string& key) const = 0;
/**
* Gets NEXRAD data time points for the date supplied. Lists and adds them
* to the cache if required.
*
* @param date Date for which to get NEXRAD data time points
*
* @return NEXRAD data time points
*/
virtual std::vector<std::chrono::system_clock::time_point>
GetTimePointsByDate(std::chrono::system_clock::time_point date) = 0;
/**
* Requests available NEXRAD products for the current radar site, and adds
* the list to the cache.

40
wxdata/source/scwx/provider/aws_nexrad_data_provider.cpp
View file

@ -9,6 +9,7 @@
#include <aws/s3/model/GetObjectRequest.h>
#include <aws/s3/model/ListObjectsV2Request.h>
#include <fmt/chrono.h>
namespace scwx
{
@ -156,6 +157,45 @@ std::string AwsNexradDataProvider::FindLatestKey()
return key;
}
std::vector<std::chrono::system_clock::time_point>
AwsNexradDataProvider::GetTimePointsByDate(
std::chrono::system_clock::time_point date)
{
const auto day = std::chrono::floor<std::chrono::days>(date);
std::vector<std::chrono::system_clock::time_point> timePoints {};
logger_->debug("GetTimePointsByDate: {}", day);
std::shared_lock lock(p->objectsMutex_);
// Is the date present in the date list?
if (std::find(p->objectDates_.cbegin(), p->objectDates_.cend(), day) ==
p->objectDates_.cend())
{
// Temporarily unlock mutex
lock.unlock();
// List objects, since the date is not present in the date list
ListObjects(date);
// Re-lock mutex
lock.lock();
}
// Determine objects to retrieve
auto objectsBegin = p->objects_.lower_bound(day);
auto objectsEnd = p->objects_.lower_bound(day + std::chrono::days {1});
// Copy time points to destination vector
std::transform(objectsBegin,
objectsEnd,
std::back_inserter(timePoints),
[](const auto& object) { return object.first; });
return timePoints;
}
std::pair<size_t, size_t>
AwsNexradDataProvider::ListObjects(std::chrono::system_clock::time_point date)
{