Fixed broken merge

Currently translated at 100.0% (323 of 323 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.17.{build}
+version: 6.0.{build}
 configuration: Release
 platform: Any CPU
 environment:

README.md

@@ -3,23 +3,29 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
 KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.
 
 ## Features
-* [User-definable online maps](https://github.com/tumic0/GPXSee-maps) (OSM/Google tiles, WMTS, WMS).
+* User-definable online maps (OSM/Google tiles, WMTS, WMS).
 * Offline maps (OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for multiple tracks in one view.
 * Support for POI files.
 * Print/export to PDF.
 * Full-screen mode.
+* HiDPI/Retina displays & maps support.
 * Native GUI for Windows, Mac OS X and Linux.
 * Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.
 
 ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
 
 ## Build
+Build requirements:
+* Qt 4.8 or QT 5.x (Qt >= 5.10.1 recommended for all features)
+* C++03 compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)
+
+Build steps:
 ```shell
 lrelease gpxsee.pro
 qmake gpxsee.pro
-make
+make # nmake on windows
 ```
 
 ## Download
@@ -31,3 +37,9 @@ make
 
 ## Homepage
 http://www.gpxsee.org
+
+## Maps
+[GPXSee maps repository](https://github.com/tumic0/GPXSee-maps)
+
+## Translations
+GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee) for translations.

gpxsee.pro

@@ -1,9 +1,10 @@
 TARGET = GPXSee
-VERSION = 5.17
+VERSION = 6.0
 
 QT += core \
     gui \
-    network
+    network \
+    sql
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += widgets
     QT += printsupport
@@ -89,7 +90,7 @@ HEADERS += src/config.h \
     src/map/downloader.h \
     src/map/tile.h \
     src/map/emptymap.h \
-    src/map/offlinemap.h \
+    src/map/ozimap.h \
     src/map/tar.h \
     src/map/ozf.h \
     src/map/atlas.h \
@@ -139,7 +140,12 @@ HEADERS += src/config.h \
     src/map/krovak.h \
     src/GUI/kv.h \
     src/data/locparser.h \
-    src/data/slfparser.h
+    src/data/slfparser.h \
+    src/map/geotiffmap.h \
+    src/map/image.h \
+    src/common/greatcircle.h \
+    src/map/mbtilesmap.h \
+    src/map/osm.h
 SOURCES += src/main.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
@@ -192,7 +198,7 @@ SOURCES += src/main.cpp \
     src/map/onlinemap.cpp \
     src/map/downloader.cpp \
     src/map/emptymap.cpp \
-    src/map/offlinemap.cpp \
+    src/map/ozimap.cpp \
     src/map/tar.cpp \
     src/map/atlas.cpp \
     src/map/ozf.cpp \
@@ -242,10 +248,16 @@ SOURCES += src/main.cpp \
     src/map/krovak.cpp \
     src/map/map.cpp \
     src/data/locparser.cpp \
-    src/data/slfparser.cpp
+    src/data/slfparser.cpp \
+    src/map/geotiffmap.cpp \
+    src/map/image.cpp \
+    src/common/greatcircle.cpp \
+    src/map/mbtilesmap.cpp \
+    src/map/osm.cpp
 
 RESOURCES += gpxsee.qrc
-TRANSLATIONS = lang/gpxsee_cs.ts \
+TRANSLATIONS = lang/gpxsee_en.ts \
+    lang/gpxsee_cs.ts \
     lang/gpxsee_sv.ts \
     lang/gpxsee_de.ts \
     lang/gpxsee_ru.ts \
@@ -257,7 +269,8 @@ macx {
     ICON = icons/gpxsee.icns
     QMAKE_INFO_PLIST = pkg/Info.plist
     LOCALE.path = Contents/Resources/translations
-    LOCALE.files = lang/gpxsee_cs.qm \
+    LOCALE.files = lang/gpxsee_en.qm \
+        lang/gpxsee_cs.qm \
         lang/gpxsee_de.qm \
         lang/gpxsee_fi.qm \
         lang/gpxsee_fr.qm \
@@ -299,3 +312,4 @@ win32 {
 }
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+DEFINES *= QT_USE_QSTRINGBUILDER

gpxsee.qrc

@@ -40,5 +40,7 @@
 		<file>icons/document-print_32@2x.png</file>
 		<file>icons/view-filter.png</file>
 		<file>icons/view-filter@2x.png</file>
+		<file>icons/applications-internet_32.png</file>
+		<file>icons/applications-internet_32@2x.png</file>
 	</qresource>
 </RCC>

lang/gpxsee_en.ts

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+<context>
+    <name>GUI</name>
+    <message numerus="yes">
+        <source>%n files</source>
+        <translation>
+            <numerusform>%n file</numerusform>
+            <numerusform>%n files</numerusform>
+        </translation>
+    </message>
+</context>
+</TS>

pkg/gpxsee.nsi

@@ -30,7 +30,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "5.17"
+!define VERSION "6.0"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -153,10 +153,12 @@ Section "QT framework" SEC_QT
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
+  File "Qt5Sql.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
   File /r "styles"
+  File /r "sqldrivers"
 
 SectionEnd
 
@@ -270,4 +272,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/gpxsee64.nsi

@@ -30,7 +30,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "5.17"
+!define VERSION "6.0"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -160,10 +160,12 @@ Section "QT framework" SEC_QT
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
+  File "Qt5Sql.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
   File /r "styles"
+  File /r "sqldrivers"
 
 SectionEnd
 
@@ -273,4 +275,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_END

src/GUI/axisitem.cpp

@@ -36,7 +36,8 @@ Ticks::Ticks(double minValue, double maxValue, int maxCount)
 }
 
 
-AxisItem::AxisItem(Type type, QGraphicsItem *parent) : QGraphicsItem(parent)
+AxisItem::AxisItem(Type type, QGraphicsItem *parent)
+  : QGraphicsItem(parent), _locale(QLocale::system())
 {
 	_type = type;
 	_size = 0;
@@ -56,7 +57,7 @@ void AxisItem::setRange(const RangeF &range)
 	for (int i = 0; i < ticks.count(); i++) {
 		Tick &t = _ticks[i];
 		t.value = ticks.val(i);
-		t.boundingBox = fm.tightBoundingRect(QString::number(t.value));
+		t.boundingBox = fm.tightBoundingRect(_locale.toString(t.value));
 	}
 
 	updateBoundingRect();
@@ -126,7 +127,7 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 			  TICK/2, (_size/_range.size()) * (val - _range.min()), -TICK/2);
 			painter->drawText(((_size/_range.size()) * (val - _range.min()))
 			  - (ts.width()/2), ts.height() + TICK/2 + PADDING,
-			  QString::number(val));
+			  _locale.toString(val));
 		}
 
 		painter->drawText(_size/2 - _labelBB.width()/2, _labelBB.height()
@@ -145,7 +146,7 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 			  * (val - _range.min())));
 			painter->drawText(-(ts.width() + PADDING + TICK/2),
 			  -((_size/_range.size()) * (val - _range.min())) + (ts.height()/2),
-			  QString::number(val));
+			  _locale.toString(val));
 		}
 
 		painter->rotate(-90);

src/GUI/axisitem.h

@@ -3,6 +3,7 @@
 
 #include <QGraphicsItem>
 #include <QVector>
+#include <QLocale>
 #include "common/range.h"
 
 class AxisItem : public QGraphicsItem
@@ -39,6 +40,7 @@ private:
 	QVector<Tick> _ticks;
 	QRectF _boundingRect;
 	QFont _font;
+	QLocale _locale;
 };
 
 #endif // AXISITEM_H

src/GUI/cadencegraph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "cadencegraphitem.h"
 #include "cadencegraph.h"
@@ -7,7 +8,7 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 {
 	_showTracks = true;
 
-	GraphView::setYUnits(tr("1/min"));
+	GraphView::setYUnits(tr("rpm"));
 	setYLabel(tr("Cadence"));
 
 	setSliderPrecision(1);
@@ -16,9 +17,11 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 void CadenceGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale()
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Average"), l.toString(avg() * yScale()
 		  + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale()
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();

src/GUI/cadencegraphitem.cpp

@@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "cadencegraphitem.h"
 
+
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@@ -16,11 +18,12 @@ CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
 QString CadenceGraphItem::toolTip() const
 {
 	ToolTip tt;
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Maximum"), QString::number(max(), 'f', 1)
-	  + UNIT_SPACE + tr("1/min"));
-	tt.insert(tr("Average"), QString::number(avg(), 'f', 1)
-	  + UNIT_SPACE + tr("1/min"));
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 1)
+	  + UNIT_SPACE + tr("rpm"));
+	tt.insert(tr("Average"), l.toString(avg(), 'f', 1)
+	  + UNIT_SPACE + tr("rpm"));
 
 	return tt.toString();
 }

src/GUI/elevationgraph.cpp

@@ -1,4 +1,5 @@
 #include <cmath>
+#include <QLocale>
 #include "data/data.h"
 #include "config.h"
 #include "tooltip.h"
@@ -54,13 +55,15 @@ void ElevationGraph::setInfo()
 	if (std::isnan(max()) || std::isnan(min()))
 		clearInfo();
 	else {
-		GraphView::addInfo(tr("Ascent"), QString::number(ascent() * yScale(),
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Ascent"), l.toString(ascent() * yScale(),
 		  'f', 0) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Descent"), QString::number(descent() * yScale(),
+		GraphView::addInfo(tr("Descent"), l.toString(descent() * yScale(),
 		  'f', 0) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale(), 'f',
 		  0) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale(), 'f',
+		GraphView::addInfo(tr("Minimum"), l.toString(min() * yScale(), 'f',
 		  0) + UNIT_SPACE + yUnits());
 	}
 }

src/GUI/elevationgraphitem.cpp

@@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "elevationgraphitem.h"
 
+
 ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@@ -24,14 +26,15 @@ QString ElevationGraphItem::toolTip(Units units) const
 	ToolTip tt;
 	qreal scale = (units == Metric) ? 1.0 : M2FT;
 	QString su = (units == Metric) ? tr("m") : tr("ft");
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Ascent"), QString::number(ascent() * scale, 'f', 0)
+	tt.insert(tr("Ascent"), l.toString(ascent() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Descent"), QString::number(descent() * scale, 'f', 0)
+	tt.insert(tr("Descent"), l.toString(descent() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Maximum"), QString::number(max() * scale, 'f', 0)
+	tt.insert(tr("Maximum"), l.toString(max() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Minimum"), QString::number(min() * scale, 'f', 0)
+	tt.insert(tr("Minimum"), l.toString(min() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
 
 	return tt.toString();

src/GUI/format.cpp

@@ -46,37 +46,41 @@ QString Format::timeSpan(qreal time, bool full)
 
 QString Format::distance(qreal value, Units units)
 {
+	QLocale l(QLocale::system());
+
 	if (units == Imperial) {
 		if (value < MIINM)
-			return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+			return l.toString(value * M2FT, 'f', 0) + UNIT_SPACE
 			  + qApp->translate("Format", "ft");
 		else
-			return QString::number(value * M2MI, 'f', 1) + UNIT_SPACE
+			return l.toString(value * M2MI, 'f', 1) + UNIT_SPACE
 			  + qApp->translate("Format", "mi");
 	} else if (units == Nautical) {
 		if (value < NMIINM)
-			return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+			return l.toString(value * M2FT, 'f', 0) + UNIT_SPACE
 			  + qApp->translate("Format", "ft");
 		else
-			return QString::number(value * M2NMI, 'f', 1) + UNIT_SPACE
+			return l.toString(value * M2NMI, 'f', 1) + UNIT_SPACE
 			  + qApp->translate("Format", "nmi");
 	} else {
 		if (value < KMINM)
-			return QString::number(value, 'f', 0) + UNIT_SPACE
+			return l.toString(value, 'f', 0) + UNIT_SPACE
 			  + qApp->translate("Format", "m");
 		else
-			return QString::number(value * M2KM, 'f', 1) + UNIT_SPACE
+			return l.toString(value * M2KM, 'f', 1) + UNIT_SPACE
 			  + qApp->translate("Format", "km");
 	}
 }
 
 QString Format::elevation(qreal value, Units units)
 {
+	QLocale l(QLocale::system());
+
 	if (units == Metric)
-		return QString::number(qRound(value)) + UNIT_SPACE
+		return l.toString(qRound(value)) + UNIT_SPACE
 		  + qApp->translate("Format", "m");
 	else
-		return QString::number(qRound(value * M2FT)) + UNIT_SPACE
+		return l.toString(qRound(value * M2FT)) + UNIT_SPACE
 		  + qApp->translate("Format", "ft");
 }
 
@@ -95,7 +99,8 @@ QString Format::coordinates(const Coordinates &value, CoordinatesFormat type)
 			  + deg2DMS(qAbs(value.lon())) + xH;
 			break;
 		default:
-			return QString::number(qAbs(value.lat()), 'f', 5) + yH + ","
-			  + QChar(0x00A0) + QString::number(qAbs(value.lon()), 'f', 5) + xH;
+			QLocale l(QLocale::system());
+			return l.toString(qAbs(value.lat()), 'f', 5) + yH + ","
+			+ QChar(0x00A0) + l.toString(qAbs(value.lon()), 'f', 5) + xH;
 	}
 }

src/GUI/gearratiograph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "gearratiographitem.h"
 #include "gearratiograph.h"
@@ -16,11 +17,13 @@ GearRatioGraph::GearRatioGraph(QWidget *parent) : GraphTab(parent)
 void GearRatioGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Most used"), QString::number(top() * yScale(),
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Most used"), l.toString(top() * yScale(),
 		  'f', 2) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale(), 'f',
+		GraphView::addInfo(tr("Minimum"), l.toString(min() * yScale(), 'f',
 		  2) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale(), 'f',
 		  2) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();

src/GUI/gearratiographitem.cpp

@@ -1,7 +1,9 @@
 #include <QMap>
+#include <QLocale>
 #include "tooltip.h"
 #include "gearratiographitem.h"
 
+
 GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent), _top(NAN)
 {
@@ -30,10 +32,11 @@ GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
 QString GearRatioGraphItem::toolTip() const
 {
 	ToolTip tt;
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Minimum"), QString::number(min(), 'f', 2));
-	tt.insert(tr("Maximum"), QString::number(max(), 'f', 2));
-	tt.insert(tr("Most used"), QString::number(top(), 'f', 2));
+	tt.insert(tr("Minimum"), l.toString(min(), 'f', 2));
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 2));
+	tt.insert(tr("Most used"), l.toString(top(), 'f', 2));
 
 	return tt.toString();
 }

src/GUI/graphview.cpp

@@ -5,6 +5,7 @@
 #include <QPaintDevice>
 #include <QGraphicsSimpleTextItem>
 #include <QPalette>
+#include <QLocale>
 #include "data/graph.h"
 #include "opengl.h"
 #include "config.h"
@@ -413,8 +414,10 @@ void GraphView::updateSliderPosition()
 
 void GraphView::updateSliderInfo()
 {
+	QLocale l(QLocale::system());
 	qreal r, y;
 
+
 	if (_visible.count() > 1) {
 		r = 0;
 		y = 0;
@@ -435,9 +438,9 @@ void GraphView::updateSliderInfo()
 	_sliderInfo->setSide(s);
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
 	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
-	  bounds().width() > 3600) : QString::number(_sliderPos * _xScale, 'f', 1)
+	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
 	  + UNIT_SPACE + _xUnits, (_visible.count() > 1) ? QString()
-	  : QString::number(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
+	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
 	  + _yUnits);
 }
 

src/GUI/gui.cpp

@@ -931,6 +931,11 @@ void GUI::openOptions()
 	if (options.enableHTTP2 != _options.enableHTTP2)
 		Downloader::enableHTTP2(options.enableHTTP2);
 #endif // ENABLE_HTTP2
+#ifdef ENABLE_HIDPI
+	if (options.hidpiMap != _options.hidpiMap)
+		_mapView->setDevicePixelRatio(options.hidpiMap ? devicePixelRatioF()
+		  : 1.0);
+#endif // ENABLE_HIDPI
 
 	if (reload)
 		reloadFile();
@@ -971,6 +976,8 @@ void GUI::exportFile()
 
 void GUI::statistics()
 {
+	QLocale l(QLocale::system());
+
 #ifdef Q_OS_WIN32
 	QString text = "<style>td {white-space: pre; padding-right: 4em;}"
 	  "th {text-align: left; padding-top: 0.5em;}</style><table>";
@@ -981,21 +988,21 @@ void GUI::statistics()
 
 	if (_showTracksAction->isChecked() && _trackCount > 1)
 		text.append("<tr><td>" + tr("Tracks") + ":</td><td>"
-		  + QString::number(_trackCount) + "</td></tr>");
+		  + l.toString(_trackCount) + "</td></tr>");
 	if (_showRoutesAction->isChecked() && _routeCount > 1)
 		text.append("<tr><td>" + tr("Routes") + ":</td><td>"
-		  + QString::number(_routeCount) + "</td></tr>");
+		  + l.toString(_routeCount) + "</td></tr>");
 	if (_showWaypointsAction->isChecked() && _waypointCount > 1)
 		text.append("<tr><td>" + tr("Waypoints") + ":</td><td>"
-		  + QString::number(_waypointCount) + "</td></tr>");
+		  + l.toString(_waypointCount) + "</td></tr>");
 
 	if (_dateRange.first.isValid()) {
 		if (_dateRange.first == _dateRange.second) {
-			QString format = QLocale::system().dateFormat(QLocale::LongFormat);
+			QString format = l.dateFormat(QLocale::LongFormat);
 			text.append("<tr><td>" + tr("Date") + ":</td><td>"
 			  + _dateRange.first.toString(format) + "</td></tr>");
 		} else {
-			QString format = QLocale::system().dateFormat(QLocale::ShortFormat);
+			QString format = l.dateFormat(QLocale::ShortFormat);
 			text.append("<tr><td>" + tr("Date") + ":</td><td>"
 			  + QString("%1 - %2").arg(_dateRange.first.toString(format),
 			  _dateRange.second.toString(format)) + "</td></tr>");
@@ -1037,6 +1044,7 @@ void GUI::statistics()
 
 void GUI::plot(QPrinter *printer)
 {
+	QLocale l(QLocale::system());
 	QPainter p(printer);
 	TrackInfo info;
 	qreal ih, gh, mh, ratio;
@@ -1047,19 +1055,19 @@ void GUI::plot(QPrinter *printer)
 
 	if (_options.printItemCount) {
 		if (_showTracksAction->isChecked() && _trackCount > 1)
-			info.insert(tr("Tracks"), QString::number(_trackCount));
+			info.insert(tr("Tracks"), l.toString(_trackCount));
 		if (_showRoutesAction->isChecked() && _routeCount > 1)
-			info.insert(tr("Routes"), QString::number(_routeCount));
+			info.insert(tr("Routes"), l.toString(_routeCount));
 		if (_showWaypointsAction->isChecked() && _waypointCount > 1)
-			info.insert(tr("Waypoints"), QString::number(_waypointCount));
+			info.insert(tr("Waypoints"), l.toString(_waypointCount));
 	}
 
 	if (_dateRange.first.isValid() && _options.printDate) {
 		if (_dateRange.first == _dateRange.second) {
-			QString format = QLocale::system().dateFormat(QLocale::LongFormat);
+			QString format = l.dateFormat(QLocale::LongFormat);
 			info.insert(tr("Date"), _dateRange.first.toString(format));
 		} else {
-			QString format = QLocale::system().dateFormat(QLocale::ShortFormat);
+			QString format = l.dateFormat(QLocale::ShortFormat);
 			info.insert(tr("Date"), QString("%1 - %2")
 			  .arg(_dateRange.first.toString(format),
 			  _dateRange.second.toString(format)));
@@ -1795,6 +1803,10 @@ void GUI::writeSettings()
 		settings.setValue(SLIDER_COLOR_SETTING, _options.sliderColor);
 	if (_options.alwaysShowMap != ALWAYS_SHOW_MAP_DEFAULT)
 		settings.setValue(ALWAYS_SHOW_MAP_SETTING, _options.alwaysShowMap);
+#ifdef ENABLE_HIDPI
+	if (_options.hidpiMap != HIDPI_MAP_DEFAULT)
+		settings.setValue(HIDPI_MAP_SETTING, _options.hidpiMap);
+#endif // ENABLE_HIDPI
 	settings.endGroup();
 }
 
@@ -2030,6 +2042,10 @@ void GUI::readSettings()
 	  SLIDER_COLOR_DEFAULT).value<QColor>();
 	_options.alwaysShowMap = settings.value(ALWAYS_SHOW_MAP_SETTING,
 	  ALWAYS_SHOW_MAP_DEFAULT).toBool();
+#ifdef ENABLE_HIDPI
+	_options.hidpiMap = settings.value(HIDPI_MAP_SETTING, HIDPI_MAP_SETTING)
+	  .toBool();
+#endif // ENABLE_HIDPI
 
 	_mapView->setPalette(_options.palette);
 	_mapView->setMapOpacity(_options.mapOpacity);
@@ -2046,6 +2062,9 @@ void GUI::readSettings()
 	_mapView->setMarkerColor(_options.sliderColor);
 	if (_options.useOpenGL)
 		_mapView->useOpenGL(true);
+#ifdef ENABLE_HIDPI
+	_mapView->setDevicePixelRatio(_options.hidpiMap ? devicePixelRatioF() : 1.0);
+#endif // ENABLE_HIDPI
 
 	for (int i = 0; i < _tabs.count(); i++) {
 		_tabs.at(i)->setPalette(_options.palette);
@@ -2131,7 +2150,7 @@ void GUI::show()
 void GUI::screenChanged(QScreen *screen)
 {
 #ifdef ENABLE_HIDPI
-	_mapView->updateDevicePixelRatio();
+	_mapView->setDevicePixelRatio(_options.hidpiMap ? devicePixelRatioF() : 1.0);
 
 	disconnect(SIGNAL(logicalDotsPerInchChanged(qreal)), this,
 	  SLOT(logicalDotsPerInchChanged(qreal)));
@@ -2147,6 +2166,6 @@ void GUI::logicalDotsPerInchChanged(qreal dpi)
 	Q_UNUSED(dpi)
 
 #ifdef ENABLE_HIDPI
-	_mapView->updateDevicePixelRatio();
+	_mapView->setDevicePixelRatio(_options.hidpiMap ? devicePixelRatioF() : 1.0);
 #endif // ENBLE_HIDPI
 }

src/GUI/heartrategraph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "heartrategraphitem.h"
 #include "heartrategraph.h"
@@ -7,7 +8,7 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 {
 	_showTracks = true;
 
-	GraphView::setYUnits(tr("1/min"));
+	GraphView::setYUnits(tr("bpm"));
 	setYLabel(tr("Heart rate"));
 
 	setSliderPrecision(0);
@@ -16,9 +17,11 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 void HeartRateGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f',
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Average"), l.toString(avg() * yScale(), 'f',
 		  0) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale(), 'f',
 		  0) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();

src/GUI/heartrategraphitem.cpp

@@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "heartrategraphitem.h"
 
+
 HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@@ -16,11 +18,12 @@ HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
 QString HeartRateGraphItem::toolTip() const
 {
 	ToolTip tt;
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Maximum"), QString::number(max(), 'f', 0)
-	  + UNIT_SPACE + tr("1/min"));
-	tt.insert(tr("Average"), QString::number(avg(), 'f', 0)
-	  + UNIT_SPACE + tr("1/min"));
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 0)
+	  + UNIT_SPACE + tr("bpm"));
+	tt.insert(tr("Average"), l.toString(avg(), 'f', 0)
+	  + UNIT_SPACE + tr("bpm"));
 
 	return tt.toString();
 }

src/GUI/icons.h

@@ -25,5 +25,6 @@
 #define SYSTEM_ICON       ":/icons/preferences-system.png"
 #define PRINT_EXPORT_ICON ":/icons/document-print_32.png"
 #define DATA_ICON         ":/icons/view-filter.png"
+#define MAPS_ICON         ":/icons/applications-internet_32.png"
 
 #endif /* ICONS_H */

src/GUI/mapview.cpp

@@ -41,10 +41,6 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	_scene->addItem(_mapScale);
 
 	_map = map;
-#ifdef ENABLE_HIDPI
-	_ratio = devicePixelRatioF();
-	_map->setDevicePixelRatio(_ratio);
-#endif // ENABLE_HIDPI
 	_map->load();
 	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
 
@@ -75,6 +71,10 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	_poiSize = 8;
 	_poiColor = Qt::black;
 
+#ifdef ENABLE_HIDPI
+	_ratio = 1.0;
+#endif // ENABLE_HIDPI
+	_opengl = false;
 	_plot = false;
 	_digitalZoom = 0;
 
@@ -268,10 +268,10 @@ void MapView::setMap(Map *map)
 	disconnect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
 
 	_map = map;
+	_map->load();
 #ifdef ENABLE_HIDPI
 	_map->setDevicePixelRatio(_ratio);
 #endif // ENABLE_HIDPI
-	_map->load();
 	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
 
 	digitalZoom(0);
@@ -765,9 +765,17 @@ void MapView::drawBackground(QPainter *painter, const QRectF &rect)
 
 	if (_showMap) {
 		QRectF ir = rect.intersected(_map->bounds());
+		Map::Flags flags = Map::NoFlags;
+
 		if (_opacity < 1.0)
 			painter->setOpacity(_opacity);
-		_map->draw(painter, ir, _plot);
+
+		if (_plot)
+			flags = Map::Block;
+		else if (_opengl)
+			flags = Map::OpenGL;
+
+		_map->draw(painter, ir, flags);
 	}
 }
 
