Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gpxsee for openSUSE:Factory checked in at 2023-12-19 23:16:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpxsee (Old) and /work/SRC/openSUSE:Factory/.gpxsee.new.9037 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpxsee" Tue Dec 19 23:16:41 2023 rev:116 rq:1134018 version:13.13 Changes: -------- --- /work/SRC/openSUSE:Factory/gpxsee/gpxsee.changes 2023-12-12 19:32:32.829162993 +0100 +++ /work/SRC/openSUSE:Factory/.gpxsee.new.9037/gpxsee.changes 2023-12-19 23:17:05.128271231 +0100 @@ -1,0 +2,9 @@ +Mon Dec 18 21:46:45 CET 2023 - tu...@cbox.cz + +- Update to version 13.13 + * Fixed broken map scale (ruler) on HiDPI maps. + * Limit the overzoom to not produce huge tiles which break map + rendering. + * Increase the default pixmap cache size on Android to 384MB. + +------------------------------------------------------------------- Old: ---- GPXSee-13.12.tar.gz New: ---- GPXSee-13.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpxsee.spec ++++++ --- /var/tmp/diff_new_pack.BnCa1d/_old 2023-12-19 23:17:05.760294246 +0100 +++ /var/tmp/diff_new_pack.BnCa1d/_new 2023-12-19 23:17:05.764294392 +0100 @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: gpxsee -Version: 13.12 +Version: 13.13 Release: 1 Summary: GPS log file visualization and analysis tool License: GPL-3.0-only ++++++ GPXSee-13.12.tar.gz -> GPXSee-13.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/.appveyor.yml new/GPXSee-13.13/.appveyor.yml --- old/GPXSee-13.12/.appveyor.yml 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/.appveyor.yml 2023-12-18 21:18:50.000000000 +0100 @@ -1,4 +1,4 @@ -version: 13.12.{build} +version: 13.13.{build} configuration: - Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/gpxsee.pro new/GPXSee-13.13/gpxsee.pro --- old/GPXSee-13.12/gpxsee.pro 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/gpxsee.pro 2023-12-18 21:18:50.000000000 +0100 @@ -3,7 +3,7 @@ } else { TARGET = GPXSee } -VERSION = 13.12 +VERSION = 13.13 QT += core \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/pkg/windows/gpxsee64.nsi new/GPXSee-13.13/pkg/windows/gpxsee64.nsi --- old/GPXSee-13.12/pkg/windows/gpxsee64.nsi 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/pkg/windows/gpxsee64.nsi 2023-12-18 21:18:50.000000000 +0100 @@ -37,7 +37,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "13.12" +!define VERSION "13.13" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/GUI/settings.cpp new/GPXSee-13.13/src/GUI/settings.cpp --- old/GPXSee-13.12/src/GUI/settings.cpp 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/GUI/settings.cpp 2023-12-18 21:18:50.000000000 +0100 @@ -33,7 +33,7 @@ : QPageSize::PageSizeId::A4) #ifdef Q_OS_ANDROID -#define PIXMAP_CACHE 256 +#define PIXMAP_CACHE 384 #define DEM_CACHE 128 #else // Q_OS_ANDROID #define PIXMAP_CACHE 512 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/map/aqmmap.cpp new/GPXSee-13.13/src/map/aqmmap.cpp --- old/GPXSee-13.12/src/map/aqmmap.cpp 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/map/aqmmap.cpp 2023-12-18 21:18:50.000000000 +0100 @@ -295,7 +295,7 @@ qreal AQMMap::resolution(const QRectF &rect) { const Zoom &z = _zooms.at(_zoom); - return OSM::resolution(rect.center(), z.zoom, z.tileSize); + return OSM::resolution(rect.center(), z.zoom, tileSize()); } int AQMMap::zoomIn() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/map/gemfmap.cpp new/GPXSee-13.13/src/map/gemfmap.cpp --- old/GPXSee-13.12/src/map/gemfmap.cpp 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/map/gemfmap.cpp 2023-12-18 21:18:50.000000000 +0100 @@ -128,7 +128,7 @@ qreal GEMFMap::resolution(const QRectF &rect) { - return OSM::resolution(rect.center(), _zooms.at(_zi).level, _tileSize); + return OSM::resolution(rect.center(), _zooms.at(_zi).level, tileSize()); } int GEMFMap::zoomFit(const QSize &size, const RectC &rect) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/map/mbtilesmap.cpp new/GPXSee-13.13/src/map/mbtilesmap.cpp --- old/GPXSee-13.12/src/map/mbtilesmap.cpp 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/map/mbtilesmap.cpp 2023-12-18 21:18:50.000000000 +0100 @@ -9,7 +9,7 @@ #include "osm.h" #include "mbtilesmap.h" -#define MAX_OVERZOOM 3 +#define MAX_TILE_SIZE 4096 #define META_TYPE(type) static_cast<QMetaType::Type>(type) static RectC str2bounds(const QString &str) @@ -79,24 +79,15 @@ " WHERE zoom_level = %1 LIMIT 1").arg(i); QSqlQuery query(sql, _db); if (query.first()) - _zooms.append(Zoom(i, i)); + _zoomsBase.append(Zoom(i, i)); } - if (!_zooms.size()) { + if (!_zoomsBase.size()) { _errorString = "Empty tile set"; return false; } - if (_scalable) { - for (int i = _zooms.last().base + 1; i <= OSM::ZOOMS.max(); i++) { - Zoom z(i, _zooms.last().base); - if (z.z - z.base > MAX_OVERZOOM) - break; - _zooms.append(Zoom(i, _zooms.last().base)); - } - } - - _zi = _zooms.size() - 1; + _zi = _zoomsBase.size() - 1; return true; } @@ -114,7 +105,7 @@ } else { qWarning("%s: missing bounds metadata", qPrintable(path())); - int z = _zooms.first().z; + int z = _zoomsBase.first().z; QString sql = QString("SELECT min(tile_column), min(tile_row), " "max(tile_column), max(tile_row) FROM tiles WHERE zoom_level = %1") .arg(z); @@ -222,12 +213,12 @@ } getTileFormat(); + if (!getTileSize()) + return; if (!getZooms()) return; if (!getBounds()) return; - if (!getTileSize()) - return; getTilePixelRatio(); getName(); @@ -243,10 +234,18 @@ Q_UNUSED(out); _mapRatio = hidpi ? deviceRatio : 1.0; + _zooms = _zoomsBase; if (_scalable) { _scaledSize = _tileSize * deviceRatio; _tileRatio = deviceRatio; + + for (int i = _zooms.last().base + 1; i <= OSM::ZOOMS.max(); i++) { + Zoom z(i, _zooms.last().base); + if (_tileSize * _tileRatio * (1U<<(z.z - z.base)) > MAX_TILE_SIZE) + break; + _zooms.append(Zoom(i, _zooms.last().base)); + } } _db.open(); @@ -286,7 +285,7 @@ qreal MBTilesMap::resolution(const QRectF &rect) { - return OSM::resolution(rect.center(), _zooms.at(_zi).z, _tileSize); + return OSM::resolution(rect.center(), _zooms.at(_zi).z, tileSize()); } int MBTilesMap::zoomIn() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/map/mbtilesmap.h new/GPXSee-13.13/src/map/mbtilesmap.h --- old/GPXSee-13.12/src/map/mbtilesmap.h 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/map/mbtilesmap.h 2023-12-18 21:18:50.000000000 +0100 @@ -146,7 +146,7 @@ QString _name; RectC _bounds; - QVector<Zoom> _zooms; + QVector<Zoom> _zooms, _zoomsBase; int _zi; int _tileSize; qreal _mapRatio, _tileRatio; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/map/onlinemap.cpp new/GPXSee-13.13/src/map/onlinemap.cpp --- old/GPXSee-13.12/src/map/onlinemap.cpp 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/map/onlinemap.cpp 2023-12-18 21:18:50.000000000 +0100 @@ -8,7 +8,7 @@ #include "onlinemap.h" -#define MAX_OVERZOOM 3 +#define MAX_TILE_SIZE 4096 OnlineMap::OnlineMap(const QString &fileName, const QString &name, const QString &url, const Range &zooms, const RectC &bounds, qreal tileRatio, @@ -24,10 +24,7 @@ _tileLoader->setHeaders(headers); connect(_tileLoader, &TileLoader::finished, this, &OnlineMap::tilesLoaded); - if (_scalable) { - _baseZoom = _zooms.max(); - _zooms.setMax(qMin(_zooms.max() + MAX_OVERZOOM, OSM::ZOOMS.max())); - } + _baseZoom = _zooms.max(); } QRectF OnlineMap::bounds() @@ -61,7 +58,7 @@ qreal OnlineMap::resolution(const QRectF &rect) { - return OSM::resolution(rect.center(), _zoom, _tileSize); + return OSM::resolution(rect.center(), _zoom, tileSize()); } int OnlineMap::zoomIn() @@ -87,10 +84,17 @@ Q_UNUSED(out); _mapRatio = hidpi ? deviceRatio : 1.0; + _zooms.setMax(_baseZoom); if (_scalable) { _scaledSize = _tileSize * deviceRatio; _tileRatio = deviceRatio; + + for (int i = _baseZoom + 1; i <= OSM::ZOOMS.max(); i++) { + if (_tileSize * _tileRatio * (1U<<(i - _baseZoom)) > MAX_TILE_SIZE) + break; + _zooms.setMax(i); + } } } @@ -168,7 +172,7 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags) { - int baseZoom = _scalable ? qMin(_baseZoom, _zoom) : _zoom; + int baseZoom = qMin(_baseZoom, _zoom); unsigned overzoom = _zoom - baseZoom; unsigned f = 1U<<overzoom; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/map/osmdroidmap.cpp new/GPXSee-13.13/src/map/osmdroidmap.cpp --- old/GPXSee-13.12/src/map/osmdroidmap.cpp 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/map/osmdroidmap.cpp 2023-12-18 21:18:50.000000000 +0100 @@ -198,7 +198,7 @@ qreal OsmdroidMap::resolution(const QRectF &rect) { - return OSM::resolution(rect.center(), _zoom, _tileSize); + return OSM::resolution(rect.center(), _zoom, tileSize()); } int OsmdroidMap::zoomIn() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.12/src/map/sqlitemap.cpp new/GPXSee-13.13/src/map/sqlitemap.cpp --- old/GPXSee-13.12/src/map/sqlitemap.cpp 2023-12-11 21:13:11.000000000 +0100 +++ new/GPXSee-13.13/src/map/sqlitemap.cpp 2023-12-18 21:18:50.000000000 +0100 @@ -146,7 +146,7 @@ qreal SqliteMap::resolution(const QRectF &rect) { - return OSM::resolution(rect.center(), _zoom, _tileSize); + return OSM::resolution(rect.center(), _zoom, tileSize()); } int SqliteMap::zoomIn() ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.BnCa1d/_old 2023-12-19 23:17:06.260312455 +0100 +++ /var/tmp/diff_new_pack.BnCa1d/_new 2023-12-19 23:17:06.264312600 +0100 @@ -1,5 +1,5 @@ pkgname=gpxsee -pkgver=13.12 +pkgver=13.13 pkgrel=1 pkgdesc='GPS log files visualizing and analyzing tool' arch=('i686' 'x86_64') ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.BnCa1d/_old 2023-12-19 23:17:06.284313329 +0100 +++ /var/tmp/diff_new_pack.BnCa1d/_new 2023-12-19 23:17:06.288313474 +0100 @@ -1,3 +1,12 @@ +gpxsee (13.13) stable; urgency=low + + * Fixed broken map scale (ruler) on HiDPI maps. + * Limit the overzoom to not produce huge tiles which break map + rendering. + * Increase the default pixmap cache size on Android to 384MB. + + -- Martin Tuma <tu...@cbox.cz> Mon, 18 Dec 2023 21:52:33 +0100 + gpxsee (13.12) stable; urgency=low * Added support for overzoom in MVT vector maps (MBTiles/online). ++++++ gpxsee.dsc ++++++ --- /var/tmp/diff_new_pack.BnCa1d/_old 2023-12-19 23:17:06.356315950 +0100 +++ /var/tmp/diff_new_pack.BnCa1d/_new 2023-12-19 23:17:06.356315950 +0100 @@ -1,10 +1,10 @@ Format: 1.0 Source: gpxsee -Version: 13.12-1 +Version: 13.13-1 Binary: gpxsee Maintainer: Martin Tuma <tu...@cbox.cz> Architecture: any Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-private-dev, qtbase5-dev-tools, qt5-qmake, qttools5-dev-tools, libqt5opengl5-dev, qtpositioning5-dev, libqt5svg5-dev, libqt5serialport5-dev Files: - 00000000000000000000000000000000 0 GPXSee-13.12.tar.gz + 00000000000000000000000000000000 0 GPXSee-13.13.tar.gz
