diff --git a/gpxsee.pro b/gpxsee.pro index 472a1aa2..66bed997 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -104,7 +104,7 @@ HEADERS += src/config.h \ src/temperaturegraphitem.h \ src/cadencegraphitem.h \ src/powergraphitem.h \ - src/azimuthalequalarea.h + src/lambertazimuthal.h SOURCES += src/main.cpp \ src/gui.cpp \ src/poi.cpp \ @@ -181,7 +181,7 @@ SOURCES += src/main.cpp \ src/temperaturegraphitem.cpp \ src/cadencegraphitem.cpp \ src/powergraphitem.cpp \ - src/azimuthalequalarea.cpp + src/lambertazimuthal.cpp RESOURCES += gpxsee.qrc TRANSLATIONS = lang/gpxsee_cs.ts \ lang/gpxsee_sv.ts \ diff --git a/src/azimuthalequalarea.cpp b/src/lambertazimuthal.cpp similarity index 96% rename from src/azimuthalequalarea.cpp rename to src/lambertazimuthal.cpp index 7ba60fe3..1b78c106 100644 --- a/src/azimuthalequalarea.cpp +++ b/src/lambertazimuthal.cpp @@ -42,14 +42,14 @@ Defense. */ #include "rd.h" -#include "azimuthalequalarea.h" +#include "lambertazimuthal.h" #ifndef M_PI_2 #define M_PI_2 1.57079632679489661923 #endif // M_PI_2 -AzimuthalEqualArea::AzimuthalEqualArea(const Ellipsoid &ellipsoid, +LambertAzimuthal::LambertAzimuthal(const Ellipsoid &ellipsoid, double latitudeOrigin, double longitudeOrigin, double falseEasting, double falseNorthing) { @@ -74,7 +74,7 @@ AzimuthalEqualArea::AzimuthalEqualArea(const Ellipsoid &ellipsoid, _falseEasting = falseEasting; } -QPointF AzimuthalEqualArea::ll2xy(const Coordinates &c) const +QPointF LambertAzimuthal::ll2xy(const Coordinates &c) const { double dlam; double k_prime; @@ -143,7 +143,7 @@ QPointF AzimuthalEqualArea::ll2xy(const Coordinates &c) const return p; } -Coordinates AzimuthalEqualArea::xy2ll(const QPointF &p) const +Coordinates LambertAzimuthal::xy2ll(const QPointF &p) const { double dx, dy; double rho; diff --git a/src/azimuthalequalarea.h b/src/lambertazimuthal.h similarity index 67% rename from src/azimuthalequalarea.h rename to src/lambertazimuthal.h index 77048dc6..b7710f7c 100644 --- a/src/azimuthalequalarea.h +++ b/src/lambertazimuthal.h @@ -1,13 +1,13 @@ -#ifndef AZIMUTHALEQUALAREA_H -#define AZIMUTHALEQUALAREA_H +#ifndef LAMBERTAZIMUTHAL_H +#define LAMBERTAZIMUTHAL_H #include "ellipsoid.h" #include "projection.h" -class AzimuthalEqualArea : public Projection +class LambertAzimuthal : public Projection { public: - AzimuthalEqualArea(const Ellipsoid &ellipsoid, double latitudeOrigin, + LambertAzimuthal(const Ellipsoid &ellipsoid, double latitudeOrigin, double longitudeOrigin, double falseEasting, double falseNorthing); virtual QPointF ll2xy(const Coordinates &c) const; @@ -27,4 +27,4 @@ private: double _falseEasting; }; -#endif // AZIMUTHALEQUALAREA_H +#endif // LAMBERTAZIMUTHAL_H diff --git a/src/offlinemap.cpp b/src/offlinemap.cpp index e356dc6f..2ba9ab4b 100644 --- a/src/offlinemap.cpp +++ b/src/offlinemap.cpp @@ -19,7 +19,7 @@ #include "utm.h" #include "lambertconic.h" #include "albersequal.h" -#include "azimuthalequalarea.h" +#include "lambertazimuthal.h" #include "ozf.h" #include "rectc.h" #include "offlinemap.h" @@ -210,7 +210,7 @@ bool OfflineMap::createProjection(const QString &datum, setup.standardParallel2, setup.latitudeOrigin, setup.longitudeOrigin, setup.falseEasting, setup.falseNorthing); else if (projection == "(A)Lambert Azimuthual Equal Area") - _projection = new AzimuthalEqualArea(d.ellipsoid(), setup.latitudeOrigin, + _projection = new LambertAzimuthal(d.ellipsoid(), setup.latitudeOrigin, setup.longitudeOrigin, setup.falseEasting, setup.falseNorthing); else if (projection == "(UTM) Universal Transverse Mercator") { if (setup.zone)