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

Replace boost/units in favor of units library

Browse source
This commit is contained in:
Dan Paulat 2023-08-18 10:45:52 -05:00
parent 12833202b7
commit 35b90fa98d
15 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scwx-qt/source/scwx/qt/util/geographic_lib.cpp
View file

@ -18,15 +18,14 @@ const ::GeographicLib::Geodesic& DefaultGeodesic()
return geodesic_;
}
boost::units::quantity<boost::units::si::length>
units::length::meters<double>
GetDistance(double lat1, double lon1, double lat2, double lon2)
{
double distance;
util::GeographicLib::DefaultGeodesic().Inverse(
lat1, lon1, lat2, lon2, distance);
return static_cast<boost::units::quantity<boost::units::si::length>>(
distance * boost::units::si::meter_base_unit::unit_type());
return units::length::meters<double> {distance};
}
} // namespace GeographicLib

5
scwx-qt/source/scwx/qt/util/geographic_lib.hpp
View file

@ -1,8 +1,7 @@
#pragma once
#include <GeographicLib/Geodesic.hpp>
#include <boost/units/quantity.hpp>
#include <boost/units/systems/si/length.hpp>
#include <units/length.h>
namespace scwx
{
@ -30,7 +29,7 @@ const ::GeographicLib::Geodesic& DefaultGeodesic();
*
* @return distance between point 1 and point 2
*/
boost::units::quantity<boost::units::si::length>
units::length::meters<double>
GetDistance(double lat1, double lon1, double lat2, double lon2);
} // namespace GeographicLib

7
scwx-qt/source/scwx/qt/util/maplibre.cpp
View file

@ -12,11 +12,12 @@ namespace util
namespace maplibre
{
boost::units::quantity<boost::units::si::length>
units::length::meters<double>
GetMapDistance(const QMapLibreGL::CustomLayerRenderParameters& params)
{
return QMapLibreGL::metersPerPixelAtLatitude(params.latitude, params.zoom) *
(params.width + params.height) / 2.0 * boost::units::si::meters;
return units::length::meters<double>(
QMapLibreGL::metersPerPixelAtLatitude(params.latitude, params.zoom) *
(params.width + params.height) / 2.0);
}
glm::vec2 LatLongToScreenCoordinate(const QMapLibreGL::Coordinate& coordinate)

5
scwx-qt/source/scwx/qt/util/maplibre.hpp
View file

@ -1,9 +1,8 @@
#pragma once
#include <QMapLibreGL/types.hpp>
#include <boost/units/quantity.hpp>
#include <boost/units/systems/si/length.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <units/length.h>
namespace scwx
{
@ -14,7 +13,7 @@ namespace util
namespace maplibre
{
boost::units::quantity<boost::units::si::length>
units::length::meters<double>
GetMapDistance(const QMapLibreGL::CustomLayerRenderParameters& params);
glm::vec2 LatLongToScreenCoordinate(const QMapLibreGL::Coordinate& coordinate);