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

USe a common default geodesic object instead of duplicate copies.

Browse source 
All used functions are constant, and don't require unique instantiations for thread safety.
This commit is contained in:
Dan Paulat 2023-02-19 15:16:34 -06:00
parent 4a31cf6d3e
commit 90c8c0183a
10 changed files with 89 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scwx-qt/source/scwx/qt/config/radar_site.cpp
View file

@ -1,4 +1,5 @@
#include <scwx/qt/config/radar_site.hpp>
#include <scwx/qt/util/geographic_lib.hpp>
#include <scwx/qt/util/json.hpp>
#include <scwx/common/sites.hpp>
#include <scwx/util/logger.hpp>
@ -8,7 +9,6 @@
#include <unordered_map>
#include <boost/json.hpp>
#include <GeographicLib/Geodesic.hpp>
namespace scwx
{
@ -31,9 +31,6 @@ static std::unordered_map<std::string, std::shared_ptr<RadarSite>>
static std::unordered_map<std::string, std::string> siteIdMap_;
static std::shared_mutex siteMutex_;
static GeographicLib::Geodesic geodesic_ {GeographicLib::Constants::WGS84_a(),
GeographicLib::Constants::WGS84_f()};
static bool ValidateJsonEntry(const boost::json::object& o);
class RadarSiteImpl
@ -187,11 +184,11 @@ std::shared_ptr<RadarSite> RadarSite::FindNearest(
}
// Calculate distance to radar site
geodesic_.Inverse(latitude,
longitude,
radarSite->latitude(),
radarSite->longitude(),
distanceInMeters);
util::GeographicLib::DefaultGeodesic().Inverse(latitude,
longitude,
radarSite->latitude(),
radarSite->longitude(),
distanceInMeters);
// If the radar site is the closer, record it as the closest
if (nearestRadarSite == nullptr || distanceInMeters < nearestDistance)