Some more code cleanup

Code cleanup
Fixed the change that has broken non-TAR maps
2025-07-23 23:24:24 +02:00 · 2024-01-01 13:02:42 +01:00 · 2024-01-01 10:58:23 +01:00 · 2024-01-01 10:48:16 +01:00 · 2023-12-31 13:57:43 +01:00 · 2023-12-31 13:24:36 +01:00
71 changed files with 329 additions and 231 deletions
--- a/data/maps/4UMaps.xml
+++ b/data/maps/4UMaps.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"/>
-	<bounds bottom="-65"/>
-	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
-</map>
--- a/data/maps/mtbmap-cz.xml
+++ b/data/maps/mtbmap-cz.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1.4">
+	<name>mtbmap.cz</name>
+	<url>https://tile.mtbmap.cz/mtbmap_tiles/$z/$x/$y.png</url>
+	<copyright>Map data: OpenStreetMap, USGS | Rendering: Martin Tesař</copyright>
+</map>
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -134,7 +134,6 @@ HEADERS += src/common/config.h \
    src/map/encjob.h \
    src/map/encmap.h \
    src/map/ENC/iso8211.h \
-    src/map/encstyle.h \
    src/map/gemfmap.h \
    src/map/gmifile.h \
    src/map/oruxmap.h \
@ -350,7 +349,6 @@ SOURCES += src/main.cpp \
    src/map/encatlas.cpp \
    src/map/encmap.cpp \
    src/map/ENC/iso8211.cpp \
-    src/map/encstyle.cpp \
    src/map/gemfmap.cpp \
    src/map/gmifile.cpp \
    src/map/oruxmap.cpp \
--- a/pkg/linux/gpxsee.appdata.xml
+++ b/pkg/linux/gpxsee.appdata.xml
@ -111,5 +111,6 @@
 		<mimetype>application/vnd.iho.s57-data</mimetype>
 		<mimetype>application/vnd.iho.s57-catalogue</mimetype>
 		<mimetype>application/vnd.gpsdump.wpt</mimetype>
+		<mimetype>application/vnd.gpstuner.gmi</mimetype>
 	</mimetypes>
 </component>
--- a/pkg/linux/gpxsee.desktop
+++ b/pkg/linux/gpxsee.desktop
@ -16,4 +16,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt
-MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt;application/vnd.orux.map+xml;application/vnd.iho.s57-data;application/vnd.iho.s57-catalogue;application/vnd.gpsdump.wpt
+MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt;application/vnd.orux.map+xml;application/vnd.iho.s57-data;application/vnd.iho.s57-catalogue;application/vnd.gpsdump.wpt;application/vnd.gpstuner.gmi
--- a/pkg/linux/gpxsee.xml
+++ b/pkg/linux/gpxsee.xml
@ -363,4 +363,14 @@
 		<glob pattern="*.031"/>
 	</mime-type>

+	<mime-type type="application/vnd.gpstuner.gmi">
+		<comment>GPS Tuner Map Calibration File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text/plain"/>
+		<magic>
+			<match type="string" offset="0" value="Map Calibration data file"/>
+		</magic>
+		<glob pattern="*.gmi"/>
+	</mime-type>
+
 </mime-info>
--- a/pkg/mac/Info.plist
+++ b/pkg/mac/Info.plist
@ -417,6 +417,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>gmi</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.gpstuner.gmi</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/map.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>GPS Tuner Map Calibration File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@ -1252,6 +1268,29 @@
 				<string>application/vnd.oziexplorer.map</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.gpstuner.gmi</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://github.com/tumic0/GPXSee/blob/master/src/map/gmifile.cpp</string>
+			<key>UTTypeDescription</key>
+			<string>GPS Tuner Map Calibration File</string>
+			<key>UTTypeIconFile</key>
+			<string>icons/map.icns</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>gmi</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.gpstuner.gmi</string>
+			</dict>
+		</dict>
 		<dict>
 			<key>UTTypeIdentifier</key>
 			<string>com.mapbox.mbtiles</string>
--- a/pkg/windows/gpxsee64.nsi
+++ b/pkg/windows/gpxsee64.nsi
@ -163,6 +163,7 @@ Section "GPXSee" SEC_APP
  !insertmacro FILE_ASSOCIATION_ADD "kap" "BSB Nautical Chart" 10
  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 11
  !insertmacro FILE_ASSOCIATION_ADD "map" "OziExplorer Map File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "gmi" "GPS Tuner Map Calibration File" 12
  !insertmacro FILE_ASSOCIATION_ADD "mbtiles" "MBTiles Map File" 13
  !insertmacro FILE_ASSOCIATION_ADD "rmap" "TwoNav Raster Map File" 14
  !insertmacro FILE_ASSOCIATION_ADD "tba" "TrekBuddy Atlas" 15
@ -218,6 +219,7 @@ Section "GPXSee" SEC_APP
  WriteRegStr HKCR ".jnx\OpenWithList" "GPXSee.exe" ""
  WriteRegStr HKCR ".kap\OpenWithList" "GPXSee.exe" ""
  WriteRegStr HKCR ".map\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".gmi\OpenWithList" "GPXSee.exe" ""
  WriteRegStr HKCR ".mbtiles\OpenWithList" "GPXSee.exe" ""
  WriteRegStr HKCR ".rmap\OpenWithList" "GPXSee.exe" ""
  WriteRegStr HKCR ".rtmap\OpenWithList" "GPXSee.exe" ""
@ -384,6 +386,7 @@ Section "Uninstall"
  !insertmacro FILE_ASSOCIATION_REMOVE "jnx"
  !insertmacro FILE_ASSOCIATION_REMOVE "kap"
  !insertmacro FILE_ASSOCIATION_REMOVE "map"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gmi"
  !insertmacro FILE_ASSOCIATION_REMOVE "mbtiles"
  !insertmacro FILE_ASSOCIATION_REMOVE "rmap"
  !insertmacro FILE_ASSOCIATION_REMOVE "tba"
@ -431,6 +434,7 @@ Section "Uninstall"
  DeleteRegValue HKCR ".jnx\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".kap\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".map\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".gmi\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".mbtiles\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".rmap\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".rtmap\OpenWithList" "GPXSee.exe"
--- a/src/GUI/elevationgraph.cpp
+++ b/src/GUI/elevationgraph.cpp
@ -1,7 +1,6 @@
 #include <cmath>
 #include <QLocale>
 #include "data/data.h"
-#include "tooltip.h"
 #include "elevationgraphitem.h"
 #include "elevationgraph.h"

--- a/src/GUI/fileselectwidget.cpp
+++ b/src/GUI/fileselectwidget.cpp
@ -5,8 +5,10 @@
 #include <QFileInfo>
 #include <QApplication>
 #include <QFontMetrics>
-#include "common/util.h"
 #include "fileselectwidget.h"
+#ifdef Q_OS_ANDROID
+#include "common/util.h"
+#endif // Q_OS_ANDROID


 FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
--- a/src/GUI/graphview.cpp
+++ b/src/GUI/graphview.cpp
@ -16,7 +16,6 @@
 #include "infoitem.h"
 #include "griditem.h"
 #include "graphitem.h"
-#include "pathitem.h"
 #include "format.h"
 #include "graphicsscene.h"
 #include "graphview.h"
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@ -52,11 +52,13 @@
 #include "graphtab.h"
 #include "graphitem.h"
 #include "pathitem.h"
-#include "mapitem.h"
 #include "mapaction.h"
 #include "poiaction.h"
-#include "navigationwidget.h"
 #include "gui.h"
+#ifdef Q_OS_ANDROID
+#include "common/util.h"
+#include "navigationwidget.h"
+#endif // Q_OS_ANDROID


 #define MAX_RECENT_FILES  10
--- a/src/GUI/mapitem.cpp
+++ b/src/GUI/mapitem.cpp
@ -4,9 +4,11 @@
 #include <QGraphicsSceneMouseEvent>
 #include "map/map.h"
 #include "mapaction.h"
-#include "popup.h"
 #include "tooltip.h"
 #include "mapitem.h"
+#ifdef Q_OS_ANDROID
+#include "popup.h"
+#endif // Q_OS_ANDROID


 static void growLeft(Map *map, const Coordinates &c, QRectF &rect)
--- a/src/GUI/pluginparameters.cpp
+++ b/src/GUI/pluginparameters.cpp
@ -2,12 +2,6 @@
 #include <QLineEdit>
 #include "pluginparameters.h"

-static const QMap<QString, QStringList> pluginParams = {
-	{"nmea", {"nmea.source", "nmea.baudrate"}},
-	{"serialnmea", {"serialnmea.serial_port"}},
-	{"geoclue2", {"desktopId"}}
-};
-
 static void deleteLayout(QLayout *layout)
 {
 	if (!layout)
@ -32,6 +26,12 @@ PluginParameters::PluginParameters(const QString &plugin,

 void PluginParameters::setPlugin(const QString &plugin)
 {
+	static const QMap<QString, QStringList> pluginParams = {
+		{"nmea", {"nmea.source", "nmea.baudrate"}},
+		{"serialnmea", {"serialnmea.serial_port"}},
+		{"geoclue2", {"desktopId"}}
+	};
+
 	saveParameters();

 	QStringList params = pluginParams.value(plugin);
--- a/src/GUI/settings.cpp
+++ b/src/GUI/settings.cpp
@ -4,7 +4,6 @@
 #include <QPageSize>
 #include <QGeoPositionInfoSource>
 #include "common/config.h"
-#include "common/util.h"
 #include "data/graph.h"
 #include "format.h"
 #include "units.h"
--- a/src/GUI/speedgraph.cpp
+++ b/src/GUI/speedgraph.cpp
@ -1,6 +1,5 @@
 #include <QLocale>
 #include "data/data.h"
-#include "tooltip.h"
 #include "format.h"
 #include "speedgraphitem.h"
 #include "speedgraph.h"
--- a/src/common/downloader.cpp
+++ b/src/common/downloader.cpp
@ -1,5 +1,4 @@
 #include <QFile>
-#include <QFileInfo>
 #include <QNetworkRequest>
 #include <QDir>
 #include <QTimerEvent>
@ -56,6 +55,7 @@ Authorization::Authorization(const QString &username, const QString &password)
 	_header = HTTPHeader("Authorization", "Basic " + data);
 }

+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 NetworkTimeout::NetworkTimeout(int timeout, QNetworkReply *reply)
  : QObject(reply), _timeout(timeout)
 {
@ -77,6 +77,7 @@ void NetworkTimeout::timerEvent(QTimerEvent *ev)
 		reply->abort();
 	_timer.stop();
 }
+#endif // QT 5.15


 QNetworkAccessManager *Downloader::_manager = 0;
@ -104,11 +105,15 @@ bool Downloader::doDownload(const Download &dl, const QList<HTTPHeader> &headers
 	request.setAttribute(ATTR_REDIRECT_POLICY,
 	  QNetworkRequest::NoLessSafeRedirectPolicy);
 	request.setAttribute(ATTR_HTTP2_ALLOWED, QVariant(_http2));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+	request.setTransferTimeout(_timeout * 1000);
+#endif // QT 5.15

 	for (int i = 0; i < headers.size(); i++) {
 		const HTTPHeader &hdr = headers.at(i);
 		request.setRawHeader(hdr.key(), hdr.value());
-		if (hdr.key() == "User-Agent")
+		// QByteArray::compare() not available in Qt < 5.12
+		if (!QString(hdr.key()).compare("User-Agent", Qt::CaseInsensitive))
 			userAgent = true;
 	}
 	if (!userAgent)
@ -128,9 +133,9 @@ bool Downloader::doDownload(const Download &dl, const QList<HTTPHeader> &headers
 	_currentDownloads.insert(url, file);

 	if (reply->isRunning()) {
-		/* Starting with Qt 5.15 this can be replaced by
-		   QNetworkRequest::setTransferTimeout() */
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 		new NetworkTimeout(_timeout, reply);
+#endif // QT 5.15
 		connect(reply, &QIODevice::readyRead, this, &Downloader::emitReadReady);
 		connect(reply, &QNetworkReply::finished, this, &Downloader::emitFinished);
 	} else {
--- a/src/common/downloader.h
+++ b/src/common/downloader.h
@ -3,7 +3,9 @@

 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 #include <QBasicTimer>
+#endif // QT 5.15
 #include <QUrl>
 #include <QList>
 #include <QHash>
@ -39,6 +41,7 @@ private:
 	HTTPHeader _header;
 };

+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 class NetworkTimeout : public QObject
 {
 	Q_OBJECT
@ -55,6 +58,7 @@ private:
 	QBasicTimer _timer;
 	int _timeout;
 };
+#endif // QT 5.15

 class Downloader : public QObject
 {
@ -79,8 +83,6 @@ private slots:
 	void emitReadReady();

 private:
-	class ReplyTimeout;
-
 	void insertError(const QUrl &url, QNetworkReply::NetworkError error);
 	bool doDownload(const Download &dl, const QList<HTTPHeader> &headers);
 	void downloadFinished(QNetworkReply *reply);
--- a/src/common/textcodec.cpp
+++ b/src/common/textcodec.cpp
@ -1,48 +1,67 @@
 #include <QTextCodec>
 #include "textcodec.h"

-/* When Qt is compiled with ICU support, QTextCodec::codecForName() is very
-   slow due to broken codec name caching (the function does dozens of
-   comparisons and only then asks the cache...), so we use our own map. */
-static QMap<int, QTextCodec *> initCodecs()
+static QTextCodec *codec(int mib)
 {
-	QMap<int, QTextCodec *> map;
+	QTextCodec *c = QTextCodec::codecForMib(mib);
+	if (!c)
+		qWarning("MIB-%d: No such QTextCodec, using UTF-8", mib);

-	map.insert(65001, 0);
-	map.insert(874, QTextCodec::codecForName("Windows-874"));
-	map.insert(932, QTextCodec::codecForName("Shift-JIS"));
-	map.insert(936, QTextCodec::codecForName("GB18030"));
-	map.insert(949, QTextCodec::codecForName("EUC-KR"));
-	map.insert(950, QTextCodec::codecForName("Big5"));
-	map.insert(1250, QTextCodec::codecForName("Windows-1250"));
-	map.insert(1251, QTextCodec::codecForName("Windows-1251"));
-	map.insert(1252, QTextCodec::codecForName("Windows-1252"));
-	map.insert(1253, QTextCodec::codecForName("Windows-1253"));
-	map.insert(1254, QTextCodec::codecForName("Windows-1254"));
-	map.insert(1255, QTextCodec::codecForName("Windows-1255"));
-	map.insert(1256, QTextCodec::codecForName("Windows-1256"));
-	map.insert(1257, QTextCodec::codecForName("Windows-1257"));
-	map.insert(1258, QTextCodec::codecForName("Windows-1258"));
-
-	return map;
-}
-
-const QMap<int, QTextCodec *> &TextCodec::codecs()
-{
-	static QMap<int, QTextCodec *> map = initCodecs();
-	return map;
+	return c;
 }

 TextCodec::TextCodec(int codepage)
 {
-	const QMap<int, QTextCodec *> &map = codecs();
-
-	QMap<int, QTextCodec *>::const_iterator it(map.find(codepage));
-	if (it == map.cend()) {
-		qWarning("%d: Unsupported codepage, using UTF-8", codepage);
-		_codec = 0;
-	} else
-		_codec = *it;
+	switch (codepage) {
+		case 874:
+			_codec = codec(2109);
+			break;
+		case 932:
+			_codec = codec(17);
+			break;
+		case 936:
+			_codec = codec(114);
+			break;
+		case 949:
+			_codec = codec(38);
+			break;
+		case 950:
+			_codec = codec(2026);
+			break;
+		case 1250:
+			_codec = codec(2250);
+			break;
+		case 1251:
+			_codec = codec(2251);
+			break;
+		case 1252:
+			_codec = codec(2252);
+			break;
+		case 1253:
+			_codec = codec(2253);
+			break;
+		case 1254:
+			_codec = codec(2254);
+			break;
+		case 1255:
+			_codec = codec(2255);
+			break;
+		case 1256:
+			_codec = codec(2256);
+			break;
+		case 1257:
+			_codec = codec(2257);
+			break;
+		case 1258:
+			_codec = codec(2258);
+			break;
+		case 65001:
+			_codec = 0;
+			break;
+		default:
+			qWarning("%d: Unknown codepage, using UTF-8", codepage);
+			_codec = 0;
+	}
 }

 QString TextCodec::toString(const QByteArray &ba) const
--- a/src/common/textcodec.h
+++ b/src/common/textcodec.h
@ -16,8 +16,6 @@ public:

 private:
 	QTextCodec *_codec;
-
-	static const QMap<int, QTextCodec *> &codecs();
 };

 #endif // TEXTCODEC_H
--- a/src/data/dem.cpp
+++ b/src/data/dem.cpp
@ -148,9 +148,9 @@ qreal DEM::elevation(const Coordinates &c)

 QList<Area> DEM::tiles()
 {
+	static const QRegularExpression re("([NS])([0-9]{2})([EW])([0-9]{3})");
 	QDir dir(_dir);
 	QFileInfoList files(dir.entryInfoList(QDir::Files | QDir::Readable));
-	QRegularExpression re("([NS])([0-9]{2})([EW])([0-9]{3})");
 	QLocale l(QLocale::system());
 	QList<Area> list;

--- a/src/data/gpsdumpparser.cpp
+++ b/src/data/gpsdumpparser.cpp
@ -88,6 +88,7 @@ static Coordinates parseUTM(const QString &zone, const QString &easting,
 bool GPSDumpParser::parse(QFile *file, QList<TrackData> &tracks,
  QList<RouteData> &routes, QList<Area> &polygons, QVector<Waypoint> &waypoints)
 {
+	static const QRegularExpression dm("[ ]{2,}");
 	Q_UNUSED(tracks);
 	Q_UNUSED(routes);
 	Q_UNUSED(polygons);
@ -95,7 +96,6 @@ bool GPSDumpParser::parse(QFile *file, QList<TrackData> &tracks,
 	_errorLine = 1;
 	_errorString.clear();
 	Type type = Unknown;
-	QRegularExpression dm("[ ]{2,}");

 	while (!file->atEnd()) {
 		QByteArray ba(file->readLine(4096).trimmed());
--- a/src/data/poi.cpp
+++ b/src/data/poi.cpp
@ -2,11 +2,9 @@
 #include <QDir>
 #include "common/rectc.h"
 #include "common/greatcircle.h"
-#include "data.h"
-#include "dem.h"
-#include "path.h"
-#include "area.h"
 #include "common/wgs84.h"
+#include "data.h"
+#include "path.h"
 #include "poi.h"


--- a/src/data/smlparser.cpp
+++ b/src/data/smlparser.cpp
@ -13,7 +13,7 @@ QDebug operator<<(QDebug dbg, const SMLParser::Sensors &sensors)
 #endif // QT_NO_DEBUG


-void SMLParser::sample(SegmentData &segment, QMap<QDateTime, Sensors> &map)
+void SMLParser::sample(SegmentData &segment, SensorsMap &map)
 {
 	QDateTime timestamp;
 	Sensors sensors;
@ -97,19 +97,20 @@ void SMLParser::sample(SegmentData &segment, QMap<QDateTime, Sensors> &map)

 void SMLParser::samples(SegmentData &segment)
 {
-	QMap<QDateTime, Sensors> sensors;
-	QMap<QDateTime, Sensors>::const_iterator it;
+	SensorsMap map;

 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("Sample")) {
-			sample(segment, sensors);
+			sample(segment, map);
 		} else
 			_reader.skipCurrentElement();
 	}

 	for (int i = 0; i < segment.size(); i++) {
 		Trackpoint &t = segment[i];
-		if ((it = sensors.lowerBound(t.timestamp())) != sensors.constEnd()) {
+		SensorsMap::const_iterator it(map.lowerBound(t.timestamp()));
+
+		if (it != map.constEnd()) {
 			t.setCadence(it->cadence * 60);
 			t.setTemperature(it->temperature - 273.15);
 			t.setHeartRate(it->hr * 60);
--- a/src/data/smlparser.h
+++ b/src/data/smlparser.h
@ -23,10 +23,12 @@ private:
 		qreal cadence, temperature, hr, power, speed;
 	};

+	typedef QMap<QDateTime, Sensors> SensorsMap;
+
 	void sml(QList<TrackData> &tracks);
 	void deviceLog(TrackData &track);
 	void samples(SegmentData &segment);
-	void sample(SegmentData &segment, QMap<QDateTime, Sensors> &map);
+	void sample(SegmentData &segment, SensorsMap &map);

 #ifndef QT_NO_DEBUG
 	friend QDebug operator<<(QDebug dbg, const Sensors &sensors);
--- a/src/map/ENC/iso8211.cpp
+++ b/src/map/ENC/iso8211.cpp
@ -323,7 +323,7 @@ bool ISO8211::readRecord(Record &record)
 		const FieldDefinition &def = fields.at(i);
 		Data data;

-		FieldsMap::const_iterator it = _map.find(def.tag);
+		FieldsMap::const_iterator it(_map.find(def.tag));
 		if (it == _map.constEnd()) {
 			_errorString = QString("%1: unknown record").arg(QString(def.tag));
 			return false;
--- a/src/map/ENC/mapdata.cpp
+++ b/src/map/ENC/mapdata.cpp
@ -86,7 +86,7 @@ static QMap<uint,uint> orderMap = orderMapInit();
 static uint order(uint type)
 {
 	uint st = ((type>>16) == BUAARE) ? type : (type & 0xFFFF0000);
-	QMap<uint, uint>::const_iterator it = orderMap.find(st);
+	QMap<uint, uint>::const_iterator it(orderMap.find(st));
 	return (it == orderMap.constEnd()) ? (type>>16) + 512 : it.value();
 }

--- a/src/map/ENC/rastertile.cpp
+++ b/src/map/ENC/rastertile.cpp
@ -15,7 +15,14 @@ using namespace ENC;
 typedef QSet<Coordinates> PointSet;

 static const float C1 = 0.866025f; /* sqrt(3)/2 */
-static const QColor haloColor(Qt::white);
+static const QColor tsslptPen = QColor("#eb49eb");
+static const QColor tsslptBrush = QColor("#80eb49eb");
+
+static const Style *style()
+{
+	static ENC::Style s;
+	return &s;
+}

 static double area(const QVector<Coordinates> &polygon)
 {
@ -168,8 +175,8 @@ void RasterTile::drawArrows(QPainter *painter,
 			QPolygonF polygon(tsslptArrow(centroid(poly.path().first()),
 			  deg2rad(180 - poly.param().toDouble())));

-			painter->setPen(QPen(QColor("#eb49eb"), 1));
-			painter->setBrush(QBrush("#80eb49eb"));
+			painter->setPen(QPen(tsslptPen, 1));
+			painter->setBrush(QBrush(tsslptBrush));
 			painter->drawPolygon(polygon);
 		}
 	}
@ -397,3 +404,23 @@ void RasterTile::render()

 	_valid = true;
 }
+
+RasterTile::RasterTile(const Projection &proj, const Transform &transform,
+  const MapData *data, int zoom, const Range &zoomRange, const QRect &rect,
+  qreal ratio) :
+	_proj(proj), _transform(transform), _map(data), _atlas(0), _zoom(zoom),
+	_zoomRange(zoomRange), _rect(rect), _ratio(ratio),
+	_pixmap(rect.width() * ratio, rect.height() * ratio), _valid(false)
+{
+	_style = style();
+}
+
+RasterTile::RasterTile(const Projection &proj, const Transform &transform,
+  AtlasData *data, int zoom, const Range &zoomRange, const QRect &rect,
+  qreal ratio) :
+	_proj(proj), _transform(transform), _map(0), _atlas(data), _zoom(zoom),
+	_zoomRange(zoomRange), _rect(rect), _ratio(ratio),
+	_pixmap(rect.width() * ratio, rect.height() * ratio), _valid(false)
+{
+	_style = style();
+}
--- a/src/map/ENC/rastertile.h
+++ b/src/map/ENC/rastertile.h
@ -18,17 +18,11 @@ class RasterTile
 {
 public:
 	RasterTile(const Projection &proj, const Transform &transform,
-	  const Style *style, const MapData *data, int zoom, const Range &zoomRange,
-	  const QRect &rect, qreal ratio) : _proj(proj), _transform(transform),
-	  _style(style), _map(data), _atlas(0), _zoom(zoom), _zoomRange(zoomRange),
-	  _rect(rect), _ratio(ratio), _pixmap(rect.width() * ratio, rect.height()
-	  * ratio), _valid(false) {}
+	  const MapData *data, int zoom, const Range &zoomRange, const QRect &rect,
+	  qreal ratio);
 	RasterTile(const Projection &proj, const Transform &transform,
-	  const Style *style, AtlasData *data, int zoom, const Range &zoomRange,
-	  const QRect &rect, qreal ratio) : _proj(proj), _transform(transform),
-	  _style(style), _map(0), _atlas(data), _zoom(zoom), _zoomRange(zoomRange),
-	  _rect(rect), _ratio(ratio), _pixmap(rect.width() * ratio, rect.height()
-	  * ratio), _valid(false) {}
+	  AtlasData *data, int zoom, const Range &zoomRange, const QRect &rect,
+	  qreal ratio);

 	int zoom() const {return _zoom;}
 	QPoint xy() const {return _rect.topLeft();}
--- a/src/map/ENC/style.cpp
+++ b/src/map/ENC/style.cpp
@ -344,7 +344,7 @@ const Style::Line &Style::line(uint type) const
 {
 	static Line null;

-	QMap<uint, Line>::const_iterator it = _lines.find(type);
+	QMap<uint, Line>::const_iterator it(_lines.find(type));
 	return (it == _lines.constEnd()) ? null : *it;
 }

@ -352,7 +352,7 @@ const Style::Polygon &Style::polygon(uint type) const
 {
 	static Polygon null;

-	QMap<uint, Polygon>::const_iterator it = _polygons.find(type);
+	QMap<uint, Polygon>::const_iterator it(_polygons.find(type));
 	return (it == _polygons.constEnd()) ? null : *it;
 }

@ -360,7 +360,7 @@ const Style::Point &Style::point(uint type) const
 {
 	static Point null;

-	QMap<uint, Point>::const_iterator it = _points.find(type);
+	QMap<uint, Point>::const_iterator it(_points.find(type));
 	return (it == _points.constEnd()) ? null : *it;
 }

--- a/src/map/ENC/style.h
+++ b/src/map/ENC/style.h
@ -111,6 +111,7 @@ private:
 	QMap<uint, Point> _points;
 	QVector<uint> _drawOrder;

+	/* Fonts and images must be initialized after QGuiApplication! */
 	QFont _small, _normal, _large;
 	QImage _light, _signal;
 };
--- a/src/map/IMG/gmapdata.cpp
+++ b/src/map/IMG/gmapdata.cpp
@ -52,8 +52,10 @@ bool GMAPData::readXML(const QString &path, QString &dataDir, QString &typFile)
 {
 	QFile file(path);

-	if (!file.open(QFile::ReadOnly | QFile::Text))
+	if (!file.open(QFile::ReadOnly | QFile::Text)) {
+		_errorString = file.errorString();
 		return false;
+	}

 	QXmlStreamReader reader(&file);
 	if (reader.readNextStartElement()) {
--- a/src/map/IMG/imgdata.cpp
+++ b/src/map/IMG/imgdata.cpp
@ -105,7 +105,7 @@ bool IMGData::readFAT(QFile &file, TileMap &tileMap)
 		QByteArray fn(name, sizeof(name));
 		if (VectorTile::isTileFile(tt)) {
 			VectorTile *tile;
-			TileMap::const_iterator it = tileMap.find(fn);
+			TileMap::const_iterator it(tileMap.find(fn));
 			if (it == tileMap.constEnd()) {
 				tile = new VectorTile();
 				tileMap.insert(fn, tile);
--- a/src/map/IMG/lblfile.h
+++ b/src/map/IMG/lblfile.h
@ -16,14 +16,14 @@ class LBLFile : public SubFile
 {
 public:
 	LBLFile(const IMGData *img)
-	  : SubFile(img), _huffmanText(0), _table(0), _rasters(0), _codec(1252),
-	  _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
+	  : SubFile(img), _huffmanText(0), _table(0), _rasters(0), _imgIdSize(0),
+	  _poiShift(0), _shift(0), _encoding(0) {}
 	LBLFile(const QString *path)
-	  : SubFile(path), _huffmanText(0), _table(0), _rasters(0), _codec(1252),
-	  _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
+	  : SubFile(path), _huffmanText(0), _table(0), _rasters(0), _imgIdSize(0),
+	  _poiShift(0), _shift(0), _encoding(0) {}
 	LBLFile(const SubFile *gmp, quint32 offset)
 	  : SubFile(gmp, offset), _huffmanText(0), _table(0), _rasters(0),
-	  _codec(1252), _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
+	  _imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {}
 	~LBLFile();

 	bool load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl);
--- a/src/map/IMG/rastertile.cpp
+++ b/src/map/IMG/rastertile.cpp
@ -1,7 +1,6 @@
 #include <QFont>
 #include <QPainter>
 #include <QCache>
-#include "map/imgmap.h"
 #include "map/textpathitem.h"
 #include "map/textpointitem.h"
 #include "map/bitmapline.h"
--- a/src/map/IMG/style.cpp
+++ b/src/map/IMG/style.cpp
@ -1250,7 +1250,7 @@ const Style::Line &Style::line(quint32 type) const
 {
 	static Line null;

-	QMap<quint32, Line>::const_iterator it = _lines.find(type);
+	QMap<quint32, Line>::const_iterator it(_lines.find(type));
 	return (it == _lines.constEnd()) ? null : *it;
 }

@ -1258,7 +1258,7 @@ const Style::Polygon &Style::polygon(quint32 type) const
 {
 	static Polygon null;

-	QMap<quint32, Polygon>::const_iterator it = _polygons.find(type);
+	QMap<quint32, Polygon>::const_iterator it(_polygons.find(type));
 	return (it == _polygons.constEnd()) ? null : *it;
 }

@ -1266,12 +1266,14 @@ const Style::Point &Style::point(quint32 type) const
 {
 	static Point null;

-	QMap<quint32, Point>::const_iterator it = _points.find(type);
+	QMap<quint32, Point>::const_iterator it(_points.find(type));
 	return (it == _points.constEnd()) ? null : *it;
 }

 const QFont *Style::font(Style::FontSize size, Style::FontSize defaultSize) const
 {
+	Q_ASSERT(defaultSize != Style::NotSet);
+
 	switch (size) {
 		case Style::None:
 			return 0;
--- a/src/map/IMG/style.h
+++ b/src/map/IMG/style.h
@ -176,6 +176,7 @@ private:
 	QMap<quint32, Point> _points;
 	QList<quint32> _drawOrder;

+	/* Fonts and images must be initialized after QGuiApplication! */
 	QFont _large, _normal, _small, _extraSmall;
 };

--- a/src/map/aqmmap.cpp
+++ b/src/map/aqmmap.cpp
@ -4,7 +4,6 @@
 #include <QImageReader>
 #include <QBuffer>
 #include <QtConcurrent>
-#include "common/hash.h"
 #include "osm.h"
 #include "tile.h"
 #include "aqmmap.h"
--- a/src/map/atlas.cpp
+++ b/src/map/atlas.cpp
@ -27,19 +27,25 @@ static bool yCmp(OziMap *m1, OziMap *m2)
 	return TL(m1).y() > TL(m2).y();
 }

-static QString calibrationFile(const QString &path)
+static QString calibrationFile(const QString &path, OziMap::CalibrationType &type)
 {
 	QDir dir(path);
-	QFileInfoList files = dir.entryInfoList(QDir::Files);
+	QFileInfoList files(dir.entryInfoList(QDir::Files));

 	for (int i = 0; i < files.size(); i++) {
 		const QFileInfo &fi = files.at(i);
 		QString suffix(fi.suffix().toLower());

-		if (suffix == "map" || suffix == "gmi")
+		if (suffix == "map") {
+			type = OziMap::MAP;
 			return fi.absoluteFilePath();
+		} else if (suffix == "gmi") {
+			type = OziMap::GMI;
+			return fi.absoluteFilePath();
+		}
 	}

+	type = OziMap::Unknown;
 	return QString();
 }

@ -141,16 +147,19 @@ Atlas::Atlas(const QString &fileName, bool TAR, const Projection &proj,
 		QFileInfoList maps = zdir.entryInfoList(QDir::Dirs
 		  | QDir::NoDotAndDotDot);
 		for (int i = 0; i < maps.count(); i++) {
+			QString path(maps.at(i).absoluteFilePath());
 			OziMap *map;
+
 			if (TAR)
-				map = new OziMap(maps.at(i).absoluteFilePath(), tar, proj, this);
+				map = new OziMap(path, tar, proj, this);
 			else {
-				QString cf(calibrationFile(maps.at(i).absoluteFilePath()));
+				OziMap::CalibrationType type;
+				QString cf(calibrationFile(path, type));
 				if (cf.isNull()) {
-					_errorString = "No calibration file found";
-					return;
+					qWarning("%s: no calibration file found", qPrintable(path));
+					continue;
 				}
-				map = new OziMap(cf, proj, this);
+				map = new OziMap(cf, type, proj, this);
 			}

 			if (map->isValid())
--- a/src/map/bsbmap.cpp
+++ b/src/map/bsbmap.cpp
@ -395,7 +395,7 @@ BSBMap::BSBMap(const QString &fileName, QObject *parent)
 	QFile file(fileName);

 	if (!file.open(QIODevice::ReadOnly)) {
-		_errorString = fileName + ": " + file.errorString();
+		_errorString = file.errorString();
 		return;
 	}

--- a/src/map/conversion.cpp
+++ b/src/map/conversion.cpp
@ -99,7 +99,7 @@ QMap<int, Conversion::Entry> Conversion::defaults()

 Conversion Conversion::conversion(int id)
 {
-	QMap<int, Entry>::const_iterator it = _conversions.find(id);
+	QMap<int, Entry>::const_iterator it(_conversions.find(id));

 	if (it == _conversions.constEnd())
 		return Conversion();
@ -189,7 +189,7 @@ QList<KV<int, QString> > Conversion::list()
 	QList<KV<int, QString> > list;

 	for (QMap<int, Entry>::const_iterator it = _conversions.constBegin();
-		 it != _conversions.constEnd(); ++it)
+	  it != _conversions.constEnd(); ++it)
 		list.append(KV<int, QString>(it.key(), it.value().name()));

 	return list;
--- a/src/map/encatlas.cpp
+++ b/src/map/encatlas.cpp
@ -5,7 +5,6 @@
 #include "rectd.h"
 #include "pcs.h"
 #include "encjob.h"
-#include "encstyle.h"
 #include "encatlas.h"

 using namespace ENC;
@ -358,7 +357,7 @@ void ENCAtlas::draw(QPainter *painter, const QRectF &rect, Flags flags)
 				painter->drawPixmap(ttl, pm);
 			else
 				tiles.append(RasterTile(_projection, _transform,
-				  ENCStyle::style(), _data.value(_usage), _zoom, zooms(_usage),
+				  _data.value(_usage), _zoom, zooms(_usage),
 				  QRect(ttl, QSize(TILE_SIZE, TILE_SIZE)), _tileRatio));
 		}
 	}
--- a/src/map/encmap.cpp
+++ b/src/map/encmap.cpp
@ -5,7 +5,6 @@
 #include "rectd.h"
 #include "pcs.h"
 #include "encjob.h"
-#include "encstyle.h"
 #include "encmap.h"


@ -324,9 +323,8 @@ void ENCMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 			if (QPixmapCache::find(key(_zoom, ttl), &pm))
 				painter->drawPixmap(ttl, pm);
 			else
-				tiles.append(RasterTile(_projection, _transform,
-				  ENCStyle::style(), _data, _zoom, _zooms,
-				  QRect(ttl, QSize(TILE_SIZE, TILE_SIZE)), _tileRatio));
+				tiles.append(RasterTile(_projection, _transform, _data, _zoom,
+				  _zooms, QRect(ttl, QSize(TILE_SIZE, TILE_SIZE)), _tileRatio));
 		}
 	}

--- a/src/map/encstyle.cpp
+++ b/src/map/encstyle.cpp
@ -1,7 +0,0 @@
-#include "encstyle.h"
-
-const ENC::Style *ENCStyle::style()
-{
-	static ENC::Style s;
-	return &s;
-}
--- a/src/map/encstyle.h
+++ b/src/map/encstyle.h
@ -1,12 +0,0 @@
-#ifndef ENCSTYLE_H
-#define ENCSTYLE_H
-
-#include "ENC/style.h"
-
-class ENCStyle
-{
-public:
-	static const ENC::Style *style();
-};
-
-#endif // ENCSTYLE_H
--- a/src/map/gcs.cpp
+++ b/src/map/gcs.cpp
@ -1,5 +1,4 @@
 #include <QFile>
-#include "common/wgs84.h"
 #include "common/csv.h"
 #include "gcs.h"

--- a/src/map/geotiffmap.cpp
+++ b/src/map/geotiffmap.cpp
@ -1,6 +1,5 @@
 #include <QPainter>
 #include <QImageReader>
-#include "common/util.h"
 #include "geotiff.h"
 #include "image.h"
 #include "geotiffmap.h"
--- a/src/map/gmifile.cpp
+++ b/src/map/gmifile.cpp
@ -41,13 +41,13 @@ bool GmiFile::parse(QIODevice &device)
 			_image = line.trimmed();
 		else if (ln == 3) {
 			width = line.toInt(&ok);
-			if (!ok || ok <= 0) {
+			if (!ok || width <= 0) {
 				_errorString = "Invalid image width";
 				return false;
 			}
 		} else if (ln == 4) {
 			height = line.toInt(&ok);
-			if (!ok || ok <= 0) {
+			if (!ok || height <= 0) {
 				_errorString = "Invalid image height";
 				return false;
 			}
--- a/src/map/jnxmap.cpp
+++ b/src/map/jnxmap.cpp
@ -2,10 +2,7 @@
 #include <QPainter>
 #include <QFileInfo>
 #include <QPixmapCache>
-#include "common/util.h"
 #include "rectd.h"
-#include "gcs.h"
-#include "pcs.h"
 #include "jnxmap.h"


--- a/src/map/kmzmap.cpp
+++ b/src/map/kmzmap.cpp
@ -18,7 +18,6 @@
 #include <QPainter>
 #include <QPixmapCache>
 #include <private/qzipreader_p.h>
-#include "common/util.h"
 #include "kmzmap.h"


--- a/src/map/kmzmap.h
+++ b/src/map/kmzmap.h
@ -4,7 +4,6 @@
 #include <QImage>
 #include "projection.h"
 #include "transform.h"
-#include "rectd.h"
 #include "map.h"

 class QXmlStreamReader;
--- a/src/map/maplist.cpp
+++ b/src/map/maplist.cpp
@ -43,7 +43,7 @@ MapList::ParserMap MapList::parsers()
 	map.insert("rtmap", &RMap::create);
 	map.insert("map", &MapsforgeMap::create);
 	map.insert("map", &OziMap::createMAP);
-	map.insert("gmi", &OziMap::createMAP);
+	map.insert("gmi", &OziMap::createGMI);
 	map.insert("kap", &BSBMap::create);
 	map.insert("kmz", &KMZMap::create);
 	map.insert("aqm", &AQMMap::create);
--- a/src/map/mapsforge/mapdata.cpp
+++ b/src/map/mapsforge/mapdata.cpp
@ -3,7 +3,6 @@
 #include <QFile>
 #include <QDataStream>
 #include <QColor>
-#include "common/hash.h"
 #include "map/osm.h"
 #include "subfile.h"
 #include "mapdata.h"
--- a/src/map/mbtilesmap.cpp
+++ b/src/map/mbtilesmap.cpp
@ -382,12 +382,19 @@ void MBTilesMap::cancelJobs(bool wait)
 		_jobs.at(i)->cancel(wait);
 }

+QPointF MBTilesMap::tilePos(const QPointF &tl, const QPoint &tc,
+  const QPoint &tile, unsigned overzoom) const
+{
+	return QPointF(tl.x() + ((tc.x() - tile.x()) << overzoom) * tileSize(),
+	  tl.y() + ((tc.y() - tile.y()) << overzoom) * tileSize());
+}
+
 void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
 	const Zoom &zoom = _zooms.at(_zi);
 	unsigned overzoom = zoom.z - zoom.base;
 	unsigned f = 1U<<overzoom;
-	qreal scale = OSM::zoom2scale(zoom.base, _tileSize * f);
+	qreal scale = OSM::zoom2scale(zoom.base, _tileSize << overzoom);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * coordinatesRatio(), zoom.base);
 	Coordinates ctl(OSM::tile2ll(tile, zoom.base));
@ -409,8 +416,7 @@ void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 				continue;

 			if (QPixmapCache::find(key, &pm)) {
-				QPointF tp(tl.x() + (t.x() - tile.x()) * tileSize() * f,
-				  tl.y() + (t.y() - tile.y()) * tileSize() * f);
+				QPointF tp(tilePos(tl, t, tile, overzoom));
 				drawTile(painter, pm, tp);
 			} else
 				tiles.append(MBTile(zoom.z, overzoom, _scaledSize, t,
@ -431,8 +437,7 @@ void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)

 				QPixmapCache::insert(mt.key(), pm);

-				QPointF tp(tl.x() + (mt.xy().x() - tile.x()) * tileSize() * f,
-				  tl.y() + (mt.xy().y() - tile.y()) * tileSize() * f);
+				QPointF tp(tilePos(tl, mt.xy(), tile, overzoom));
 				drawTile(painter, pm, tp);
 			}
 		} else
--- a/src/map/mbtilesmap.h
+++ b/src/map/mbtilesmap.h
@ -139,6 +139,8 @@ private:
 	void runJob(MBTilesMapJob *job);
 	void removeJob(MBTilesMapJob *job);
 	void cancelJobs(bool wait);
+	QPointF tilePos(const QPointF &tl, const QPoint &tc, const QPoint &tile,
+	  unsigned overzoom) const;

 	friend QDebug operator<<(QDebug dbg, const Zoom &zoom);

--- a/src/map/onlinemap.cpp
+++ b/src/map/onlinemap.cpp
@ -118,11 +118,18 @@ qreal OnlineMap::tileSize() const
 	return (_tileSize / coordinatesRatio());
 }

-QPoint OnlineMap::tileCoordinates(int x, int y, int zoom)
+QPoint OnlineMap::tileCoordinates(int x, int y, int zoom) const
 {
 	return QPoint(x, _invertY ? (1<<zoom) - y - 1 : y);
 }

+QPointF OnlineMap::tilePos(const QPointF &tl, const QPoint &tc,
+  const QPoint &tile, unsigned overzoom) const
+{
+	return QPointF(tl.x() + ((tc.x() - tile.x()) << overzoom) * tileSize(),
+	  tl.y() + ((tc.y() - tile.y()) << overzoom) * tileSize());
+}
+
 bool OnlineMap::isRunning(const QString &key) const
 {
 	for (int i = 0; i < _jobs.size(); i++) {
@ -174,14 +181,14 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
 	int baseZoom = qMin(_baseZoom, _zoom);
 	unsigned overzoom = _zoom - baseZoom;
-	unsigned f = 1U<<overzoom;

-	qreal scale = OSM::zoom2scale(baseZoom, _tileSize * f);
+	qreal scale = OSM::zoom2scale(baseZoom, _tileSize << overzoom);
 	QPoint tile = OSM::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * coordinatesRatio(), baseZoom);
 	Coordinates ctl(OSM::tile2ll(tile, baseZoom));
 	QPointF tl(ll2xy(Coordinates(ctl.lon(), -ctl.lat())));
 	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	unsigned f = 1U<<overzoom;
 	int width = ceil(s.width() / (tileSize() * f));
 	int height = ceil(s.height() / (tileSize() * f));

@ -213,8 +220,7 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		QPixmap pm;
 		if (QPixmapCache::find(key, &pm)) {
 			QPoint tc(tileCoordinates(t.xy().x(), t.xy().y(), baseZoom));
-			QPointF tp(tl.x() + (tc.x() - tile.x()) * tileSize() * f,
-			  tl.y() + (tc.y() - tile.y()) * tileSize() * f);
+			QPointF tp(tilePos(tl, tc, tile, overzoom));
 			drawTile(painter, pm, tp);
 		} else
 			renderTiles.append(OnlineMapTile(t.xy(), t.file(), _zoom, overzoom,
@ -236,8 +242,7 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 				QPixmapCache::insert(mt.key(), pm);

 				QPoint tc(tileCoordinates(mt.xy().x(), mt.xy().y(), baseZoom));
-				QPointF tp(tl.x() + (tc.x() - tile.x()) * tileSize() * f,
-				  tl.y() + (tc.y() - tile.y()) * tileSize() * f);
+				QPointF tp(tilePos(tl, tc, tile, overzoom));
 				drawTile(painter, pm, tp);
 			}
 		} else
--- a/src/map/onlinemap.h
+++ b/src/map/onlinemap.h
@ -115,7 +115,9 @@ private:
 	qreal tileSize() const;
 	qreal coordinatesRatio() const;
 	qreal imageRatio() const;
-	QPoint tileCoordinates(int x, int y, int zoom);
+	QPoint tileCoordinates(int x, int y, int zoom) const;
+	QPointF tilePos(const QPointF &tl, const QPoint &tc, const QPoint &tile,
+	  unsigned overzoom) const;
 	void drawTile(QPainter *painter, QPixmap &pixmap, QPointF &tp);
 	bool isRunning(const QString &key) const;
 	void runJob(OnlineMapJob *job);
--- a/src/map/oruxmap.cpp
+++ b/src/map/oruxmap.cpp
@ -366,8 +366,10 @@ bool OruxMap::readXML(const QString &path, const QString &dir)
 {
 	QFile file(path);

-	if (!file.open(QFile::ReadOnly | QFile::Text))
+	if (!file.open(QFile::ReadOnly | QFile::Text)) {
+		_errorString = file.errorString();
 		return false;
+	}

 	QXmlStreamReader reader(&file);
 	if (reader.readNextStartElement()) {
--- a/src/map/ozimap.cpp
+++ b/src/map/ozimap.cpp
@ -54,19 +54,15 @@ QString OziMap::calibrationFile(const QStringList &files, const QString path,
 	return QString();
 }

-OziMap::OziMap(const QString &fileName, const Projection &proj, QObject *parent)
-  : Map(fileName, parent), _img(0), _tar(0), _ozf(0), _zoom(0), _mapRatio(1.0),
-  _valid(false)
+OziMap::OziMap(const QString &fileName, CalibrationType type,
+  const Projection &proj, QObject *parent) : Map(fileName, parent), _img(0),
+  _tar(0), _ozf(0), _zoom(0), _mapRatio(1.0), _valid(false)
 {
-	QFileInfo fi(fileName);
-	QString suffix(fi.suffix().toLower());
-
-	if (suffix == "tar") {
-		CalibrationType type;
-
+	// TAR maps
+	if (type == Unknown) {
 		_tar = new Tar(fileName);
 		if (!_tar->open()) {
-			_errorString = "Error reading tar file: " + _tar->errorString();
+			_errorString = _tar->errorString();
 			return;
 		}
 		QStringList files(_tar->files());
@ -110,10 +106,12 @@ OziMap::OziMap(const QString &fileName, const Projection &proj, QObject *parent)
 			return;

 		_tar->close();
+
+	// regular MAP or GMI maps
 	} else {
 		QFile file(fileName);

-		if (suffix == "map") {
+		if (type == MAP) {
 			MapFile mf(file);
 			if (!mf.isValid()) {
 				_errorString = mf.errorString();
@ -125,7 +123,7 @@ OziMap::OziMap(const QString &fileName, const Projection &proj, QObject *parent)
 				_projection = mf.projection();
 				_transform = mf.transform();
 			}
-		} else if (suffix == "gmi") {
+		} else if (type == GMI) {
 			GmiFile gmi(file);
 			if (!gmi.isValid()) {
 				_errorString = gmi.errorString();
@ -138,11 +136,9 @@ OziMap::OziMap(const QString &fileName, const Projection &proj, QObject *parent)
 				_projection = proj;
 				computeTransform();
 			}
-		} else {
-			_errorString = "Unknown file type";
-			return;
 		}

+		QFileInfo fi(fileName);
 		QDir set(fi.absolutePath() + "/" + "set");
 		if (set.exists()) {
 			if (!setTileInfo(set.entryList(), set.absolutePath()))
@ -266,32 +262,33 @@ bool OziMap::setImageInfo(const QString &path)

 bool OziMap::setTileInfo(const QStringList &tiles, const QString &path)
 {
+	static const QRegularExpression rx("_[0-9]+_[0-9]+\\.");
+
 	if (!_map.size.isValid()) {
 		_errorString = "Missing total image size (IWH)";
 		return false;
 	}

-	QRegularExpression rx("_[0-9]+_[0-9]+\\.");
 	for (int i = 0; i < tiles.size(); i++) {
-		if (tiles.at(i).contains(rx)) {
-			_tile.path = QString(tiles.at(i)).replace(rx, "_%1_%2.");
+		const QString &tile = tiles.at(i);
+
+		if (tile.contains(rx)) {
+			QString pattern(QString(tile).replace(rx, "_%1_%2."));

 			if (_tar) {
-				QByteArray ba = _tar->file(tiles.at(i));
+				QByteArray ba(_tar->file(tile));
 				QBuffer buffer(&ba);
+				_tile.path = pattern;
 				_tile.size = QImageReader(&buffer).size();
 			} else {
-				_tile.path = path + "/" + _tile.path;
-				_tile.size = QImageReader(path + "/" + tiles.at(i)).size();
-			}
-			if (!_tile.size.isValid()) {
-				_errorString = QString("Error retrieving tile size: "
-				  "%1: Invalid image").arg(QFileInfo(tiles.at(i)).fileName());
-				return false;
+				_tile.path = path + "/" + pattern;
+				_tile.size = QImageReader(path + "/" + tile).size();
 			}

-			_map.path = QString();
-			return true;
+			if (_tile.size.isValid())
+				return true;
+			else
+				qWarning("%s: error reading tile image", qPrintable(tile));
 		}
 	}

@ -373,8 +370,7 @@ void OziMap::drawTiled(QPainter *painter, const QRectF &rect) const
 				pixmap = QPixmap(tileName);

 			if (pixmap.isNull())
-				qWarning("%s: error loading tile image", qPrintable(
-				  _tile.path.arg(QString::number(x), QString::number(y))));
+				qWarning("%s: error loading tile image", qPrintable(tileName));
 			else {
 				pixmap.setDevicePixelRatio(_mapRatio);
 				QPointF tp(tl.x() + i * ts.width(), tl.y() + j * ts.height());
@ -398,8 +394,9 @@ void OziMap::drawOZF(QPainter *painter, const QRectF &rect) const
 			int y = round(tl.y() * _mapRatio + j * _ozf->tileSize().height());

 			QPixmap pixmap;
-			QString key = _ozf->fileName() + "/" + QString::number(_zoom) + "_"
-			  + QString::number(x) + "_" + QString::number(y);
+			QString key(_ozf->fileName() + "/" + QString::number(_zoom) + "_"
+			  + QString::number(x) + "_" + QString::number(y));
+
 			if (!QPixmapCache::find(key, &pixmap)) {
 				pixmap = _ozf->tile(_zoom, x, y);
 				if (!pixmap.isNull())
@ -512,7 +509,7 @@ Map *OziMap::createTAR(const QString &path, const Projection &proj, bool *isDir)
 	if (isDir)
 		*isDir = false;

-	return new OziMap(path, proj);
+	return new OziMap(path, Unknown, proj);
 }

 Map *OziMap::createMAP(const QString &path, const Projection &proj, bool *isDir)
@ -520,5 +517,13 @@ Map *OziMap::createMAP(const QString &path, const Projection &proj, bool *isDir)
 	if (isDir)
 		*isDir = false;

-	return new OziMap(path, proj);
+	return new OziMap(path, MAP, proj);
+}
+
+Map *OziMap::createGMI(const QString &path, const Projection &proj, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new OziMap(path, GMI, proj);
 }
--- a/src/map/ozimap.h
+++ b/src/map/ozimap.h
@ -15,7 +15,11 @@ class OziMap : public Map
 	Q_OBJECT

 public:
-	OziMap(const QString &fileName, const Projection &proj,
+	enum CalibrationType {
+		Unknown, MAP, GMI
+	};
+
+	OziMap(const QString &fileName, CalibrationType type, const Projection &proj,
 	  QObject *parent = 0);
 	OziMap(const QString &dirName, Tar &tar, const Projection &proj,
 	  QObject *parent = 0);
@ -54,12 +58,10 @@ public:
 	  bool *isDir);
 	static Map *createMAP(const QString &path, const Projection &proj,
 	  bool *isDir);
+	static Map *createGMI(const QString &path, const Projection &proj,
+	  bool *isDir);

 private:
-	enum CalibrationType {
-		Unknown, MAP, GMI
-	};
-
 	struct ImageInfo {
 		QSize size;
 		QString path;
--- a/src/map/pcs.cpp
+++ b/src/map/pcs.cpp
@ -1,6 +1,5 @@
 #include <QFile>
 #include "common/csv.h"
-#include "angularunits.h"
 #include "pcs.h"

 QMap<int, PCS::Entry> PCS::_pcss = defaults();
@ -14,7 +13,7 @@ QMap<int, PCS::Entry> PCS::defaults()

 PCS PCS::pcs(int id)
 {
-	QMap<int, Entry>::const_iterator it = _pcss.find(id);
+	QMap<int, Entry>::const_iterator it(_pcss.find(id));

 	if (it == _pcss.constEnd())
 		return PCS();
--- a/src/map/pcs.h
+++ b/src/map/pcs.h
@ -5,8 +5,6 @@
 #include <QMap>
 #include "common/kv.h"
 #include "gcs.h"
-#include "linearunits.h"
-#include "coordinatesystem.h"
 #include "conversion.h"

 class PCS
--- a/src/map/qctmap.cpp
+++ b/src/map/qctmap.cpp
@ -327,7 +327,7 @@ QCTMap::QCTMap(const QString &fileName, QObject *parent)
  _mapRatio(1.0), _valid(false)
 {
 	if (!_file.open(QIODevice::ReadOnly)) {
-		_errorString = fileName + ": " + _file.errorString();
+		_errorString = _file.errorString();
 		return;
 	}

--- a/src/map/rmap.cpp
+++ b/src/map/rmap.cpp
@ -5,7 +5,6 @@
 #include <QRegularExpression>
 #include <QtEndian>
 #include "common/rectc.h"
-#include "common/wgs84.h"
 #include "common/color.h"
 #include "calibrationpoint.h"
 #include "utm.h"
@ -98,10 +97,10 @@ static Projection parseProjection(const QString &str, const GCS &gcs)

 bool RMap::parseIMP(const QByteArray &data)
 {
-	QStringList lines = QString(data).split("\r\n");
+	static const QRegularExpression re("^P[0-9]+=");
+	QStringList lines(QString(data).split("\r\n"));
 	QVector<CalibrationPoint> calibrationPoints;
 	QString projection, datum;
-	QRegularExpression re("^P[0-9]+=");

 	for (int i = 0; i < lines.count(); i++) {
 		const QString &line = lines.at(i);
--- a/src/map/tar.cpp
+++ b/src/map/tar.cpp
@ -70,11 +70,11 @@ bool Tar::loadTar()
 	quint64 size;
 	qint64 ret;

-	while ((ret = _file.read(buffer, BLOCKSIZE)) > 0) {
+	while ((ret = _file.read(buffer, BLOCKSIZE))) {
 		if (ret < BLOCKSIZE) {
 			_file.close();
 			_index.clear();
-			_errorString = "Error reading header block";
+			_errorString = "Error reading TAR header block";
 			return false;
 		}
 		size = number(hdr->size, sizeof(hdr->size));
@ -100,7 +100,7 @@ bool Tar::loadTmi(const QString &path)
 		return false;

 	while (!file.atEnd()) {
-		QByteArray line = file.readLine(4096);
+		QByteArray line(file.readLine(4096));
 		int pos = line.indexOf(':');
 		if (line.size() < 10 || pos < 7 || !line.startsWith("block")) {
 			qWarning("%s:%d: syntax error", qPrintable(path), ln);
--- a/src/map/textpointitem.h
+++ b/src/map/textpointitem.h
@ -1,6 +1,7 @@
 #ifndef TEXTPOINTITEM_H
 #define TEXTPOINTITEM_H

+#include <cmath>
 #include "textitem.h"

 class QFont;
--- a/src/map/tileloader.cpp
+++ b/src/map/tileloader.cpp
@ -110,8 +110,8 @@ void TileLoader::loadTilesSync(QVector<Tile> &list)

 		for (int i = 0; i < tl.size(); i++) {
 			Tile *t = tl[i];
-			QString file = tileFile(*t);
-			if (QFileInfo(file).exists())
+			QString file(tileFile(*t));
+			if (QFileInfo::exists(file))
 				t->setFile(file);
 		}
 	}
--- a/src/map/transform.cpp
+++ b/src/map/transform.cpp
@ -1,4 +1,3 @@
-#include "projection.h"
 #include "matrix.h"
 #include "transform.h"

--- a/src/map/wms.cpp
+++ b/src/map/wms.cpp
@ -321,7 +321,7 @@ bool WMS::parseCapabilities()

 void WMS::capabilitiesReady()
 {
-	if (!QFileInfo(_path).exists()) {
+	if (!QFileInfo::exists(_path)) {
 		_errorString = "Error downloading capabilities XML file";
 		_valid = false;
 	} else {
@ -338,7 +338,7 @@ WMS::WMS(const QString &file, const WMS::Setup &setup, QObject *parent)
 	QString url = QString("%1%2service=WMS&request=GetCapabilities")
 	  .arg(setup.url(), setup.url().contains('?') ? "&" : "?");

-	if (!QFileInfo(file).exists()) {
+	if (!QFileInfo::exists(file)) {
 		Downloader *downloader = new Downloader(this);
 		connect(downloader, &Downloader::finished, this,
 		  &WMS::capabilitiesReady);
--- a/src/map/wmts.cpp
+++ b/src/map/wmts.cpp
@ -6,7 +6,6 @@
 #include <QStringList>
 #include <QtAlgorithms>
 #include <QXmlStreamReader>
-#include "pcs.h"
 #include "crs.h"
 #include "wmts.h"

@ -301,7 +300,7 @@ bool WMTS::parseCapabilities(CTX &ctx)

 void WMTS::capabilitiesReady()
 {
-	if (!QFileInfo(_path).exists()) {
+	if (!QFileInfo::exists(_path)) {
 		_errorString = "Error downloading capabilities XML file";
 		_valid = false;
 	} else {
@ -354,7 +353,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup, QObject *parent)

 	_path = url.isLocalFile() ? url.toLocalFile() : file;

-	if (!url.isLocalFile() && !QFileInfo(file).exists()) {
+	if (!url.isLocalFile() && !QFileInfo::exists(file)) {
 		Downloader *downloader = new Downloader(this);
 		connect(downloader, &Downloader::finished, this,
 		  &WMTS::capabilitiesReady);
--- a/src/map/worldfilemap.cpp
+++ b/src/map/worldfilemap.cpp
@ -3,7 +3,6 @@
 #include <QPainter>
 #include <QImageReader>
 #include "image.h"
-#include "gcs.h"
 #include "prjfile.h"
 #include "wldfile.h"
 #include "worldfilemap.h"
Author	SHA1	Message	Date
Martin Tůma	a1e10c395a	Some more code cleanup	2024-01-01 13:02:42 +01:00
Martin Tůma	c97561add4	Code cleanup	2024-01-01 10:58:23 +01:00
Martin Tůma	d994fae4ce	Fixed the change that has broken non-TAR maps Do not fail on the first image read error - there may be files with a "_%u_%u." file name match that are not image tiles.	2024-01-01 10:48:16 +01:00
Martin Tůma	789606cf86	Silenced some more clazy warnings	2023-12-31 13:57:43 +01:00
Martin Tůma	542b3e920e	Fixed read error check	2023-12-31 13:24:36 +01:00
Martin Tůma	0248ecb254	Improved tile file check	2023-12-31 13:20:04 +01:00
Martin Tůma	acc9d07a22	Properly associate .gmi files	2023-12-31 10:48:26 +01:00
Martin Tůma	7860ce8acc	Use the info we already have for calibration file type distinction	2023-12-31 10:05:02 +01:00
Martin Tůma	2541797e7d	Improved error reporting	2023-12-31 01:12:46 +01:00
Martin Tůma	e13d6dfc4b	Fixed broken image dimensions checks	2023-12-29 18:01:28 +01:00
Martin Tůma	9e1e960c93	Use a file name that allows QFileInfo::completeSuffix() to match	2023-12-27 22:41:56 +01:00
Martin Tůma	d18537733f	Added mtbmap.cz as replacement for 4Umaps While having a much lower topographic quality than 4Umaps, there is apparently no other freely accessible map with the same MTB/hiking info out there. So let's provide at least what we have...	2023-12-27 22:17:35 +01:00
Martin Tůma	c6a37594ae	Code cleanup	2023-12-27 15:26:39 +01:00
Martin Tůma	bcfd51276f	Use QNetworkRequest::setTransferTimeout where available	2023-12-27 15:12:53 +01:00
Martin Tůma	aed09a0e6a	Android build fix no.3	2023-12-27 00:33:49 +01:00
Martin Tůma	867b70d159	Android build fix #2	2023-12-26 21:00:27 +01:00
Martin Tůma	0b05079a49	Fixed Android build	2023-12-26 20:52:58 +01:00
Martin Tůma	ca71eb9d93	Header includes cleanup	2023-12-26 20:46:52 +01:00
Martin Tůma	4a82055867	Some more code cleanup	2023-12-26 20:05:38 +01:00
Martin Tůma	f9b4cd991f	Removed 4Umaps from the default map sources 4Umaps are most probably dead: https://sourceforge.net/p/mobac/forum/general/thread/106784dc1d/	2023-12-26 14:38:03 +01:00
Martin Tůma	14dc2af877	Code cleanup	2023-12-26 14:14:08 +01:00
Martin Tůma	9380f31022	Code cleanup	2023-12-25 11:12:52 +01:00
Martin Tůma	5f76427ba4	Code cleanup	2023-12-25 10:49:50 +01:00
Martin Tůma	d4b731aeaf	Use MIB numbers for QTextCodec fetching Discard the "broken name cache" workaround and use QTextCodec search based on MIB numbers.	2023-12-22 09:32:47 +01:00
Martin Tůma	3d27b4ea00	The codec is always set in load(), use the default constructor	2023-12-21 17:27:27 +01:00
Martin Tůma	502a7b4129	Do not have a separate class/file for ENC style retrieving, move the stuff to the ENC raster tile constructor	2023-12-21 16:57:11 +01:00
Martin Tůma	6f32c73684	Added infinitive recursion assert	2023-12-21 16:55:42 +01:00