@@ -808,6 +816,8 @@ void MapView::scrollContentsBy(int dx, int dy)
 
 void MapView::useOpenGL(bool use)
 {
+	_opengl = use;
+
 	if (use)
 		setViewport(new OPENGL_WIDGET);
 	else
@@ -834,23 +844,19 @@ void MapView::reloadMap()
 	_scene->invalidate();
 }
 
-void MapView::updateDevicePixelRatio()
+void MapView::setDevicePixelRatio(qreal ratio)
 {
 #ifdef ENABLE_HIDPI
-	if (_ratio == devicePixelRatioF())
+	if (_ratio == ratio)
 		return;
 
-	_ratio = devicePixelRatioF();
+	_ratio = ratio;
 
 	QRectF vr(mapToScene(viewport()->rect()).boundingRect()
 	  .intersected(_map->bounds()));
 	RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
 
 	_map->setDevicePixelRatio(_ratio);
-
-	digitalZoom(0);
-
-	_map->zoomFit(viewport()->rect().size(), cr);
 	_scene->setSceneRect(_map->bounds());
 
 	for (int i = 0; i < _tracks.size(); i++)
@@ -870,5 +876,7 @@ void MapView::updateDevicePixelRatio()
 	centerOn(nc);
 
 	reloadMap();
+#else // ENABLE_HIDPI
+	Q_UNUSED(ratio);
 #endif // ENABLE_HIDPI
 }

src/GUI/mapview.h

@@ -69,7 +69,7 @@ public slots:
 	void showRouteWaypoints(bool show);
 	void clearMapCache();
 	void setCoordinatesFormat(CoordinatesFormat format);
-	void updateDevicePixelRatio();
+	void setDevicePixelRatio(qreal ratio);
 
 private slots:
 	void updatePOI();
@@ -142,6 +142,7 @@ private:
 #ifdef ENABLE_HIDPI
 	qreal _ratio;
 #endif // ENABLE_HIDPI
+	bool _opengl;
 };
 
 #endif // MAPVIEW_H

src/GUI/optionsdialog.cpp

@@ -34,26 +34,61 @@ static QFrame *line()
 }
 #endif
 
-QWidget *OptionsDialog::createGeneralPage()
+QWidget *OptionsDialog::createMapPage()
 {
 	_alwaysShowMap = new QCheckBox(tr("Always show the map"));
 	_alwaysShowMap->setChecked(_options->alwaysShowMap);
 	_alwaysShowMap->setToolTip("<p>" +
 	  tr("Show the map even when no files are loaded.") + "</p>");
 
+#ifdef ENABLE_HIDPI
+	_hidpi = new QRadioButton(tr("High-resolution"));
+	_lodpi = new QRadioButton(tr("Standard"));
+	if (_options->hidpiMap)
+		_hidpi->setChecked(true);
+	else
+		_lodpi->setChecked(true);
+	QLabel *lhi = new QLabel(tr("Non-HiDPI maps are loaded as HiDPI maps. "
+	  "The map is sharp but map objects are small/hard to read."));
+	QLabel *llo = new QLabel(tr("Non-HiDPI maps are loaded such as they are. "
+	  "Map objects have the expected size but the map is blurry."));
+	QFont f = lhi->font();
+	f.setPointSize(f.pointSize() - 1);
+	lhi->setWordWrap(true);
+	llo->setWordWrap(true);
+	lhi->setFont(f);
+	llo->setFont(f);
+#endif // ENABLE_HIDPI
+
 	QFormLayout *showMapLayout = new QFormLayout();
 	showMapLayout->addWidget(_alwaysShowMap);
 
-	QWidget *generalTab = new QWidget();
-	QVBoxLayout *generalTabLayout = new QVBoxLayout();
-	generalTabLayout->addLayout(showMapLayout);
-	generalTabLayout->addStretch();
-	generalTab->setLayout(generalTabLayout);
+	QWidget *mapTab = new QWidget();
+	QVBoxLayout *mapTabLayout = new QVBoxLayout();
+	mapTabLayout->addLayout(showMapLayout);
+	mapTabLayout->addStretch();
+	mapTab->setLayout(mapTabLayout);
 
-	QTabWidget *generalPage = new QTabWidget();
-	generalPage->addTab(generalTab, tr("General"));
+#ifdef ENABLE_HIDPI
+	QVBoxLayout *hidpiTabLayout = new QVBoxLayout();
+	hidpiTabLayout->addWidget(_lodpi);
+	hidpiTabLayout->addWidget(llo);
+	hidpiTabLayout->addSpacing(10);
+	hidpiTabLayout->addWidget(_hidpi);
+	hidpiTabLayout->addWidget(lhi);
+	hidpiTabLayout->addStretch();
 
-	return generalPage;
+	QWidget *hidpiTab = new QWidget();
+	hidpiTab->setLayout(hidpiTabLayout);
+#endif // ENABLE_HIDPI
+
+	QTabWidget *mapPage = new QTabWidget();
+	mapPage->addTab(mapTab, tr("General"));
+#ifdef ENABLE_HIDPI
+	mapPage->addTab(hidpiTab, tr("HiDPI display mode"));
+#endif // ENABLE_HIDPI
+
+	return mapPage;
 }
 
 QWidget *OptionsDialog::createAppearancePage()
@@ -483,8 +518,8 @@ OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
   : QDialog(parent), _options(options)
 {
 	QStackedWidget *pages = new QStackedWidget();
-	pages->addWidget(createGeneralPage());
 	pages->addWidget(createAppearancePage());
+	pages->addWidget(createMapPage());
 	pages->addWidget(createDataPage());
 	pages->addWidget(createPOIPage());
 	pages->addWidget(createExportPage());
@@ -492,9 +527,9 @@ OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
 
 	QListWidget *menu = new QListWidget();
 	menu->setIconSize(QSize(MENU_ICON_SIZE, MENU_ICON_SIZE));
-	new QListWidgetItem(QIcon(APP_ICON), tr("General"), menu);
 	new QListWidgetItem(QIcon(APPEARANCE_ICON), tr("Appearance"),
 	  menu);
+	new QListWidgetItem(QIcon(MAPS_ICON), tr("Maps"), menu);
 	new QListWidgetItem(QIcon(DATA_ICON), tr("Data"), menu);
 	new QListWidgetItem(QIcon(POI_ICON), tr("POI"), menu);
 	new QListWidgetItem(QIcon(PRINT_EXPORT_ICON), tr("Print & Export"),
@@ -532,8 +567,6 @@ OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
 
 void OptionsDialog::accept()
 {
-	_options->alwaysShowMap = _alwaysShowMap->isChecked();
-
 	_options->palette.setColor(_baseColor->color());
 	_options->palette.setShift(_colorOffset->value());
 	_options->mapOpacity = _mapOpacity->value();
@@ -553,6 +586,11 @@ void OptionsDialog::accept()
 	_options->sliderColor = _sliderColor->color();
 	_options->graphAntiAliasing = _graphAA->isChecked();
 
+	_options->alwaysShowMap = _alwaysShowMap->isChecked();
+#ifdef ENABLE_HIDPI
+	_options->hidpiMap = _hidpi->isChecked();
+#endif // ENABLE_HIDPI
+
 	_options->elevationFilter = _elevationFilter->value();
 	_options->speedFilter = _speedFilter->value();
 	_options->heartRateFilter = _heartRateFilter->value();

src/GUI/optionsdialog.h

@@ -18,8 +18,6 @@ class QRadioButton;
 class PercentSlider;
 
 struct Options {
-	// General
-	bool alwaysShowMap;
 	// Appearance
 	Palette palette;
 	int trackWidth;
@@ -36,6 +34,11 @@ struct Options {
 	bool graphAntiAliasing;
 	int mapOpacity;
 	QColor backgroundColor;
+	// Map
+	bool alwaysShowMap;
+#ifdef ENABLE_HIDPI
+	bool hidpiMap;
+#endif // ENABLE_HIDPI
 	// Data
 	int elevationFilter;
 	int speedFilter;
@@ -79,7 +82,7 @@ public slots:
 	void accept();
 
 private:
-	QWidget *createGeneralPage();
+	QWidget *createMapPage();
 	QWidget *createAppearancePage();
 	QWidget *createDataPage();
 	QWidget *createPOIPage();
@@ -88,8 +91,6 @@ private:
 
 	Options *_options;
 
-	// General
-	QCheckBox *_alwaysShowMap;
 	// Appearance
 	ColorBox *_baseColor;
 	QDoubleSpinBox *_colorOffset;
@@ -107,6 +108,12 @@ private:
 	QSpinBox *_graphWidth;
 	ColorBox *_sliderColor;
 	QCheckBox *_graphAA;
+	// Map
+	QCheckBox *_alwaysShowMap;
+#ifdef ENABLE_HIDPI
+	QRadioButton *_hidpi;
+	QRadioButton *_lodpi;
+#endif // ENABLE_HIDPI
 	// Data
 	OddSpinBox *_elevationFilter;
 	OddSpinBox *_speedFilter;

src/GUI/pathitem.cpp

@@ -2,12 +2,20 @@
 #include <QApplication>
 #include <QCursor>
 #include <QPainter>
+#include "common/greatcircle.h"
 #include "map/map.h"
 #include "tooltip.h"
 #include "nicenum.h"
 #include "pathitem.h"
 
 
+#define GEOGRAPHICAL_MILE 1855.3248
+
+static unsigned segments(qreal distance)
+{
+	return ceil(distance / GEOGRAPHICAL_MILE);
+}
+
 PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
   : QGraphicsObject(parent)
 {
@@ -21,7 +29,7 @@ PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
 	QBrush brush(Qt::SolidPattern);
 	_pen = QPen(brush, _width);
 
-	updatePainterPath(map);
+	updatePainterPath();
 	updateShape();
 
 	_marker = new MarkerItem(this);
@@ -39,13 +47,53 @@ void PathItem::updateShape()
 	_shape = s.createStroke(_painterPath);
 }
 
-void PathItem::updatePainterPath(Map *map)
+void PathItem::addSegment(const Coordinates &c1, const Coordinates &c2)
+{
+	if (fabs(c1.lon() - c2.lon()) > 180.0) {
+		QPointF p;
+
+		if (c2.lon() < 0) {
+			QLineF l(QPointF(c1.lon(), c1.lat()), QPointF(c2.lon() + 360,
+			  c2.lat()));
+			QLineF dl(QPointF(180, -90), QPointF(180, 90));
+			l.intersect(dl, &p);
+			_painterPath.lineTo(_map->ll2xy(Coordinates(180, p.y())));
+			_painterPath.moveTo(_map->ll2xy(Coordinates(-180, p.y())));
+		} else {
+			QLineF l(QPointF(c1.lon(), c1.lat()), QPointF(c2.lon() - 360,
+			  c2.lat()));
+			QLineF dl(QPointF(-180, -90), QPointF(-180, 90));
+			l.intersect(dl, &p);
+			_painterPath.lineTo(_map->ll2xy(Coordinates(-180, p.y())));
+			_painterPath.moveTo(_map->ll2xy(Coordinates(180, p.y())));
+		}
+		_painterPath.lineTo(_map->ll2xy(c2));
+	} else
+		_painterPath.lineTo(_map->ll2xy(c2));
+}
+
+void PathItem::updatePainterPath()
 {
 	_painterPath = QPainterPath();
 
-	_painterPath.moveTo(map->ll2xy(_path.first().coordinates()));
-	for (int i = 1; i < _path.size(); i++)
-		_painterPath.lineTo(map->ll2xy(_path.at(i).coordinates()));
+	_painterPath.moveTo(_map->ll2xy(_path.first().coordinates()));
+	for (int i = 1; i < _path.size(); i++) {
+		const PathPoint &p1 = _path.at(i-1);
+		const PathPoint &p2 = _path.at(i);
+		unsigned n = segments(p2.distance() - p1.distance());
+
+		if (n > 1) {
+			GreatCircle gc(p1.coordinates(), p2.coordinates());
+			Coordinates last = p1.coordinates();
+
+			for (unsigned j = 1; j <= n; j++) {
+				Coordinates c(gc.pointAt(j/(double)n));
+				addSegment(last, c);
+				last = c;
+			}
+		} else
+			addSegment(p1.coordinates(), p2.coordinates());
+	}
 }
 
 void PathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@@ -70,7 +118,7 @@ void PathItem::setMap(Map *map)
 
 	_map = map;
 
-	updatePainterPath(map);
+	updatePainterPath();
 	updateShape();
 
 	_marker->setPos(position(_markerDistance));
@@ -141,19 +189,40 @@ QPointF PathItem::position(qreal x) const
 			return _map->ll2xy(_path.at(mid).coordinates());
 	}
 
-	QLineF l;
+	Coordinates c1, c2;
 	qreal p1, p2;
+
 	if (_path.at(mid).distance() < x) {
-		l = QLineF(_map->ll2xy(_path.at(mid).coordinates()),
-		  _map->ll2xy(_path.at(mid+1).coordinates()));
+		c1 = _path.at(mid).coordinates(); c2 = _path.at(mid+1).coordinates();
 		p1 = _path.at(mid).distance(); p2 = _path.at(mid+1).distance();
 	} else {
-		l = QLineF(_map->ll2xy(_path.at(mid-1).coordinates()),
-		  _map->ll2xy(_path.at(mid).coordinates()));
+		c1 = _path.at(mid-1).coordinates(); c2 = _path.at(mid).coordinates();
 		p1 = _path.at(mid-1).distance(); p2 = _path.at(mid).distance();
 	}
 
-	return l.pointAt((x - p1) / (p2 - p1));
+	unsigned n = segments(p2 - p1);
+	if (n > 1) {
+		GreatCircle gc(c1, c2);
+
+		// Great circle point
+		double f = (x - p1) / (p2 - p1);
+		QPointF p(_map->ll2xy(gc.pointAt(f)));
+
+		// Segment line of the great circle path
+		double f1 = floor(n * f) / n;
+		double f2 = ceil(n * f) / n;
+		QLineF l(_map->ll2xy(gc.pointAt(f1)), _map->ll2xy(gc.pointAt(f2)));
+
+		// Project the great circle point to the segment line
+		QLineF u = l.unitVector();
+		double lambda = (u.dx() * (p.x() - l.p1().x())) + (u.dy() * (p.y()
+		  - l.p1().y()));
+		return QPointF((u.dx() * lambda) + l.p1().x(), (u.dy() * lambda)
+		  + l.p1().y());
+	} else {
+		QLineF l(_map->ll2xy(c1), _map->ll2xy(c2));
+		return l.pointAt((x - p1) / (p2 - p1));
+	}
 }
 
 void PathItem::moveMarker(qreal distance)

src/GUI/pathitem.h

@@ -43,8 +43,10 @@ protected:
 
 private:
 	QPointF position(qreal distance) const;
-	void updatePainterPath(Map *map);
+	void updatePainterPath();
 	void updateShape();
+	void addSegment(const Coordinates &c1, const Coordinates &c2);
+
 
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);

src/GUI/percentslider.cpp

@@ -1,13 +1,14 @@
 #include <QSlider>
 #include <QLabel>
 #include <QHBoxLayout>
+#include <QLocale>
 #include "units.h"
 #include "percentslider.h"
 
 
 static QString format(int value)
 {
-	return QString::number(value) + UNIT_SPACE + QString("%");
+	return QLocale::system().toString(value) + UNIT_SPACE + QString("%");
 }
 
 PercentSlider::PercentSlider(QWidget *parent) : QWidget(parent)

src/GUI/powergraph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "powergraphitem.h"
 #include "powergraph.h"
@@ -16,9 +17,11 @@ PowerGraph::PowerGraph(QWidget *parent) : GraphTab(parent)
 void PowerGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale()
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Average"), l.toString(avg() * yScale()
 		  + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale()
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();

src/GUI/powergraphitem.cpp

@@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "powergraphitem.h"
 
+
 PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@@ -16,11 +18,12 @@ PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type,
 QString PowerGraphItem::toolTip() const
 {
 	ToolTip tt;
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Maximum"), QString::number(max(), 'f', 1)
-	  + UNIT_SPACE + tr("1/min"));
-	tt.insert(tr("Average"), QString::number(avg(), 'f', 1)
-	  + UNIT_SPACE + tr("1/min"));
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 1)
+	  + UNIT_SPACE + tr("W"));
+	tt.insert(tr("Average"), l.toString(avg(), 'f', 1)
+	  + UNIT_SPACE + tr("W"));
 
 	return tt.toString();
 }

