From 7e1ed21662563f7316ad9b0de5f271974f83f84c Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Thu, 15 Dec 2016 16:35:05 +0000 Subject: [PATCH] refs #837 Height in feet, for consistency. --- src/blackmisc/geo/coordinategeodetic.cpp | 4 ++-- src/blackmisc/geo/coordinategeodetic.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index b9e3cb390..d95aae2ef 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -200,8 +200,8 @@ namespace BlackMisc CCoordinateGeodetic::CCoordinateGeodetic(double latitudeDegrees, double longitudeDegrees) : CCoordinateGeodetic( { latitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg() }, { longitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg() }, { 0, nullptr }) {} - CCoordinateGeodetic::CCoordinateGeodetic(double latitudeDegrees, double longitudeDegrees, double heightMeters) : - CCoordinateGeodetic( { latitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg() }, { longitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg() }, { heightMeters, BlackMisc::PhysicalQuantities::CLengthUnit::m() }) {} + CCoordinateGeodetic::CCoordinateGeodetic(double latitudeDegrees, double longitudeDegrees, double heightFeet) : + CCoordinateGeodetic( { latitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg() }, { longitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg() }, { heightFeet, BlackMisc::PhysicalQuantities::CLengthUnit::ft() }) {} CLatitude CCoordinateGeodetic::latitude() const { diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h index dacbcd5a9..2c9ff42e6 100644 --- a/src/blackmisc/geo/coordinategeodetic.h +++ b/src/blackmisc/geo/coordinategeodetic.h @@ -194,7 +194,7 @@ namespace BlackMisc CCoordinateGeodetic(double latitudeDegrees, double longitudeDegrees); //! Constructor by values - CCoordinateGeodetic(double latitudeDegrees, double longitudeDegrees, double heightMeters); + CCoordinateGeodetic(double latitudeDegrees, double longitudeDegrees, double heightFeet); //! \copydoc ICoordinateGeodetic::latitude virtual CLatitude latitude() const override;