flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-12 23:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Weather uses null altitude, https://swift-project.slack.com/archives/G7GD2UP9C/p1534378412000100

Browse Source
This commit is contained in:
Klaus Basan
2018-08-16 14:02:25 +02:00
parent 7d2c063aba
commit 359d56b6f6
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackmisc/geo/coordinategeodetic.cpp
View File

@@ -214,6 +214,11 @@ namespace BlackMisc
this->setNormalVector(normalVector);
}
CCoordinateGeodetic::CCoordinateGeodetic(const CLatitude &latitude, const CLongitude &longitude) : CCoordinateGeodetic(latitude, longitude, CAltitude::null())
{
// void
}
CCoordinateGeodetic::CCoordinateGeodetic(const CLatitude &latitude, const CLongitude &longitude, const CAltitude &geodeticHeight) :
m_x(latitude.cos() * longitude.cos()),
m_y(latitude.cos() * longitude.sin()),

5
src/blackmisc/geo/coordinategeodetic.h
View File

@@ -215,7 +215,10 @@ namespace BlackMisc
//! Constructor by normal vector
CCoordinateGeodetic(const std::array<double, 3> &normalVector);
//! Constructor by values
//! Constructor by latitude/longitude, height is null
CCoordinateGeodetic(const CLatitude &latitude, const CLongitude &longitude);
//! Constructor by latitude/longitude/height (or altitude)
CCoordinateGeodetic(const CLatitude &latitude, const CLongitude &longitude, const Aviation::CAltitude &geodeticHeight);
//! Constructor by double values, but no geodetic height

2
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -228,7 +228,7 @@ namespace BlackSimPlugin
if (m_isWeatherActivated)
{
const auto currentPosition = CCoordinateGeodetic { situation.latitude(), situation.longitude(), {0} };
const auto currentPosition = CCoordinateGeodetic { situation.latitude(), situation.longitude() };
if (CWeatherScenario::isRealWeatherScenario(m_weatherScenarioSettings.get()) &&
calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20)
{

2
src/plugins/simulator/fs9/simulatorfs9.cpp
View File

@@ -333,7 +333,7 @@ namespace BlackSimPlugin
if (m_isWeatherActivated)
{
const auto currentPosition = CCoordinateGeodetic { aircraftSituation.latitude(), aircraftSituation.longitude(), {0} };
const auto currentPosition = CCoordinateGeodetic { aircraftSituation.latitude(), aircraftSituation.longitude() };
if (CWeatherScenario::isRealWeatherScenario(m_weatherScenarioSettings.get()) &&
calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20)
{

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -608,7 +608,7 @@ namespace BlackSimPlugin
if (m_isWeatherActivated)
{
const auto currentPosition = CCoordinateGeodetic { aircraftSituation.latitude(), aircraftSituation.longitude(), {0} };
const auto currentPosition = CCoordinateGeodetic { aircraftSituation.latitude(), aircraftSituation.longitude() };
if (CWeatherScenario::isRealWeatherScenario(m_weatherScenarioSettings.get()) &&
calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20)
{

2
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -233,7 +233,7 @@ namespace BlackSimPlugin
if (m_isWeatherActivated)
{
const auto currentPosition = CCoordinateGeodetic { situation.latitude(), situation.longitude(), {0} };
const auto currentPosition = CCoordinateGeodetic { situation.latitude(), situation.longitude() };
if (CWeatherScenario::isRealWeatherScenario(m_weatherScenarioSettings.get()) &&
calculateGreatCircleDistance(m_lastWeatherPosition, currentPosition).value(CLengthUnit::mi()) > 20)
{