src/GUI/scaleitem.cpp

@@ -6,7 +6,7 @@
 
 
 #define BORDER_WIDTH   1
-#define SCALE_WIDTH    132
+#define SCALE_WIDTH    135
 #define SCALE_HEIGHT   5
 #define SEGMENTS       3
 #define PADDING        4

src/GUI/settings.h

@@ -156,5 +156,7 @@
 #define SLIDER_COLOR_DEFAULT              QColor(Qt::red)
 #define ALWAYS_SHOW_MAP_SETTING           "alwaysShowMap"
 #define ALWAYS_SHOW_MAP_DEFAULT           true
+#define HIDPI_MAP_SETTING                 "HiDPIMap"
+#define HIDPI_MAP_DEFAULT                 true
 
 #endif // SETTINGS_H

src/GUI/speedgraph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "config.h"
 #include "tooltip.h"
@@ -21,13 +22,14 @@ SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 void SpeedGraph::setInfo()
 {
 	if (_showTracks) {
+		QLocale l(QLocale::system());
 		QString pace = Format::timeSpan((3600.0 / (avg() * yScale())), false);
 		QString pu = (_units == Metric) ? tr("min/km") : (_units == Imperial) ?
 		  tr("min/mi") : tr("min/nmi");
 
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f',
+		GraphView::addInfo(tr("Average"), l.toString(avg() * yScale(), 'f',
 		  1) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale(), 'f',
 		  1) + UNIT_SPACE + yUnits());
 		GraphView::addInfo(tr("Pace"), pace + UNIT_SPACE + pu);
 	} else

src/GUI/speedgraphitem.cpp

@@ -1,7 +1,9 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "format.h"
 #include "speedgraphitem.h"
 
+
 SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type,
   qreal movingTime, QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@@ -25,10 +27,11 @@ QString SpeedGraphItem::toolTip() const
 	  ? avg() * scale : mavg() * scale)), false);
 	QString pu = (_units == Metric) ? tr("min/km") : (_units == Imperial) ?
 	  tr("min/mi") : tr("min/nmi");
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Maximum"), QString::number(max() * scale, 'f', 1)
+	tt.insert(tr("Maximum"), l.toString(max() * scale, 'f', 1)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Average"), QString::number((_timeType == Total)
+	tt.insert(tr("Average"), l.toString((_timeType == Total)
 	  ? avg() * scale : mavg() * scale, 'f', 1) + UNIT_SPACE + su);
 	tt.insert(tr("Pace"), pace + UNIT_SPACE + pu);
 

src/GUI/temperaturegraph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "temperaturegraphitem.h"
 #include "temperaturegraph.h"
@@ -16,11 +17,13 @@ TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
 void TemperatureGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale()
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Average"), l.toString(avg() * yScale()
 		  + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale()
+		GraphView::addInfo(tr("Minimum"), l.toString(min() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale()
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();

src/GUI/temperaturegraphitem.cpp

@@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "temperaturegraphitem.h"
 
+
 TemperatureGraphItem::TemperatureGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@@ -20,12 +22,13 @@ QString TemperatureGraphItem::toolTip(Units units) const
 	qreal offset = (units == Metric) ? 0 : C2FO;
 	QString su = (units == Metric) ?
 	  QChar(0x00B0) + tr("C") : QChar(0x00B0) + tr("F");
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Average"), QString::number(avg() * scale + offset, 'f', 1)
+	tt.insert(tr("Average"), l.toString(avg() * scale + offset, 'f', 1)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Maximum"), QString::number(max() * scale + offset, 'f', 1)
+	tt.insert(tr("Maximum"), l.toString(max() * scale + offset, 'f', 1)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Minimum"), QString::number(min() * scale + offset, 'f', 1)
+	tt.insert(tr("Minimum"), l.toString(min() * scale + offset, 'f', 1)
 	  + UNIT_SPACE + su);
 
 	return tt.toString();

src/common/greatcircle.cpp

@@ -0,0 +1,34 @@
+#include "greatcircle.h"
+
+GreatCircle::GreatCircle(const Coordinates &c1, const Coordinates &c2)
+{
+	double lat1 = deg2rad(c1.lat());
+	double lon1 = deg2rad(c1.lon());
+	double lat2 = deg2rad(c2.lat());
+	double lon2 = deg2rad(c2.lon());
+
+	double cosLat1 = cos(lat1);
+	double cosLat2 = cos(lat2);
+	_sinLat1 = sin(lat1);
+	_sinLat2 = sin(lat2);
+
+	_xA = cosLat1 * cos(lon1);
+	_xB = cosLat2 * cos(lon2);
+	_yA = cosLat1 * sin(lon1);
+	_yB = cosLat2 * sin(lon2);
+
+	_d = 2 * asin(sqrt(pow((sin((lat1 - lat2) / 2)), 2) + cosLat1 * cosLat2
+	  * pow(sin((lon1 - lon2) / 2), 2)));
+	_sinD = sin(_d);
+}
+
+Coordinates GreatCircle::pointAt(double f) const
+{
+	double A = sin((1.0 - f) * _d) / _sinD;
+	double B = sin(f * _d) / _sinD;
+	double x = A * _xA + B * _xB;
+	double y = A * _yA + B * _yB;
+	double z = A * _sinLat1 + B * _sinLat2;
+
+	return Coordinates(rad2deg(atan2(y, x)), rad2deg(atan2(z, sqrt(x*x + y*y))));
+}

src/common/greatcircle.h

@@ -0,0 +1,20 @@
+#ifndef GREATCIRCLE_H
+#define GREATCIRCLE_H
+
+#include "coordinates.h"
+
+class GreatCircle
+{
+public:
+	GreatCircle(const Coordinates &c1, const Coordinates &c2);
+
+	Coordinates pointAt(double f) const;
+
+private:
+	double _xA, _xB, _yA, _yB;
+	double _d;
+	double _sinD;
+	double _sinLat1, _sinLat2;
+};
+
+#endif // GREATCIRCLE_H

src/common/range.h

@@ -19,6 +19,8 @@ public:
 	void setMin(int min) {_min = min;}
 	void setMax(int max) {_max = max;}
 
+	bool contains(int val) const {return (val >= _min && val <= _max);}
+
 private:
 	int _min, _max;
 };

src/common/rectc.h

@@ -23,6 +23,11 @@ public:
 	  {return Coordinates((_tl.lon() + _br.lon()) / 2.0,
 	    (_tl.lat() + _br.lat()) / 2.0);}
 
+	double top() const {return _tl.lat();}
+	double bottom() const {return _br.lat();}
+	double left() const {return _tl.lon();}
+	double right() const {return _br.lon();}
+
 	RectC operator|(const RectC &r) const;
 	RectC &operator|=(const RectC &r) {*this = *this | r; return *this;}
 	RectC operator&(const RectC &r) const;

src/data/csvparser.cpp

@@ -18,16 +18,16 @@ bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
 			return false;
 		}
 
-		qreal lat = list[0].trimmed().toDouble(&res);
-		if (!res || (lat < -90.0 || lat > 90.0)) {
-			_errorString = "Invalid latitude";
-			return false;
-		}
-		qreal lon = list[1].trimmed().toDouble(&res);
+		qreal lon = list[0].trimmed().toDouble(&res);
 		if (!res || (lon < -180.0 || lon > 180.0)) {
 			_errorString = "Invalid longitude";
 			return false;
 		}
+		qreal lat = list[1].trimmed().toDouble(&res);
+		if (!res || (lat < -90.0 || lat > 90.0)) {
+			_errorString = "Invalid latitude";
+			return false;
+		}
 		Waypoint wp(Coordinates(lon, lat));
 
 		QByteArray ba = list[2].trimmed();

src/data/fitparser.cpp

@@ -98,7 +98,7 @@ template<class T> bool FITParser::readValue(CTX &ctx, T &val)
 	return true;
 }
 
-bool FITParser::skipValue(CTX &ctx, size_t size)
+bool FITParser::skipValue(CTX &ctx, quint8 size)
 {
 	ctx.len -= size;
 	return ctx.file->seek(ctx.file->pos() + size);

src/data/fitparser.h

@@ -20,7 +20,7 @@ private:
 
 	bool readData(QFile *file, char *data, size_t size);
 	template<class T> bool readValue(CTX &ctx, T &val);
-	bool skipValue(CTX &ctx, size_t size);
+	bool skipValue(CTX &ctx, quint8 size);
 	bool readField(CTX &ctx, Field *field, quint32 &val);
 
 	bool parseHeader(CTX &ctx);

src/data/gpxparser.cpp

@@ -54,7 +54,7 @@ Coordinates GPXParser::coordinates()
 void GPXParser::rpExtension(TrackData *autoRoute)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "rpt")
+		if (_reader.name() == QLatin1String("rpt"))
 			autoRoute->append(Trackpoint(coordinates()));
 		_reader.skipCurrentElement();
 	}
@@ -63,9 +63,9 @@ void GPXParser::rpExtension(TrackData *autoRoute)
 void GPXParser::tpExtension(Trackpoint &trackpoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "hr")
+		if (_reader.name() == QLatin1String("hr"))
 			trackpoint.setHeartRate(number());
-		else if (_reader.name() == "atemp")
+		else if (_reader.name() == QLatin1String("atemp"))
 			trackpoint.setTemperature(number());
 		else
 			_reader.skipCurrentElement();
@@ -75,7 +75,7 @@ void GPXParser::tpExtension(Trackpoint &trackpoint)
 void GPXParser::rteptExtensions(TrackData *autoRoute)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "RoutePointExtension")
+		if (_reader.name() == QLatin1String("RoutePointExtension"))
 			rpExtension(autoRoute);
 		else
 			_reader.skipCurrentElement();
@@ -85,17 +85,18 @@ void GPXParser::rteptExtensions(TrackData *autoRoute)
 void GPXParser::trkptExtensions(Trackpoint &trackpoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "speed")
+		if (_reader.name() == QLatin1String("speed"))
 			trackpoint.setSpeed(number());
-		else if (_reader.name() == "hr" || _reader.name() == "heartrate")
+		else if (_reader.name() == QLatin1String("hr")
+		  || _reader.name() == QLatin1String("heartrate"))
 			trackpoint.setHeartRate(number());
-		else if (_reader.name() == "temp")
+		else if (_reader.name() == QLatin1String("temp"))
 			trackpoint.setTemperature(number());
-		else if (_reader.name() == "cadence")
+		else if (_reader.name() == QLatin1String("cadence"))
 			trackpoint.setCadence(number());
-		else if (_reader.name() == "power")
+		else if (_reader.name() == QLatin1String("power"))
 			trackpoint.setPower(number());
-		else if (_reader.name() == "TrackPointExtension")
+		else if (_reader.name() == QLatin1String("TrackPointExtension"))
 			tpExtension(trackpoint);
 		else
 			_reader.skipCurrentElement();
@@ -107,13 +108,13 @@ void GPXParser::trackpointData(Trackpoint &trackpoint)
 	qreal gh = NAN;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "ele")
+		if (_reader.name() == QLatin1String("ele"))
 			trackpoint.setElevation(number());
-		else if (_reader.name() == "time")
+		else if (_reader.name() == QLatin1String("time"))
 			trackpoint.setTimestamp(time());
-		else if (_reader.name() == "geoidheight")
+		else if (_reader.name() == QLatin1String("geoidheight"))
 			gh = number();
-		else if (_reader.name() == "extensions")
+		else if (_reader.name() == QLatin1String("extensions"))
 			trkptExtensions(trackpoint);
 		else
 			_reader.skipCurrentElement();
@@ -128,17 +129,17 @@ void GPXParser::waypointData(Waypoint &waypoint, TrackData *autoRoute)
 	qreal gh = NAN;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "name")
+		if (_reader.name() == QLatin1String("name"))
 			waypoint.setName(_reader.readElementText());
-		else if (_reader.name() == "desc")
+		else if (_reader.name() == QLatin1String("desc"))
 			waypoint.setDescription(_reader.readElementText());
-		else if (_reader.name() == "ele")
+		else if (_reader.name() == QLatin1String("ele"))
 			waypoint.setElevation(number());
-		else if (_reader.name() == "geoidheight")
+		else if (_reader.name() == QLatin1String("geoidheight"))
 			gh = number();
-		else if (_reader.name() == "time")
+		else if (_reader.name() == QLatin1String("time"))
 			waypoint.setTimestamp(time());
-		else if (autoRoute && _reader.name() == "extensions")
+		else if (autoRoute && _reader.name() == QLatin1String("extensions"))
 			rteptExtensions(autoRoute);
 		else
 			_reader.skipCurrentElement();
@@ -151,7 +152,7 @@ void GPXParser::waypointData(Waypoint &waypoint, TrackData *autoRoute)
 void GPXParser::trackpoints(TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "trkpt") {
+		if (_reader.name() == QLatin1String("trkpt")) {
 			track.append(Trackpoint(coordinates()));
 			trackpointData(track.last());
 		} else
@@ -164,12 +165,12 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
 	TrackData autoRoute;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "rtept") {
+		if (_reader.name() == QLatin1String("rtept")) {
 			route.append(Waypoint(coordinates()));
 			waypointData(route.last(), &autoRoute);
-		} else if (_reader.name() == "name")
+		} else if (_reader.name() == QLatin1String("name"))
 			route.setName(_reader.readElementText());
