root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-07 18:53:02 +02:00
Code Issues Projects Releases Activity

Convert remaining reserved variables (underscore + capital leter)

Browse Source
This commit is contained in:
Martin Tůma 2025-06-06 19:02:38 +02:00
parent 2efc7a3d2c
commit 7ed154b662
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/ENC/data.h
View File

@ -19,13 +19,13 @@ public:
const Polygon &path() const {return _path;} const Polygon &path() const {return _path;}
uint type() const {return _type;} uint type() const {return _type;}
const Attributes &attributes() const {return _attr;} const Attributes &attributes() const {return _attr;}
uint HUNI() const {return _HUNI;} uint huni() const {return _huni;}
private: private:
uint _type; uint _type;
Polygon _path; Polygon _path;
Attributes _attr; Attributes _attr;
uint _HUNI; uint _huni;
}; };
class Line { class Line {

4
src/map/ENC/mapdata.cpp
View File

@ -215,7 +215,7 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context)
|| type == SUBTYPE(RESARE, 25) || type == SUBTYPE(I_RESARE, 25) || type == SUBTYPE(RESARE, 25) || type == SUBTYPE(I_RESARE, 25)
|| type == SUBTYPE(RESARE, 26) || type == SUBTYPE(I_RESARE, 26)) || type == SUBTYPE(RESARE, 26) || type == SUBTYPE(I_RESARE, 26))
points->append(MapData::Point(baseType, polygon->bounds().center(), points->append(MapData::Point(baseType, polygon->bounds().center(),
polygon->attributes(), polygon->HUNI(), true)); polygon->attributes(), polygon->huni(), true));
return true; return true;
} }
@ -466,7 +466,7 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr,
} }
MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr, MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr,
uint HUNI) : _path(path), _attr(attr), _HUNI(HUNI) uint HUNI) : _path(path), _attr(attr), _huni(HUNI)
{ {
uint subtype = 0; uint subtype = 0;

10
src/map/proj/polyconic.cpp
View File

@ -84,7 +84,7 @@ Polyconic::Polyconic(const Ellipsoid &ellipsoid, double latitudeOrigin,
sin2lat = POLY_COEFF_TIMES_SIN(_c1, 2.0, _latitudeOrigin); sin2lat = POLY_COEFF_TIMES_SIN(_c1, 2.0, _latitudeOrigin);
sin4lat = POLY_COEFF_TIMES_SIN(_c2, 4.0, _latitudeOrigin); sin4lat = POLY_COEFF_TIMES_SIN(_c2, 4.0, _latitudeOrigin);
sin6lat = POLY_COEFF_TIMES_SIN(_c3, 6.0, _latitudeOrigin); sin6lat = POLY_COEFF_TIMES_SIN(_c3, 6.0, _latitudeOrigin);
_M0 = POLY_M(lat, sin2lat, sin4lat, sin6lat); _m0 = POLY_M(lat, sin2lat, sin4lat, sin6lat);
} }
PointD Polyconic::ll2xy(const Coordinates &c) const PointD Polyconic::ll2xy(const Coordinates &c) const
@ -107,7 +107,7 @@ PointD Polyconic::ll2xy(const Coordinates &c) const
if (Latitude == 0.0) { if (Latitude == 0.0) {
return PointD(_a * dlam + _falseEasting, return PointD(_a * dlam + _falseEasting,
-_M0 + _falseNorthing); -_m0 + _falseNorthing);
} else { } else {
NN = _a / sqrt(1.0 - _es2 * (slat * slat)); NN = _a / sqrt(1.0 - _es2 * (slat * slat));
NN_OVER_tlat = NN / tan(Latitude); NN_OVER_tlat = NN / tan(Latitude);
@ -118,7 +118,7 @@ PointD Polyconic::ll2xy(const Coordinates &c) const
MM = POLY_M(lat, sin2lat, sin4lat, sin6lat); MM = POLY_M(lat, sin2lat, sin4lat, sin6lat);
EE = dlam * slat; EE = dlam * slat;
return PointD(NN_OVER_tlat * sin(EE) + _falseEasting, return PointD(NN_OVER_tlat * sin(EE) + _falseEasting,
MM - _M0 + NN_OVER_tlat * (1.0 - cos(EE)) + _falseNorthing); MM - _m0 + NN_OVER_tlat * (1.0 - cos(EE)) + _falseNorthing);
} }
} }
@ -146,11 +146,11 @@ Coordinates Polyconic::xy2ll(const PointD &p) const
dx = p.x() - _falseEasting; dx = p.x() - _falseEasting;
dx_OVER_Poly_a = dx / _a; dx_OVER_Poly_a = dx / _a;
if (FLOAT_EQ(dy,-_M0,1)) { if (FLOAT_EQ(dy,-_m0,1)) {
Latitude = 0.0; Latitude = 0.0;
Longitude = dx_OVER_Poly_a + _longitudeOrigin; Longitude = dx_OVER_Poly_a + _longitudeOrigin;
} else { } else {
AA = (_M0 + dy) / _a; AA = (_m0 + dy) / _a;
BB = dx_OVER_Poly_a * dx_OVER_Poly_a + (AA * AA); BB = dx_OVER_Poly_a * dx_OVER_Poly_a + (AA * AA);
PHIn = AA; PHIn = AA;

2
src/map/proj/polyconic.h
View File

@ -23,7 +23,7 @@ private:
double _es2; double _es2;
double _es4; double _es4;
double _es6; double _es6;
double _M0; double _m0;
double _c0; double _c0;
double _c1; double _c1;
double _c2; double _c2;