Hello community, here is the log from the commit of package gpxsee for openSUSE:Leap:15.2 checked in at 2020-03-09 18:13:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/gpxsee (Old) and /work/SRC/openSUSE:Leap:15.2/.gpxsee.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpxsee" Mon Mar 9 18:13:33 2020 rev:68 rq:782147 version:7.25 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/gpxsee/gpxsee.changes 2020-02-26 16:59:19.614863847 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.gpxsee.new.26092/gpxsee.changes 2020-03-09 18:14:19.881410324 +0100 @@ -1,0 +2,14 @@ +Wed Mar 4 20:35:11 CET 2020 - [email protected] + +- Update to version 7.25 + * Added missing OnlineResources URLs handling in WMS maps. + * A better WMS format parameter handling (partialy broken in + 7.24) + +------------------------------------------------------------------- +Sun Mar 1 15:21:52 CET 2020 - [email protected] + +- Update to version 7.24 + * Multiple WMS maps fixes. + +------------------------------------------------------------------- Old: ---- GPXSee-7.23.tar.gz New: ---- GPXSee-7.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpxsee.spec ++++++ --- /var/tmp/diff_new_pack.giUAn2/_old 2020-03-09 18:14:22.073411387 +0100 +++ /var/tmp/diff_new_pack.giUAn2/_new 2020-03-09 18:14:22.097411398 +0100 @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: gpxsee -Version: 7.23 +Version: 7.25 Release: 1 Summary: GPS log file visualization and analysis tool License: GPL-3.0-only ++++++ GPXSee-7.23.tar.gz -> GPXSee-7.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/.appveyor.yml new/GPXSee-7.25/.appveyor.yml --- old/GPXSee-7.23/.appveyor.yml 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/.appveyor.yml 2020-03-04 19:49:11.000000000 +0100 @@ -1,4 +1,4 @@ -version: 7.23.{build} +version: 7.25.{build} configuration: - Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/gpxsee.pro new/GPXSee-7.25/gpxsee.pro --- old/GPXSee-7.23/gpxsee.pro 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/gpxsee.pro 2020-03-04 19:49:11.000000000 +0100 @@ -3,7 +3,7 @@ } else { TARGET = GPXSee } -VERSION = 7.23 +VERSION = 7.25 QT += core \ gui \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/gpxsee.nsi new/GPXSee-7.25/pkg/gpxsee.nsi --- old/GPXSee-7.23/pkg/gpxsee.nsi 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/gpxsee.nsi 2020-03-04 19:49:11.000000000 +0100 @@ -7,7 +7,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "7.23" +!define VERSION "7.25" ; The file to write OutFile "GPXSee-${VERSION}.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/gpxsee64.nsi new/GPXSee-7.25/pkg/gpxsee64.nsi --- old/GPXSee-7.23/pkg/gpxsee64.nsi 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/gpxsee64.nsi 2020-03-04 19:49:11.000000000 +0100 @@ -7,7 +7,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "7.23" +!define VERSION "7.25" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/maps/4UMaps.xml new/GPXSee-7.25/pkg/maps/4UMaps.xml --- old/GPXSee-7.23/pkg/maps/4UMaps.xml 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/maps/4UMaps.xml 2020-03-04 19:49:11.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map xmlns="http://www.gpxsee.org/map/1.3";> +<map xmlns="http://www.gpxsee.org/map/1.4";> <name>4UMaps</name> <url>https://tileserver.4umaps.com/$z/$x/$y.png</url> <zoom min="2" max="15"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/maps/Antarctica.xml new/GPXSee-7.25/pkg/maps/Antarctica.xml --- old/GPXSee-7.23/pkg/maps/Antarctica.xml 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/maps/Antarctica.xml 2020-03-04 19:49:11.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map xmlns="http://www.gpxsee.org/map/1.3"; type="WMTS"> +<map xmlns="http://www.gpxsee.org/map/1.4"; type="WMTS"> <name>Antarctica</name> <url type="REST">https://gis.ngdc.noaa.gov/arcgis/rest/services/antarctic/antarctic_basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url> <copyright>NOAA National Centers for Environmental Information (NCEI); International Bathymetric Chart of the Southern Ocean (IBCSO); General Bathymetric Chart of the Oceans (GEBCO); Natural Earth</copyright> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/maps/OpenStreetMap.xml new/GPXSee-7.25/pkg/maps/OpenStreetMap.xml --- old/GPXSee-7.23/pkg/maps/OpenStreetMap.xml 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/maps/OpenStreetMap.xml 2020-03-04 19:49:11.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map xmlns="http://www.gpxsee.org/map/1.3";> +<map xmlns="http://www.gpxsee.org/map/1.4";> <name>Open Street Map</name> <url>https://tile.openstreetmap.org/$z/$x/$y.png</url> <copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © OpenStreetMap (CC-BY-SA)</copyright> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/maps/OpenTopoMap.xml new/GPXSee-7.25/pkg/maps/OpenTopoMap.xml --- old/GPXSee-7.23/pkg/maps/OpenTopoMap.xml 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/maps/OpenTopoMap.xml 2020-03-04 19:49:11.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map xmlns="http://www.gpxsee.org/map/1.3";> +<map xmlns="http://www.gpxsee.org/map/1.4";> <name>Open Topo Map</name> <url>https://a.tile.opentopomap.org/$z/$x/$y.png</url> <zoom max="17"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/maps/USGS-imagery.xml new/GPXSee-7.25/pkg/maps/USGS-imagery.xml --- old/GPXSee-7.23/pkg/maps/USGS-imagery.xml 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/maps/USGS-imagery.xml 2020-03-04 19:49:11.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map xmlns="http://www.gpxsee.org/map/1.3";> +<map xmlns="http://www.gpxsee.org/map/1.4";> <name>USGS Imagery</name> <url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url> <zoom min="2" max="15"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/pkg/maps/USGS-topo.xml new/GPXSee-7.25/pkg/maps/USGS-topo.xml --- old/GPXSee-7.23/pkg/maps/USGS-topo.xml 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/pkg/maps/USGS-topo.xml 2020-03-04 19:49:11.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map xmlns="http://www.gpxsee.org/map/1.3";> +<map xmlns="http://www.gpxsee.org/map/1.4";> <name>USGS Topo</name> <url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url> <zoom min="2" max="15"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/GUI/mapview.cpp new/GPXSee-7.25/src/GUI/mapview.cpp --- old/GPXSee-7.23/src/GUI/mapview.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/GUI/mapview.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -2,7 +2,6 @@ #include <QGraphicsScene> #include <QWheelEvent> #include <QApplication> -#include <QPixmapCache> #include <QScrollBar> #include "data/poi.h" #include "data/data.h" @@ -351,7 +350,6 @@ centerOn(nc); reloadMap(); - QPixmapCache::clear(); } void MapView::setPOI(POI *poi) @@ -982,7 +980,6 @@ _deviceRatio = deviceRatio; _mapRatio = mapRatio; - QPixmapCache::clear(); QRectF vr(mapToScene(viewport()->rect()).boundingRect() .intersected(_map->bounds())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/IMG/rgnfile.cpp new/GPXSee-7.25/src/map/IMG/rgnfile.cpp --- old/GPXSee-7.23/src/map/IMG/rgnfile.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/IMG/rgnfile.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -425,7 +425,7 @@ quint32 ls = 0; SegmentType lt = (SegmentType)0; - for (quint16 mask = 0x1; mask <= 0x10; mask <<= 1) { + for (quint8 mask = 0x1; mask <= 0x10; mask <<= 1) { if (subdiv->objects() & mask) { if (ls) { quint16 po; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/maplist.cpp new/GPXSee-7.25/src/map/maplist.cpp --- old/GPXSee-7.23/src/map/maplist.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/maplist.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -52,7 +52,7 @@ else if (GMAP::isGMAP(path)) { if (terminate) *terminate = true; - map = new IMGMap(path); + map = new IMGMap(path, this); } } else if (suffix == "jnx") map = new JNXMap(path, this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/mapsource.cpp new/GPXSee-7.25/src/map/mapsource.cpp --- old/GPXSee-7.23/src/map/mapsource.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/mapsource.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -300,7 +300,7 @@ case WMS: return new WMSMap(config.name, WMS::Setup(config.url, config.layer, config.style, config.format, config.crs, config.coordinateSystem, - config.dimensions, config.authorization)); + config.dimensions, config.authorization), config.tileSize); case TMS: return new OnlineMap(config.name, config.url, config.zooms, config.bounds, config.tileRatio, config.authorization, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/tileloader.cpp new/GPXSee-7.25/src/map/tileloader.cpp --- old/GPXSee-7.23/src/map/tileloader.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/tileloader.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -169,6 +169,17 @@ dir.remove(list.at(i)); _downloader->clearErrors(); + + QPixmapCache::clear(); +} + +void TileLoader::setScaledSize(int size) +{ + if (_scaledSize == size) + return; + + _scaledSize = size; + QPixmapCache::clear(); } QUrl TileLoader::tileUrl(const Tile &tile) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/tileloader.h new/GPXSee-7.25/src/map/tileloader.h --- old/GPXSee-7.23/src/map/tileloader.h 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/tileloader.h 2020-03-04 19:49:11.000000000 +0100 @@ -16,7 +16,7 @@ void setUrl(const QString &url) {_url = url;} void setAuthorization(const Authorization &authorization) {_authorization = authorization;} - void setScaledSize(int size) {_scaledSize = size;} + void setScaledSize(int size); void setQuadTiles(bool quadTiles) {_quadTiles = quadTiles;} void loadTilesAsync(QVector<Tile> &list); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/wms.cpp new/GPXSee-7.25/src/map/wms.cpp --- old/GPXSee-7.23/src/map/wms.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/wms.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -1,3 +1,4 @@ +#include <cmath> #include <QFileInfo> #include <QEventLoop> #include <QXmlStreamReader> @@ -7,6 +8,19 @@ #include "wms.h" +static QString bareFormat(const QString &format) +{ + return format.left(format.indexOf(';')).trimmed(); +} + +static inline double hint2denominator(double h) +{ + /* Some WMS 1.1.1 servers use a 72dpi resolution by default. Using the usual + 90dpi (0.28mm) resolution known from later standards (WMS 1.3, WMTS) does + make them return emty images in the "max" scale level. */ + return h / (M_SQRT2 * 0.36e-3); +} + WMS::CTX::CTX(const Setup &setup) : setup(setup), formatSupported(false) { QStringList ll = setup.layer().split(','); @@ -24,13 +38,48 @@ } } +void WMS::get(QXmlStreamReader &reader, CTX &ctx) +{ + while (reader.readNextStartElement()) { + if (reader.name() == "OnlineResource") { + QXmlStreamAttributes attr = reader.attributes(); + ctx.url = attr.value("xlink:href").toString(); + reader.skipCurrentElement(); + } else + reader.skipCurrentElement(); + } +} + +void WMS::http(QXmlStreamReader &reader, CTX &ctx) +{ + while (reader.readNextStartElement()) { + if (reader.name() == "Get") + get(reader, ctx); + else + reader.skipCurrentElement(); + } +} + +void WMS::dcpType(QXmlStreamReader &reader, CTX &ctx) +{ + while (reader.readNextStartElement()) { + if (reader.name() == "HTTP") + http(reader, ctx); + else + reader.skipCurrentElement(); + } +} + void WMS::getMap(QXmlStreamReader &reader, CTX &ctx) { while (reader.readNextStartElement()) { if (reader.name() == "Format") { - if (reader.readElementText() == ctx.setup.format()) + QString format(reader.readElementText()); + if (bareFormat(format) == bareFormat(ctx.setup.format())) ctx.formatSupported = true; - } else + } else if (reader.name() == "DCPType") + dcpType(reader, ctx); + else reader.skipCurrentElement(); } } @@ -97,7 +146,16 @@ CRSs.append(reader.readElementText()); else if (reader.name() == "Style") styles.append(style(reader)); - else if (reader.name() == "MinScaleDenominator") { + else if (reader.name() == "ScaleHint") { + QXmlStreamAttributes attr = reader.attributes(); + double minHint = attr.value("min").toString().toDouble(); + double maxHint = attr.value("max").toString().toDouble(); + if (minHint > 0) + scaleDenominator.setMin(hint2denominator(minHint)); + if (maxHint > 0) + scaleDenominator.setMax(hint2denominator(maxHint)); + reader.skipCurrentElement(); + } else if (reader.name() == "MinScaleDenominator") { double sd = reader.readElementText().toDouble(); if (sd > 0) scaleDenominator.setMin(sd); @@ -248,6 +306,8 @@ return false; } + _tileUrl = ctx.url.isEmpty() ? setup.url() : ctx.url; + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/wms.h new/GPXSee-7.25/src/map/wms.h --- old/GPXSee-7.23/src/map/wms.h 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/wms.h 2020-03-04 19:49:11.000000000 +0100 @@ -54,6 +54,7 @@ const RangeF &scaleDenominator() const {return _scaleDenominator;} const RectC &boundingBox() const {return _boundingBox;} const QString &version() const {return _version;} + const QString &tileUrl() const {return _tileUrl;} bool isValid() const {return _valid;} const QString &errorString() const {return _errorString;} @@ -79,12 +80,16 @@ const Setup &setup; QList<Layer> layers; bool formatSupported; + QString url; CTX(const Setup &setup); }; RectC geographicBoundingBox(QXmlStreamReader &reader); QString style(QXmlStreamReader &reader); + void get(QXmlStreamReader &reader, CTX &ctx); + void http(QXmlStreamReader &reader, CTX &ctx); + void dcpType(QXmlStreamReader &reader, CTX &ctx); void getMap(QXmlStreamReader &reader, CTX &ctx); void request(QXmlStreamReader &reader, CTX &ctx); void layer(QXmlStreamReader &reader, CTX &ctx, const QList<QString> &pCRSs, @@ -100,6 +105,7 @@ RangeF _scaleDenominator; RectC _boundingBox; QString _version; + QString _tileUrl; bool _valid; QString _errorString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/wmsmap.cpp new/GPXSee-7.25/src/map/wmsmap.cpp --- old/GPXSee-7.23/src/map/wmsmap.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/wmsmap.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -10,7 +10,6 @@ #define CAPABILITIES_FILE "capabilities.xml" -#define TILE_SIZE 256 #define EPSILON 1e-6 double WMSMap::sd2res(double scaleDenominator) const @@ -18,14 +17,14 @@ return scaleDenominator * 0.28e-3 * _projection.units().fromMeters(1.0); } -QString WMSMap::tileUrl(const QString &version) const +QString WMSMap::tileUrl(const QString &baseUrl, const QString &version) const { QString url; - url = QString("%1%2version=%3&request=GetMap&bbox=$bbox" + url = QString("%1%2service=WMS&version=%3&request=GetMap&bbox=$bbox" "&width=%4&height=%5&layers=%6&styles=%7&format=%8&transparent=true") - .arg(_setup.url(), _setup.url().contains('?') ? "&" : "?", version, - QString::number(TILE_SIZE), QString::number(TILE_SIZE), _setup.layer(), + .arg(baseUrl, baseUrl.contains('?') ? "&" : "?", version, + QString::number(_tileSize), QString::number(_tileSize), _setup.layer(), _setup.style(), _setup.format()); if (version >= "1.3.0") @@ -84,7 +83,7 @@ _projection = wms.projection(); _bbox = wms.boundingBox(); _bounds = RectD(_bbox, _projection); - _tileLoader->setUrl(tileUrl(wms.version())); + _tileLoader->setUrl(tileUrl(wms.tileUrl(), wms.version())); if (wms.version() >= "1.3.0") { if (_setup.coordinateSystem().axisOrder() == CoordinateSystem::Unknown) @@ -100,9 +99,9 @@ return true; } -WMSMap::WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent) - : Map(parent), _name(name), _setup(setup), _tileLoader(0), _zoom(0), - _mapRatio(1.0), _valid(false) +WMSMap::WMSMap(const QString &name, const WMS::Setup &setup, int tileSize, + QObject *parent) : Map(parent), _name(name), _setup(setup), _tileLoader(0), + _zoom(0), _tileSize(tileSize), _mapRatio(1.0), _valid(false) { _tileLoader = new TileLoader(tilesDir(), this); _tileLoader->setAuthorization(_setup.authorization()); @@ -180,7 +179,7 @@ qreal WMSMap::tileSize() const { - return (TILE_SIZE / _mapRatio); + return (_tileSize / _mapRatio); } void WMSMap::draw(QPainter *painter, const QRectF &rect, Flags flags) @@ -194,10 +193,10 @@ tiles.reserve((br.x() - tl.x()) * (br.y() - tl.y())); for (int i = tl.x(); i < br.x(); i++) { for (int j = tl.y(); j < br.y(); j++) { - PointD ttl(_transform.img2proj(QPointF(i * TILE_SIZE, - j * TILE_SIZE))); - PointD tbr(_transform.img2proj(QPointF(i * TILE_SIZE + TILE_SIZE, - j * TILE_SIZE + TILE_SIZE))); + PointD ttl(_transform.img2proj(QPointF(i * _tileSize, + j * _tileSize))); + PointD tbr(_transform.img2proj(QPointF(i * _tileSize + _tileSize, + j * _tileSize + _tileSize))); RectD bbox = (_cs.axisOrder() == CoordinateSystem::YX) ? RectD(PointD(tbr.y(), tbr.x()), PointD(ttl.y(), ttl.x())) : RectD(ttl, tbr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/wmsmap.h new/GPXSee-7.25/src/map/wmsmap.h --- old/GPXSee-7.23/src/map/wmsmap.h 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/wmsmap.h 2020-03-04 19:49:11.000000000 +0100 @@ -14,7 +14,8 @@ Q_OBJECT public: - WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent = 0); + WMSMap(const QString &name, const WMS::Setup &setup, int tileSize, + QObject *parent = 0); QString name() const {return _name;} @@ -39,7 +40,7 @@ QString errorString() const {return _errorString;} private: - QString tileUrl(const QString &version) const; + QString tileUrl(const QString &baseUrl, const QString &version) const; double sd2res(double scaleDenominator) const; QString tilesDir() const; void computeZooms(const RangeF &scaleDenominator); @@ -58,6 +59,7 @@ RectC _bbox; RectD _bounds; int _zoom; + int _tileSize; qreal _mapRatio; bool _valid; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-7.23/src/map/wmts.cpp new/GPXSee-7.25/src/map/wmts.cpp --- old/GPXSee-7.23/src/map/wmts.cpp 2020-02-17 20:19:11.000000000 +0100 +++ new/GPXSee-7.25/src/map/wmts.cpp 2020-03-04 19:49:11.000000000 +0100 @@ -12,6 +12,11 @@ #include "wmts.h" +static QString bareFormat(const QString &format) +{ + return format.left(format.indexOf(';')).trimmed(); +} + static void skipParentElement(QXmlStreamReader &reader) { while (reader.readNextStartElement()) @@ -182,7 +187,8 @@ if (s == ctx.setup.style()) ctx.hasStyle = true; } else if (reader.name() == "Format") { - if (reader.readElementText() == ctx.setup.format()) + QString format(reader.readElementText()); + if (bareFormat(format) == bareFormat(ctx.setup.format())) ctx.hasFormat = true; } else reader.skipCurrentElement(); ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.giUAn2/_old 2020-03-09 18:14:23.153411911 +0100 +++ /var/tmp/diff_new_pack.giUAn2/_new 2020-03-09 18:14:23.173411920 +0100 @@ -1,5 +1,5 @@ pkgname=gpxsee -pkgver=7.23 +pkgver=7.25 pkgrel=1 pkgdesc='GPS log files visualizing and analyzing tool' arch=('i686' 'x86_64') ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.giUAn2/_old 2020-03-09 18:14:23.361412011 +0100 +++ /var/tmp/diff_new_pack.giUAn2/_new 2020-03-09 18:14:23.385412023 +0100 @@ -1,3 +1,17 @@ +gpxsee (7.25) stable; urgency=low + + * Added missing OnlineResources URLs handling in WMS maps. + * A better WMS format parameter handling (partialy broken in + 7.24) + + -- Martin Tuma <[email protected]> Wed, 04 Mar 2020 20:40:00 +0100 + +gpxsee (7.24) stable; urgency=low + + * Multiple WMS maps fixes. + + -- Martin Tuma <[email protected]> Sun, 01 Mar 2020 15:24:38 +0100 + gpxsee (7.23) stable; urgency=low * Fixed various IMG maps rendering issues. ++++++ gpxsee.dsc ++++++ --- /var/tmp/diff_new_pack.giUAn2/_old 2020-03-09 18:14:23.965412304 +0100 +++ /var/tmp/diff_new_pack.giUAn2/_new 2020-03-09 18:14:23.985412314 +0100 @@ -1,9 +1,9 @@ Format: 1.0 Source: gpxsee -Version: 7.23 +Version: 7.25 Binary: gpxsee Maintainer: Martin Tuma <[email protected]> Architecture: any Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, qttools5-dev-tools, libqt5opengl5-dev Files: - 00000000000000000000000000000000 0 GPXSee-7.23.tar.gz + 00000000000000000000000000000000 0 GPXSee-7.25.tar.gz
