Version++

(formal only, the data is allocated during the whole application life anyway)

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.23.{build}
+version: 7.24.{build}
 
 configuration:
   - Release

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.23
+VERSION = 7.24
 
 QT += core \
     gui \

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.23"
+!define VERSION "7.24"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.23"
+!define VERSION "7.24"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

pkg/maps/4UMaps.xml

@@ -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"/>

pkg/maps/Antarctica.xml

@@ -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>

pkg/maps/OpenStreetMap.xml

@@ -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>

pkg/maps/OpenTopoMap.xml

@@ -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"/>

pkg/maps/USGS-imagery.xml

@@ -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"/>

pkg/maps/USGS-topo.xml

@@ -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"/>

src/GUI/mapview.cpp

@@ -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 @@ void MapView::setMap(Map *map)
 	centerOn(nc);
 
 	reloadMap();
-	QPixmapCache::clear();
 }
 
 void MapView::setPOI(POI *poi)
@@ -982,7 +980,6 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 
 	_deviceRatio = deviceRatio;
 	_mapRatio = mapRatio;
-	QPixmapCache::clear();
 
 	QRectF vr(mapToScene(viewport()->rect()).boundingRect()
 	  .intersected(_map->bounds()));

src/map/IMG/rgnfile.cpp

@@ -425,7 +425,7 @@ QMap<RGNFile::SegmentType, SubDiv::Segment> RGNFile::segments(Handle &hdl,
 	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;

src/map/maplist.cpp

@@ -52,7 +52,7 @@ bool MapList::loadFile(const QString &path, bool *terminate)
 		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);

src/map/mapsource.cpp

@@ -300,7 +300,7 @@ Map *MapSource::loadMap(const QString &path, QString &errorString)
 		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,

src/map/tileloader.cpp

@@ -169,6 +169,17 @@ void TileLoader::clearCache()
 		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

src/map/tileloader.h

@@ -16,7 +16,7 @@ public:
 	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);

src/map/wms.cpp

@@ -1,3 +1,4 @@
+#include <cmath>
 #include <QFileInfo>
 #include <QEventLoop>
 #include <QXmlStreamReader>
@@ -7,6 +8,14 @@
 #include "wms.h"
 
 
+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(',');
@@ -28,7 +37,8 @@ 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 (format.left(format.indexOf(';')) == ctx.setup.format())
 				ctx.formatSupported = true;
 		} else
 			reader.skipCurrentElement();
@@ -97,7 +107,16 @@ void WMS::layer(QXmlStreamReader &reader, CTX &ctx,
 			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);

src/map/wmsmap.cpp

@@ -10,7 +10,6 @@
 
 
 #define CAPABILITIES_FILE "capabilities.xml"
-#define TILE_SIZE 256
 #define EPSILON 1e-6
 
 double WMSMap::sd2res(double scaleDenominator) const
@@ -25,7 +24,7 @@ QString WMSMap::tileUrl(const QString &version) const
 	url = QString("%1%2version=%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(),
+	  QString::number(_tileSize), QString::number(_tileSize), _setup.layer(),
 	  _setup.style(), _setup.format());
 
 	if (version >= "1.3.0")
@@ -100,9 +99,9 @@ bool WMSMap::loadWMS()
 	return true;
 }
 
-WMSMap::WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent)
+WMSMap::WMSMap(const QString &name, const WMS::Setup &setup, int tileSize,
-  : Map(parent), _name(name), _setup(setup), _tileLoader(0), _zoom(0),
+  QObject *parent) : Map(parent), _name(name), _setup(setup), _tileLoader(0),
-  _mapRatio(1.0), _valid(false)
+  _zoom(0), _tileSize(tileSize), _mapRatio(1.0), _valid(false)
 {
 	_tileLoader = new TileLoader(tilesDir(), this);
 	_tileLoader->setAuthorization(_setup.authorization());
@@ -180,7 +179,7 @@ Coordinates WMSMap::xy2ll(const QPointF &p)
 
 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 @@ void WMSMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 	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,
+			PointD ttl(_transform.img2proj(QPointF(i * _tileSize,
-			  j * TILE_SIZE)));
+			  j * _tileSize)));
-			PointD tbr(_transform.img2proj(QPointF(i * TILE_SIZE + TILE_SIZE,
+			PointD tbr(_transform.img2proj(QPointF(i * _tileSize + _tileSize,
-			  j * TILE_SIZE + TILE_SIZE)));
+			  j * _tileSize + _tileSize)));
 			RectD bbox = (_cs.axisOrder() == CoordinateSystem::YX)
 			  ? RectD(PointD(tbr.y(), tbr.x()), PointD(ttl.y(), ttl.x()))
 			  : RectD(ttl, tbr);

src/map/wmsmap.h

@@ -14,7 +14,8 @@ class WMSMap : public Map
 	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;}
 
@@ -58,6 +59,7 @@ private:
 	RectC _bbox;
 	RectD _bounds;
 	int _zoom;
+	int _tileSize;
 	qreal _mapRatio;
 
 	bool _valid;

src/map/wmts.cpp

@@ -182,7 +182,8 @@ void WMTS::layer(QXmlStreamReader &reader, CTX &ctx)
 			if (s == ctx.setup.style())
 				ctx.hasStyle = true;
 		} else if (reader.name() == "Format") {
-			if (reader.readElementText() == ctx.setup.format())
+			QString format(reader.readElementText());
+			if (format.left(format.indexOf(';')) == ctx.setup.format())
 				ctx.hasFormat = true;
 		} else
 			reader.skipCurrentElement();