From f6905d1d8bb766c4d1de7ce2ecaa3e9bd105f72d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 20 Dec 2013 22:43:20 +0000 Subject: [PATCH] format latitude and longitude strings with cardinal directions refs #81 --- src/blackmisc/geolatitude.h | 10 +++++++--- src/blackmisc/geolongitude.h | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/blackmisc/geolatitude.h b/src/blackmisc/geolatitude.h index c51674282..fa03df178 100644 --- a/src/blackmisc/geolatitude.h +++ b/src/blackmisc/geolatitude.h @@ -18,11 +18,15 @@ namespace BlackMisc protected: /*! * \brief Specific string representation + * \param i18n + * \return */ - virtual QString convertToQString() const + virtual QString convertToQString(bool i18n = false) const { - QString s = "latitude "; - return s.append(CEarthAngle::convertToQString()); + QString s(CEarthAngle::convertToQString(i18n)); + if (!this->isZeroEpsilonConsidered()) + s.append(this->isNegativeWithEpsilonConsidered() ? " S" : " N"); + return s; } public: diff --git a/src/blackmisc/geolongitude.h b/src/blackmisc/geolongitude.h index 5e76ae2fc..c27e066c9 100644 --- a/src/blackmisc/geolongitude.h +++ b/src/blackmisc/geolongitude.h @@ -15,11 +15,15 @@ namespace BlackMisc protected: /*! * \brief Specific string representation + * \param i18n + * \return */ - virtual QString convertToQString() const + virtual QString convertToQString(bool i18n = false) const { - QString s = "longitude "; - return s.append(CEarthAngle::convertToQString()); + QString s(CEarthAngle::convertToQString(i18n)); + if (!this->isZeroEpsilonConsidered()) + s.append(this->isNegativeWithEpsilonConsidered() ? " W" : " E"); + return s; } public: