root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Made the Lambert azimuthal equal-area projection naming consistent with other projections namings

Browse Source
This commit is contained in:
Martin Tůma 2017-11-14 23:30:25 +01:00
parent 0894fb0ddf
commit 8675a0e945
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpxsee.pro
View File

@ -104,7 +104,7 @@ HEADERS += src/config.h \
src/temperaturegraphitem.h \ src/temperaturegraphitem.h \
src/cadencegraphitem.h \ src/cadencegraphitem.h \
src/powergraphitem.h \ src/powergraphitem.h \
src/azimuthalequalarea.h src/lambertazimuthal.h
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/gui.cpp \ src/gui.cpp \
src/poi.cpp \ src/poi.cpp \
@ -181,7 +181,7 @@ SOURCES += src/main.cpp \
src/temperaturegraphitem.cpp \ src/temperaturegraphitem.cpp \
src/cadencegraphitem.cpp \ src/cadencegraphitem.cpp \
src/powergraphitem.cpp \ src/powergraphitem.cpp \
src/azimuthalequalarea.cpp src/lambertazimuthal.cpp
RESOURCES += gpxsee.qrc RESOURCES += gpxsee.qrc
TRANSLATIONS = lang/gpxsee_cs.ts \ TRANSLATIONS = lang/gpxsee_cs.ts \
lang/gpxsee_sv.ts \ lang/gpxsee_sv.ts \

8
src/azimuthalequalarea.cpp → src/lambertazimuthal.cpp
View File

@ -42,14 +42,14 @@ Defense.
*/ */
#include "rd.h" #include "rd.h"
#include "azimuthalequalarea.h" #include "lambertazimuthal.h"
#ifndef M_PI_2 #ifndef M_PI_2
#define M_PI_2 1.57079632679489661923 #define M_PI_2 1.57079632679489661923
#endif // M_PI_2 #endif // M_PI_2
AzimuthalEqualArea::AzimuthalEqualArea(const Ellipsoid &ellipsoid, LambertAzimuthal::LambertAzimuthal(const Ellipsoid &ellipsoid,
double latitudeOrigin, double longitudeOrigin, double falseEasting, double latitudeOrigin, double longitudeOrigin, double falseEasting,
double falseNorthing) double falseNorthing)
{ {
@ -74,7 +74,7 @@ AzimuthalEqualArea::AzimuthalEqualArea(const Ellipsoid &ellipsoid,
_falseEasting = falseEasting; _falseEasting = falseEasting;
} }
QPointF AzimuthalEqualArea::ll2xy(const Coordinates &c) const QPointF LambertAzimuthal::ll2xy(const Coordinates &c) const
{ {
double dlam; double dlam;
double k_prime; double k_prime;
@ -143,7 +143,7 @@ QPointF AzimuthalEqualArea::ll2xy(const Coordinates &c) const
return p; return p;
} }
Coordinates AzimuthalEqualArea::xy2ll(const QPointF &p) const Coordinates LambertAzimuthal::xy2ll(const QPointF &p) const
{ {
double dx, dy; double dx, dy;
double rho; double rho;

10
src/azimuthalequalarea.h → src/lambertazimuthal.h
View File

@ -1,13 +1,13 @@
#ifndef AZIMUTHALEQUALAREA_H #ifndef LAMBERTAZIMUTHAL_H
#define AZIMUTHALEQUALAREA_H #define LAMBERTAZIMUTHAL_H
#include "ellipsoid.h" #include "ellipsoid.h"
#include "projection.h" #include "projection.h"
class AzimuthalEqualArea : public Projection class LambertAzimuthal : public Projection
{ {
public: public:
AzimuthalEqualArea(const Ellipsoid &ellipsoid, double latitudeOrigin, LambertAzimuthal(const Ellipsoid &ellipsoid, double latitudeOrigin,
double longitudeOrigin, double falseEasting, double falseNorthing); double longitudeOrigin, double falseEasting, double falseNorthing);
virtual QPointF ll2xy(const Coordinates &c) const; virtual QPointF ll2xy(const Coordinates &c) const;
@ -27,4 +27,4 @@ private:
double _falseEasting; double _falseEasting;
}; };
#endif // AZIMUTHALEQUALAREA_H #endif // LAMBERTAZIMUTHAL_H

4
src/offlinemap.cpp
View File

@ -19,7 +19,7 @@
#include "utm.h" #include "utm.h"
#include "lambertconic.h" #include "lambertconic.h"
#include "albersequal.h" #include "albersequal.h"
#include "azimuthalequalarea.h" #include "lambertazimuthal.h"
#include "ozf.h" #include "ozf.h"
#include "rectc.h" #include "rectc.h"
#include "offlinemap.h" #include "offlinemap.h"
@ -210,7 +210,7 @@ bool OfflineMap::createProjection(const QString &datum,
setup.standardParallel2, setup.latitudeOrigin, setup.longitudeOrigin, setup.standardParallel2, setup.latitudeOrigin, setup.longitudeOrigin,
setup.falseEasting, setup.falseNorthing); setup.falseEasting, setup.falseNorthing);
else if (projection == "(A)Lambert Azimuthual Equal Area") 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); setup.longitudeOrigin, setup.falseEasting, setup.falseNorthing);
else if (projection == "(UTM) Universal Transverse Mercator") { else if (projection == "(UTM) Universal Transverse Mercator") {
if (setup.zone) if (setup.zone)