-		else if (_reader.name() == "desc")
+		else if (_reader.name() == QLatin1String("desc"))
 			route.setDescription(_reader.readElementText());
 		else
 			_reader.skipCurrentElement();
@@ -185,11 +186,11 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
 void GPXParser::track(TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "trkseg")
+		if (_reader.name() == QLatin1String("trkseg"))
 			trackpoints(track);
-		else if (_reader.name() == "name")
+		else if (_reader.name() == QLatin1String("name"))
 			track.setName(_reader.readElementText());
-		else if (_reader.name() == "desc")
+		else if (_reader.name() == QLatin1String("desc"))
 			track.setDescription(_reader.readElementText());
 		else
 			_reader.skipCurrentElement();
@@ -200,13 +201,13 @@ void GPXParser::gpx(QList<TrackData> &tracks, QList<RouteData> &routes,
   QList<Waypoint> &waypoints)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "trk") {
+		if (_reader.name() == QLatin1String("trk")) {
 			tracks.append(TrackData());
 			track(tracks.back());
-		} else if (_reader.name() == "rte") {
+		} else if (_reader.name() == QLatin1String("rte")) {
 			routes.append(RouteData());
 			routepoints(routes.back(), tracks);
-		} else if (_reader.name() == "wpt") {
+		} else if (_reader.name() == QLatin1String("wpt")) {
 			waypoints.append(Waypoint(coordinates()));
 			waypointData(waypoints.last());
 		} else
@@ -222,7 +223,7 @@ bool GPXParser::parse(QFile *file, QList<TrackData> &tracks,
 	_reader.setNamespaceProcessing(false);
 
 	if (_reader.readNextStartElement()) {
-		if (_reader.name() == "gpx")
+		if (_reader.name() == QLatin1String("gpx"))
 			gpx(tracks, routes, waypoints);
 		else
 			_reader.raiseError("Not a GPX file");

src/data/igcparser.cpp

@@ -98,12 +98,14 @@ static bool readARecord(const char *line, qint64 len)
 
 bool IGCParser::readHRecord(const char *line, int len)
 {
-	if (len < 10 || ::strncmp(line, "HFDTE", 5))
+	if (len < 11 || ::strncmp(line, "HFDTE", 5))
 		return true;
 
-	int d = str2int(line + 5, 2);
-	int m = str2int(line + 7, 2);
-	int y = str2int(line + 9, 2);
+	int offset = (len < 16 || ::strncmp(line + 5, "DATE:", 5)) ? 5 : 10;
+
+	int d = str2int(line + offset, 2);
+	int m = str2int(line + offset + 2, 2);
+	int y = str2int(line + offset + 4, 2);
 
 	if (y < 0 || m < 0 || d < 0) {
 		_errorString = "Invalid date header format";

src/data/kmlparser.cpp

@@ -191,7 +191,7 @@ QDateTime KMLParser::timeStamp()
 	QDateTime ts;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "when")
+		if (_reader.name() == QLatin1String("when"))
 			ts = time();
 		else
 			_reader.skipCurrentElement();
@@ -203,7 +203,7 @@ QDateTime KMLParser::timeStamp()
 void KMLParser::lineString(TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "coordinates") {
+		if (_reader.name() == QLatin1String("coordinates")) {
 			if (!lineCoordinates(track))
 				_reader.raiseError("Invalid coordinates");
 		} else
@@ -214,7 +214,7 @@ void KMLParser::lineString(TrackData &track)
 void KMLParser::point(Waypoint &waypoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "coordinates") {
+		if (_reader.name() == QLatin1String("coordinates")) {
 			if (!pointCoordinates(waypoint))
 				_reader.raiseError("Invalid coordinates");
 		} else
@@ -231,7 +231,7 @@ void KMLParser::heartRate(TrackData &track, int start)
 	const char error[] = "Heartrate data count mismatch";
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "value") {
+		if (_reader.name() == QLatin1String("value")) {
 			if (i < track.size())
 				track[i++].setHeartRate(number());
 			else {
@@ -252,7 +252,7 @@ void KMLParser::cadence(TrackData &track, int start)
 	const char error[] = "Cadence data count mismatch";
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "value") {
+		if (_reader.name() == QLatin1String("value")) {
 			if (i < track.size())
 				track[i++].setCadence(number());
 			else {
@@ -273,7 +273,7 @@ void KMLParser::speed(TrackData &track, int start)
 	const char error[] = "Speed data count mismatch";
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "value") {
+		if (_reader.name() == QLatin1String("value")) {
 			if (i < track.size())
 				track[i++].setSpeed(number());
 			else {
@@ -294,7 +294,7 @@ void KMLParser::temperature(TrackData &track, int start)
 	const char error[] = "Temperature data count mismatch";
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "value") {
+		if (_reader.name() == QLatin1String("value")) {
 			if (i < track.size())
 				track[i++].setTemperature(number());
 			else {
@@ -312,17 +312,17 @@ void KMLParser::temperature(TrackData &track, int start)
 void KMLParser::schemaData(TrackData &track, int start)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "SimpleArrayData") {
+		if (_reader.name() == QLatin1String("SimpleArrayData")) {
 			QXmlStreamAttributes attr = _reader.attributes();
 			QStringRef name = attr.value("name");
 
-			if (name == "Heartrate")
+			if (name == QLatin1String("Heartrate"))
 				heartRate(track, start);
-			else if (name == "Cadence")
+			else if (name == QLatin1String("Cadence"))
 				cadence(track, start);
-			else if (name == "Speed")
+			else if (name == QLatin1String("Speed"))
 				speed(track, start);
-			else if (name == "Temperature")
+			else if (name == QLatin1String("Temperature"))
 				temperature(track, start);
 			else
 				_reader.skipCurrentElement();
@@ -334,7 +334,7 @@ void KMLParser::schemaData(TrackData &track, int start)
 void KMLParser::extendedData(TrackData &track, int start)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "SchemaData")
+		if (_reader.name() == QLatin1String("SchemaData"))
 			schemaData(track, start);
 		else
 			_reader.skipCurrentElement();
@@ -348,10 +348,10 @@ void KMLParser::track(TrackData &track)
 	int i = first;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "when") {
+		if (_reader.name() == QLatin1String("when")) {
 			track.append(Trackpoint());
 			track.last().setTimestamp(time());
-		} else if (_reader.name() == "coord") {
+		} else if (_reader.name() == QLatin1String("coord")) {
 			if (i == track.size()) {
 				_reader.raiseError(error);
 				return;
@@ -360,7 +360,7 @@ void KMLParser::track(TrackData &track)
 				return;
 			}
 			i++;
-		} else if (_reader.name() == "ExtendedData")
+		} else if (_reader.name() == QLatin1String("ExtendedData"))
 			extendedData(track, first);
 		else
 			_reader.skipCurrentElement();
@@ -373,7 +373,7 @@ void KMLParser::track(TrackData &track)
 void KMLParser::multiTrack(TrackData &t)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Track")
+		if (_reader.name() == QLatin1String("Track"))
 			track(t);
 		else
 			_reader.skipCurrentElement();
@@ -385,14 +385,14 @@ void KMLParser::multiGeometry(QList<TrackData> &tracks,
   const QDateTime timestamp)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Point") {
+		if (_reader.name() == QLatin1String("Point")) {
 			waypoints.append(Waypoint());
 			Waypoint &w = waypoints.last();
 			w.setName(name);
 			w.setDescription(desc);
 			w.setTimestamp(timestamp);
 			point(w);
-		} else if (_reader.name() == "LineString") {
+		} else if (_reader.name() == QLatin1String("LineString")) {
 			tracks.append(TrackData());
 			TrackData &t = tracks.last();
 			t.setName(name);
@@ -409,35 +409,35 @@ void KMLParser::placemark(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 	QDateTime timestamp;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "name")
+		if (_reader.name() == QLatin1String("name"))
 			name = _reader.readElementText();
-		else if (_reader.name() == "description")
+		else if (_reader.name() == QLatin1String("description"))
 			desc = _reader.readElementText();
-		else if (_reader.name() == "TimeStamp")
+		else if (_reader.name() == QLatin1String("TimeStamp"))
 			timestamp = timeStamp();
-		else if (_reader.name() == "MultiGeometry")
+		else if (_reader.name() == QLatin1String("MultiGeometry"))
 			multiGeometry(tracks, waypoints, name, desc, timestamp);
-		else if (_reader.name() == "Point") {
+		else if (_reader.name() == QLatin1String("Point")) {
 			waypoints.append(Waypoint());
 			Waypoint &w = waypoints.last();
 			w.setName(name);
 			w.setDescription(desc);
 			w.setTimestamp(timestamp);
 			point(w);
-		} else if (_reader.name() == "LineString"
-		  || _reader.name() == "LinearRing") {
+		} else if (_reader.name() == QLatin1String("LineString")
+		  || _reader.name() == QLatin1String("LinearRing")) {
 			tracks.append(TrackData());
 			TrackData &t = tracks.last();
 			t.setName(name);
 			t.setDescription(desc);
 			lineString(t);
-		} else if (_reader.name() == "Track") {
+		} else if (_reader.name() == QLatin1String("Track")) {
 			tracks.append(TrackData());
 			TrackData &t = tracks.last();
 			t.setName(name);
 			t.setDescription(desc);
 			track(t);
-		} else if (_reader.name() == "MultiTrack") {
+		} else if (_reader.name() == QLatin1String("MultiTrack")) {
 			tracks.append(TrackData());
 			TrackData &t = tracks.last();
 			t.setName(name);
@@ -451,9 +451,9 @@ void KMLParser::placemark(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 void KMLParser::folder(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Placemark")
+		if (_reader.name() == QLatin1String("Placemark"))
 			placemark(tracks, waypoints);
-		else if (_reader.name() == "Folder")
+		else if (_reader.name() == QLatin1String("Folder"))
 			folder(tracks, waypoints);
 		else
 			_reader.skipCurrentElement();
@@ -463,9 +463,9 @@ void KMLParser::folder(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 void KMLParser::document(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Placemark")
+		if (_reader.name() == QLatin1String("Placemark"))
 			placemark(tracks, waypoints);
-		else if (_reader.name() == "Folder")
+		else if (_reader.name() == QLatin1String("Folder"))
 			folder(tracks, waypoints);
 		else
 			_reader.skipCurrentElement();
@@ -475,11 +475,11 @@ void KMLParser::document(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 void KMLParser::kml(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Document")
+		if (_reader.name() == QLatin1String("Document"))
 			document(tracks, waypoints);
-		else if (_reader.name() == "Placemark")
+		else if (_reader.name() == QLatin1String("Placemark"))
 			placemark(tracks, waypoints);
-		else if (_reader.name() == "Folder")
+		else if (_reader.name() == QLatin1String("Folder"))
 			folder(tracks, waypoints);
 		else
 			_reader.skipCurrentElement();
@@ -495,7 +495,7 @@ bool KMLParser::parse(QFile *file, QList<TrackData> &tracks,
 	_reader.setDevice(file);
 
 	if (_reader.readNextStartElement()) {
-		if (_reader.name() == "kml")
+		if (_reader.name() == QLatin1String("kml"))
 			kml(tracks, waypoints);
 		else
 			_reader.raiseError("Not a KML file");

src/data/locparser.cpp

@@ -31,11 +31,11 @@ Coordinates LOCParser::coordinates()
 void LOCParser::waypoint(Waypoint &waypoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "name") {
+		if (_reader.name() == QLatin1String("name")) {
 			const QXmlStreamAttributes &attr = _reader.attributes();
 			waypoint.setName(attr.value("id").toString());
 			waypoint.setDescription(_reader.readElementText());
-		} else if (_reader.name() == "coord") {
+		} else if (_reader.name() == QLatin1String("coord")) {
 			waypoint.setCoordinates(coordinates());
 			_reader.skipCurrentElement();
 		} else
@@ -49,7 +49,7 @@ void LOCParser::waypoint(Waypoint &waypoint)
 void LOCParser::loc(QList<Waypoint> &waypoints)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "waypoint") {
+		if (_reader.name() == QLatin1String("waypoint")) {
 			waypoints.append(Waypoint());
 			waypoint(waypoints.last());
 		} else
@@ -67,7 +67,7 @@ bool LOCParser::parse(QFile *file, QList<TrackData> &tracks,
 	_reader.setDevice(file);
 
 	if (_reader.readNextStartElement()) {
-		if (_reader.name() == "loc")
+		if (_reader.name() == QLatin1String("loc"))
 			loc(waypoints);
 		else
 			_reader.raiseError("Not a LOC file");

src/data/poi.cpp

@@ -1,6 +1,7 @@
 #include <QFile>
 #include <QDir>
 #include "common/rectc.h"
+#include "common/greatcircle.h"
 #include "data.h"
 #include "poi.h"
 
@@ -94,23 +95,45 @@ static bool cb(size_t data, void* context)
 	return true;
 }
 
+void POI::search(const RectC &rect, QSet<int> &set) const
+{
+	qreal min[2], max[2];
+
+	min[0] = rect.topLeft().lon();
+	min[1] = rect.bottomRight().lat();
+	max[0] = rect.bottomRight().lon();
+	max[1] = rect.topLeft().lat();
+
+	_tree.Search(min, max, cb, &set);
+}
+
 QList<Waypoint> POI::points(const Path &path) const
 {
 	QList<Waypoint> ret;
 	QSet<int> set;
-	qreal min[2], max[2];
 	QSet<int>::const_iterator it;
 
-	for (int i = 0; i < path.count(); i++) {
-		RectC br(path.at(i).coordinates(), _radius);
-		min[0] = br.topLeft().lon();
-		min[1] = br.bottomRight().lat();
-		max[0] = br.bottomRight().lon();
-		max[1] = br.topLeft().lat();
 
-		_tree.Search(min, max, cb, &set);
+	for (int i = 1; i < path.count(); i++) {
+		double ds = path.at(i).distance() - path.at(i-1).distance();
+		unsigned n = (unsigned)ceil(ds / _radius);
+
+		if (n > 1) {
+			GreatCircle gc(path.at(i-1).coordinates(), path.at(i).coordinates());
+			for (unsigned j = 0; j < n; j++) {
+				RectC br(gc.pointAt((double)j/n), _radius);
+				search(br, set);
+			}
+		} else {
+			RectC br(path.at(i-1).coordinates(), _radius);
+			search(br, set);
+		}
 	}
 
+	RectC br(path.last().coordinates(), _radius);
+	search(br, set);
+
+
 	for (it = set.constBegin(); it != set.constEnd(); ++it)
 		ret.append(_data.at(*it));
 

src/data/poi.h

@@ -45,6 +45,7 @@ private:
 	};
 
 	bool loadFile(const QString &path, bool dir);
+	void search(const RectC &rect, QSet<int> &set) const;
 
 	POITree _tree;
 	QVector<Waypoint> _data;

src/data/slfparser.cpp

@@ -29,7 +29,7 @@ bool SLFParser::data(const QXmlStreamAttributes &attr, const char *name,
 void SLFParser::entries(const QDateTime &date, TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Entry") {
+		if (_reader.name() == QLatin1String("Entry")) {
 			qreal val, lat, lon;
 			QXmlStreamAttributes attr(_reader.attributes());
 
@@ -70,11 +70,11 @@ void SLFParser::entries(const QDateTime &date, TrackData &track)
 void SLFParser::generalInformation(QDateTime &date, TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "name")
+		if (_reader.name() == QLatin1String("name"))
 			track.setName(_reader.readElementText());
-		else if (_reader.name() == "description")
+		else if (_reader.name() == QLatin1String("description"))
 			track.setDescription(_reader.readElementText());
-		else if (_reader.name() == "startDate") {
+		else if (_reader.name() == QLatin1String("startDate")) {
 			QString ds(_reader.readElementText());
 			QLocale locale(QLocale::English);
 			date = locale.toDateTime(ds.mid(0, ds.indexOf("GMT"))
@@ -89,9 +89,9 @@ void SLFParser::activity(TrackData &track)
 	QDateTime date;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Entries")
+		if (_reader.name() == QLatin1String("Entries"))
 			entries(date, track);
-		else if (_reader.name() == "GeneralInformation")
+		else if (_reader.name() == QLatin1String("GeneralInformation"))
 			generalInformation(date, track);
 		else
 			_reader.skipCurrentElement();
@@ -108,7 +108,7 @@ bool SLFParser::parse(QFile *file, QList<TrackData> &tracks,
 	_reader.setDevice(file);
 
 	if (_reader.readNextStartElement()) {
-		if (_reader.name() == "Activity") {
+		if (_reader.name() == QLatin1String("Activity")) {
 			tracks.append(TrackData());
 			activity(tracks.last());
 		} else

src/data/tcxparser.cpp

@@ -37,13 +37,13 @@ Coordinates TCXParser::position()
 	bool res;
 
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "LatitudeDegrees") {
+		if (_reader.name() == QLatin1String("LatitudeDegrees")) {
 			val = _reader.readElementText().toDouble(&res);
 			if (!res || (val < -90.0 || val > 90.0))
 				_reader.raiseError("Invalid LatitudeDegrees");
 			else
 				pos.setLat(val);
-		} else if (_reader.name() == "LongitudeDegrees") {
+		} else if (_reader.name() == QLatin1String("LongitudeDegrees")) {
 			val = _reader.readElementText().toDouble(&res);
 			if (!res || (val < -180.0 || val > 180.0))
 				_reader.raiseError("Invalid LongitudeDegrees");
@@ -59,7 +59,7 @@ Coordinates TCXParser::position()
 void TCXParser::heartRateBpm(Trackpoint &trackpoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Value")
+		if (_reader.name() == QLatin1String("Value"))
 			trackpoint.setHeartRate(number());
 		else
 			_reader.skipCurrentElement();
@@ -69,9 +69,9 @@ void TCXParser::heartRateBpm(Trackpoint &trackpoint)
 void TCXParser::extensions(Trackpoint &trackpoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "RunCadence")
+		if (_reader.name() == QLatin1String("RunCadence"))
 			trackpoint.setCadence(number());
-		else if (_reader.name() == "Watts")
+		else if (_reader.name() == QLatin1String("Watts"))
 			trackpoint.setPower(number());
 		else
 			_reader.skipCurrentElement();
@@ -81,17 +81,17 @@ void TCXParser::extensions(Trackpoint &trackpoint)
 void TCXParser::trackpointData(Trackpoint &trackpoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Position")
+		if (_reader.name() == QLatin1String("Position"))
 			trackpoint.setCoordinates(position());
-		else if (_reader.name() == "AltitudeMeters")
+		else if (_reader.name() == QLatin1String("AltitudeMeters"))
 			trackpoint.setElevation(number());
-		else if (_reader.name() == "Time")
+		else if (_reader.name() == QLatin1String("Time"))
 			trackpoint.setTimestamp(time());
-		else if (_reader.name() == "HeartRateBpm")
+		else if (_reader.name() == QLatin1String("HeartRateBpm"))
 			heartRateBpm(trackpoint);
-		else if (_reader.name() == "Cadence")
+		else if (_reader.name() == QLatin1String("Cadence"))
 			trackpoint.setCadence(number());
-		else if (_reader.name() == "Extensions")
+		else if (_reader.name() == QLatin1String("Extensions"))
 			extensions(trackpoint);
 		else
 			_reader.skipCurrentElement();
@@ -101,15 +101,15 @@ void TCXParser::trackpointData(Trackpoint &trackpoint)
 void TCXParser::waypointData(Waypoint &waypoint)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Position")
+		if (_reader.name() == QLatin1String("Position"))
 			waypoint.setCoordinates(position());
-		else if (_reader.name() == "Name")
+		else if (_reader.name() == QLatin1String("Name"))
 			waypoint.setName(_reader.readElementText());
-		else if (_reader.name() == "Notes")
+		else if (_reader.name() == QLatin1String("Notes"))
 			waypoint.setDescription(_reader.readElementText());
-		else if (_reader.name() == "AltitudeMeters")
+		else if (_reader.name() == QLatin1String("AltitudeMeters"))
 			waypoint.setElevation(number());
-		else if (_reader.name() == "Time")
+		else if (_reader.name() == QLatin1String("Time"))
 			waypoint.setTimestamp(time());
 		else
 			_reader.skipCurrentElement();
@@ -119,7 +119,7 @@ void TCXParser::waypointData(Waypoint &waypoint)
 void TCXParser::trackpoints(TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Trackpoint") {
+		if (_reader.name() == QLatin1String("Trackpoint")) {
 			Trackpoint t;
 			trackpointData(t);
 			if (t.coordinates().isValid())
@@ -134,7 +134,7 @@ void TCXParser::trackpoints(TrackData &track)
 void TCXParser::lap(TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Track")
+		if (_reader.name() == QLatin1String("Track"))
 			trackpoints(track);
 		else
 			_reader.skipCurrentElement();
@@ -144,13 +144,13 @@ void TCXParser::lap(TrackData &track)
 void TCXParser::course(QList<Waypoint> &waypoints, TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Track")
+		if (_reader.name() == QLatin1String("Track"))
 			trackpoints(track);
-		else if (_reader.name() == "Name")
+		else if (_reader.name() == QLatin1String("Name"))
 			track.setName(_reader.readElementText());
-		else if (_reader.name() == "Notes")
+		else if (_reader.name() == QLatin1String("Notes"))
 			track.setDescription(_reader.readElementText());
-		else if (_reader.name() == "CoursePoint") {
+		else if (_reader.name() == QLatin1String("CoursePoint")) {
 			Waypoint w;
 			waypointData(w);
 			if (w.coordinates().isValid())
@@ -165,7 +165,7 @@ void TCXParser::course(QList<Waypoint> &waypoints, TrackData &track)
 void TCXParser::activity(TrackData &track)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Lap")
+		if (_reader.name() == QLatin1String("Lap"))
 			lap(track);
 		else
 			_reader.skipCurrentElement();
@@ -175,7 +175,7 @@ void TCXParser::activity(TrackData &track)
 void TCXParser::courses(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Course") {
+		if (_reader.name() == QLatin1String("Course")) {
 			tracks.append(TrackData());
 			course(waypoints, tracks.back());
 		} else
@@ -186,7 +186,7 @@ void TCXParser::courses(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 void TCXParser::sport(QList<TrackData> &tracks)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Activity") {
+		if (_reader.name() == QLatin1String("Activity")) {
 			tracks.append(TrackData());
 			activity(tracks.back());
 		} else
@@ -197,7 +197,8 @@ void TCXParser::sport(QList<TrackData> &tracks)
 void TCXParser::multiSportSession(QList<TrackData> &tracks)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "FirstSport" || _reader.name() == "NextSport")
+		if (_reader.name() == QLatin1String("FirstSport")
+		  || _reader.name() == QLatin1String("NextSport"))
 			sport(tracks);
 		else
 			_reader.skipCurrentElement();
@@ -207,10 +208,10 @@ void TCXParser::multiSportSession(QList<TrackData> &tracks)
 void TCXParser::activities(QList<TrackData> &tracks)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Activity") {
+		if (_reader.name() == QLatin1String("Activity")) {
 			tracks.append(TrackData());
 			activity(tracks.back());
-		} else if (_reader.name() == "MultiSportSession")
+		} else if (_reader.name() == QLatin1String("MultiSportSession"))
 			multiSportSession(tracks);
 		else
 			_reader.skipCurrentElement();
@@ -220,9 +221,9 @@ void TCXParser::activities(QList<TrackData> &tracks)
 void TCXParser::tcx(QList<TrackData> &tracks, QList<Waypoint> &waypoints)
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "Courses")
+		if (_reader.name() == QLatin1String("Courses"))
 			courses(tracks, waypoints);
-		else if (_reader.name() == "Activities")
+		else if (_reader.name() == QLatin1String("Activities"))
 			activities(tracks);
 		else
 			_reader.skipCurrentElement();
@@ -238,7 +239,7 @@ bool TCXParser::parse(QFile *file, QList<TrackData> &tracks,
 	_reader.setDevice(file);
 
 	if (_reader.readNextStartElement()) {
-		if (_reader.name() == "TrainingCenterDatabase")
+		if (_reader.name() == QLatin1String("TrainingCenterDatabase"))
 			tcx(tracks, waypoints);
 		else
 			_reader.raiseError("Not a TCX file");

src/map/atlas.cpp

@@ -2,7 +2,7 @@
 #include <QtAlgorithms>
 #include <QPainter>
 #include "common/rectc.h"
-#include "offlinemap.h"
+#include "ozimap.h"
 #include "tar.h"
 #include "atlas.h"
 
@@ -12,7 +12,7 @@
 #define TL(m) ((m)->xy2pp((m)->bounds().topLeft()))
 #define BR(m) ((m)->xy2pp((m)->bounds().bottomRight()))
 
-static bool resCmp(OfflineMap *m1, OfflineMap *m2)
+static bool resCmp(OziMap *m1, OziMap *m2)
 {
 	qreal r1, r2;
 
@@ -22,12 +22,12 @@ static bool resCmp(OfflineMap *m1, OfflineMap *m2)
 	return r1 > r2;
 }
 
-static bool xCmp(OfflineMap *m1, OfflineMap *m2)
+static bool xCmp(OziMap *m1, OziMap *m2)
 {
 	return TL(m1).x() < TL(m2).x();
 }
 
-static bool yCmp(OfflineMap *m1, OfflineMap *m2)
+static bool yCmp(OziMap *m1, OziMap *m2)
 {
 	return TL(m1).y() > TL(m2).y();
 }
@@ -52,7 +52,7 @@ void Atlas::computeBounds()
 	QVector<QPointF> offsets(_maps.count());
 
 	for (int z = 0; z < _zooms.count(); z++) {
-		QList<OfflineMap*> m;
+		QList<OziMap*> m;
 		for (int i = _zooms.at(z).first; i <= _zooms.at(z).last; i++)
 			m.append(_maps.at(i));
 
@@ -119,11 +119,11 @@ Atlas::Atlas(const QString &fileName, QObject *parent)
 			QString mapFile = maps.at(i).absoluteFilePath() + "/"
 			  + maps.at(i).fileName() + ".map";
 
-			OfflineMap *map;
+			OziMap *map;
 			if (tar.isOpen())
-				map = new OfflineMap(mapFile, tar, this);
+				map = new OziMap(mapFile, tar, this);
 			else
-				map = new OfflineMap(mapFile, this);
+				map = new OziMap(mapFile, this);
 
 			if (map->isValid())
 				_maps.append(map);
@@ -255,14 +255,12 @@ Coordinates Atlas::xy2ll(const QPointF &p)
 	return _maps.at(idx)->xy2ll(p2);
 }
 
-void Atlas::draw(QPainter *painter, const QRectF &rect, bool block)
+void Atlas::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
-	Q_UNUSED(block);
-
 	// All in one map
 	for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).last; i++) {
 		if (_bounds.at(i).xy.contains(rect)) {
-			draw(painter, rect, i);
+			draw(painter, rect, i, flags);
 			return;
 		}
 	}
@@ -271,20 +269,21 @@ void Atlas::draw(QPainter *painter, const QRectF &rect, bool block)
 	for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).last; i++) {
 		QRectF ir = rect.intersected(_bounds.at(i).xy);
 		if (!ir.isNull())
-			draw(painter, ir, i);
+			draw(painter, ir, i, flags);
 	}
 }
 
-void Atlas::draw(QPainter *painter, const QRectF &rect, int mapIndex)
+void Atlas::draw(QPainter *painter, const QRectF &rect, int mapIndex,
+  Flags flags)
 {
-	OfflineMap *map = _maps.at(mapIndex);
+	OziMap *map = _maps.at(mapIndex);
 	const QPointF offset = _bounds.at(mapIndex).xy.topLeft();
 	QRectF pr = QRectF(rect.topLeft() - offset, rect.size());
 
 	map->load();
 
 	painter->translate(offset);
-	map->draw(painter, pr, true);
+	map->draw(painter, pr, flags);
 	painter->translate(-offset);
 }
 

src/map/atlas.h

@@ -4,7 +4,7 @@
 #include "map.h"
 #include "rectd.h"
 
-class OfflineMap;
+class OziMap;
 
 class Atlas : public Map
 {
@@ -26,7 +26,7 @@ public:
 	QPointF ll2xy(const Coordinates &c);
 	Coordinates xy2ll(const QPointF &p);
 
-	void draw(QPainter *painter, const QRectF &rect, bool block);
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
 	void setDevicePixelRatio(qreal ratio);
 	void unload();
@@ -53,13 +53,13 @@ private:
 		Bounds(const RectD &pp, const QRectF &xy) : pp(pp), xy(xy) {}
 	};
 
-	void draw(QPainter *painter, const QRectF &rect, int mapIndex);
+	void draw(QPainter *painter, const QRectF &rect, int mapIndex, Flags flags);
 	void computeZooms();
 	void computeBounds();
 
 	QString _name;
 
-	QList<OfflineMap*> _maps;
+	QList<OziMap*> _maps;
 	QVector<Zoom> _zooms;
 	QVector<Bounds> _bounds;
 	int _zoom;

src/map/emptymap.cpp

@@ -85,11 +85,11 @@ int EmptyMap::zoomOut()
 	return _zoom;
 }
 
-void EmptyMap::draw(QPainter *painter, const QRectF &rect, bool block)
+void EmptyMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
 	Q_UNUSED(painter);
 	Q_UNUSED(rect);
-	Q_UNUSED(block);
+	Q_UNUSED(flags);
 }
 
 QPointF EmptyMap::ll2xy(const Coordinates &c)

src/map/emptymap.h

@@ -24,7 +24,7 @@ public:
 	QPointF ll2xy(const Coordinates &c);
 	Coordinates xy2ll(const QPointF &p);
 
-	void draw(QPainter *painter, const QRectF &rect, bool block);
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
 private:
 	int _zoom;

src/map/geotiffmap.cpp

@@ -0,0 +1,81 @@
+#include <QFileInfo>
+#include <QPainter>
+#include <QImageReader>
+#include "config.h"
+#include "geotiff.h"
+#include "image.h"
+#include "geotiffmap.h"
+
+
+GeoTIFFMap::GeoTIFFMap(const QString &fileName, QObject *parent)
+  : Map(parent), _fileName(fileName), _img(0), _ratio(1.0), _valid(false)
+{
+	QImageReader ir(fileName);
+	if (!ir.canRead()) {
+		_errorString = "Unsupported/invalid image file";
+		return;
+	}
+	_size = ir.size();
+
+	GeoTIFF gt(fileName);
+	if (!gt.isValid()) {
+		_errorString = gt.errorString();
+		return;
+	} else {
+		_projection = gt.projection();
+		_transform = gt.transform();
+	}
+
+	_valid = true;
+}
+
+GeoTIFFMap::~GeoTIFFMap()
+{
+	delete _img;
+}
+
+QString GeoTIFFMap::name() const
+{
+	QFileInfo fi(_fileName);
+	return fi.fileName();
+}
+
+QPointF GeoTIFFMap::ll2xy(const Coordinates &c)
+{
+	return QPointF(_transform.proj2img(_projection.ll2xy(c))) / _ratio;
+}
+
+Coordinates GeoTIFFMap::xy2ll(const QPointF &p)
+{
+	return _projection.xy2ll(_transform.img2proj(p * _ratio));
+}
+
+QRectF GeoTIFFMap::bounds()
+{
+	return QRectF(QPointF(0, 0), _size / _ratio);
+}
+
+void GeoTIFFMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
+{
+	if (_img)
+		_img->draw(painter, rect, flags);
+}
+
+void GeoTIFFMap::setDevicePixelRatio(qreal ratio)
+{
+	_ratio = ratio;
+	if (_img)
+		_img->setDevicePixelRatio(_ratio);
+}
+
+void GeoTIFFMap::load()
+{
+	if (!_img)
+		_img = new Image(_fileName);
+}
+
+void GeoTIFFMap::unload()
+{
+	delete _img;
+	_img = 0;
+}

src/map/geotiffmap.h

@@ -0,0 +1,45 @@
+#ifndef GEOTIFFMAP_H
+#define GEOTIFFMAP_H
+
+#include "transform.h"
+#include "projection.h"
+#include "map.h"
+
+class Image;
+
+class GeoTIFFMap : public Map
+{
+	Q_OBJECT
+
+public:
+	GeoTIFFMap(const QString &fileName, QObject *parent = 0);
+	~GeoTIFFMap();
+
+	QString name() const;
+
+	QRectF bounds();
+	QPointF ll2xy(const Coordinates &c);
+	Coordinates xy2ll(const QPointF &p);
+
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
+
+	void load();
+	void unload();
+	void setDevicePixelRatio(qreal ratio);
+
+	bool isValid() const {return _valid;}
+	QString errorString() const {return _errorString;}
+
+private:
+	QString _fileName;
+	Projection _projection;
+	Transform _transform;
+	Image *_img;
+	QSize _size;
+	qreal _ratio;
+
+	bool _valid;
+	QString _errorString;
+};
+
+#endif // GEOTIFFMAP_H

src/map/image.cpp

@@ -0,0 +1,53 @@
+#include <QPainter>
+#include <QPixmapCache>
+#include "config.h"
+#include "image.h"
+
+
+#define TILE_SIZE 256
+
+Image::Image(const QString &fileName) : _img(fileName), _fileName(fileName)
+{
+}
+
+void Image::draw(QPainter *painter, const QRectF &rect, Map::Flags flags)
+{
+#ifdef ENABLE_HIDPI
+	qreal ratio = _img.devicePixelRatioF();
+#else // ENABLE_HIDPI
+	qreal ratio = 1.0;
+#endif // ENABLE_HIDPI
+	QRectF sr(rect.topLeft() * ratio, rect.size() * ratio);
+
+	if (flags & Map::OpenGL) {
+		for (int i = sr.left()/TILE_SIZE; i <= sr.right()/TILE_SIZE; i++) {
+			for (int j = sr.top()/TILE_SIZE; j <= sr.bottom()/TILE_SIZE; j++) {
+				QString key = _fileName + "-" + QString::number(i) + "_"
+				  + QString::number(j);
+				QPoint tl(i * TILE_SIZE, j * TILE_SIZE);
+				QPixmap pm;
+
+				if (!QPixmapCache::find(key, &pm)) {
+					QRect tile(tl, QSize(TILE_SIZE, TILE_SIZE));
+					pm = QPixmap::fromImage(_img.copy(tile));
+					if (!pm.isNull())
+						QPixmapCache::insert(key, pm);
+				}
+#ifdef ENABLE_HIDPI
+				pm.setDevicePixelRatio(ratio);
+#endif // ENABLE_HIDPI
+				painter->drawPixmap(tl/ratio, pm);
+			}
+		}
+	} else
+		painter->drawImage(rect.topLeft(), _img, sr);
+}
+
+void Image::setDevicePixelRatio(qreal ratio)
+{
+#ifdef ENABLE_HIDPI
+	_img.setDevicePixelRatio(ratio);
+#else // ENABLE_HIDPI
+	Q_UNUSED(ratio);
+#endif // ENABLE_HIDPI
+}

src/map/image.h

@@ -0,0 +1,22 @@
+#ifndef IMAGE_H
+#define IMAGE_H
+
+#include <QImage>
+#include "map.h"
+
+class QPainter;
+
+class Image
+{
+public:
+	Image(const QString &fileName);
+
+	void draw(QPainter *painter, const QRectF &rect, Map::Flags flags);
+	void setDevicePixelRatio(qreal ratio);
+
+private:
+	QImage _img;
+	QString _fileName;
+};
+
+#endif // IMAGE_H

src/map/jnxmap.cpp

@@ -245,9 +245,9 @@ bool JNXMap::cb(Tile *tile, void *context)
 	return true;
 }
 
-void JNXMap::draw(QPainter *painter, const QRectF &rect, bool block)
+void JNXMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
-	Q_UNUSED(block);
+	Q_UNUSED(flags);
 	const RTree<Tile*, qreal, 2> &tree = _zooms.at(_zoom).tree;
 	Ctx ctx(painter, &_file, _ratio);
 	QRectF rr(rect.topLeft() * _ratio, rect.size() * _ratio);

src/map/jnxmap.h

@@ -30,7 +30,7 @@ public:
 	QPointF ll2xy(const Coordinates &c);
 	Coordinates xy2ll(const QPointF &p);
 
-	void draw(QPainter *painter, const QRectF &rect, bool block);
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
 	void setDevicePixelRatio(qreal ratio) {_ratio = ratio;}
 

src/map/map.h

@@ -4,6 +4,7 @@
 #include <QObject>
 #include <QString>
 #include <QRectF>
+#include <QFlags>
 #include "common/coordinates.h"
 
 class QPainter;
@@ -14,6 +15,13 @@ class Map : public QObject
 	Q_OBJECT
 
 public:
+	enum Flag {
+		NoFlags = 0,
+		Block = 1,
+		OpenGL = 2
+	};
+	Q_DECLARE_FLAGS(Flags, Flag)
+
 	Map(QObject *parent = 0) : QObject(parent) {}
 	virtual ~Map() {}
 
@@ -22,21 +30,21 @@ public:
 	virtual QRectF bounds() = 0;
 	virtual qreal resolution(const QRectF &rect);
 
-	virtual int zoom() const = 0;
-	virtual void setZoom(int zoom) = 0;
-	virtual int zoomFit(const QSize &size, const RectC &rect) = 0;
-	virtual int zoomIn() = 0;
-	virtual int zoomOut() = 0;
+	virtual int zoom() const {return 0;}
+	virtual void setZoom(int) {}
+	virtual int zoomFit(const QSize &, const RectC &) {return 0;}
+	virtual int zoomIn() {return 0;}
+	virtual int zoomOut() {return 0;}
 
 	virtual QPointF ll2xy(const Coordinates &c) = 0;
 	virtual Coordinates xy2ll(const QPointF &p) = 0;
 
-	virtual void draw(QPainter *painter, const QRectF &rect, bool block) = 0;
+	virtual void draw(QPainter *painter, const QRectF &rect, Flags flags) = 0;
 
 	virtual void clearCache() {}
 	virtual void load() {}
 	virtual void unload() {}
-	virtual void setDevicePixelRatio(qreal ratio) {Q_UNUSED(ratio);}
+	virtual void setDevicePixelRatio(qreal) {}
 
 	virtual bool isValid() const {return true;}
 	virtual QString errorString() const {return QString();}
@@ -45,4 +53,6 @@ signals:
 	void loaded();
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(Map::Flags)
+
 #endif // MAP_H

src/map/maplist.cpp

@@ -1,10 +1,12 @@
 #include <QFileInfo>
 #include <QDir>
 #include "atlas.h"
-#include "offlinemap.h"
+#include "ozimap.h"
 #include "onlinemap.h"
 #include "jnxmap.h"
+#include "geotiffmap.h"
 #include "mapsource.h"
+#include "mbtilesmap.h"
 #include "maplist.h"
 
 
@@ -53,8 +55,12 @@ bool MapList::loadFile(const QString &path, bool *atlas, bool dir)
 		return loadSource(path, dir);
 	else if (suffix == "jnx")
 		return loadMap(new JNXMap(path, this), path, dir);
+	else if (suffix == "tif" || suffix == "tiff")
+		return loadMap(new GeoTIFFMap(path, this), path, dir);
+	else if (suffix == "mbtiles")
+		return loadMap(new MBTilesMap(path, this), path, dir);
 	else
-		return loadMap(new OfflineMap(path, this), path, dir);
+		return loadMap(new OziMap(path, this), path, dir);
 }
 
 bool MapList::loadDirR(const QString &path)
@@ -108,7 +114,9 @@ void MapList::clear()
 QString MapList::formats()
 {
 	return
-	  tr("Supported files") + " (*.jnx *.map *.tar *.tba *.tif *.tiff *.xml);;"
+	  tr("Supported files")
+	  + " (*.jnx *.map *.mbtiles *.tar *.tba *.tif *.tiff *.xml);;"
+	  + tr("MBTiles maps") + " (*.mbtiles);;"
 	  + tr("Garmin JNX maps") + " (*.jnx);;"
 	  + tr("OziExplorer maps") + " (*.map);;"
 	  + tr("TrekBuddy maps/atlases") + " (*.tar *.tba);;"
@@ -120,6 +128,6 @@ QStringList MapList::filter()
 {
 	QStringList filter;
 	filter << "*.jnx" << "*.map" << "*.tba" << "*.tar" << "*.xml" << "*.tif"
-	  << "*.tiff";
+	  << "*.tiff" << "*.mbtiles";
 	return filter;
 }

src/map/mapsource.cpp

@@ -1,21 +1,15 @@
 #include <QFile>
 #include <QXmlStreamReader>
+#include "config.h"
 #include "onlinemap.h"
 #include "wmtsmap.h"
 #include "wmsmap.h"
+#include "osm.h"
 #include "mapsource.h"
 
-#define ZOOM_MAX       19
-#define ZOOM_MIN       0
-#define BOUNDS_LEFT    -180
-#define BOUNDS_TOP     85.0511
-#define BOUNDS_RIGHT   180
-#define BOUNDS_BOTTOM  -85.0511
 
-
-MapSource::Config::Config() : type(OSM), zooms(ZOOM_MIN, ZOOM_MAX),
-  bounds(Coordinates(BOUNDS_LEFT, BOUNDS_TOP), Coordinates(BOUNDS_RIGHT,
-  BOUNDS_BOTTOM)), format("image/png"), rest(false), tileRatio(1.0) {}
+MapSource::Config::Config() : type(OSM), zooms(osm::zooms), bounds(osm::bounds),
+  format("image/png"), rest(false), tileRatio(1.0) {}
 
 
 static CoordinateSystem coordinateSystem(QXmlStreamReader &reader)
@@ -37,21 +31,21 @@ Range MapSource::zooms(QXmlStreamReader &reader)
 
 	if (attr.hasAttribute("min")) {
 		min = attr.value("min").toString().toInt(&res);
-		if (!res || (min < ZOOM_MIN || min > ZOOM_MAX)) {
+		if (!res || !osm::zooms.contains(min)) {
 			reader.raiseError("Invalid minimal zoom level");
 			return Range();
 		}
 	} else
-		min = ZOOM_MIN;
+		min = osm::zooms.min();
 
 	if (attr.hasAttribute("max")) {
 		max = attr.value("max").toString().toInt(&res);
-		if (!res || (max < ZOOM_MIN || max > ZOOM_MAX)) {
+		if (!res || !osm::zooms.contains(max)) {
 			reader.raiseError("Invalid maximal zoom level");
 			return Range();
 		}
 	} else
-		max = ZOOM_MAX;
+		max = osm::zooms.max();
 
 	if (min > max) {
 		reader.raiseError("Invalid maximal/minimal zoom level combination");
@@ -69,39 +63,41 @@ RectC MapSource::bounds(QXmlStreamReader &reader)
 
 	if (attr.hasAttribute("top")) {
 		top = attr.value("top").toString().toDouble(&res);
-		if (!res || (top < BOUNDS_BOTTOM || top > BOUNDS_TOP)) {
+		if (!res || (top < osm::bounds.bottom() || top > osm::bounds.top())) {
 			reader.raiseError("Invalid bounds top value");
 			return RectC();
 		}
 	} else
-		top = BOUNDS_TOP;
+		top = osm::bounds.top();
 
 	if (attr.hasAttribute("bottom")) {
 		bottom = attr.value("bottom").toString().toDouble(&res);
-		if (!res || (bottom < BOUNDS_BOTTOM || bottom > BOUNDS_TOP)) {
+		if (!res || (bottom < osm::bounds.bottom()
+		  || bottom > osm::bounds.top())) {
 			reader.raiseError("Invalid bounds bottom value");
 			return RectC();
 		}
 	} else
-		bottom = BOUNDS_BOTTOM;
+		bottom = osm::bounds.bottom();
 
 	if (attr.hasAttribute("left")) {
 		left = attr.value("left").toString().toDouble(&res);
-		if (!res || (left < BOUNDS_LEFT || left > BOUNDS_RIGHT)) {
+		if (!res || (left < osm::bounds.left() || left > osm::bounds.right())) {
 			reader.raiseError("Invalid bounds left value");
 			return RectC();
 		}
 	} else
-		left = BOUNDS_LEFT;
+		left = osm::bounds.left();
 
 	if (attr.hasAttribute("right")) {
 		right = attr.value("right").toString().toDouble(&res);
-		if (!res || (right < BOUNDS_LEFT || right > BOUNDS_RIGHT)) {
+		if (!res || (right < osm::bounds.left()
+		  || right > osm::bounds.right())) {
 			reader.raiseError("Invalid bounds right value");
 			return RectC();
 		}
 	} else
-		right = BOUNDS_RIGHT;
+		right = osm::bounds.right();
 
 	if (bottom >= top) {
 		reader.raiseError("Invalid bottom/top bounds combination");
@@ -118,8 +114,20 @@ RectC MapSource::bounds(QXmlStreamReader &reader)
 void MapSource::map(QXmlStreamReader &reader, Config &config)
 {
 	const QXmlStreamAttributes &attr = reader.attributes();
-	config.type = (attr.value("type") == "WMTS") ? WMTS
-	  : (attr.value("type") == "WMS") ? WMS : OSM;
+	QStringRef type = attr.value("type");
+
+	if (type == "WMTS")
+		config.type = WMTS;
+	else if (type == "WMS")
+		config.type = WMS;
+	else if (type == "TMS")
+		config.type = TMS;
+	else if (type == "OSM" || type.isEmpty())
+		config.type = OSM;
+	else {
+		reader.raiseError("Invalid map type");
+		return;
+	}
 
 	while (reader.readNextStartElement()) {
 		if (reader.name() == "name")
@@ -160,12 +168,16 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
 			  attr.value("password").toString());
 			reader.skipCurrentElement();
 		} else if (reader.name() == "tilePixelRatio") {
+#ifdef ENABLE_HIDPI
 			bool res;
 			qreal val = reader.readElementText().toDouble(&res);
 			if (!res)
 				reader.raiseError("Invalid tilePixelRatio");
 			else
 				config.tileRatio = val;
+#else // ENABLE_HIDPI
+			reader.raiseError("HiDPI maps not supported");
+#endif // ENABLE_HIDPI
 		} else
 			reader.skipCurrentElement();
 	}
@@ -226,16 +238,23 @@ Map *MapSource::loadMap(const QString &path, QString &errorString)
 		}
 	}
 
-	if (config.type == WMTS)
-		return new WMTSMap(config.name, WMTS::Setup(config.url, config.layer,
-		  config.set, config.style, config.format, config.rest,
-		  config.coordinateSystem, config.dimensions, config.authorization),
-		  config.tileRatio);
-	else if (config.type == WMS)
-		return new WMSMap(config.name, WMS::Setup(config.url, config.layer,
-		  config.style, config.format, config.crs, config.coordinateSystem,
-		  config.dimensions, config.authorization));
-	else
-		return new OnlineMap(config.name, config.url, config.zooms,
-		  config.bounds, config.tileRatio, config.authorization);
+	switch (config.type) {
+		case WMTS:
+			return new WMTSMap(config.name, WMTS::Setup(config.url, config.layer,
+			  config.set, config.style, config.format, config.rest,
+			  config.coordinateSystem, config.dimensions, config.authorization),
+			  config.tileRatio);
+		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));
+		case TMS:
+			return new OnlineMap(config.name, config.url, config.zooms,
+			  config.bounds, config.tileRatio, config.authorization, true);
+		case OSM:
+			return new OnlineMap(config.name, config.url, config.zooms,
+			 config.bounds, config.tileRatio, config.authorization, false);
+		default:
+			return 0;
+	}
 }

src/map/mapsource.h

@@ -19,7 +19,8 @@ private:
 	enum Type {
 		OSM,
 		WMTS,
-		WMS
+		WMS,
+		TMS
 	};
 
 	struct Config {

src/map/mbtilesmap.cpp

@@ -0,0 +1,264 @@
+#include <QSqlQuery>
+#include <QSqlRecord>
+#include <QSqlField>
+#include <QFileInfo>
+#include <QPainter>
+#include <QPixmapCache>
+#include "common/rectc.h"
+#include "common/wgs84.h"
+#include "osm.h"
+#include "config.h"
+#include "mbtilesmap.h"
+
+
+#define META_TYPE(type) static_cast<QMetaType::Type>(type)
+
+static double index2mercator(int index, int zoom)
+{
+	return rad2deg(-M_PI + 2 * M_PI * ((double)index / (1<<zoom)));
+}
+
+MBTilesMap::MBTilesMap(const QString &fileName, QObject *parent)
+  : Map(parent), _fileName(fileName), _deviceRatio(1.0), _tileRatio(1.0),
+  _valid(false)
+{
+	_db = QSqlDatabase::addDatabase("QSQLITE", fileName);
+	_db.setDatabaseName(fileName);
+
+	if (!_db.open()) {
+		_errorString = fileName + ": Error opening database file";
+		return;
+	}
+
+	QSqlRecord r = _db.record("tiles");
+	if (r.isEmpty()
+	  || r.field(0).name() != "zoom_level"
+	  || META_TYPE(r.field(0).type()) != QMetaType::Int
+	  || r.field(1).name() != "tile_column"
+	  || META_TYPE(r.field(1).type()) != QMetaType::Int
+	  || r.field(2).name() != "tile_row"
+	  || META_TYPE(r.field(2).type()) != QMetaType::Int
+	  || r.field(3).name() != "tile_data"
+	  || META_TYPE(r.field(3).type()) != QMetaType::QByteArray) {
+		_errorString = "Invalid table format";
+		return;
+	}
+
+	{
+		QSqlQuery query("SELECT min(zoom_level), max(zoom_level) FROM tiles",
+		  _db);
+		if (!query.first()) {
+			_errorString = "Empty tile set";
+			return;
+		}
+		_zooms = Range(query.value(0).toInt(), query.value(1).toInt());
+		if (_zooms.min() < 0 || !_zooms.isValid()) {
+			_errorString = "Invalid zoom levels";
+			return;
+		}
+	}
+	_zoom = _zooms.max();
+
+	{
+		QString sql = QString("SELECT min(tile_column), min(tile_row), "
+		  "max(tile_column), max(tile_row) FROM tiles WHERE zoom_level = %1")
+		  .arg(_zooms.min());
+		QSqlQuery query(sql, _db);
+		query.first();
+
+		double minX = index2mercator(qMin((1<<_zooms.min()) - 1,
+		  qMax(0, query.value(0).toInt())), _zooms.min());
+		double minY = index2mercator(qMin((1<<_zooms.min()) - 1,
+		  qMax(0, query.value(1).toInt())), _zooms.min());
+		double maxX = index2mercator(qMin((1<<_zooms.min()) - 1,
+		  qMax(0, query.value(2).toInt())) + 1, _zooms.min());
+		double maxY = index2mercator(qMin((1<<_zooms.min()) - 1,
+		  qMax(0, query.value(3).toInt())) + 1, _zooms.min());
+		Coordinates tl(osm::m2ll(QPointF(minX, maxY)));
+		Coordinates br(osm::m2ll(QPointF(maxX, minY)));
+		// Workaround of broken zoom levels 0 and 1 due to numerical instability
+		tl.rlat() = qMin(tl.lat(), osm::bounds.top());
+		br.rlat() = qMax(br.lat(), osm::bounds.bottom());
+		_bounds = RectC(tl, br);
+	}
+
+	{
+		QString sql = QString("SELECT tile_data FROM tiles LIMIT 1");
+		QSqlQuery query(sql, _db);
+		query.first();
+		QImage tile = QImage::fromData(query.value(0).toByteArray());
+		if (tile.isNull() || tile.size().width() != tile.size().height()) {
+			_errorString = "Unsupported/invalid tile images";
+			return;
+		}
+		_tileSize = tile.size().width();
+	}
+
+	{
+		QSqlQuery query("SELECT value FROM metadata WHERE name = 'name'", _db);
+		if (query.first())
+			_name = query.value(0).toString();
+		else {
+			qWarning("%s: missing map name", qPrintable(_fileName));
+			_name = QFileInfo(_fileName).fileName();
+		}
+	}
+
+	{
+		QSqlQuery query(
+		  "SELECT value FROM metadata WHERE name = 'tilepixelratio'", _db);
+		if (query.first()) {
+			bool ok;
+			_tileRatio = query.value(0).toString().toDouble(&ok);
+			if (!ok) {
+				_errorString = "Invalid tile pixel ratio";
+				return;
+			}
+		}
+	}
+
+	_db.close();
+
+	_valid = true;
+}
+
+void MBTilesMap::load()
+{
+	_db.open();
+}
+
+void MBTilesMap::unload()
+{
+	_db.close();
+}
+
+QRectF MBTilesMap::bounds()
+{
+	return QRectF(ll2xy(_bounds.topLeft()), ll2xy(_bounds.bottomRight()));
+}
+
+int MBTilesMap::limitZoom(int zoom) const
+{
+	if (zoom < _zooms.min())
+		return _zooms.min();
+	if (zoom > _zooms.max())
+		return _zooms.max();
+
+	return zoom;
+}
+
+int MBTilesMap::zoomFit(const QSize &size, const RectC &rect)
+{
+	if (!rect.isValid())
+		_zoom = _zooms.max();
+	else {
+		QRectF tbr(osm::ll2m(rect.topLeft()), osm::ll2m(rect.bottomRight()));
+		QPointF sc(tbr.width() / size.width(), tbr.height() / size.height());
+		_zoom = limitZoom(osm::scale2zoom(qMax(sc.x(), -sc.y())
+		  / coordinatesRatio(), _tileSize));
+	}
+
+	return _zoom;
+}
+
+qreal MBTilesMap::resolution(const QRectF &rect)
+{
+	qreal scale = osm::zoom2scale(_zoom, _tileSize);
+
+	return (WGS84_RADIUS * 2.0 * M_PI * scale / 360.0
+	  * cos(2.0 * atan(exp(deg2rad(-rect.center().y() * scale))) - M_PI/2));
+}
+
+int MBTilesMap::zoomIn()
+{
+	_zoom = qMin(_zoom + 1, _zooms.max());
+	return _zoom;
+}
+
+int MBTilesMap::zoomOut()
+{
+	_zoom = qMax(_zoom - 1, _zooms.min());
+	return _zoom;
+}
+
+qreal MBTilesMap::coordinatesRatio() const
+{
+	return _deviceRatio > 1.0 ? _deviceRatio / _tileRatio : 1.0;
+}
+
+qreal MBTilesMap::imageRatio() const
+{
+	return _deviceRatio > 1.0 ? _deviceRatio : _tileRatio;
+}
+
+qreal MBTilesMap::tileSize() const
+{
+	return (_tileSize / coordinatesRatio());
+}
+
+QByteArray MBTilesMap::tileData(int zoom, const QPoint &tile) const
+{
+	QSqlQuery query(_db);
+	query.prepare("SELECT tile_data FROM tiles "
+	  "WHERE zoom_level=:zoom AND tile_column=:x AND tile_row=:y");
+	query.bindValue(":zoom", zoom);
+	query.bindValue(":x", tile.x());
+	query.bindValue(":y", (1<<zoom) - tile.y() - 1);
+	query.exec();
+
+	if (query.first())
+		return query.value(0).toByteArray();
+
+	return QByteArray();
+}
+
+void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
+{
+	Q_UNUSED(flags);
+	qreal scale = osm::zoom2scale(_zoom, _tileSize);
+	QRectF b(bounds());
+
+
+	QPoint tile = osm::mercator2tile(QPointF(rect.topLeft().x() * scale,
+	  -rect.topLeft().y() * scale) * coordinatesRatio(), _zoom);
+	QPointF tl(floor(rect.left() / tileSize())
+	  * tileSize(), floor(rect.top() / tileSize()) * tileSize());
+
+	QSizeF s(qMin(rect.right() - tl.x(), b.width()),
+	  qMin(rect.bottom() - tl.y(), b.height()));
+	for (int i = 0; i < ceil(s.width() / tileSize()); i++) {
+		for (int j = 0; j < ceil(s.height() / tileSize()); j++) {
+			QPixmap pm;
+			QPoint t(tile.x() + i, tile.y() + j);
+			QString key = _fileName + "-" + QString::number(_zoom) + "_"
+			  + QString::number(t.x()) + "_" + QString::number(t.y());
+
+			if (!QPixmapCache::find(key, &pm))
+				if (pm.loadFromData(tileData(_zoom, t)))
+					QPixmapCache::insert(key, pm);
+
+			QPointF tp(qMax(tl.x(), b.left()) + (t.x() - tile.x()) * tileSize(),
+			  qMax(tl.y(), b.top()) + (t.y() - tile.y()) * tileSize());
+			if (!pm.isNull()) {
+#ifdef ENABLE_HIDPI
+				pm.setDevicePixelRatio(imageRatio());
+#endif // ENABLE_HIDPI
+				painter->drawPixmap(tp, pm);
+			}
+		}
+	}
+}
+
+QPointF MBTilesMap::ll2xy(const Coordinates &c)
+{
+	qreal scale = osm::zoom2scale(_zoom, _tileSize);
+	QPointF m = osm::ll2m(c);
+	return QPointF(m.x() / scale, m.y() / -scale) / coordinatesRatio();
+}
+
+Coordinates MBTilesMap::xy2ll(const QPointF &p)
+{
+	qreal scale = osm::zoom2scale(_zoom, _tileSize);
+	return osm::m2ll(QPointF(p.x() * scale, -p.y() * scale)
+	  * coordinatesRatio());
+}

src/map/mbtilesmap.h

@@ -0,0 +1,57 @@
+#ifndef MBTILESMAP_H
+#define MBTILESMAP_H
+
+#include <QSqlDatabase>
+#include <QByteArray>
+#include "common/range.h"
+#include "map.h"
+
+class MBTilesMap : public Map
+{
+public:
+	MBTilesMap(const QString &fileName, QObject *parent = 0);
+
+	QString name() const {return _name;}
+
+	QRectF bounds();
+	qreal resolution(const QRectF &rect);
+
+	int zoom() const {return _zoom;}
+	void setZoom(int zoom) {_zoom = zoom;}
+	int zoomFit(const QSize &size, const RectC &rect);
+	int zoomIn();
+	int zoomOut();
+
+	QPointF ll2xy(const Coordinates &c);
+	Coordinates xy2ll(const QPointF &p);
+
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
+
+	void load();
+	void unload();
+	void setDevicePixelRatio(qreal ratio) {_deviceRatio = ratio;}
+
+	bool isValid() const {return _valid;}
+	QString errorString() const {return _errorString;}
+
+private:
+	int limitZoom(int zoom) const;
+	qreal tileSize() const;
+	qreal coordinatesRatio() const;
+	qreal imageRatio() const;
+	QByteArray tileData(int zoom, const QPoint &tile) const;
+
+	QSqlDatabase _db;
+
+	QString _fileName, _name;
+	RectC _bounds;
+	Range _zooms;
+	int _zoom;
+	int _tileSize;
+	qreal _deviceRatio, _tileRatio;
+
+	bool _valid;
+	QString _errorString;
+};
+
+#endif // MBTILESMAP_H

src/map/onlinemap.cpp

@@ -3,49 +3,19 @@
 #include "common/rectc.h"
 #include "common/wgs84.h"
 #include "downloader.h"
+#include "osm.h"
 #include "config.h"
 #include "onlinemap.h"
 
 
 #define TILE_SIZE     256
-#define EPSILON       1e-6
-
-static QPointF ll2m(const Coordinates &c)
-{
-	return QPointF(c.lon(), rad2deg(log(tan(M_PI_4 + deg2rad(c.lat())/2.0))));
-}
-
-static Coordinates m2ll(const QPointF &p)
-{
-	return Coordinates(p.x(), rad2deg(2.0 * atan(exp(deg2rad(p.y()))) - M_PI_2));
-}
-
-static QPoint mercator2tile(const QPointF &m, int z)
-{
-	QPoint tile;
-
-	tile.setX((int)(floor((m.x() + 180.0) / 360.0 * (1<<z))));
-	tile.setY((int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * (1<<z))));
-
-	return tile;
-}
-
-static qreal zoom2scale(int zoom)
-{
-	return (360.0/(qreal)((1<<zoom) * TILE_SIZE));
-}
-
-static int scale2zoom(qreal scale)
-{
-	return (int)(log2(360.0/(scale * (qreal)TILE_SIZE)) + EPSILON);
-}
-
 
 OnlineMap::OnlineMap(const QString &name, const QString &url,
   const Range &zooms, const RectC &bounds, qreal tileRatio,
-  const Authorization &authorization, QObject *parent)
+  const Authorization &authorization, bool invertY, QObject *parent)
 	: Map(parent), _name(name), _zooms(zooms), _bounds(bounds),
-	_zoom(_zooms.max()), _deviceRatio(1.0), _tileRatio(tileRatio), _valid(false)
+	_zoom(_zooms.max()), _deviceRatio(1.0), _tileRatio(tileRatio),
+	_invertY(invertY), _valid(false)
 {
 	QString dir(TILES_DIR + "/" + _name);
 
@@ -83,9 +53,10 @@ int OnlineMap::zoomFit(const QSize &size, const RectC &rect)
 	if (!rect.isValid())
 		_zoom = _zooms.max();
 	else {
-		QRectF tbr(ll2m(rect.topLeft()), ll2m(rect.bottomRight()));
+		QRectF tbr(osm::ll2m(rect.topLeft()), osm::ll2m(rect.bottomRight()));
 		QPointF sc(tbr.width() / size.width(), tbr.height() / size.height());
-		_zoom = limitZoom(scale2zoom(qMax(sc.x(), -sc.y()) / coordinatesRatio()));
+		_zoom = limitZoom(osm::scale2zoom(qMax(sc.x(), -sc.y())
+		  / coordinatesRatio(), TILE_SIZE));
 	}
 
 	return _zoom;
@@ -93,7 +64,7 @@ int OnlineMap::zoomFit(const QSize &size, const RectC &rect)
 
 qreal OnlineMap::resolution(const QRectF &rect)
 {
-	qreal scale = zoom2scale(_zoom);
+	qreal scale = osm::zoom2scale(_zoom, TILE_SIZE);
 
 	return (WGS84_RADIUS * 2.0 * M_PI * scale / 360.0
 	  * cos(2.0 * atan(exp(deg2rad(-rect.center().y() * scale))) - M_PI/2));
@@ -126,30 +97,34 @@ qreal OnlineMap::tileSize() const
 	return (TILE_SIZE / coordinatesRatio());
 }
 
-void OnlineMap::draw(QPainter *painter, const QRectF &rect, bool block)
+void OnlineMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
-	qreal scale = zoom2scale(_zoom);
+	qreal scale = osm::zoom2scale(_zoom, TILE_SIZE);
+	QRectF b(bounds());
 
-	QPoint tile = mercator2tile(QPointF(rect.topLeft().x() * scale,
+	QPoint tile = osm::mercator2tile(QPointF(rect.topLeft().x() * scale,
 	  -rect.topLeft().y() * scale) * coordinatesRatio(), _zoom);
 	QPointF tl(floor(rect.left() / tileSize())
 	  * tileSize(), floor(rect.top() / tileSize()) * tileSize());
 
 	QList<Tile> tiles;
-	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	QSizeF s(qMin(rect.right() - tl.x(), b.width()),
+	  qMin(rect.bottom() - tl.y(), b.height()));
 	for (int i = 0; i < ceil(s.width() / tileSize()); i++)
 		for (int j = 0; j < ceil(s.height() / tileSize()); j++)
-			tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom));
+			tiles.append(Tile(QPoint(tile.x() + i,
+			  _invertY ? (1<<_zoom) - (tile.y() + j) - 1 : tile.y() + j), _zoom));
 
-	if (block)
+	if (flags & Map::Block)
 		_tileLoader->loadTilesSync(tiles);
 	else
 		_tileLoader->loadTilesAsync(tiles);
 
 	for (int i = 0; i < tiles.count(); i++) {
 		Tile &t = tiles[i];
-		QPointF tp(tl.x() + (t.xy().x() - tile.x()) * tileSize(),
-		  tl.y() + (t.xy().y() - tile.y()) * tileSize());
+		QPointF tp(qMax(tl.x(), b.left()) + (t.xy().x() - tile.x()) * tileSize(),
+		  qMax(tl.y(), b.top()) + ((_invertY ? (1<<_zoom) - t.xy().y() - 1 :
+		  t.xy().y()) - tile.y()) * tileSize());
 		if (!t.pixmap().isNull()) {
 #ifdef ENABLE_HIDPI
 			t.pixmap().setDevicePixelRatio(imageRatio());
@@ -161,13 +136,14 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, bool block)
 
 QPointF OnlineMap::ll2xy(const Coordinates &c)
 {
-	qreal scale = zoom2scale(_zoom);
-	QPointF m = ll2m(c);
+	qreal scale = osm::zoom2scale(_zoom, TILE_SIZE);
+	QPointF m = osm::ll2m(c);
 	return QPointF(m.x() / scale, m.y() / -scale) / coordinatesRatio();
 }
 
 Coordinates OnlineMap::xy2ll(const QPointF &p)
 {
-	qreal scale = zoom2scale(_zoom);
-	return m2ll(QPointF(p.x() * scale, -p.y() * scale) * coordinatesRatio());
+	qreal scale = osm::zoom2scale(_zoom, TILE_SIZE);
+	return osm::m2ll(QPointF(p.x() * scale, -p.y() * scale)
+	  * coordinatesRatio());
 }

src/map/onlinemap.h

@@ -13,7 +13,7 @@ class OnlineMap : public Map
 public:
 	OnlineMap(const QString &name, const QString &url, const Range &zooms,
 	  const RectC &bounds, qreal tileRatio, const Authorization &authorization,
-	  QObject *parent = 0);
+	  bool invertY, QObject *parent = 0);
 
 	QString name() const {return _name;}
 
@@ -29,7 +29,7 @@ public:
 	QPointF ll2xy(const Coordinates &c);
 	Coordinates xy2ll(const QPointF &p);
 
-	void draw(QPainter *painter, const QRectF &rect, bool block);
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
 	void setDevicePixelRatio(qreal ratio) {_deviceRatio = ratio;}
 	void clearCache() {_tileLoader->clearCache();}
@@ -49,6 +49,7 @@ private:
 	RectC _bounds;
 	int _zoom;
 	qreal _deviceRatio, _tileRatio;
+	bool _invertY;
 
 	bool _valid;
 	QString _errorString;

src/map/osm.cpp

@@ -0,0 +1,29 @@
+#include "osm.h"
+
+#define EPSILON       1e-6
+
+QPointF osm::ll2m(const Coordinates &c)
+{
+	return QPointF(c.lon(), rad2deg(log(tan(M_PI_4 + deg2rad(c.lat())/2.0))));
+}
+
+Coordinates osm::m2ll(const QPointF &p)
+{
+	return Coordinates(p.x(), rad2deg(2.0 * atan(exp(deg2rad(p.y()))) - M_PI_2));
+}
+
+QPoint osm::mercator2tile(const QPointF &m, int z)
+{
+	return QPoint((int)(floor((m.x() + 180.0) / 360.0 * (1<<z))),
+	  (int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * (1<<z))));
+}
+
+qreal osm::zoom2scale(int zoom, int tileSize)
+{
+	return (360.0/(qreal)((1<<zoom) * tileSize));
+}
+
+int osm::scale2zoom(qreal scale, int tileSize)
+{
+	return (int)(log2(360.0/(scale * (qreal)tileSize)) + EPSILON);
+}

src/map/osm.h

@@ -0,0 +1,22 @@
+#ifndef OSM_H
+#define OSM_H
+
+#include <QPointF>
+#include <common/coordinates.h>
+#include <common/rectc.h>
+#include <common/range.h>
+
+namespace osm
+{
+	static const RectC bounds(Coordinates(-180, 85.0511),
+	  Coordinates(180, -85.0511));
+	static const Range zooms(0, 19);
+
+	QPointF ll2m(const Coordinates &c);
+	Coordinates m2ll(const QPointF &p);
+	QPoint mercator2tile(const QPointF &m, int z);
+	qreal zoom2scale(int zoom, int tileSize);
+	int scale2zoom(qreal scale, int tileSize);
+}
+
+#endif // OSM_H

src/map/ozimap.cpp

@@ -3,20 +3,118 @@
 #include <QMap>
 #include <QDir>
 #include <QBuffer>
-#include <QImage>
 #include <QImageReader>
 #include <QPixmapCache>
 #include "common/coordinates.h"
 #include "common/rectc.h"
 #include "tar.h"
 #include "ozf.h"
+#include "image.h"
 #include "mapfile.h"
-#include "geotiff.h"
 #include "config.h"
-#include "offlinemap.h"
+#include "ozimap.h"
 
 
-bool OfflineMap::setImageInfo(const QString &path)
+OziMap::OziMap(const QString &fileName, QObject *parent)
+  : Map(parent), _img(0), _tar(0), _ozf(0), _zoom(0), _ratio(1.0), _valid(false)
+{
+	QFileInfo fi(fileName);
+	QString suffix = fi.suffix().toLower();
+
+
+	if (suffix == "tar") {
+		_tar = new Tar(fileName);
+		if (!_tar->open()) {
+			_errorString = "Error reading tar file";
+			return;
+		}
+
+		QString mapFileName = fi.completeBaseName() + ".map";
+		QByteArray ba = _tar->file(mapFileName);
+		if (ba.isNull()) {
+			_errorString = "Map file not found";
+			return;
+		}
+		QBuffer buffer(&ba);
+		MapFile mf(buffer);
+		if (!mf.isValid()) {
+			_errorString = mf.errorString();
+			return;
+		} else {
+			_name = mf.name();
+			_map.size = mf.size();
+			_map.path = mf.image();
+			_projection = mf.projection();
+			_transform = mf.transform();
+		}
+
+		if (!setTileInfo(_tar->files()))
+			return;
+	} else {
+		QFile file(fileName);
+		MapFile mf(file);
+		if (!mf.isValid()) {
+			_errorString = mf.errorString();
+			return;
+		} else {
+			_name = mf.name();
+			_map.size = mf.size();
+			_map.path = mf.image();
+			_projection = mf.projection();
+			_transform = mf.transform();
+		}
+
+		QDir set(fi.absolutePath() + "/" + "set");
+		if (set.exists()) {
+			if (!setTileInfo(set.entryList(), set.absolutePath()))
+				return;
+		} else {
+			if (!setImageInfo(fi.absolutePath()))
+				return;
+		}
+	}
+
+	_valid = true;
+}
+
+OziMap::OziMap(const QString &fileName, Tar &tar, QObject *parent)
+  : Map(parent), _img(0), _tar(0), _ozf(0), _zoom(0), _ratio(1.0), _valid(false)
+{
+	QFileInfo fi(fileName);
+	QFileInfo map(fi.absolutePath());
+	QFileInfo layer(map.absolutePath());
+	QString mapFile = layer.fileName() + "/" + map.fileName() + "/"
+	  + fi.fileName();
+
+	QByteArray ba = tar.file(mapFile);
+	if (ba.isNull()) {
+		_errorString = "Map file not found";
+		return;
+	}
+	QBuffer buffer(&ba);
+	MapFile mf(buffer);
+	if (!mf.isValid()) {
+		_errorString = mf.errorString();
+		return;
+	}
+
+	_name = mf.name();
+	_map.size = mf.size();
+	_projection = mf.projection();
+	_transform = mf.transform();
+	_tar = new Tar(fi.absolutePath() + "/" + fi.completeBaseName() + ".tar");
+
+	_valid = true;
+}
+
+OziMap::~OziMap()
+{
+	delete _img;
+	delete _tar;
+	delete _ozf;
+}
+
+bool OziMap::setImageInfo(const QString &path)
 {
 	QFileInfo ii(_map.path);
 
@@ -40,26 +138,25 @@ bool OfflineMap::setImageInfo(const QString &path)
 
 	if (OZF::isOZF(_map.path)) {
 		_ozf = new OZF(_map.path);
-		if (!_ozf->open()) {
-			_errorString = QString("%1: Error loading OZF file")
-			  .arg(_ozf->fileName());
+		if (!_ozf || !_ozf->open()) {
+			_errorString = QString("%1: Error loading OZF file").arg(_map.path);
 			return false;
 		}
 		_scale = _ozf->scale(_zoom);
 	} else {
-		QImageReader img(_map.path);
-		_map.size = img.size();
-		if (!_map.size.isValid()) {
-			_errorString = QString("%1: Error reading map image")
-			  .arg(QFileInfo(_map.path).fileName());
+		QImageReader ir(_map.path);
+		if (!ir.canRead()) {
+			_errorString = QString("%1: Unsupported/invalid image file")
+			  .arg(_map.path);
 			return false;
 		}
+		_map.size = ir.size();
 	}
 
 	return true;
 }
 
-bool OfflineMap::setTileInfo(const QStringList &tiles, const QString &path)
+bool OziMap::setTileInfo(const QStringList &tiles, const QString &path)
 {
 	if (!_map.size.isValid()) {
 		_errorString = "Missing total image size (IWH)";
@@ -94,122 +191,7 @@ bool OfflineMap::setTileInfo(const QStringList &tiles, const QString &path)
 	return false;
 }
 
-OfflineMap::OfflineMap(const QString &fileName, QObject *parent)
-  : Map(parent), _img(0), _tar(0), _ozf(0), _zoom(0), _ratio(1.0), _valid(false)
-{
-	QFileInfo fi(fileName);
-	QString suffix = fi.suffix().toLower();
-
-
-	if (suffix == "tar") {
-		_tar = new Tar(fileName);
-		if (!_tar->open()) {
-			_errorString = "Error reading tar file";
-			return;
-		}
-
-		QString mapFileName = fi.completeBaseName() + ".map";
-		QByteArray ba = _tar->file(mapFileName);
-		if (ba.isNull()) {
-			_errorString = "Map file not found";
-			return;
-		}
-		QBuffer buffer(&ba);
-		MapFile mf(buffer);
-		if (!mf.isValid()) {
-			_errorString = mf.errorString();
-			return;
-		} else {
-			_name = mf.name();
-			_map.size = mf.size();
-			_map.path = mf.image();
-			_projection = mf.projection();
-			_transform = mf.transform();
-		}
-	} else if (suffix == "map") {
-		QFile file(fileName);
-		MapFile mf(file);
-		if (!mf.isValid()) {
-			_errorString = mf.errorString();
-			return;
-		} else {
-			_name = mf.name();
-			_map.size = mf.size();
-			_map.path = mf.image();
-			_projection = mf.projection();
-			_transform = mf.transform();
-		}
-	} else if (suffix == "tif" || suffix == "tiff") {
-		GeoTIFF gt(fileName);
-		if (!gt.isValid()) {
-			_errorString = gt.errorString();
-			return;
-		} else {
-			_name = fi.fileName();
-			_map.path = fileName;
-			_projection = gt.projection();
-			_transform = gt.transform();
-		}
-	} else {
-		_errorString = "Not a map file";
-		return;
-	}
-
-	if (_tar) {
-		if (!setTileInfo(_tar->files()))
-			return;
-	} else {
-		QDir set(fi.absolutePath() + "/" + "set");
-		if (set.exists()) {
-			if (!setTileInfo(set.entryList(), set.absolutePath()))
-				return;
-		} else {
-			if (!setImageInfo(fi.absolutePath()))
-				return;
-		}
-	}
-
-	_valid = true;
-}
-
-OfflineMap::OfflineMap(const QString &fileName, Tar &tar, QObject *parent)
-  : Map(parent), _img(0), _tar(0), _ozf(0), _zoom(0), _ratio(1.0), _valid(false)
-{
-	QFileInfo fi(fileName);
-	QFileInfo map(fi.absolutePath());
-	QFileInfo layer(map.absolutePath());
-	QString mapFile = layer.fileName() + "/" + map.fileName() + "/"
-	  + fi.fileName();
-
-	QByteArray ba = tar.file(mapFile);
-	if (ba.isNull()) {
-		_errorString = "Map file not found";
-		return;
-	}
-	QBuffer buffer(&ba);
-	MapFile mf(buffer);
-	if (!mf.isValid()) {
-		_errorString = mf.errorString();
-		return;
-	}
-
-	_name = mf.name();
-	_map.size = mf.size();
-	_projection = mf.projection();
-	_transform = mf.transform();
-	_tar = new Tar(fi.absolutePath() + "/" + fi.completeBaseName() + ".tar");
-
-	_valid = true;
-}
-
-OfflineMap::~OfflineMap()
-{
-	delete _img;
-	delete _tar;
-	delete _ozf;
-}
-
-void OfflineMap::load()
+void OziMap::load()
 {
 	if (_tar && !_tar->isOpen()) {
 		if (!_tar->open()) {
@@ -223,25 +205,17 @@ void OfflineMap::load()
 		return;
 	}
 
-	if (!_ozf && !_img && _map.isValid()) {
-		_img = new QImage(_map.path);
-		if (!_img || _img->isNull()) {
-			qWarning("%s: error loading map image", qPrintable(_map.path));
-			return;
-		}
-#ifdef ENABLE_HIDPI
-		_img->setDevicePixelRatio(_ratio);
-#endif // ENABLE_HIDPI
-	}
+	if (!_tile.isValid() && !_ozf && !_img)
+		_img = new Image(_map.path);
 }
 
-void OfflineMap::unload()
+void OziMap::unload()
 {
 	delete _img;
 	_img = 0;
 }
 
-void OfflineMap::drawTiled(QPainter *painter, const QRectF &rect) const
+void OziMap::drawTiled(QPainter *painter, const QRectF &rect) const
 {
 	QSizeF ts(_tile.size.width() / _ratio, _tile.size.height() / _ratio);
 	QPointF tl(floor(rect.left() / ts.width()) * ts.width(),
@@ -282,7 +256,7 @@ void OfflineMap::drawTiled(QPainter *painter, const QRectF &rect) const
 	}
 }
 
-void OfflineMap::drawOZF(QPainter *painter, const QRectF &rect) const
+void OziMap::drawOZF(QPainter *painter, const QRectF &rect) const
 {
 	QSizeF ts(_ozf->tileSize().width() / _ratio, _ozf->tileSize().height()
 	  / _ratio);
@@ -317,25 +291,19 @@ void OfflineMap::drawOZF(QPainter *painter, const QRectF &rect) const
 	}
 }
 
-void OfflineMap::drawImage(QPainter *painter, const QRectF &rect) const
+void OziMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
-	painter->drawImage(rect.topLeft(), *_img, QRectF(rect.topLeft() * _ratio,
-	  rect.size() * _ratio));
-}
-
-void OfflineMap::draw(QPainter *painter, const QRectF &rect, bool block)
-{
-	Q_UNUSED(block);
+	Q_UNUSED(flags);
 
 	if (_ozf)
 		drawOZF(painter, rect);
+	else if (_img)
+		_img->draw(painter, rect, flags);
 	else if (_tile.isValid())
 		drawTiled(painter, rect);
-	else if (_img && !_img->isNull())
-		drawImage(painter, rect);
 }
 
-QPointF OfflineMap::ll2xy(const Coordinates &c)
+QPointF OziMap::ll2xy(const Coordinates &c)
 {
 	QPointF p(_transform.proj2img(_projection.ll2xy(c)));
 	return _ozf
@@ -343,7 +311,7 @@ QPointF OfflineMap::ll2xy(const Coordinates &c)
 	  : p / _ratio;
 }
 
-Coordinates OfflineMap::xy2ll(const QPointF &p)
+Coordinates OziMap::xy2ll(const QPointF &p)
 {
 	return _ozf
 	  ? _projection.xy2ll(_transform.img2proj(QPointF(p.x() / _scale.x(),
@@ -351,14 +319,14 @@ Coordinates OfflineMap::xy2ll(const QPointF &p)
 	  : _projection.xy2ll(_transform.img2proj(p * _ratio));
 }
 
-QRectF OfflineMap::bounds()
+QRectF OziMap::bounds()
 {
 	return _ozf
 	  ? QRectF(QPointF(0, 0), _ozf->size(_zoom) / _ratio)
 	  : QRectF(QPointF(0, 0), _map.size / _ratio);
 }
 
-int OfflineMap::zoomFit(const QSize &size, const RectC &rect)
+int OziMap::zoomFit(const QSize &size, const RectC &rect)
 {
 	if (!_ozf)
 		return _zoom;
@@ -381,7 +349,7 @@ int OfflineMap::zoomFit(const QSize &size, const RectC &rect)
 	return _zoom;
 }
 
-int OfflineMap::zoomIn()
+int OziMap::zoomIn()
 {
 	if (_ozf)
 		rescale(qMax(_zoom - 1, 0));
@@ -389,7 +357,7 @@ int OfflineMap::zoomIn()
 	return _zoom;
 }
 
-int OfflineMap::zoomOut()
+int OziMap::zoomOut()
 {
 	if (_ozf)
 		rescale(qMin(_zoom + 1, _ozf->zooms() - 1));
@@ -397,8 +365,15 @@ int OfflineMap::zoomOut()
 	return _zoom;
 }
 
-void OfflineMap::rescale(int zoom)
+void OziMap::rescale(int zoom)
 {
 	_zoom = zoom;
 	_scale = _ozf->scale(zoom);
 }
+
+void OziMap::setDevicePixelRatio(qreal ratio)
+{
+	_ratio = ratio;
+	if (_img)
+		_img->setDevicePixelRatio(_ratio);
+}

src/map/ozimap.h

@@ -1,5 +1,5 @@
-#ifndef OFFLINEMAP_H
-#define OFFLINEMAP_H
+#ifndef OZIMAP_H
+#define OZIMAP_H
 
 #include "transform.h"
 #include "projection.h"
@@ -7,16 +7,16 @@
 
 class Tar;
 class OZF;
-class QImage;
+class Image;
 
-class OfflineMap : public Map
+class OziMap : public Map
 {
 	Q_OBJECT
 
 public:
-	OfflineMap(const QString &fileName, QObject *parent = 0);
-	OfflineMap(const QString &fileName, Tar &tar, QObject *parent = 0);
-	~OfflineMap();
+	OziMap(const QString &fileName, QObject *parent = 0);
+	OziMap(const QString &fileName, Tar &tar, QObject *parent = 0);
+	~OziMap();
 
 	QString name() const {return _name;}
 
@@ -31,9 +31,9 @@ public:
 	QPointF ll2xy(const Coordinates &c);
 	Coordinates xy2ll(const QPointF &p);
 
-	void draw(QPainter *painter, const QRectF &rect, bool block);
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
-	void setDevicePixelRatio(qreal ratio) {_ratio = ratio;}
+	void setDevicePixelRatio(qreal ratio);
 	void load();
 	void unload();
 
@@ -60,14 +60,14 @@ private:
 
 	void drawTiled(QPainter *painter, const QRectF &rect) const;
 	void drawOZF(QPainter *painter, const QRectF &rect) const;
-	void drawImage(QPainter *painter, const QRectF &rect) const;
+	void drawImage(QPainter *painter, const QRectF &rect, Flags flags) const;
 
 	void rescale(int zoom);
 
 	QString _name;
 	Projection _projection;
 	Transform _transform;
-	QImage *_img;
+	Image *_img;
 	Tar *_tar;
 	OZF *_ozf;
 	ImageInfo _map, _tile;
@@ -79,4 +79,4 @@ private:
 	QString _errorString;
 };
 
-#endif // OFFLINEMAP_H
+#endif // OZIMAP_H

src/map/tileloader.cpp

@@ -26,13 +26,16 @@ void TileLoader::loadTilesAsync(QList<Tile> &list)
 
 	for (int i = 0; i < list.size(); i++) {
 		Tile &t = list[i];
-		QString file = tileFile(t);
+		QString file(tileFile(t));
 		QFileInfo fi(file);
+		QUrl url(tileUrl(t));
 
-		if (!fi.exists())
-			dl.append(Download(tileUrl(t), file));
-		else
+		if (url.isLocalFile())
+			loadTileFile(t, url.toLocalFile());
+		else if (fi.exists())
 			loadTileFile(t, file);
+		else
+			dl.append(Download(tileUrl(t), file));
 	}
 
 	if (!dl.empty())
@@ -45,13 +48,16 @@ void TileLoader::loadTilesSync(QList<Tile> &list)
 
 	for (int i = 0; i < list.size(); i++) {
 		Tile &t = list[i];
-		QString file = tileFile(t);
+		QString file(tileFile(t));
 		QFileInfo fi(file);
+		QUrl url(tileUrl(t));
 
-		if (!fi.exists())
-			dl.append(Download(tileUrl(t), file));
-		else
+		if (url.isLocalFile())
+			loadTileFile(t, url.toLocalFile());
+		else if (fi.exists())
 			loadTileFile(t, file);
+		else
+			dl.append(Download(tileUrl(t), file));
 	}
 
 	if (dl.empty())
@@ -84,7 +90,7 @@ void TileLoader::clearCache()
 	_downloader->clearErrors();
 }
 
-QString TileLoader::tileUrl(const Tile &tile) const
+QUrl TileLoader::tileUrl(const Tile &tile) const
 {
 	QString url(_url);
 
@@ -101,7 +107,7 @@ QString TileLoader::tileUrl(const Tile &tile) const
 		url.replace("$y", QString::number(tile.xy().y()));
 	}
 
-	return url;
+	return QUrl(url);
 }
 
 QString TileLoader::tileFile(const Tile &tile) const

src/map/tileloader.h

@@ -26,7 +26,7 @@ signals:
 	void finished();
 
 private:
-	QString tileUrl(const Tile &tile) const;
+	QUrl tileUrl(const Tile &tile) const;
 	QString tileFile(const Tile &tile) const;
 
 	Downloader *_downloader;

src/map/wms.cpp

@@ -274,8 +274,8 @@ bool WMS::getCapabilities(const QString &url, const QString &file,
 
 WMS::WMS(const QString &file, const WMS::Setup &setup) : _valid(false)
 {
-	QString capaUrl = QString("%1?service=WMS&request=GetCapabilities")
-	  .arg(setup.url());
+	QString capaUrl = QString("%1%2service=WMS&request=GetCapabilities")
+	  .arg(setup.url(), setup.url().contains('?') ? "&" : "?");
 
 	if (!QFileInfo(file).exists())
 		if (!getCapabilities(capaUrl, file, setup.authorization()))

src/map/wmsmap.cpp

@@ -20,11 +20,11 @@ QString WMSMap::tileUrl(const QString &version) const
 {
 	QString url;
 
-	url = QString("%1?version=%2&request=GetMap&bbox=$bbox"
-	  "&width=%3&height=%4&layers=%5&styles=%6&format=%7&transparent=true")
-	  .arg(_setup.url(), version, QString::number(TILE_SIZE),
-	  QString::number(TILE_SIZE), _setup.layer(), _setup.style(),
-	  _setup.format());
+	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(),
+	  _setup.style(), _setup.format());
 
 	if (version >= "1.3.0")
 		url.append(QString("&CRS=%1").arg(_setup.crs()));
@@ -192,7 +192,7 @@ qreal WMSMap::tileSize() const
 	return (TILE_SIZE / _ratio);
 }
 
-void WMSMap::draw(QPainter *painter, const QRectF &rect, bool block)
+void WMSMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
 	QPoint tl = QPoint((int)floor(rect.left() / tileSize()),
 	  (int)floor(rect.top() / tileSize()));
@@ -214,7 +214,7 @@ void WMSMap::draw(QPainter *painter, const QRectF &rect, bool block)
 		}
 	}
 
-	if (block)
+	if (flags & Map::Block)
 		_tileLoader->loadTilesSync(tiles);
 	else
 		_tileLoader->loadTilesAsync(tiles);

src/map/wmsmap.h

@@ -29,7 +29,7 @@ public:
 	QPointF ll2xy(const Coordinates &c);
 	Coordinates xy2ll(const QPointF &p);
 
-	void draw(QPainter *painter, const QRectF &rect, bool block);
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
 	void setDevicePixelRatio(qreal ratio) {_ratio = ratio;}
 	void clearCache();

src/map/wmts.cpp

@@ -277,7 +277,7 @@ bool WMTS::parseCapabilities(const QString &path, const Setup &setup)
 	return true;
 }
 
-bool WMTS::getCapabilities(const QString &url, const QString &file,
+bool WMTS::downloadCapabilities(const QString &url, const QString &file,
   const Authorization &authorization)
 {
 	Downloader d;
@@ -300,21 +300,22 @@ bool WMTS::getCapabilities(const QString &url, const QString &file,
 
 WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
 {
-	QString capaUrl = setup.rest() ? setup.url() :
-	  QString("%1?service=WMTS&Version=1.0.0&request=GetCapabilities")
-	  .arg(setup.url());
+	QUrl url(setup.rest() ? setup.url() : QString(
+	  "%1%2service=WMTS&Version=1.0.0&request=GetCapabilities").arg(setup.url(),
+	  setup.url().contains('?') ? "&" : "?"));
 
-	if (!QFileInfo(file).exists())
-		if (!getCapabilities(capaUrl, file, setup.authorization()))
+	if (!url.isLocalFile() && !QFileInfo(file).exists())
+		if (!downloadCapabilities(url.toString(), file, setup.authorization()))
 			return;
-	if (!parseCapabilities(file, setup))
+	if (!parseCapabilities(url.isLocalFile() ? url.toLocalFile() : file, setup))
 		return;
 
 	QString style = setup.style().isEmpty() ? "default" : setup.style();
 	if (!setup.rest()) {
-		_tileUrl = QString("%1?service=WMTS&Version=1.0.0&request=GetTile"
-		  "&Format=%2&Layer=%3&Style=%4&TileMatrixSet=%5&TileMatrix=$z"
-		  "&TileRow=$y&TileCol=$x").arg(setup.url(), setup.format(),
+		_tileUrl = QString("%1%2service=WMTS&Version=1.0.0&request=GetTile"
+		  "&Format=%3&Layer=%4&Style=%5&TileMatrixSet=%6&TileMatrix=$z"
+		  "&TileRow=$y&TileCol=$x").arg(setup.url(),
+		  setup.url().contains('?') ? "&" : "?" , setup.format(),
 		  setup.layer(), style, setup.set());
 		for (int i = 0; i < setup.dimensions().size(); i++) {
 			const QPair<QString, QString> &dim = setup.dimensions().at(i);

src/map/wmts.h

@@ -139,7 +139,7 @@ private:
 	void contents(QXmlStreamReader &reader, CTX &ctx);
 	void capabilities(QXmlStreamReader &reader, CTX &ctx);
 	bool parseCapabilities(const QString &path, const Setup &setup);
-	bool getCapabilities(const QString &url, const QString &file,
+	bool downloadCapabilities(const QString &url, const QString &file,
 	  const Authorization &authorization);
 
 	QSet<TileMatrix> _matrixes;

src/map/wmtsmap.cpp

@@ -169,7 +169,7 @@ QSizeF WMTSMap::tileSize(const WMTS::Zoom &zoom) const
 	  zoom.tile().height() / coordinatesRatio());
 }
 
-void WMTSMap::draw(QPainter *painter, const QRectF &rect, bool block)
+void WMTSMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 {
 	const WMTS::Zoom &z = _zooms.at(_zoom);
 	QSizeF ts(tileSize(z));
@@ -184,7 +184,7 @@ void WMTSMap::draw(QPainter *painter, const QRectF &rect, bool block)
 		for (int j = tl.y(); j < br.y(); j++)
 			tiles.append(Tile(QPoint(i, j), z.id()));
 
-	if (block)
+	if (flags & Map::Block)
 		_tileLoader->loadTilesSync(tiles);
 	else
 		_tileLoader->loadTilesAsync(tiles);

src/map/wmtsmap.h

@@ -29,7 +29,7 @@ public:
 	QPointF ll2xy(const Coordinates &c);
 	Coordinates xy2ll(const QPointF &p);
 
-	void draw(QPainter *painter, const QRectF &rect, bool block);
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
 	void setDevicePixelRatio(qreal ratio) {_deviceRatio = ratio;}
 	void clearCache();