Hello community, here is the log from the commit of package gpxsee for openSUSE:Factory checked in at 2017-04-14 13:42:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpxsee (Old) and /work/SRC/openSUSE:Factory/.gpxsee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpxsee" Fri Apr 14 13:42:02 2017 rev:5 rq:487680 version:4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gpxsee/gpxsee.changes 2017-04-12 18:10:53.175177883 +0200 +++ /work/SRC/openSUSE:Factory/.gpxsee.new/gpxsee.changes 2017-04-14 13:42:02.926692852 +0200 @@ -1,0 +2,8 @@ +Wed Apr 12 18:29:30 CEST 2017 - tu...@cbox.cz + +- Update to version 4.3 + * Fixed missing cached content cleanup causing huge draw areas + (causing memory exhaustion) issue. + * Fixed map file defined datum not set for UTM maps issue. + +------------------------------------------------------------------- Old: ---- GPXSee-4.2.tar.gz New: ---- GPXSee-4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpxsee.spec ++++++ --- /var/tmp/diff_new_pack.yAhCS1/_old 2017-04-14 13:42:03.766574182 +0200 +++ /var/tmp/diff_new_pack.yAhCS1/_new 2017-04-14 13:42:03.770573617 +0200 @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: gpxsee -Version: 4.2 +Version: 4.3 Release: 1 Summary: GPS log files visualizing and analyzing tool License: GPL-3.0 ++++++ GPXSee-4.2.tar.gz -> GPXSee-4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/README.md new/GPXSee-4.3/README.md --- old/GPXSee-4.2/README.md 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/README.md 2017-04-12 18:19:03.000000000 +0200 @@ -16,22 +16,18 @@  ## Build -### Linux/OS X ```shell lrelease gpxsee.pro qmake gpxsee.pro make ``` -### Windows -```shell -lrelease gpxsee.pro -qmake gpxsee.pro -nmake release -``` -## Binaries +## Download * [Windows & OS X builds](http://sourceforge.net/projects/gpxsee) * [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee) +## Changelog +[Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes) + ## Homepage GPXSee homepage: http://tumic.wz.cz/gpxsee diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/gpxsee.pro new/GPXSee-4.3/gpxsee.pro --- old/GPXSee-4.2/gpxsee.pro 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/gpxsee.pro 2017-04-12 18:19:03.000000000 +0200 @@ -1,5 +1,5 @@ TARGET = GPXSee -VERSION = 4.2 +VERSION = 4.3 QT += core \ gui \ network diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/lang/gpxsee_cs.ts new/GPXSee-4.3/lang/gpxsee_cs.ts --- old/GPXSee-4.2/lang/gpxsee_cs.ts 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/lang/gpxsee_cs.ts 2017-04-12 18:19:03.000000000 +0200 @@ -489,8 +489,8 @@ </message> <message> <location filename="../src/gui.cpp" line="641"/> - <source>The expected structure is one map/atlas in a separate subdirectory. Supported map formats are OziMap image-based maps and tiled TrekBuddy maps/atlases (tared and non-tared).</source> - <translation>Očekávaná struktura je jedna mapa/atlas v samostatném podadresáři. Podporované mapové formáty jsou OziMap mapy a TrekBuddy mapy/atlasy (včetně tar varianty).</translation> + <source>The expected structure is one map/atlas in a separate subdirectory. Supported map formats are OziExplorer image-based maps and tiled TrekBuddy maps/atlases (tared and non-tared).</source> + <translation>Očekávaná struktura je jedna mapa/atlas v samostatném podadresáři. Podporované mapové formáty jsou OziExplorer mapy a TrekBuddy mapy/atlasy (včetně tar varianty).</translation> </message> <message> <location filename="../src/gui.cpp" line="1097"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/lang/gpxsee_sv.ts new/GPXSee-4.3/lang/gpxsee_sv.ts --- old/GPXSee-4.2/lang/gpxsee_sv.ts 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/lang/gpxsee_sv.ts 2017-04-12 18:19:03.000000000 +0200 @@ -494,8 +494,8 @@ </message> <message> <location filename="../src/gui.cpp" line="641"/> - <source>The expected structure is one map/atlas in a separate subdirectory. Supported map formats are OziMap image-based maps and tiled TrekBuddy maps/atlases (tared and non-tared).</source> - <translation>Den förväntade strukturen är en karta/atlas i en separat undermapp. Kartformat som stöds är OziMap bildbaserade kartor och rutindelade TrekBuddy-kartor/-kartsamlingar (tarerade och icke tarerade).</translation> + <source>The expected structure is one map/atlas in a separate subdirectory. Supported map formats are OziExplorer image-based maps and tiled TrekBuddy maps/atlases (tared and non-tared).</source> + <translation>Den förväntade strukturen är en karta/atlas i en separat undermapp. Kartformat som stöds är OziExplorer bildbaserade kartor och rutindelade TrekBuddy-kartor/-kartsamlingar (tarerade och icke tarerade).</translation> </message> <message> <location filename="../src/gui.cpp" line="1097"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/pkg/gpxsee.nsi new/GPXSee-4.3/pkg/gpxsee.nsi --- old/GPXSee-4.2/pkg/gpxsee.nsi 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/pkg/gpxsee.nsi 2017-04-12 18:19:03.000000000 +0200 @@ -5,7 +5,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "4.2" +!define VERSION "4.3" ; The file to write OutFile "GPXSee-${VERSION}.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/pkg/gpxsee64.nsi new/GPXSee-4.3/pkg/gpxsee64.nsi --- old/GPXSee-4.2/pkg/gpxsee64.nsi 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/pkg/gpxsee64.nsi 2017-04-12 18:19:03.000000000 +0200 @@ -5,7 +5,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "4.2" +!define VERSION "4.3" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/ellipsoid.cpp new/GPXSee-4.3/src/ellipsoid.cpp --- old/GPXSee-4.2/src/ellipsoid.cpp 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/ellipsoid.cpp 2017-04-12 18:19:03.000000000 +0200 @@ -8,89 +8,35 @@ #define INTERNATIONAL_FLATTENING (1.0/297.0) #define KRASSOVSKY_RADIUS 6378245.0 #define KRASSOVSKY_FLATTENING (1.0/298.3) -#define BESSEL_RADIUS 6377397.155 -#define BESSEL_FLATTENING (1.0/299.1528128) +#define CLARKE1866_RADIUS 6378206.4 +#define CLARKE1866_FLATTENING (1.0/294.9786982) #define GRS80_RADIUS 6378137.0 #define GRS80_FLATTENING (1.0/298.257222101) -#define WGS70_RADIUS 6378135.0 -#define WGS70_FLATTENING (1.0/298.26) -#define SAD69_RADIUS 6378160.0 -#define SAD69_FLATTENING (1.0/298.25) +#define WGS72_RADIUS 6378135.0 +#define WGS72_FLATTENING (1.0/298.26) +#define GRS67_RADIUS 6378160.0 +#define GRS67_FLATTENING (1.0/298.25) -#ifndef M_PI_2 - #define M_PI_2 1.57079632679489661923 -#endif // M_PI_2 -#ifndef M_PI_4 - #define M_PI_4 0.78539816339744830962 -#endif // M_PI_4 - -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - -typedef struct { - const char *name; - double radius; - double flattening; -} Entry; - -static Entry list[] = { - {"S42", KRASSOVSKY_RADIUS, KRASSOVSKY_FLATTENING}, - {"Pulkovo 1942", KRASSOVSKY_RADIUS, KRASSOVSKY_FLATTENING}, - {"European 1950", INTERNATIONAL_RADIUS, INTERNATIONAL_FLATTENING}, - {"European 1979", INTERNATIONAL_RADIUS, INTERNATIONAL_FLATTENING}, - {"NZGD1949", INTERNATIONAL_RADIUS, INTERNATIONAL_FLATTENING}, - {"NAD27", BESSEL_RADIUS, BESSEL_FLATTENING}, - {"NAD83", GRS80_RADIUS, GRS80_FLATTENING}, - {"WGS 72", WGS70_RADIUS, WGS70_FLATTENING}, - {"South American 1969", SAD69_RADIUS, SAD69_FLATTENING} +// Must be in Ellipsoid::Name order! +struct {double radius; double flattening;} static ellipsoids[] = { + {CLARKE1866_RADIUS, CLARKE1866_FLATTENING}, + {GRS80_RADIUS, GRS80_FLATTENING}, + {INTERNATIONAL_RADIUS, INTERNATIONAL_FLATTENING}, + {KRASSOVSKY_RADIUS, KRASSOVSKY_FLATTENING}, + {WGS84_RADIUS, WGS84_FLATTENING}, + {WGS72_RADIUS, WGS72_FLATTENING}, + {GRS67_RADIUS, GRS67_FLATTENING} }; - Ellipsoid::Ellipsoid() { _radius = WGS84_RADIUS; _flattening = WGS84_FLATTENING; } -Ellipsoid::Ellipsoid(const QString &datum) -{ - for (size_t i = 0; i < ARRAY_SIZE(list); i++) { - if (datum.startsWith(list[i].name)) { - _radius = list[i].radius; - _flattening = list[i].flattening; - return; - } - } - - _radius = WGS84_RADIUS; - _flattening = WGS84_FLATTENING; -} - -double Ellipsoid::q(double b) const -{ - double e = sqrt(_flattening * (2. - _flattening)); - double esb = e * sin(b); - return log(tan(M_PI_4 + b / 2.) * pow((1. - esb) / (1. + esb), e / 2.)); -} - -double Ellipsoid::iq(double q) const -{ - double e = sqrt(_flattening * (2. - _flattening)); - double b0 = 0.; - double b = 2. * atan(exp(q)) - M_PI_2; - - do { - b0 = b; - double esb = e * sin(b); - b = 2. * atan(exp(q) * pow((1. - esb) / (1. + esb), -e / 2.)) - M_PI_2; - } while (fabs(b - b0) > 1e-10); - - return b; -} - -double Ellipsoid::nradius(double phi) const +Ellipsoid::Ellipsoid(Name name) { - double sin_phi = sin(phi); - return (_radius / sqrt(1. - (_flattening * (2. - _flattening)) * sin_phi - * sin_phi)); + _radius = ellipsoids[name].radius; + _flattening = ellipsoids[name].flattening; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/ellipsoid.h new/GPXSee-4.3/src/ellipsoid.h --- old/GPXSee-4.2/src/ellipsoid.h 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/ellipsoid.h 2017-04-12 18:19:03.000000000 +0200 @@ -1,21 +1,25 @@ #ifndef ELLIPSOID_H #define ELLIPSOID_H -class QString; - class Ellipsoid { public: + enum Name { + Clarke1866, + GRS80, + International1924, + Krassowsky1940, + WGS84, + WGS72, + GRS67 + }; + Ellipsoid(); - Ellipsoid(const QString &datum); + Ellipsoid(Name name); double radius() const {return _radius;} double flattening() const {return _flattening;} - double q(double b) const; - double iq(double q) const; - double nradius(double phi) const; - private: double _radius; double _flattening; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/gui.cpp new/GPXSee-4.3/src/gui.cpp --- old/GPXSee-4.2/src/gui.cpp 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/gui.cpp 2017-04-12 18:19:03.000000000 +0200 @@ -639,8 +639,8 @@ "directory:") + "</p><p><code>" + USER_MAP_DIR + "</code></p><p>" + tr("The expected structure is one map/atlas in a separate subdirectory." - " Supported map formats are OziMap image-based maps and tiled TrekBuddy" - " maps/atlases (tared and non-tared).") + "</p>" + " Supported map formats are OziExplorer image-based maps and tiled" + " TrekBuddy maps/atlases (tared and non-tared).") + "</p>" + "<h4>" + tr("POIs") + "</h4><p>" + tr("To make GPXSee load a POI file automatically on startup, add " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/lambertconic.cpp new/GPXSee-4.3/src/lambertconic.cpp --- old/GPXSee-4.2/src/lambertconic.cpp 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/lambertconic.cpp 2017-04-12 18:19:03.000000000 +0200 @@ -2,24 +2,59 @@ #include "rd.h" #include "lambertconic.h" +#ifndef M_PI_2 + #define M_PI_2 1.57079632679489661923 +#endif // M_PI_2 +#ifndef M_PI_4 + #define M_PI_4 0.78539816339744830962 +#endif // M_PI_4 + +static double q(const Ellipsoid &el, double b) +{ + double e = sqrt(el.flattening() * (2. - el.flattening())); + double esb = e * sin(b); + return log(tan(M_PI_4 + b / 2.) * pow((1. - esb) / (1. + esb), e / 2.)); +} + +static double iq(const Ellipsoid &el, double q) +{ + double e = sqrt(el.flattening() * (2. - el.flattening())); + double b0 = 0.; + double b = 2. * atan(exp(q)) - M_PI_2; + + do { + b0 = b; + double esb = e * sin(b); + b = 2. * atan(exp(q) * pow((1. - esb) / (1. + esb), -e / 2.)) - M_PI_2; + } while (fabs(b - b0) > 1e-10); + + return b; +} + +static double nradius(const Ellipsoid &el, double phi) +{ + double sin_phi = sin(phi); + return (el.radius() / sqrt(1. - (el.flattening() * (2. - el.flattening())) + * sin_phi * sin_phi)); +} LambertConic::LambertConic(const Ellipsoid &ellipsoid, double standardParallel1, - double standardParallel2, double centralParallel, double centralMeridian, + double standardParallel2, double latitudeOrigin, double longitudeOrigin, double scale, double falseEasting, double falseNorthing) : _e(ellipsoid) { - _cm = centralMeridian; + _cm = longitudeOrigin; _fe = falseEasting; _fn = falseNorthing; double sp1 = deg2rad(standardParallel1); double sp2 = deg2rad(standardParallel2); - double N1 = _e.nradius(sp1); - double N2 = _e.nradius(sp2); + double N1 = nradius(_e, sp1); + double N2 = nradius(_e, sp2); - _q0 = ellipsoid.q(deg2rad(centralParallel)); - double q1 = _e.q(sp1); - double q2 = _e.q(sp2); + _q0 = q(_e, deg2rad(latitudeOrigin)); + double q1 = q(_e, sp1); + double q2 = q(_e, sp2); _n = log((N1 * cos(sp1)) / (N2 * cos(sp2))) / (q2 - q1); double R1 = N1 * cos(sp1) / _n; @@ -29,7 +64,7 @@ QPointF LambertConic::ll2xy(const Coordinates &c) const { double dl = _n * (deg2rad(c.lon()) - deg2rad(_cm)); - double R = _R0 * exp(_n * (_q0 - _e.q(deg2rad(c.lat())))); + double R = _R0 * exp(_n * (_q0 - q(_e, deg2rad(c.lat())))); return QPointF(_fe + R * sin(dl), _fn + _R0 - R * cos(dl)); } @@ -42,5 +77,5 @@ double R = sqrt(dx * dx + dy * dy); double q = _q0 - log(R / _R0) / _n; - return Coordinates(rad2deg(deg2rad(_cm) + dl / _n), rad2deg(_e.iq(q))); + return Coordinates(rad2deg(deg2rad(_cm) + dl / _n), rad2deg(iq(_e, q))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/lambertconic.h new/GPXSee-4.3/src/lambertconic.h --- old/GPXSee-4.2/src/lambertconic.h 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/lambertconic.h 2017-04-12 18:19:03.000000000 +0200 @@ -8,7 +8,7 @@ { public: LambertConic(const Ellipsoid &ellipsoid, double standardParallel1, - double standardParallel2, double centralParallel, double centralMeridian, + double standardParallel2, double latitudeOrigin, double longitudeOrigin, double scale, double falseEasting, double falseNorthing); virtual QPointF ll2xy(const Coordinates &c) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/misc.h new/GPXSee-4.3/src/misc.h --- old/GPXSee-4.2/src/misc.h 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/misc.h 2017-04-12 18:19:03.000000000 +0200 @@ -3,6 +3,9 @@ #include <QRectF> +#define ARRAY_SIZE(array) \ + (sizeof(array) / sizeof((array)[0])) + double niceNum(double x, int round); int str2int(const char *str, int len); QRectF scaled(const QRectF &rect, qreal factor); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/offlinemap.cpp new/GPXSee-4.3/src/offlinemap.cpp --- old/GPXSee-4.2/src/offlinemap.cpp 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/offlinemap.cpp 2017-04-12 18:19:03.000000000 +0200 @@ -21,6 +21,18 @@ #include "offlinemap.h" +struct {const char *name; Ellipsoid::Name ellipsoid;} static datums[] = { + {"S42", Ellipsoid::Krassowsky1940}, + {"Pulkovo 1942", Ellipsoid::Krassowsky1940}, + {"European 1950", Ellipsoid::International1924}, + {"European 1979", Ellipsoid::International1924}, + {"NZGD1949", Ellipsoid::International1924}, + {"NAD27", Ellipsoid::Clarke1866}, + {"NAD83", Ellipsoid::GRS80}, + {"WGS 72", Ellipsoid::WGS72}, + {"South American 1969", Ellipsoid::GRS67} +}; + int OfflineMap::parseMapFile(QIODevice &device, QList<ReferencePoint> &points, QString &projection, ProjectionSetup &setup, QString &datum) { @@ -108,12 +120,12 @@ } else if (key == "Projection Setup") { if (list.count() < 8) return ln; - setup.centralParallel = list.at(1).trimmed().toFloat(&res); + setup.latitudeOrigin = list.at(1).trimmed().toFloat(&res); if (!res) - setup.centralParallel = 0; - setup.centralMeridian = list.at(2).trimmed().toFloat(&res); + setup.latitudeOrigin = 0; + setup.longitudeOrigin = list.at(2).trimmed().toFloat(&res); if (!res) - setup.centralMeridian = 0; + setup.longitudeOrigin = 0; setup.scale = list.at(3).trimmed().toFloat(&res); if (!res) setup.scale = 1.0; @@ -142,29 +154,39 @@ const QString &projection, const ProjectionSetup &setup, QList<ReferencePoint> &points) { + Ellipsoid::Name ellipsoid = Ellipsoid::WGS84; + if (points.count() < 2) { qWarning("%s: insufficient number of reference points", qPrintable(_name)); return false; } + for (size_t i = 0; i < ARRAY_SIZE(datums); i++) { + if (datum.startsWith(datums[i].name)) { + ellipsoid = datums[i].ellipsoid; + break; + } + } + if (projection == "Mercator") _projection = new Mercator(); else if (projection == "Transverse Mercator") - _projection = new TransverseMercator(Ellipsoid(datum), - setup.centralMeridian, setup.scale, setup.falseEasting, + _projection = new TransverseMercator(Ellipsoid(ellipsoid), + setup.longitudeOrigin, setup.scale, setup.falseEasting, setup.falseNorthing); else if (projection == "Latitude/Longitude") _projection = new LatLon(); else if (projection == "Lambert Conformal Conic") - _projection = new LambertConic(Ellipsoid(datum), setup.standardParallel1, - setup.standardParallel2, setup.centralParallel, setup.centralMeridian, - setup.scale, setup.falseEasting, setup.falseNorthing); + _projection = new LambertConic(Ellipsoid(ellipsoid), + setup.standardParallel1, setup.standardParallel2, + setup.latitudeOrigin, setup.longitudeOrigin, setup.scale, + setup.falseEasting, setup.falseNorthing); else if (projection == "(UTM) Universal Transverse Mercator") { if (setup.zone) - _projection = new UTM(setup.zone); + _projection = new UTM(Ellipsoid(ellipsoid), setup.zone); else if (!points.first().ll.isNull()) - _projection = new UTM(points.first().ll); + _projection = new UTM(Ellipsoid(ellipsoid), points.first().ll); else { qWarning("%s: Can not determine UTM zone", qPrintable(_name)); return false; @@ -496,36 +518,6 @@ } } -QRectF OfflineMap::bounds() const -{ - return QRectF(QPointF(0, 0), _size); -} - -qreal OfflineMap::zoomFit(const QSize &size, const QRectF &br) -{ - Q_UNUSED(size); - Q_UNUSED(br); - - return 1.0; -} - -qreal OfflineMap::resolution(const QPointF &p) const -{ - Q_UNUSED(p); - - return _resolution; -} - -qreal OfflineMap::zoomIn() -{ - return 1.0; -} - -qreal OfflineMap::zoomOut() -{ - return 1.0; -} - void OfflineMap::draw(QPainter *painter, const QRectF &rect) { if (_tileSize.isValid()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/offlinemap.h new/GPXSee-4.3/src/offlinemap.h --- old/GPXSee-4.2/src/offlinemap.h 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/offlinemap.h 2017-04-12 18:19:03.000000000 +0200 @@ -22,13 +22,13 @@ const QString &name() const {return _name;} - QRectF bounds() const; - qreal resolution(const QPointF &p) const; + QRectF bounds() const {return QRectF(QPointF(0, 0), _size);} + qreal resolution(const QPointF &) const {return _resolution;} qreal zoom() const {return 1.0;} - qreal zoomFit(const QSize &size, const QRectF &br); - qreal zoomIn(); - qreal zoomOut(); + qreal zoomFit(const QSize &, const QRectF &) {return 1.0;} + qreal zoomIn() {return 1.0;} + qreal zoomOut() {return 1.0;} QPointF ll2xy(const Coordinates &c) const {return _transform.map(_projection->ll2xy(c));} @@ -57,8 +57,8 @@ } ReferencePoint; typedef struct { - double centralParallel; - double centralMeridian; + double latitudeOrigin; + double longitudeOrigin; double scale; double falseEasting; double falseNorthing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/pathview.cpp new/GPXSee-4.3/src/pathview.cpp --- old/GPXSee-4.2/src/pathview.cpp 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/pathview.cpp 2017-04-12 18:19:03.000000000 +0200 @@ -521,6 +521,8 @@ _digitalZoom = 0; resetTransform(); + + resetCachedContent(); } void PathView::showTracks(bool show) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/utm.cpp new/GPXSee-4.3/src/utm.cpp --- old/GPXSee-4.2/src/utm.cpp 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/utm.cpp 2017-04-12 18:19:03.000000000 +0200 @@ -1,12 +1,14 @@ #include "ellipsoid.h" #include "utm.h" -UTM::UTM(int zone) : _tm(Ellipsoid(), (qAbs(zone) - 1)*6 - 180 + 3, 0.9996, - 500000, zone < 0 ? 10000000 : 0) +UTM::UTM(const Ellipsoid &ellipsoid, int zone) + : _tm(ellipsoid, (qAbs(zone) - 1)*6 - 180 + 3, 0.9996, 500000, + zone < 0 ? 10000000 : 0) { } -UTM::UTM(const Coordinates &c) : _tm(Ellipsoid(), 0, 0, 0, 0) +UTM::UTM(const Ellipsoid &ellipsoid, const Coordinates &c) + : _tm(ellipsoid, 0, 0, 0, 0) { int zone = int((c.lon() + 180)/6) + 1; @@ -24,6 +26,6 @@ } double cm = (zone - 1)*6 - 180 + 3; - _tm = TransverseMercator(Ellipsoid(), cm, 0.9996, 500000, + _tm = TransverseMercator(ellipsoid, cm, 0.9996, 500000, (c.lat() < 0) ? 10000000 : 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-4.2/src/utm.h new/GPXSee-4.3/src/utm.h --- old/GPXSee-4.2/src/utm.h 2017-04-06 19:54:50.000000000 +0200 +++ new/GPXSee-4.3/src/utm.h 2017-04-12 18:19:03.000000000 +0200 @@ -7,8 +7,8 @@ class UTM : public Projection { public: - UTM(int zone); - UTM(const Coordinates &c); + UTM(const Ellipsoid &ellipsoid, int zone); + UTM(const Ellipsoid &ellipsoid, const Coordinates &c); virtual QPointF ll2xy(const Coordinates &c) const {return _tm.ll2xy(c);} ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.yAhCS1/_old 2017-04-14 13:42:04.002540842 +0200 +++ /var/tmp/diff_new_pack.yAhCS1/_new 2017-04-14 13:42:04.006540277 +0200 @@ -1,3 +1,11 @@ +gpxsee (4.3) stable; urgency=high + + * Fixed missing cached content cleanup causing huge draw areas + (causing memory exhaustion) issue. + * Fixed map file defined datum not set for UTM maps issue. + + -- Martin Tuma <tu...@cbox.cz> Wed, 12 Apr 2017 18:39:32 +0200 + gpxsee (4.2) stable; urgency=low * Added digital zoom. ++++++ gpxsee.dsc ++++++ --- /var/tmp/diff_new_pack.yAhCS1/_old 2017-04-14 13:42:04.118524454 +0200 +++ /var/tmp/diff_new_pack.yAhCS1/_new 2017-04-14 13:42:04.118524454 +0200 @@ -1,9 +1,9 @@ Format: 1.0 Source: gpxsee -Version: 4.2 +Version: 4.3 Binary: gpxsee Maintainer: Martin Tuma <tu...@cbox.cz> Architecture: any Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, qttools5-dev-tools, libqt5opengl5-dev Files: - 00000000000000000000000000000000 0 GPXSee-4.2.tar.gz + 00000000000000000000000000000000 0 GPXSee-4.3.tar.gz
