Version++

(we do not reload the map parameters any more)

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.20.{build}
+version: 7.27.{build}
 
 configuration:
   - Release
@@ -17,7 +17,7 @@ environment:
     LIBSSL: libcrypto-1_1.dll
   - QTDIR: C:\Qt\5.13\msvc2017_64
     NSI: gpxsee64.nsi
-    VCVARS: vcvars64.bat"
+    VCVARS: vcvars64.bat
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
     LIBCRYPTO: libssl-1_1-x64.dll
     LIBSSL: libcrypto-1_1-x64.dll    

README.md

@@ -2,9 +2,9 @@
 GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.
 
 ## Features
-* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
+* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
 * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
-* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG & JNX maps, TwoNav RMaps, GeoTIFF images).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.20
+VERSION = 7.27
 
 QT += core \
     gui \
@@ -20,6 +20,7 @@ equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
     src/GUI/graphicsscene.h \
+    src/GUI/mapaction.h \
     src/GUI/popup.h \
     src/common/garmin.h \
     src/common/staticassert.h \
@@ -91,8 +92,10 @@ HEADERS += src/common/config.h \
     src/map/IMG/bitmapline.h \
     src/map/IMG/bitstream.h \
     src/map/IMG/deltastream.h \
+    src/map/IMG/gmap.h \
     src/map/IMG/huffmanstream.h \
     src/map/IMG/huffmantable.h \
+    src/map/IMG/mapdata.h \
     src/map/IMG/textpathitem.h \
     src/map/IMG/textpointitem.h \
     src/map/projection.h \
@@ -246,11 +249,14 @@ SOURCES += src/main.cpp \
     src/GUI/gearratiographitem.cpp \
     src/GUI/mapview.cpp \
     src/GUI/areaitem.cpp \
+    src/data/waypoint.cpp \
     src/map/IMG/bitmapline.cpp \
     src/map/IMG/bitstream.cpp \
     src/map/IMG/deltastream.cpp \
+    src/map/IMG/gmap.cpp \
     src/map/IMG/huffmanstream.cpp \
     src/map/IMG/huffmantable.cpp \
+    src/map/IMG/mapdata.cpp \
     src/map/IMG/textpathitem.cpp \
     src/map/IMG/textpointitem.cpp \
     src/map/maplist.cpp \
@@ -359,7 +365,8 @@ TRANSLATIONS = lang/gpxsee_en.ts \
     lang/gpxsee_tr.ts \
     lang/gpxsee_es.ts \
     lang/gpxsee_pt_BR.ts \
-    lang/gpxsee_uk.ts
+    lang/gpxsee_uk.ts \
+    lang/gpxsee_hu.ts
 
 macx {
     ICON = icons/gpxsee.icns
@@ -378,7 +385,8 @@ macx {
         lang/gpxsee_tr.qm \
         lang/gpxsee_es.qm \
         lang/gpxsee_pt_BR.qm \
-        lang/gpxsee_uk.qm
+        lang/gpxsee_uk.qm \
+        lang/gpxsee_hu.qm
     csv.path = Contents/Resources
     csv.files = pkg/csv
     maps.path = Contents/Resources

pkg/gpxsee.desktop

@@ -4,6 +4,7 @@ Comment=GPS log file viewer and analyzer
 Comment[cz]=Prohlížeč a analyzátor GPS logů
 Comment[fi]=Ohjelma GPS-lokien katseluun ja analysointiin
 Comment[fr]=Visualisation et analyse de fichier GPS
+Comment[nb]=GPS-loggfilleser og analysator
 Comment[pl]=Przeglądarka i analizator plików dziennika GPS
 Comment[ru]=Программа для просмотра и анализа GPS логов
 Comment[sv]=GPS-loggfilsläsare och analysator
@@ -14,4 +15,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt;
-MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;
+MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/sml+xml;

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.20"
+!define VERSION "7.27"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -176,6 +176,7 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Hungarian" "hu"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -251,4 +252,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

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.20"
+!define VERSION "7.27"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -183,6 +183,7 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Hungarian" "hu"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -259,4 +260,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/maps/4UMaps.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>4UMaps</name>
 	<url>https://tileserver.4umaps.com/$z/$x/$y.png</url>
 	<zoom min="2" max="15"/>

pkg/maps/Antarctica.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3" type="WMTS">
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
 	<name>Antarctica</name>
 	<url type="REST">https://gis.ngdc.noaa.gov/arcgis/rest/services/antarctic/antarctic_basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url>
 	<copyright>NOAA National Centers for Environmental Information (NCEI); International Bathymetric Chart of the Southern Ocean (IBCSO); General Bathymetric Chart of the Oceans (GEBCO); Natural Earth</copyright>

pkg/maps/OpenStreetMap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Open Street Map</name>
 	<url>https://tile.openstreetmap.org/$z/$x/$y.png</url>
 	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © OpenStreetMap (CC-BY-SA)</copyright>

pkg/maps/OpenTopoMap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Open Topo Map</name>
 	<url>https://a.tile.opentopomap.org/$z/$x/$y.png</url>
 	<zoom max="17"/>

pkg/maps/USGS-imagery.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Imagery</name>
 	<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>

pkg/maps/USGS-topo.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Topo</name>
 	<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>

src/GUI/cadencegraphitem.cpp

@@ -5,7 +5,7 @@
 
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
   int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 }
 

src/GUI/elevationgraph.cpp

@@ -65,35 +65,38 @@ void ElevationGraph::setInfo()
 	}
 }
 
-GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
+GraphItem *ElevationGraph::loadGraph(const Graph &graph, PathType type,
+  const QColor &color, bool primary)
 {
-	if (!graph.isValid()) {
-		_palette.nextColor();
+	if (!graph.isValid())
 		return 0;
-	}
 
 	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
-	  _palette.nextColor());
+	  color, primary ? Qt::SolidLine : Qt::DashLine);
 	gi->setUnits(_units);
 
-	if (type == Track) {
+	if (type == TrackPath) {
 		_tracks.append(gi);
 		if (_showTracks)
 			addGraph(gi);
 
-		_trackAscent += gi->ascent();
-		_trackDescent += gi->descent();
-		_trackMax = nMax(_trackMax, gi->max());
-		_trackMin = nMin(_trackMin, gi->min());
+		if (primary) {
+			_trackAscent += gi->ascent();
+			_trackDescent += gi->descent();
+			_trackMax = nMax(_trackMax, gi->max());
+			_trackMin = nMin(_trackMin, gi->min());
+		}
 	} else {
 		_routes.append(gi);
 		if (_showRoutes)
 			addGraph(gi);
 
-		_routeAscent += gi->ascent();
-		_routeDescent += gi->descent();
-		_routeMax = nMax(_routeMax, gi->max());
-		_routeMin = nMin(_routeMin, gi->min());
+		if (primary) {
+			_routeAscent += gi->ascent();
+			_routeDescent += gi->descent();
+			_routeMax = nMax(_routeMax, gi->max());
+			_routeMin = nMin(_routeMin, gi->min());
+		}
 	}
 
 	return gi;
@@ -102,11 +105,32 @@ GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
 QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 {
 	QList<GraphItem*> graphs;
+	GraphItem *primary, *secondary;
 
-	for (int i = 0; i < data.tracks().count(); i++)
-		graphs.append(loadGraph(data.tracks().at(i).elevation(), Track));
-	for (int i = 0; i < data.routes().count(); i++)
-		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
+	for (int i = 0; i < data.tracks().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.tracks().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), TrackPath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), TrackPath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
+	for (int i = 0; i < data.routes().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.routes().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), RoutePath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), RoutePath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
 	for (int i = 0; i < data.areas().count(); i++)
 		_palette.nextColor();
 

src/GUI/elevationgraph.h

@@ -21,7 +21,7 @@ public:
 	void showRoutes(bool show);
 
 private:
-	enum Type {Track, Route};
+	enum PathType {TrackPath, RoutePath};
 
 	qreal max() const;
 	qreal min() const;
@@ -31,7 +31,8 @@ private:
 	void setYUnits(Units units);
 	void setInfo();
 
-	GraphItem *loadGraph(const Graph &graph, Type type);
+	GraphItem *loadGraph(const Graph &graph, PathType type, const QColor &color,
+	  bool primary);
 	void showItems(const QList<ElevationGraphItem *> &list, bool show);
 
 	qreal _trackAscent, _trackDescent;

src/GUI/elevationgraphitem.cpp

@@ -4,8 +4,8 @@
 
 
 ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
-  int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  int width, const QColor &color, Qt::PenStyle style, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, style, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();
@@ -42,5 +42,6 @@ QString ElevationGraphItem::info() const
 	tt.insert(tr("Minimum"), l.toString(min() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
 
+
 	return tt.toString();
 }

src/GUI/elevationgraphitem.h

@@ -8,8 +8,10 @@ class ElevationGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
+	enum DataType {GPS, DEM};
+
 	ElevationGraphItem(const Graph &graph, GraphType type, int width,
-	  const QColor &color, QGraphicsItem *parent = 0);
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 
 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}

src/GUI/gearratiographitem.cpp

@@ -6,7 +6,7 @@
 
 GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
   int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 	for (int i = 0; i < graph.size(); i++) {
 		const GraphSegment &segment = graph.at(i);

src/GUI/graphitem.cpp

@@ -5,13 +5,13 @@
 
 
 GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
-  const QColor &color, QGraphicsItem *parent)
-  : GraphicsItem(parent), _graph(graph), _type(type)
+  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent)
+  : GraphicsItem(parent), _graph(graph), _type(type), _secondaryGraph(0)
 {
 	Q_ASSERT(_graph.isValid());
 
 	_units = Metric;
-	_pen = QPen(color, width);
+	_pen = QPen(color, width, style);
 	_sx = 0; _sy = 0;
 	_time = _graph.hasTime();
 	setZValue(2.0);

src/GUI/graphitem.h

@@ -12,8 +12,8 @@ class GraphItem : public QObject, public GraphicsItem
 	Q_OBJECT
 
 public:
-	GraphItem(const Graph &graph, GraphType type, int width, const QColor &color,
-	  QGraphicsItem *parent = 0);
+	GraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
 	virtual QString info() const = 0;
@@ -35,6 +35,9 @@ public:
 	void setWidth(int width);
 	void setUnits(Units units) {_units = units;}
 
+	GraphItem *secondaryGraph() const {return _secondaryGraph;}
+	void setSecondaryGraph(GraphItem *graph) {_secondaryGraph = graph;}
+
 	qreal yAtX(qreal x);
 	qreal distanceAtTime(qreal time);
 
@@ -69,6 +72,8 @@ private:
 	qreal _sx, _sy;
 	QPen _pen;
 	bool _time;
+
+	GraphItem *_secondaryGraph;
 };
 
 #endif // GRAPHITEM_H

src/GUI/graphview.cpp

@@ -274,8 +274,8 @@ void GraphView::redraw(const QSizeF &size)
 	rx = RangeF(bounds().left() * _xScale, bounds().right() * _xScale);
 	ry = RangeF(bounds().top() * _yScale + _yOffset, bounds().bottom() * _yScale
 	  + _yOffset);
-	if (ry.size() < _minYRange)
-		ry.resize(_minYRange);
+	if (ry.size() < _minYRange * _yScale)
+		ry.resize(_minYRange * _yScale);
 
 	_xAxis->setRange(rx);
 	_yAxis->setRange(ry);
@@ -419,14 +419,16 @@ void GraphView::updateSliderInfo()
 {
 	QLocale l(QLocale::system());
 	qreal r = 0, y = 0;
+	GraphItem *cardinal = (_graphs.count() == 1 || (_graphs.count() == 2
+	  && _graphs.first()->secondaryGraph())) ? _graphs.first() : 0;
 
-	if (_graphs.count() == 1) {
-		QRectF br(_graphs.first()->bounds());
+	if (cardinal) {
+		QRectF br(_bounds);
 		if (br.height() < _minYRange)
 			br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
 			  _minYRange/2 - br.height()/2);
 
-		y = _graphs.first()->yAtX(_sliderPos);
+		y = cardinal->yAtX(_sliderPos);
 		r = (y - br.bottom()) / br.height();
 	}
 
@@ -436,11 +438,17 @@ void GraphView::updateSliderInfo()
 
 	_sliderInfo->setSide(s);
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
-	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
+	QString xText(_graphType == Time ? Format::timeSpan(_sliderPos,
 	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
-	  + UNIT_SPACE + _xUnits, (_graphs.count() > 1) ? QString()
-	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
-	  + _yUnits);
+	  + UNIT_SPACE + _xUnits);
+	QString yText((!cardinal) ? QString() : l.toString(-y * _yScale + _yOffset,
+	  'f', _precision) + UNIT_SPACE + _yUnits);
+	if (cardinal && cardinal->secondaryGraph()) {
+		qreal delta = y - cardinal->secondaryGraph()->yAtX(_sliderPos);
+		yText += " " + QChar(0x0394) + l.toString(-delta * _yScale + _yOffset,
+		  'f', _precision) + UNIT_SPACE + _yUnits;
+	}
+	_sliderInfo->setText(xText, yText);
 }
 
 void GraphView::emitSliderPositionChanged(const QPointF &pos)

src/GUI/gui.cpp

@@ -51,6 +51,7 @@
 #include "graphtab.h"
 #include "graphitem.h"
 #include "pathitem.h"
+#include "mapaction.h"
 #include "gui.h"
 
 
@@ -58,7 +59,6 @@
 
 GUI::GUI()
 {
-	loadMaps();
 	loadPOIs();
 
 	createMapView();
@@ -106,24 +106,13 @@ GUI::GUI()
 	updateStatusBarInfo();
 }
 
-void GUI::loadMaps()
-{
-	_ml = new MapList(this);
-	QString mapDir(ProgramPaths::mapDir());
-
-	if (!mapDir.isNull() && !_ml->loadDir(mapDir))
-		qWarning("%s", qPrintable(_ml->errorString()));
-
-	_map = new EmptyMap(this);
-}
-
 void GUI::loadPOIs()
 {
 	_poi = new POI(this);
-	QString poiDir(ProgramPaths::poiDir());
 
-	if (!poiDir.isNull() && !_poi->loadDir(poiDir))
-		qWarning("%s", qPrintable(_poi->errorString()));
+	QString poiDir(ProgramPaths::poiDir());
+	if (!poiDir.isNull())
+		_poi->loadDir(poiDir);
 }
 
 void GUI::createBrowser()
@@ -134,40 +123,56 @@ void GUI::createBrowser()
 
 void GUI::createMapActions()
 {
-	_mapsSignalMapper = new QSignalMapper(this);
 	_mapsActionGroup = new QActionGroup(this);
 	_mapsActionGroup->setExclusive(true);
 
-	for (int i = 0; i < _ml->maps().count(); i++)
-		createMapAction(_ml->maps().at(i));
+	QString mapDir(ProgramPaths::mapDir());
+	if (mapDir.isNull())
+		return;
 
-	connect(_mapsSignalMapper, SIGNAL(mapped(int)), this,
-	  SLOT(mapChanged(int)));
+	QString unused;
+	QList<Map*> maps(MapList::loadMaps(mapDir, unused));
+	for (int i = 0; i < maps.count(); i++) {
+		MapAction *a = createMapAction(maps.at(i));
+		connect(a, SIGNAL(loaded()), this, SLOT(mapInitialized()));
+	}
 }
 
-QAction *GUI::createMapAction(const Map *map)
+MapAction *GUI::createMapAction(Map *map)
 {
-	QAction *a = new QAction(map->name(), this);
+	MapAction *a = new MapAction(map);
 	a->setMenuRole(QAction::NoRole);
 	a->setCheckable(true);
 	a->setActionGroup(_mapsActionGroup);
-
-	_mapActions.append(a);
-	_mapsSignalMapper->setMapping(a, _mapActions.size() - 1);
-	connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
+	connect(a, SIGNAL(triggered()), this, SLOT(mapChanged()));
 
 	return a;
 }
 
+void GUI::mapInitialized()
+{
+	MapAction *action = static_cast<MapAction*>(QObject::sender());
+	Map *map = action->data().value<Map*>();
+
+	if (map->isValid()) {
+		if (!_mapsActionGroup->checkedAction())
+			action->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
+	} else {
+		qWarning("%s: %s", qPrintable(map->name()), qPrintable(map->errorString()));
+		action->deleteLater();
+	}
+}
+
 void GUI::createPOIFilesActions()
 {
 	_poiFilesSignalMapper = new QSignalMapper(this);
+	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
+	  SLOT(poiFileChecked(int)));
 
 	for (int i = 0; i < _poi->files().count(); i++)
 		createPOIFileAction(_poi->files().at(i));
-
-	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
-	  SLOT(poiFileChecked(int)));
 }
 
 QAction *GUI::createPOIFileAction(const QString &fileName)
@@ -281,8 +286,10 @@ void GUI::createActions()
 	createPOIFilesActions();
 
 	// Map actions
+	createMapActions();
 	_showMapAction = new QAction(QIcon(SHOW_MAP_ICON), tr("Show map"),
 	  this);
+	_showMapAction->setEnabled(false);
 	_showMapAction->setMenuRole(QAction::NoRole);
 	_showMapAction->setCheckable(true);
 	_showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
@@ -294,10 +301,10 @@ void GUI::createActions()
 	_loadMapAction->setMenuRole(QAction::NoRole);
 	connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
 	_clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
+	_clearMapCacheAction->setEnabled(false);
 	_clearMapCacheAction->setMenuRole(QAction::NoRole);
 	connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView,
 	  SLOT(clearMapCache()));
-	createMapActions();
 	_nextMapAction = new QAction(tr("Next map"), this);
 	_nextMapAction->setMenuRole(QAction::NoRole);
 	_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
@@ -308,10 +315,6 @@ void GUI::createActions()
 	_prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
 	connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap()));
 	addAction(_prevMapAction);
-	if (_ml->maps().isEmpty()) {
-		_showMapAction->setEnabled(false);
-		_clearMapCacheAction->setEnabled(false);
-	}
 	_showCoordinatesAction = new QAction(tr("Show cursor coordinates"), this);
 	_showCoordinatesAction->setMenuRole(QAction::NoRole);
 	_showCoordinatesAction->setCheckable(true);
@@ -506,7 +509,7 @@ void GUI::createMenus()
 #endif // Q_OS_MAC
 
 	_mapMenu = menuBar()->addMenu(tr("&Map"));
-	_mapMenu->addActions(_mapActions);
+	_mapMenu->addActions(_mapsActionGroup->actions());
 	_mapsEnd = _mapMenu->addSeparator();
 	_mapMenu->addAction(_loadMapAction);
 	_mapMenu->addAction(_clearMapCacheAction);
@@ -608,6 +611,7 @@ void GUI::createToolBars()
 
 void GUI::createMapView()
 {
+	_map = new EmptyMap(this);
 	_mapView = new MapView(_map, _poi, this);
 	_mapView->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
 	  QSizePolicy::Expanding));
@@ -905,9 +909,14 @@ void GUI::openOptions()
 		Track::action(options.option); \
 		reload = true; \
 	}
-#define SET_DATA_OPTION(option, action) \
+#define SET_ROUTE_OPTION(option, action) \
 	if (options.option != _options.option) { \
-		Data::action(options.option); \
+		Route::action(options.option); \
+		reload = true; \
+	}
+#define SET_WAYPOINT_OPTION(option, action) \
+	if (options.option != _options.option) { \
+		Waypoint::action(options.option); \
 		reload = true; \
 	}
 
@@ -953,13 +962,18 @@ void GUI::openOptions()
 	SET_TRACK_OPTION(pauseSpeed, setPauseSpeed);
 	SET_TRACK_OPTION(pauseInterval, setPauseInterval);
 	SET_TRACK_OPTION(useReportedSpeed, useReportedSpeed);
+	SET_TRACK_OPTION(dataUseDEM, useDEM);
+	SET_TRACK_OPTION(showSecondaryElevation, showSecondaryElevation);
+	SET_TRACK_OPTION(showSecondarySpeed, showSecondarySpeed);
 
-	SET_DATA_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(showSecondaryElevation, showSecondaryElevation);
+
+	SET_WAYPOINT_OPTION(dataUseDEM, useDEM);
+	SET_WAYPOINT_OPTION(showSecondaryElevation, showSecondaryElevation);
 
 	if (options.poiRadius != _options.poiRadius)
 		_poi->setRadius(options.poiRadius);
-	if (options.poiUseDEM != _options.poiUseDEM)
-		_poi->useDEM(options.poiUseDEM);
 
 	if (options.pixmapCache != _options.pixmapCache)
 		QPixmapCache::setCacheLimit(options.pixmapCache * 1024);
@@ -1322,22 +1336,49 @@ void GUI::loadMap()
 
 bool GUI::loadMap(const QString &fileName)
 {
+	// On OS X fileName may be a directory!
+
 	if (fileName.isEmpty())
 		return false;
 
-	if (_ml->loadFile(fileName)) {
-		QAction *a = createMapAction(_ml->maps().last());
+	QString error;
+	QList<Map*> maps = MapList::loadMaps(fileName, error);
+	if (maps.isEmpty()) {
+		error = tr("Error loading map:") + "\n\n"
+		  + fileName + "\n\n" + error;
+		QMessageBox::critical(this, APP_NAME, error);
+		return false;
+	}
+
+	for (int i = 0; i < maps.size(); i++) {
+		Map *map = maps.at(i);
+		MapAction *a = createMapAction(map);
 		_mapMenu->insertAction(_mapsEnd, a);
+		if (map->isReady()) {
+			a->trigger();
+			_showMapAction->setEnabled(true);
+			_clearMapCacheAction->setEnabled(true);
+		} else
+			connect(a, SIGNAL(loaded()), this, SLOT(mapLoaded()));
+	}
+
+	return true;
+}
+
+void GUI::mapLoaded()
+{
+	MapAction *action = static_cast<MapAction*>(QObject::sender());
+	Map *map = action->data().value<Map*>();
+
+	if (map->isValid()) {
+		action->trigger();
 		_showMapAction->setEnabled(true);
 		_clearMapCacheAction->setEnabled(true);
-		a->trigger();
-		return true;
 	} else {
 		QString error = tr("Error loading map:") + "\n\n"
-		  + fileName + "\n\n" + _ml->errorString();
+		  + map->name() + "\n\n" + map->errorString();
 		QMessageBox::critical(this, APP_NAME, error);
-
-		return false;
+		action->deleteLater();
 	}
 }
 
@@ -1379,31 +1420,42 @@ void GUI::updateWindowTitle()
 		setWindowTitle(APP_NAME);
 }
 
-void GUI::mapChanged(int index)
+void GUI::mapChanged()
 {
-	_map = _ml->maps().at(index);
+	_map = _mapsActionGroup->checkedAction()->data().value<Map*>();
 	_mapView->setMap(_map);
 }
 
 void GUI::nextMap()
 {
-	if (_ml->maps().count() < 2)
+	QAction *checked = _mapsActionGroup->checkedAction();
+	if (!checked)
 		return;
 
-	int next = (_ml->maps().indexOf(_map) + 1) % _ml->maps().count();
-	_mapActions.at(next)->setChecked(true);
-	mapChanged(next);
+	QList<QAction*> maps = _mapsActionGroup->actions();
+	for (int i = 1;	i < maps.size(); i++) {
+		int next = (maps.indexOf(checked) + i) % maps.count();
+		if (maps.at(next)->isEnabled()) {
+			maps.at(next)->trigger();
+			break;
+		}
+	}
 }
 
 void GUI::prevMap()
 {
-	if (_ml->maps().count() < 2)
+	QAction *checked = _mapsActionGroup->checkedAction();
+	if (!checked)
 		return;
 
-	int prev = (_ml->maps().indexOf(_map) + _ml->maps().count() - 1)
-	  % _ml->maps().count();
-	_mapActions.at(prev)->setChecked(true);
-	mapChanged(prev);
+	QList<QAction*> maps = _mapsActionGroup->actions();
+	for (int i = 1; i < maps.size(); i++) {
+		int prev = (maps.indexOf(checked) + maps.count() - i) % maps.count();
+		if (maps.at(prev)->isEnabled()) {
+			maps.at(prev)->trigger();
+			break;
+		}
+	}
 }
 
 void GUI::poiFileChecked(int index)
@@ -1809,10 +1861,14 @@ void GUI::writeSettings()
 		settings.setValue(USE_REPORTED_SPEED_SETTING, _options.useReportedSpeed);
 	if (_options.dataUseDEM != DATA_USE_DEM_DEFAULT)
 		settings.setValue(DATA_USE_DEM_SETTING, _options.dataUseDEM);
+	if (_options.showSecondaryElevation != SHOW_SECONDARY_ELEVATION_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_ELEVATION_SETTING,
+		  _options.showSecondaryElevation);
+	if (_options.showSecondarySpeed != SHOW_SECONDARY_SPEED_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_SPEED_SETTING,
+		  _options.showSecondarySpeed);
 	if (_options.poiRadius != POI_RADIUS_DEFAULT)
 		settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
-	if (_options.poiUseDEM != POI_USE_DEM_DEFAULT)
-		settings.setValue(POI_USE_DEM_SETTING, _options.poiUseDEM);
 	if (_options.useOpenGL != USE_OPENGL_DEFAULT)
 		settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
 #ifdef ENABLE_HTTP2
@@ -1896,9 +1952,11 @@ void GUI::readSettings()
 		_showMapAction->setChecked(true);
 	else
 		_mapView->showMap(false);
-	if (_ml->maps().count()) {
-		int index = mapIndex(settings.value(CURRENT_MAP_SETTING).toString());
-		_mapActions.at(index)->trigger();
+	QAction *ma = mapAction(settings.value(CURRENT_MAP_SETTING).toString());
+	if (ma) {
+		ma->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
 	}
 	if (settings.value(SHOW_COORDINATES_SETTING, SHOW_COORDINATES_DEFAULT)
 	  .toBool()) {
@@ -2075,14 +2133,18 @@ void GUI::readSettings()
 	  USE_REPORTED_SPEED_DEFAULT).toBool();
 	_options.dataUseDEM = settings.value(DATA_USE_DEM_SETTING,
 	  DATA_USE_DEM_DEFAULT).toBool();
+	_options.showSecondaryElevation = settings.value(
+	  SHOW_SECONDARY_ELEVATION_SETTING,
+	  SHOW_SECONDARY_ELEVATION_DEFAULT).toBool();
+	_options.showSecondarySpeed = settings.value(
+	  SHOW_SECONDARY_SPEED_SETTING,
+	  SHOW_SECONDARY_SPEED_DEFAULT).toBool();
 	_options.automaticPause = settings.value(AUTOMATIC_PAUSE_SETTING,
 	  AUTOMATIC_PAUSE_DEFAULT).toBool();
 	_options.pauseInterval = settings.value(PAUSE_INTERVAL_SETTING,
 	  PAUSE_INTERVAL_DEFAULT).toInt();
 	_options.poiRadius = settings.value(POI_RADIUS_SETTING, POI_RADIUS_DEFAULT)
 	  .toInt();
-	_options.poiUseDEM = settings.value(POI_USE_DEM_SETTING,
-	  POI_USE_DEM_DEFAULT).toBool();
 	_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
 	  .toBool();
 #ifdef ENABLE_HTTP2
@@ -2162,21 +2224,38 @@ void GUI::readSettings()
 	Track::setPauseSpeed(_options.pauseSpeed);
 	Track::setPauseInterval(_options.pauseInterval);
 	Track::useReportedSpeed(_options.useReportedSpeed);
-	Data::useDEM(_options.dataUseDEM);
+	Track::useDEM(_options.dataUseDEM);
+	Track::showSecondaryElevation(_options.showSecondaryElevation);
+	Track::showSecondarySpeed(_options.showSecondarySpeed);
+	Route::useDEM(_options.dataUseDEM);
+	Route::showSecondaryElevation(_options.showSecondaryElevation);
+	Waypoint::useDEM(_options.dataUseDEM);
+	Waypoint::showSecondaryElevation(_options.showSecondaryElevation);
 
 	_poi->setRadius(_options.poiRadius);
-	_poi->useDEM(_options.poiUseDEM);
 
 	QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);
 
 	settings.endGroup();
 }
 
-int GUI::mapIndex(const QString &name)
+QAction *GUI::mapAction(const QString &name)
 {
-	for (int i = 0; i < _ml->maps().count(); i++)
-		if (_ml->maps().at(i)->name() == name)
-			return i;
+	QList<QAction *> maps = _mapsActionGroup->actions();
+
+	// Last map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->name() == name && map->isReady())
+			return maps.at(i);
+	}
+
+	// Any usable map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->isReady())
+			return maps.at(i);
+	}
 
 	return 0;
 }

src/GUI/gui.h

@@ -26,9 +26,9 @@ class FileBrowser;
 class GraphTab;
 class MapView;
 class Map;
-class MapList;
 class POI;
 class QScreen;
+class MapAction;
 
 class GUI : public QMainWindow
 {
@@ -64,7 +64,7 @@ private slots:
 	void prevMap();
 	void openOptions();
 
-	void mapChanged(int);
+	void mapChanged();
 	void graphChanged(int);
 	void poiFileChecked(int);
 
@@ -88,16 +88,18 @@ private slots:
 	void screenChanged(QScreen *screen);
 	void logicalDotsPerInchChanged(qreal dpi);
 
+	void mapLoaded();
+	void mapInitialized();
+
 private:
 	typedef QPair<QDate, QDate> DateRange;
 
-	void loadMaps();
 	void loadPOIs();
 	void closeFiles();
 	void plot(QPrinter *printer);
 
 	QAction *createPOIFileAction(const QString &fileName);
-	QAction *createMapAction(const Map *map);
+	MapAction *createMapAction(Map *map);
 	void createPOIFilesActions();
 	void createMapActions();
 	void createActions();
@@ -127,7 +129,7 @@ private:
 	qreal distance() const;
 	qreal time() const;
 	qreal movingTime() const;
-	int mapIndex(const QString &name);
+	QAction *mapAction(const QString &name);
 	void readSettings();
 	void writeSettings();
 
@@ -196,11 +198,9 @@ private:
 	QAction *_showCoordinatesAction;
 	QAction *_openOptionsAction;
 	QAction *_mapsEnd;
-	QList<QAction*> _mapActions;
-	QList<QAction*> _poiFilesActions;
 
+	QList<QAction*> _poiFilesActions;
 	QSignalMapper *_poiFilesSignalMapper;
-	QSignalMapper *_mapsSignalMapper;
 
 	QLabel *_fileNameLabel;
 	QLabel *_distanceLabel;
@@ -212,7 +212,6 @@ private:
 	QList<GraphTab*> _tabs;
 
 	POI *_poi;
-	MapList *_ml;
 	Map *_map;
 
 	FileBrowser *_browser;

src/GUI/heartrategraphitem.cpp

@@ -5,7 +5,7 @@
 
 HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
   int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 }
 

src/GUI/mapaction.h

@@ -0,0 +1,32 @@
+#ifndef MAPACTION_H
+#define MAPACTION_H
+
+#include <QAction>
+#include "map/map.h"
+
+class MapAction : public QAction
+{
+	Q_OBJECT
+
+public:
+	MapAction(Map *map, QObject *parent = 0) : QAction(map->name(), parent)
+	{
+		map->setParent(this);
+		setData(QVariant::fromValue(map));
+		setEnabled(map->isValid());
+		connect(map, SIGNAL(mapLoaded()), this, SLOT(mapLoaded()));
+	}
+
+signals:
+	void loaded();
+
+private slots:
+	void mapLoaded()
+	{
+		Map *map = data().value<Map*>();
+		setEnabled(map->isValid());
+		emit loaded();
+	}
+};
+
+#endif // MAPACTION_H

src/GUI/mapview.cpp

@@ -2,7 +2,6 @@
 #include <QGraphicsScene>
 #include <QWheelEvent>
 #include <QApplication>
-#include <QPixmapCache>
 #include <QScrollBar>
 #include "data/poi.h"
 #include "data/data.h"
@@ -55,7 +54,7 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	_map = map;
 	_map->load();
 	_map->setProjection(_projection);
-	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));
 
 	_poi = poi;
 	connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
@@ -317,7 +316,7 @@ void MapView::setMap(Map *map)
 	RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
 
 	_map->unload();
-	disconnect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	disconnect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));
 
 	_map = map;
 	_map->load();
@@ -325,7 +324,7 @@ void MapView::setMap(Map *map)
 #ifdef ENABLE_HIDPI
 	_map->setDevicePixelRatio(_deviceRatio, _mapRatio);
 #endif // ENABLE_HIDPI
-	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));
 
 	digitalZoom(0);
 
@@ -351,7 +350,6 @@ void MapView::setMap(Map *map)
 	centerOn(nc);
 
 	reloadMap();
-	QPixmapCache::clear();
 }
 
 void MapView::setPOI(POI *poi)
@@ -453,10 +451,7 @@ void MapView::setCoordinatesFormat(CoordinatesFormat format)
 void MapView::clearMapCache()
 {
 	_map->clearCache();
-
-	fitMapZoom();
-	rescale();
-	centerOn(contentCenter());
+	reloadMap();
 }
 
 void MapView::digitalZoom(int zoom)
@@ -982,7 +977,6 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 
 	_deviceRatio = deviceRatio;
 	_mapRatio = mapRatio;
-	QPixmapCache::clear();
 
 	QRectF vr(mapToScene(viewport()->rect()).boundingRect()
 	  .intersected(_map->bounds()));

src/GUI/optionsdialog.cpp

@@ -12,6 +12,7 @@
 #include <QRadioButton>
 #include <QLabel>
 #include <QSysInfo>
+#include <QButtonGroup>
 #include "map/pcs.h"
 #include "icons.h"
 #include "colorbox.h"
@@ -406,6 +407,8 @@ QWidget *OptionsDialog::createDataPage()
 		_reportedSpeed->setChecked(true);
 	else
 		_computedSpeed->setChecked(true);
+	_showSecondarySpeed = new QCheckBox(tr("Show secondary speed"));
+	_showSecondarySpeed->setChecked(_options->showSecondarySpeed);
 
 	_dataGPSElevation = new QRadioButton(tr("GPS data"));
 	_dataDEMElevation = new QRadioButton(tr("DEM data"));
@@ -413,19 +416,28 @@ QWidget *OptionsDialog::createDataPage()
 		_dataDEMElevation->setChecked(true);
 	else
 		_dataGPSElevation->setChecked(true);
-
+	_showSecondaryElevation = new QCheckBox(tr("Show secondary elevation"));
+	_showSecondaryElevation->setChecked(_options->showSecondaryElevation);
 
 	QWidget *sourceTab = new QWidget();
 	QVBoxLayout *sourceTabLayout = new QVBoxLayout();
 
 #ifdef Q_OS_MAC
+	QButtonGroup *speedGroup = new QButtonGroup(this);
+	speedGroup->addButton(_computedSpeed);
+	speedGroup->addButton(_reportedSpeed);
 	QVBoxLayout *speedOptions = new QVBoxLayout();
 	speedOptions->addWidget(_computedSpeed);
 	speedOptions->addWidget(_reportedSpeed);
+	speedOptions->addWidget(_showSecondarySpeed);
 
+	QButtonGroup *elevationGroup = new QButtonGroup(this);
+	elevationGroup->addButton(_dataGPSElevation);
+	elevationGroup->addButton(_dataDEMElevation);
 	QVBoxLayout *elevationOptions = new QVBoxLayout();
 	elevationOptions->addWidget(_dataGPSElevation);
 	elevationOptions->addWidget(_dataDEMElevation);
+	elevationOptions->addWidget(_showSecondaryElevation);
 
 	QFormLayout *formLayout = new QFormLayout();
 	formLayout->addRow(tr("Speed:"), speedOptions);
@@ -438,12 +450,14 @@ QWidget *OptionsDialog::createDataPage()
 
 	speedLayout->addWidget(_computedSpeed);
 	speedLayout->addWidget(_reportedSpeed);
+	speedLayout->addWidget(_showSecondarySpeed);
 
 	QGroupBox *speedBox = new QGroupBox(tr("Speed"));
 	speedBox->setLayout(speedLayout);
 
 	elevationLayout->addWidget(_dataGPSElevation);
 	elevationLayout->addWidget(_dataDEMElevation);
+	elevationLayout->addWidget(_showSecondaryElevation);
 
 	QGroupBox *elevationBox = new QGroupBox(tr("Elevation"));
 	elevationBox->setLayout(elevationLayout);
@@ -465,13 +479,6 @@ QWidget *OptionsDialog::createDataPage()
 
 QWidget *OptionsDialog::createPOIPage()
 {
-	_poiGPSElevation = new QRadioButton(tr("GPS data"));
-	_poiDEMElevation = new QRadioButton(tr("DEM data"));
-	if (_options->poiUseDEM)
-		_poiDEMElevation->setChecked(true);
-	else
-		_poiGPSElevation->setChecked(true);
-
 	_poiRadius = new QDoubleSpinBox();
 	_poiRadius->setSingleStep(1);
 	_poiRadius->setDecimals(1);
@@ -486,13 +493,8 @@ QWidget *OptionsDialog::createPOIPage()
 		_poiRadius->setSuffix(UNIT_SPACE + tr("km"));
 	}
 
-	QVBoxLayout *elevationLayout = new QVBoxLayout();
-	elevationLayout->addWidget(_poiGPSElevation);
-	elevationLayout->addWidget(_poiDEMElevation);
-
 	QFormLayout *poiLayout = new QFormLayout();
 	poiLayout->addRow(tr("Radius:"), _poiRadius);
-	poiLayout->addRow(tr("Elevation:"), elevationLayout);
 
 	QWidget *poiTab = new QWidget();
 	poiTab->setLayout(poiLayout);
@@ -718,13 +720,14 @@ void OptionsDialog::accept()
 	_options->pauseInterval = _pauseInterval->value();
 	_options->useReportedSpeed = _reportedSpeed->isChecked();
 	_options->dataUseDEM = _dataDEMElevation->isChecked();
+	_options->showSecondaryElevation = _showSecondaryElevation->isChecked();
+	_options->showSecondarySpeed = _showSecondarySpeed->isChecked();
 
 	qreal poiRadius = (_options->units == Imperial)
 		? _poiRadius->value() * MIINM : (_options->units == Nautical)
 		? _poiRadius->value() * NMIINM : _poiRadius->value() * KMINM;
 	if (qAbs(poiRadius - _options->poiRadius) > 0.01)
 		_options->poiRadius = poiRadius;
-	_options->poiUseDEM = _poiDEMElevation->isChecked();
 
 	_options->useOpenGL = _useOpenGL->isChecked();
 #ifdef ENABLE_HTTP2

src/GUI/optionsdialog.h

@@ -54,9 +54,10 @@ struct Options {
 	int pauseInterval;
 	bool useReportedSpeed;
 	bool dataUseDEM;
+	bool showSecondaryElevation;
+	bool showSecondarySpeed;
 	// POI
 	int poiRadius;
-	bool poiUseDEM;
 	// System
 	bool useOpenGL;
 #ifdef ENABLE_HTTP2
@@ -142,10 +143,10 @@ private:
 	QRadioButton *_reportedSpeed;
 	QRadioButton *_dataGPSElevation;
 	QRadioButton *_dataDEMElevation;
+	QCheckBox *_showSecondaryElevation;
+	QCheckBox *_showSecondarySpeed;
 	// POI
 	QDoubleSpinBox *_poiRadius;
-	QRadioButton *_poiGPSElevation;
-	QRadioButton *_poiDEMElevation;
 	// System
 	QSpinBox *_pixmapCache;
 	QSpinBox *_connectionTimeout;

src/GUI/powergraphitem.cpp

@@ -5,7 +5,7 @@
 
 PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type, int width,
   const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 }
 

src/GUI/routeitem.cpp

@@ -15,6 +15,8 @@ QString RouteItem::info() const
 		tt.insert(tr("Name"), _name);
 	if (!_desc.isEmpty())
 		tt.insert(tr("Description"), _desc);
+	if (!_comment.isEmpty() && _comment != _desc)
+		tt.insert(tr("Comment"), _comment);
 	tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
 	  _units));
 	if (!_links.isEmpty()) {
@@ -43,6 +45,7 @@ RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
 
 	_name = route.name();
 	_desc = route.description();
+	_comment = route.comment();
 	_links = route.links();
 	_coordinatesFormat = DecimalDegrees;
 }

src/GUI/routeitem.h

@@ -29,6 +29,7 @@ public:
 private:
 	QString _name;
 	QString _desc;
+	QString _comment;
 	QVector<Link> _links;
 	CoordinatesFormat _coordinatesFormat;
 

src/GUI/settings.h

@@ -145,10 +145,12 @@
 #define USE_REPORTED_SPEED_DEFAULT        false
 #define DATA_USE_DEM_SETTING              "dataUseDEM"
 #define DATA_USE_DEM_DEFAULT              false
+#define SHOW_SECONDARY_ELEVATION_SETTING  "showSecondaryElevation"
+#define SHOW_SECONDARY_ELEVATION_DEFAULT  false
+#define SHOW_SECONDARY_SPEED_SETTING      "showSecondarySpeed"
+#define SHOW_SECONDARY_SPEED_DEFAULT      false
 #define POI_RADIUS_SETTING                "poiRadius"
 #define POI_RADIUS_DEFAULT                (int)(IMPERIAL_UNITS() ? MIINM : KMINM)
-#define POI_USE_DEM_SETTING               "poiUseDEM"
-#define POI_USE_DEM_DEFAULT               false
 #define USE_OPENGL_SETTING                "useOpenGL"
 #define USE_OPENGL_DEFAULT                false
 #define ENABLE_HTTP2_SETTING              "enableHTTP2"

src/GUI/speedgraph.cpp

@@ -40,31 +40,46 @@ void SpeedGraph::setInfo()
 		clearInfo();
 }
 
+GraphItem *SpeedGraph::loadGraph(const Graph &graph, const Track &track,
+  const QColor &color, bool primary)
+{
+	if (!graph.isValid())
+		return 0;
+
+	SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,
+	  color, primary ? Qt::SolidLine : Qt::DashLine, track.movingTime());
+	gi->setTimeType(_timeType);
+	gi->setUnits(_units);
+
+	_tracks.append(gi);
+	if (_showTracks)
+		addGraph(gi);
+
+	if (primary) {
+		_avg.append(QPointF(track.distance(), gi->avg()));
+		_mavg.append(QPointF(track.distance(), gi->mavg()));
+	}
+
+	return gi;
+}
+
 QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 {
 	QList<GraphItem*> graphs;
 
 	for (int i = 0; i < data.tracks().count(); i++) {
+		GraphItem *primary, *secondary;
+		QColor color(_palette.nextColor());
 		const Track &track = data.tracks().at(i);
-		const Graph &graph = track.speed();
+		const GraphPair &gp = track.speed();
 
-		if (!graph.isValid()) {
-			_palette.nextColor();
-			graphs.append(0);
-		} else {
-			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,
-			  _palette.nextColor(), track.movingTime());
-			gi->setTimeType(_timeType);
-			gi->setUnits(_units);
+		primary = loadGraph(gp.primary(), track, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), track, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
 
-			_tracks.append(gi);
-			if (_showTracks)
-				addGraph(gi);
-
-			_avg.append(QPointF(track.distance(), gi->avg()));
-			_mavg.append(QPointF(track.distance(), gi->mavg()));
-			graphs.append(gi);
-		}
+		graphs.append(primary);
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {

src/GUI/speedgraph.h

@@ -5,6 +5,7 @@
 #include "graphtab.h"
 
 class SpeedGraphItem;
+class Track;
 
 class SpeedGraph : public GraphTab
 {
@@ -22,6 +23,8 @@ public:
 	void showTracks(bool show);
 
 private:
+	GraphItem *loadGraph(const Graph &graph, const Track &track,
+	  const QColor &color, bool primary);
 	qreal avg() const;
 	qreal max() const {return bounds().bottom();}
 	void setYUnits();

src/GUI/speedgraphitem.cpp

@@ -5,8 +5,8 @@
 
 
 SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type, int width,
-  const QColor &color, qreal movingTime, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  const QColor &color, Qt::PenStyle style, qreal movingTime,
+  QGraphicsItem *parent) : GraphItem(graph, type, width, color, style, parent)
 {
 	_timeType = Total;
 

src/GUI/speedgraphitem.h

@@ -10,7 +10,8 @@ class SpeedGraphItem : public GraphItem
 
 public:
 	SpeedGraphItem(const Graph &graph, GraphType type, int width,
-	  const QColor &color, qreal movingTime, QGraphicsItem *parent = 0);
+	  const QColor &color, Qt::PenStyle style, qreal movingTime,
+	  QGraphicsItem *parent = 0);
 
 	qreal avg() const {return _avg;}
 	qreal mavg() const {return _mavg;}

src/GUI/temperaturegraphitem.cpp

@@ -5,7 +5,7 @@
 
 TemperatureGraphItem::TemperatureGraphItem(const Graph &graph, GraphType type,
   int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();

src/GUI/trackitem.cpp

@@ -13,6 +13,8 @@ QString TrackItem::info() const
 		tt.insert(tr("Name"), _name);
 	if (!_desc.isEmpty())
 		tt.insert(tr("Description"), _desc);
+	if (!_comment.isEmpty() && _comment != _desc)
+		tt.insert(tr("Comment"), _comment);
 	tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
 	  _units));
 	if  (_time > 0)
@@ -41,6 +43,7 @@ TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)
 {
 	_name = track.name();
 	_desc = track.description();
+	_comment = track.comment();
 	_links = track.links();
 	_date = track.date();
 	_time = track.time();

src/GUI/trackitem.h

@@ -22,6 +22,7 @@ public:
 private:
 	QString _name;
 	QString _desc;
+	QString _comment;
 	QVector<Link> _links;
 	QDateTime _date;
 	qreal _time;

src/GUI/waypointitem.cpp

@@ -21,15 +21,23 @@ QString WaypointItem::info() const
 		tt.insert(qApp->translate("WaypointItem", "Name"), _waypoint.name());
 	tt.insert(qApp->translate("WaypointItem", "Coordinates"),
 	  Format::coordinates(_waypoint.coordinates(), _format));
-	if (_waypoint.hasElevation())
-		tt.insert(qApp->translate("WaypointItem", "Elevation"),
-		  Format::elevation(_waypoint.elevation(), _units));
+	if (!std::isnan(_waypoint.elevations().first)) {
+		QString val = Format::elevation(_waypoint.elevations().first, _units);
+		if (!std::isnan(_waypoint.elevations().second))
+			val += " (" + Format::elevation(_waypoint.elevations().second,
+			  _units) + ")";
+		tt.insert(qApp->translate("WaypointItem", "Elevation"), val);
+	}
 	if (_waypoint.timestamp().isValid())
 		tt.insert(qApp->translate("WaypointItem", "Date"),
 		  _waypoint.timestamp().toString(Qt::SystemLocaleShortDate));
 	if (!_waypoint.description().isEmpty())
 		tt.insert(qApp->translate("WaypointItem", "Description"),
 		  _waypoint.description());
+	if (!_waypoint.comment().isEmpty()
+	  && _waypoint.comment() != _waypoint.description())
+		tt.insert(qApp->translate("WaypointItem", "Comment"),
+		  _waypoint.comment());
 	if (_waypoint.address().isValid()) {
 		QString addr("<address>");
 		addr += _waypoint.address().street();

src/common/coordinates.cpp

@@ -14,8 +14,8 @@ double Coordinates::distanceTo(const Coordinates &c) const
 #ifndef QT_NO_DEBUG
 QDebug operator<<(QDebug dbg, const Coordinates &c)
 {
-	dbg.nospace() << qSetRealNumberPrecision(10) << "Coordinates(" << c.lat()
-	  << ", " << c.lon() << ")";
+	dbg.nospace() << qSetRealNumberPrecision(10) << "Coordinates(" << c.lon()
+	  << ", " << c.lat() << ")";
 	return dbg.space();
 }
 #endif // QT_NO_DEBUG

src/common/garmin.h

@@ -3,14 +3,16 @@
 
 #include <QtGlobal>
 
+#define LS(val, bits) ((qint32)(((quint32)(val))<<(bits)))
+
 inline double toWGS32(qint32 v)
 {
-	return (double)(((double)v / (double)(1U<<31)) * (double)180);
+	return ((double)v / (double)(1U<<31)) * 180.0;
 }
 
 inline double toWGS24(qint32 v)
 {
-	return toWGS32(v<<8);
+	return toWGS32(LS(v, 8));
 }
 
 #endif // GARMIN_H

src/common/rectc.h

@@ -28,6 +28,9 @@ public:
 	double left() const {return _tl.lon();}
 	double right() const {return _br.lon();}
 
+	double width() const {return (right() - left());}
+	double height() const {return (top() - bottom());}
+
 	void setLeft(double val) {_tl.rlon() = val;}
 	void setRight(double val) {_br.rlon() = val;}
 	void setTop(double val) {_tl.rlat() = val;}

src/data/data.cpp

@@ -20,7 +20,6 @@
 #include "cupparser.h"
 #include "gpiparser.h"
 #include "smlparser.h"
-#include "dem.h"
 #include "data.h"
 
 
@@ -44,78 +43,46 @@ static CUPParser cup;
 static GPIParser gpi;
 static SMLParser sml;
 
-static QHash<QString, Parser*> parsers()
+static QMap<QString, Parser*> parsers()
 {
-	QHash<QString, Parser*> hash;
+	QMap<QString, Parser*> map;
 
-	hash.insert("gpx", &gpx);
-	hash.insert("tcx", &tcx);
-	hash.insert("kml", &kml);
-	hash.insert("fit", &fit);
-	hash.insert("csv", &csv);
-	hash.insert("igc", &igc);
-	hash.insert("nmea", &nmea);
-	hash.insert("plt", &plt);
-	hash.insert("wpt", &wpt);
-	hash.insert("rte", &rte);
-	hash.insert("loc", &loc);
-	hash.insert("slf", &slf);
+	map.insert("gpx", &gpx);
+	map.insert("tcx", &tcx);
+	map.insert("kml", &kml);
+	map.insert("fit", &fit);
+	map.insert("csv", &csv);
+	map.insert("igc", &igc);
+	map.insert("nmea", &nmea);
+	map.insert("plt", &plt);
+	map.insert("wpt", &wpt);
+	map.insert("rte", &rte);
+	map.insert("loc", &loc);
+	map.insert("slf", &slf);
 #ifdef ENABLE_GEOJSON
-	hash.insert("json", &geojson);
-	hash.insert("geojson", &geojson);
+	map.insert("json", &geojson);
+	map.insert("geojson", &geojson);
 #endif // ENABLE_GEOJSON
-	hash.insert("jpeg", &exif);
-	hash.insert("jpg", &exif);
-	hash.insert("cup", &cup);
-	hash.insert("gpi", &gpi);
-	hash.insert("sml", &sml);
+	map.insert("jpeg", &exif);
+	map.insert("jpg", &exif);
+	map.insert("cup", &cup);
+	map.insert("gpi", &gpi);
+	map.insert("sml", &sml);
 
-	return hash;
+	return map;
 }
 
-
-QHash<QString, Parser*> Data::_parsers = parsers();
-bool Data::_useDEM = false;
+QMap<QString, Parser*> Data::_parsers = parsers();
 
 void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
 {
-	for (int i = 0; i < trackData.count(); i++) {
-		TrackData &track = trackData[i];
-		for (int j = 0; j < track.size(); j++) {
-			SegmentData &segment = track[j];
-			for (int k = 0; k < segment.size(); k++) {
-				Trackpoint &t = segment[k];
-				if (!t.hasElevation() || _useDEM) {
-					qreal elevation = DEM::elevation(t.coordinates());
-					if (!std::isnan(elevation))
-						t.setElevation(elevation);
-				}
-			}
-		}
+	for (int i = 0; i < trackData.count(); i++)
 		_tracks.append(Track(trackData.at(i)));
-	}
-	for (int i = 0; i < routeData.count(); i++) {
-		RouteData &route = routeData[i];
-		for (int j = 0; j < route.size(); j++) {
-			Waypoint &w = route[j];
-			if (!w.hasElevation() || _useDEM) {
-				qreal elevation = DEM::elevation(w.coordinates());
-				if (!std::isnan(elevation))
-					w.setElevation(elevation);
-			}
-		}
+	for (int i = 0; i < routeData.count(); i++)
 		_routes.append(Route(routeData.at(i)));
-	}
-	for (int i = 0; i < _waypoints.size(); i++) {
-		if (!_waypoints.at(i).hasElevation() || _useDEM) {
-			qreal elevation = DEM::elevation(_waypoints.at(i).coordinates());
-			if (!std::isnan(elevation))
-				_waypoints[i].setElevation(elevation);
-		}
-	}
 }
 
-Data::Data(const QString &fileName, bool poi)
+Data::Data(const QString &fileName)
 {
 	QFile file(fileName);
 	QFileInfo fi(fileName);
@@ -130,12 +97,11 @@ Data::Data(const QString &fileName, bool poi)
 		return;
 	}
 
-	QHash<QString, Parser*>::iterator it;
+	QMap<QString, Parser*>::iterator it;
 	if ((it = _parsers.find(fi.suffix().toLower())) != _parsers.end()) {
 		if (it.value()->parse(&file, trackData, routeData, _polygons,
 		  _waypoints)) {
-			if (!poi)
-				processData(trackData, routeData);
+			processData(trackData, routeData);
 			_valid = true;
 			return;
 		} else {
@@ -146,8 +112,7 @@ Data::Data(const QString &fileName, bool poi)
 		for (it = _parsers.begin(); it != _parsers.end(); it++) {
 			if (it.value()->parse(&file, trackData, routeData, _polygons,
 			  _waypoints)) {
-				if (!poi)
-					processData(trackData, routeData);
+				processData(trackData, routeData);
 				_valid = true;
 				return;
 			}
@@ -166,17 +131,8 @@ Data::Data(const QString &fileName, bool poi)
 
 QString Data::formats()
 {
-	QStringList l(filter());
-	qSort(l);
-	QString supported;
-	for (int i = 0; i < l.size(); i++) {
-		supported += l.at(i);
-		if (i != l.size() - 1)
-			supported += " ";
-	}
-
 	return
-	  qApp->translate("Data", "Supported files") + " (" + supported + ");;"
+	  qApp->translate("Data", "Supported files") + " (" + filter().join(" ") + ");;"
 	  + qApp->translate("Data", "CSV files") + " (*.csv);;"
 	  + qApp->translate("Data", "CUP files") + " (*.cup);;"
 	  + qApp->translate("Data", "FIT files") + " (*.fit);;"
@@ -200,15 +156,10 @@ QString Data::formats()
 QStringList Data::filter()
 {
 	QStringList filter;
-	QHash<QString, Parser*>::iterator it;
 
-	for (it = _parsers.begin(); it != _parsers.end(); it++)
-		filter << QString("*.%1").arg(it.key());
+	for (QMap<QString, Parser*>::iterator it = _parsers.begin();
+	  it != _parsers.end(); it++)
+		filter << "*." + it.key();
 
 	return filter;
 }
-
-void Data::useDEM(bool use)
-{
-	_useDEM = use;
-}

src/data/data.h

@@ -2,7 +2,7 @@
 #define DATA_H
 
 #include <QList>
-#include <QHash>
+#include <QMap>
 #include <QString>
 #include <QStringList>
 #include "waypoint.h"
@@ -14,7 +14,7 @@
 class Data
 {
 public:
-	Data(const QString &fileName, bool poi = false);
+	Data(const QString &fileName);
 
 	bool isValid() const {return _valid;}
 	const QString &errorString() const {return _errorString;}
@@ -28,8 +28,6 @@ public:
 	static QString formats();
 	static QStringList filter();
 
-	static void useDEM(bool use);
-
 private:
 	void processData(QList<TrackData> &trackData, QList<RouteData> &routeData);
 
@@ -42,8 +40,7 @@ private:
 	QList<Area> _polygons;
 	QVector<Waypoint> _waypoints;
 
-	static QHash<QString, Parser*> _parsers;
-	static bool _useDEM;
+	static QMap<QString, Parser*> _parsers;
 };
 
 #endif // DATA_H

src/data/gpiparser.cpp

@@ -282,14 +282,14 @@ static quint32 readNotes(QDataStream &stream, QTextCodec *codec,
 	if (s1 & 0x1) {
 		QList<TranslatedString> obj;
 		ds += readTranslatedObjects(stream, codec, obj);
-		if (!obj.isEmpty() && waypoint.description().isNull())
-			waypoint.setDescription(obj.first().str());
+		if (!obj.isEmpty())
+			waypoint.setComment(obj.first().str());
 	}
 	if (s1 & 0x2) {
 		QString str;
 		ds += readString(stream, codec, str);
-		if (!str.isEmpty() && waypoint.description().isNull())
-			waypoint.setDescription(str);
+		if (!str.isEmpty())
+			waypoint.setComment(str);
 	}
 
 	if (ds != rh.size)

src/data/gpxparser.cpp

@@ -192,6 +192,8 @@ void GPXParser::waypointData(Waypoint &waypoint, SegmentData *autoRoute)
 			waypoint.setName(_reader.readElementText());
 		else if (_reader.name() == QLatin1String("desc"))
 			waypoint.setDescription(_reader.readElementText());
+		else if (_reader.name() == QLatin1String("cmt"))
+			waypoint.setComment(_reader.readElementText());
 		else if (_reader.name() == QLatin1String("ele"))
 			waypoint.setElevation(number());
 		else if (_reader.name() == QLatin1String("geoidheight"))
@@ -244,6 +246,8 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
 			route.setName(_reader.readElementText());
 		else if (_reader.name() == QLatin1String("desc"))
 			route.setDescription(_reader.readElementText());
+		else if (_reader.name() == QLatin1String("cmt"))
+			route.setComment(_reader.readElementText());
 		else if (_reader.name() == QLatin1String("link")) {
 			Link l(link());
 			if (!l.URL().isEmpty())
@@ -278,6 +282,8 @@ void GPXParser::track(TrackData &track)
 			track.setName(_reader.readElementText());
 		else if (_reader.name() == QLatin1String("desc"))
 			track.setDescription(_reader.readElementText());
+		else if (_reader.name() == QLatin1String("cmt"))
+			track.setComment(_reader.readElementText());
 		else if (_reader.name() == QLatin1String("link")) {
 			Link l(link());
 			if (!l.URL().isEmpty())

src/data/graph.h

@@ -67,4 +67,17 @@ public:
 	}
 };
 
+class GraphPair
+{
+public:
+	GraphPair(const Graph &primary, const Graph &secondary)
+	  : _primary(primary), _secondary(secondary) {}
+
+	const Graph &primary() const {return _primary;}
+	const Graph &secondary() const {return _secondary;}
+
+private:
+	Graph _primary, _secondary;
+};
+
 #endif // GRAPH_H

src/data/igcparser.cpp

@@ -87,10 +87,12 @@ static bool readTimestamp(const char *data, QTime &time)
 
 static bool readARecord(const char *line, qint64 len)
 {
-	if (len < 7 || line[0] != 'A')
+	/* The minimal A record length should be 7 according to the specification,
+	   but records with length of 6 exist in the wild */
+	if (len < 6 || line[0] != 'A')
 		return false;
 
-	for (int i = 1; i < 7; i++)
+	for (int i = 1; i < 6; i++)
 		if (!::isprint(line[i]))
 			return false;
 	return true;

src/data/poi.cpp

@@ -14,28 +14,19 @@ POI::POI(QObject *parent) : QObject(parent)
 {
 	_errorLine = 0;
 	_radius = 1000;
-	_useDEM = false;
 }
 
-bool POI::loadFile(const QString &path, bool dir)
+bool POI::loadFile(const QString &path)
 {
-	Data data(path, true);
+	Data data(path);
 	FileIndex index;
 
 	index.enabled = true;
 	index.start = _data.size();
 
 	if (!data.isValid()) {
-		if (dir) {
-			if (data.errorLine())
-				_errorString += QString("%1:%2: %3\n").arg(path)
-				  .arg(data.errorLine()).arg(data.errorString());
-			else
-				_errorString += path + ": " + data.errorString() + "\n";
-		} else {
-			_errorString = data.errorString();
-			_errorLine = data.errorLine();
-		}
+		_errorString = data.errorString();
+		_errorLine = data.errorLine();
 		return false;
 	}
 
@@ -59,37 +50,22 @@ bool POI::loadFile(const QString &path, bool dir)
 	return true;
 }
 
-bool POI::loadFile(const QString &path)
-{
-	_errorString.clear();
-	_errorLine = 0;
-
-	return loadFile(path, false);
-}
-
-bool POI::loadDir(const QString &path)
+void POI::loadDir(const QString &path)
 {
 	QDir md(path);
 	md.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
 	QFileInfoList fl = md.entryInfoList();
-	bool ret = true;
-
-	_errorString.clear();
-	_errorLine = 0;
 
 	for (int i = 0; i < fl.size(); i++) {
 		const QFileInfo &fi = fl.at(i);
 
-		if (fi.isDir()) {
-			if (!loadDir(fi.absoluteFilePath()))
-				ret = false;
-		} else {
-			if (!loadFile(fi.absoluteFilePath(), true))
-				ret = false;
-		}
+		if (fi.isDir())
+			loadDir(fi.absoluteFilePath());
+		else
+			if (!loadFile(fi.absoluteFilePath()))
+				qWarning("%s: %s", qPrintable(fi.absoluteFilePath()),
+				  qPrintable(_errorString));
 	}
-
-	return ret;
 }
 
 static bool cb(size_t data, void* context)
@@ -112,17 +88,6 @@ void POI::search(const RectC &rect, QSet<int> &set) const
 	_tree.Search(min, max, cb, &set);
 }
 
-void POI::appendElevation(QList<Waypoint> &points) const
-{
-	for (int i = 0; i < points.size(); i++) {
-		if (!points.at(i).hasElevation() || _useDEM) {
-			qreal elevation = DEM::elevation(points.at(i).coordinates());
-			if (!std::isnan(elevation))
-				points[i].setElevation(elevation);
-		}
-	}
-}
-
 QList<Waypoint> POI::points(const Path &path) const
 {
 	QList<Waypoint> ret;
@@ -158,8 +123,6 @@ QList<Waypoint> POI::points(const Path &path) const
 	for (it = set.constBegin(); it != set.constEnd(); ++it)
 		ret.append(_data.at(*it));
 
-	appendElevation(ret);
-
 	return ret;
 }
 
@@ -181,8 +144,6 @@ QList<Waypoint> POI::points(const Waypoint &point) const
 	for (it = set.constBegin(); it != set.constEnd(); ++it)
 		ret.append(_data.at(*it));
 
-	appendElevation(ret);
-
 	return ret;
 }
 
@@ -206,8 +167,6 @@ QList<Waypoint> POI::points(const Area &area) const
 	for (it = set.constBegin(); it != set.constEnd(); ++it)
 		ret.append(_data.at(*it));
 
-	appendElevation(ret);
-
 	return ret;
 }
 
@@ -253,10 +212,3 @@ void POI::setRadius(unsigned radius)
 
 	emit pointsChanged();
 }
-
-void POI::useDEM(bool use)
-{
-	_useDEM = use;
-
-	emit pointsChanged();
-}

src/data/poi.h

@@ -20,13 +20,12 @@ public:
 	POI(QObject *parent = 0);
 
 	bool loadFile(const QString &path);
-	bool loadDir(const QString &path);
+	void loadDir(const QString &path);
 	const QString &errorString() const {return _errorString;}
 	int errorLine() const {return _errorLine;}
 
 	unsigned radius() const {return _radius;}
 	void setRadius(unsigned radius);
-	void useDEM(bool use);
 
 	QList<Waypoint> points(const Path &path) const;
 	QList<Waypoint> points(const Waypoint &point) const;
@@ -49,7 +48,6 @@ private:
 
 	bool loadFile(const QString &path, bool dir);
 	void search(const RectC &rect, QSet<int> &set) const;
-	void appendElevation(QList<Waypoint> &points) const;
 
 	POITree _tree;
 	QVector<Waypoint> _data;
@@ -57,7 +55,6 @@ private:
 	QList<FileIndex> _indexes;
 
 	unsigned _radius;
-	bool _useDEM;
 
 	QString _errorString;
 	int _errorLine;

src/data/route.cpp

@@ -1,5 +1,8 @@
+#include "dem.h"
 #include "route.h"
 
+bool Route::_useDEM = false;
+bool Route::_show2ndElevation = false;
 
 Route::Route(const RouteData &data) : _data(data)
 {
@@ -25,7 +28,7 @@ Path Route::path() const
 	return ret;
 }
 
-Graph Route::elevation() const
+Graph Route::gpsElevation() const
 {
 	Graph graph;
 	graph.append(GraphSegment());
@@ -38,6 +41,38 @@ Graph Route::elevation() const
 	return graph;
 }
 
+Graph Route::demElevation() const
+{
+	Graph graph;
+	graph.append(GraphSegment());
+	GraphSegment &gs = graph.last();
+
+	for (int i = 0; i < _data.size(); i++) {
+		qreal dem = DEM::elevation(_data.at(i).coordinates());
+		if (!std::isnan(dem))
+			gs.append(GraphPoint(_distance.at(i), NAN, dem));
+	}
+
+	return graph;
+}
+
+GraphPair Route::elevation() const
+{
+	if (_useDEM) {
+		Graph dem(demElevation());
+		if (dem.isValid())
+			return GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph());
+		else
+			return GraphPair(gpsElevation(), Graph());
+	} else {
+		Graph gps(gpsElevation());
+		if (gps.isValid())
+			return GraphPair(gps, _show2ndElevation ? demElevation() : Graph());
+		else
+			return GraphPair(demElevation(), Graph());
+	}
+}
+
 qreal Route::distance() const
 {
 	return (_distance.isEmpty()) ? 0 : _distance.last();

src/data/route.h

@@ -11,23 +11,31 @@ class Route
 public:
 	Route(const RouteData &data);
 
-	Path path() const;
-
 	const RouteData &data() const {return _data;}
-
-	Graph elevation() const;
-
+	Path path() const;
+	GraphPair elevation() const;
 	qreal distance() const;
 
 	const QString &name() const {return _data.name();}
 	const QString &description() const {return _data.description();}
+	const QString &comment() const {return _data.comment();}
 	const QVector<Link> &links() const {return _data.links();}
 
 	bool isValid() const {return _data.size() >= 2;}
 
+	static void useDEM(bool use) {_useDEM = use;}
+	static void showSecondaryElevation(bool show)
+	  {_show2ndElevation = show;}
+
 private:
+	Graph gpsElevation() const;
+	Graph demElevation() const;
+
 	RouteData _data;
 	QVector<qreal> _distance;
+
+	static bool _useDEM;
+	static bool _show2ndElevation;
 };
 
 #endif // ROUTE_H

src/data/routedata.h

@@ -11,15 +11,18 @@ class RouteData : public QVector<Waypoint>
 public:
 	const QString &name() const {return _name;}
 	const QString &description() const {return _desc;}
+	const QString &comment() const {return _comment;}
 	const QVector<Link> &links() const {return _links;}
 
 	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &desc) {_desc = desc;}
+	void setComment(const QString &comment) {_comment = comment;}
 	void addLink(const Link &link) {_links.append(link);}
 
 private:
 	QString _name;
 	QString _desc;
+	QString _comment;
 	QVector<Link> _links;
 };
 

src/data/track.cpp

@@ -1,3 +1,4 @@
+#include "dem.h"
 #include "track.h"
 
 
@@ -13,6 +14,9 @@ int Track::_pauseInterval = 10;
 
 bool Track::_outlierEliminate = true;
 bool Track::_useReportedSpeed = false;
+bool Track::_useDEM = false;
+bool Track::_show2ndElevation = false;
+bool Track::_show2ndSpeed = false;
 
 
 static qreal avg(const QVector<qreal> &v)
@@ -47,7 +51,7 @@ static QSet<int> eliminate(const QVector<qreal> &v)
 	qreal M = MAD(w, m);
 
 	for (int i = 0; i < v.size(); i++)
-		if (qAbs((0.6745 * (v.at(i) - m)) / M) > 5)
+		if (qAbs((0.6745 * (v.at(i) - m)) / M) > 3.5)
 			rm.insert(i);
 
 	return rm;
@@ -213,7 +217,7 @@ Track::Track(const TrackData &data) : _data(data), _pause(0)
 	}
 }
 
-Graph Track::elevation() const
+Graph Track::gpsElevation() const
 {
 	Graph ret;
 
@@ -237,7 +241,48 @@ Graph Track::elevation() const
 	return ret;
 }
 
-Graph Track::speed() const
+Graph Track::demElevation() const
+{
+	Graph ret;
+
+	for (int i = 0; i < _data.size(); i++) {
+		const SegmentData &sd = _data.at(i);
+		if (sd.size() < 2)
+			continue;
+		const Segment &seg = _segments.at(i);
+		GraphSegment gs;
+
+		for (int j = 0; j < sd.size(); j++) {
+			qreal dem = DEM::elevation(sd.at(j).coordinates());
+			if (std::isnan(dem) || seg.outliers.contains(j))
+				continue;
+			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), dem));
+		}
+
+		ret.append(filter(gs, _elevationWindow));
+	}
+
+	return ret;
+}
+
+GraphPair Track::elevation() const
+{
+	if (_useDEM) {
+		Graph dem(demElevation());
+		if (dem.isValid())
+			return GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph());
+		else
+			return GraphPair(gpsElevation(), Graph());
+	} else {
+		Graph gps(gpsElevation());
+		if (gps.isValid())
+			return GraphPair(gps, _show2ndElevation ? demElevation() : Graph());
+		else
+			return GraphPair(demElevation(), Graph());
+	}
+}
+
+Graph Track::computedSpeed() const
 {
 	Graph ret;
 
@@ -251,14 +296,10 @@ Graph Track::speed() const
 		qreal v;
 
 		for (int j = 0; j < sd.size(); j++) {
-			if (seg.stop.contains(j) && (!std::isnan(seg.speed.at(j))
-			  || sd.at(j).hasSpeed())) {
+			if (seg.stop.contains(j) && !std::isnan(seg.speed.at(j))) {
 				v = 0;
 				stop.append(gs.size());
-			} else if (_useReportedSpeed && sd.at(j).hasSpeed()
-			  && !seg.outliers.contains(j))
-				v = sd.at(j).speed();
-			else if (!std::isnan(seg.speed.at(j)) && !seg.outliers.contains(j))
+			} else if (!std::isnan(seg.speed.at(j)) && !seg.outliers.contains(j))
 				v = seg.speed.at(j);
 			else
 				continue;
@@ -276,6 +317,60 @@ Graph Track::speed() const
 	return ret;
 }
 
+Graph Track::reportedSpeed() const
+{
+	Graph ret;
+
+	for (int i = 0; i < _data.size(); i++) {
+		const SegmentData &sd = _data.at(i);
+		if (sd.size() < 2)
+			continue;
+		const Segment &seg = _segments.at(i);
+		GraphSegment gs;
+		QList<int> stop;
+		qreal v;
+
+		for (int j = 0; j < sd.size(); j++) {
+			if (seg.stop.contains(j) && sd.at(j).hasSpeed()) {
+				v = 0;
+				stop.append(gs.size());
+			} else if (sd.at(j).hasSpeed() && !seg.outliers.contains(j))
+				v = sd.at(j).speed();
+			else
+				continue;
+
+			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), v));
+		}
+
+		ret.append(filter(gs, _speedWindow));
+		GraphSegment &filtered = ret.last();
+
+		for (int j = 0; j < stop.size(); j++)
+			filtered[stop.at(j)].setY(0);
+	}
+
+	return ret;
+}
+
+GraphPair Track::speed() const
+{
+	if (_useReportedSpeed) {
+		Graph reported(reportedSpeed());
+		if (reported.isValid())
+			return GraphPair(reported, _show2ndSpeed ? computedSpeed()
+			  : Graph());
+		else
+			return GraphPair(computedSpeed(), Graph());
+	} else {
+		Graph computed(computedSpeed());
+		if (computed.isValid())
+			return GraphPair(computed, _show2ndSpeed ? reportedSpeed()
+			  : Graph());
+		else
+			return GraphPair(reportedSpeed(), Graph());
+	}
+}
+
 Graph Track::heartRate() const
 {
 	Graph ret;

src/data/track.h

@@ -17,8 +17,8 @@ public:
 
 	Path path() const;
 
-	Graph elevation() const;
-	Graph speed() const;
+	GraphPair elevation() const;
+	GraphPair speed() const;
 	Graph heartRate() const;
 	Graph temperature() const;
 	Graph cadence() const;
@@ -32,6 +32,7 @@ public:
 
 	const QString &name() const {return _data.name();}
 	const QString &description() const {return _data.description();}
+	const QString &comment() const {return _data.comment();}
 	const QVector<Link> &links() const {return _data.links();}
 
 	bool isValid() const;
@@ -47,6 +48,11 @@ public:
 	static void setOutlierElimination(bool eliminate)
 	  {_outlierEliminate = eliminate;}
 	static void useReportedSpeed(bool use) {_useReportedSpeed = use;}
+	static void useDEM(bool use) {_useDEM = use;}
+	static void showSecondaryElevation(bool show)
+	  {_show2ndElevation = show;}
+	static void showSecondarySpeed(bool show)
+	  {_show2ndSpeed = show;}
 
 private:
 	struct Segment {
@@ -59,6 +65,11 @@ private:
 
 	bool discardStopPoint(const Segment &seg, int i) const;
 
+	Graph demElevation() const;
+	Graph gpsElevation() const;
+	Graph reportedSpeed() const;
+	Graph computedSpeed() const;
+
 	TrackData _data;
 	QList<Segment> _segments;
 	qreal _pause;
@@ -73,6 +84,9 @@ private:
 	static qreal _pauseSpeed;
 	static int _pauseInterval;
 	static bool _useReportedSpeed;
+	static bool _useDEM;
+	static bool _show2ndElevation;
+	static bool _show2ndSpeed;
 };
 
 #endif // TRACK_H

src/data/trackdata.h

@@ -14,15 +14,18 @@ class TrackData : public QList<SegmentData>
 public:
 	const QString &name() const {return _name;}
 	const QString &description() const {return _desc;}
+	const QString &comment() const {return _comment;}
 	const QVector<Link> &links() const {return _links;}
 
 	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &desc) {_desc = desc;}
+	void setComment(const QString &comment) {_comment = comment;}
 	void addLink(const Link &link) {_links.append(link);}
 
 private:
 	QString _name;
 	QString _desc;
+	QString _comment;
 	QVector<Link> _links;
 };
 

src/data/waypoint.cpp

@@ -0,0 +1,23 @@
+#include "dem.h"
+#include "waypoint.h"
+
+bool Waypoint::_useDEM = false;
+bool Waypoint::_show2ndElevation = false;
+
+QPair<qreal, qreal> Waypoint::elevations() const
+{
+	if (_useDEM) {
+		qreal dem = DEM::elevation(coordinates());
+		if (!std::isnan(dem))
+			return QPair<qreal, qreal>(dem, _show2ndElevation ? elevation()
+			  : NAN);
+		else
+			return QPair<qreal, qreal>(elevation(), NAN);
+	} else {
+		if (hasElevation())
+			return QPair<qreal, qreal>(elevation(), _show2ndElevation
+			  ? DEM::elevation(coordinates()) : NAN);
+		else
+			return QPair<qreal, qreal>(DEM::elevation(coordinates()), NAN);
+	}
+}

src/data/waypoint.h

@@ -14,24 +14,28 @@
 class Waypoint
 {
 public:
-	Waypoint() {_elevation = NAN;}
-	Waypoint(const Coordinates &coordinates) : _coordinates(coordinates)
-	  {_elevation = NAN;}
+	Waypoint() : _elevation(NAN) {}
+	Waypoint(const Coordinates &coordinates)
+	  : _coordinates(coordinates), _elevation(NAN) {}
 
 	const Coordinates &coordinates() const {return _coordinates;}
 	const QString &name() const {return _name;}
 	const QString &description() const {return _description;}
+	const QString &comment() const {return _comment;}
 	const Address &address() const {return _address;}
 	const QVector<ImageInfo> &images() const {return _images;}
 	const QVector<Link> &links() const {return _links;}
 	const QDateTime &timestamp() const {return _timestamp;}
 	qreal elevation() const {return _elevation;}
 
+	QPair<qreal, qreal> elevations() const;
+
 	void setCoordinates(const Coordinates &coordinates)
 	  {_coordinates = coordinates;}
 	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &description)
 	  {_description = description;}
+	void setComment(const QString &comment) {_comment = comment;}
 	void setAddress(const Address &address) {_address = address;}
 	void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
 	void setElevation(qreal elevation) {_elevation = elevation;}
@@ -44,15 +48,23 @@ public:
 	  {return this->_name == other._name
 	  && this->_coordinates == other._coordinates;}
 
+	static void useDEM(bool use) {_useDEM = use;}
+	static void showSecondaryElevation(bool show)
+	  {_show2ndElevation = show;}
+
 private:
 	Coordinates _coordinates;
 	QString _name;
 	QString _description;
+	QString _comment;
 	Address _address;
 	QVector<ImageInfo> _images;
 	QVector<Link> _links;
 	QDateTime _timestamp;
 	qreal _elevation;
+
+	static bool _useDEM;
+	static bool _show2ndElevation;
 };
 
 inline uint qHash(const Waypoint &key)
@@ -64,11 +76,9 @@ inline uint qHash(const Waypoint &key)
 inline QDebug operator<<(QDebug dbg, const Waypoint &waypoint)
 {
 	dbg.nospace() << "Waypoint(" << waypoint.coordinates() << ", "
-	  << waypoint.name() << ", " << waypoint.description() << ")";
+	  << waypoint.name() << ")";
 	return dbg.space();
 }
 #endif // QT_NO_DEBUG
 
-Q_DECLARE_TYPEINFO(Waypoint, Q_MOVABLE_TYPE);
-
 #endif // WAYPOINT_H

src/map/IMG/bitmapline.cpp

@@ -1,7 +1,13 @@
 #include <QPainter>
 #include <QImage>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#include <QtCore/qmath.h>
+#else // QT5
+#include <QtMath>
+#endif // QT5
 #include "bitmapline.h"
 
+
 static QImage img2line(const QImage &img, int width)
 {
 	Q_ASSERT(img.format() == QImage::Format_ARGB32_Premultiplied);
@@ -32,8 +38,8 @@ void BitmapLine::draw(QPainter *painter, const QPolygonF &line,
 		painter->save();
 		painter->translate(segment.p1());
 		painter->rotate(-segment.angle());
-		painter->drawImage(0, -img.height()/2, img2line(img, segment.length()));
+		painter->drawImage(0.0, -img.height()/2.0, img2line(img,
+		  qCeil(segment.length())));
 		painter->restore();
 	}
 }
-

src/map/IMG/bitstream.cpp

@@ -32,7 +32,7 @@ bool BitStream1::read(int bits, quint32 &val)
 
 bool BitStream1::flush()
 {
-	if (_length && !_file.seek(_hdl, _hdl.pos + _length))
+	if (_length && !_file.seek(_hdl, _hdl.pos() + _length))
 		return false;
 
 	_length = 0;
@@ -50,18 +50,13 @@ bool BitStream4::read(int bits, quint32 &val)
 		return true;
 	}
 
-	quint32 old = 0;
-	if (_used < 32) {
-		old = (_data << _used) >> (32 - bits);
-		bits = (bits - 32) + _used;
-	}
-	_used = bits;
-
-	quint32 bytes = qMin(_length, (quint32)4);
+	quint32 old = (_used < 32) ? (_data << _used) >> (32 - bits) : 0;
+	quint32 bytes = qMin(_length, 4U);
 
 	if (!_file.readVUInt32SW(_hdl, bytes, _data))
 		return false;
 
+	_used -= 32 - bits;
 	_length -= bytes;
 	_unused = (4 - bytes) * 8;
 	_data <<= _unused;
@@ -73,11 +68,12 @@ bool BitStream4::read(int bits, quint32 &val)
 
 bool BitStream4::flush()
 {
-	if (_length && !_file.seek(_hdl, _hdl.pos + _length))
+	if (_length && !_file.seek(_hdl, _hdl.pos() + _length))
 		return false;
 
 	_length = 0;
-	_unused = 32;
+	_used = 32;
+	_unused = 0;
 
 	return true;
 }

src/map/IMG/gmap.cpp

@@ -0,0 +1,161 @@
+#include <QXmlStreamReader>
+#include <QDir>
+#include "map/osm.h"
+#include "vectortile.h"
+#include "gmap.h"
+
+
+static SubFile::Type tileType(const QString &suffix)
+{
+	if (!suffix.compare("TRE"))
+		return SubFile::TRE;
+	else if (!suffix.compare("RGN"))
+		return SubFile::RGN;
+	else if (!suffix.compare("LBL"))
+		return SubFile::LBL;
+	else if (!suffix.compare("TYP"))
+		return SubFile::TYP;
+	else if (!suffix.compare("GMP"))
+		return SubFile::GMP;
+	else if (!suffix.compare("NET"))
+		return SubFile::NET;
+	else
+		return SubFile::Unknown;
+}
+
+void GMAP::subProduct(QXmlStreamReader &reader, QString &dataDir,
+  QString &baseMap)
+{
+	while (reader.readNextStartElement()) {
+		if (reader.name() == "Directory")
+			dataDir = reader.readElementText();
+		else if (reader.name() == "BaseMap")
+			baseMap = reader.readElementText();
+		else
+			reader.skipCurrentElement();
+	}
+}
+
+void GMAP::mapProduct(QXmlStreamReader &reader, QString &dataDir,
+  QString &typFile, QString &baseMap)
+{
+	while (reader.readNextStartElement()) {
+		if (reader.name() == "Name")
+			_name = reader.readElementText();
+		else if (reader.name() == "TYP")
+			typFile = reader.readElementText();
+		else if (reader.name() == "SubProduct")
+			subProduct(reader, dataDir, baseMap);
+		else
+			reader.skipCurrentElement();
+	}
+}
+
+bool GMAP::readXML(const QString &path, QString &dataDir, QString &typFile,
+  QString &baseMap)
+{
+	QFile file(path);
+
+	if (!file.open(QFile::ReadOnly | QFile::Text))
+		return false;
+
+	QXmlStreamReader reader(&file);
+	if (reader.readNextStartElement()) {
+		if (reader.name() == "MapProduct")
+			mapProduct(reader, dataDir, typFile, baseMap);
+		else
+			reader.raiseError("Not a GMAP XML file");
+	}
+	if (reader.error()) {
+		_errorString = QString("%1: %2").arg(reader.lineNumber())
+		  .arg(reader.errorString());
+		return false;
+	}
+
+	return true;
+}
+
+bool GMAP::loadTile(const QDir &dir, bool baseMap)
+{
+	VectorTile *tile = new VectorTile();
+
+	QFileInfoList ml = dir.entryInfoList(QDir::Files);
+	for (int i = 0; i < ml.size(); i++) {
+		const QFileInfo &fi = ml.at(i);
+		tile->addFile(fi.absoluteFilePath(), tileType(fi.suffix()));
+	}
+
+	if (!tile->init()) {
+		qWarning("%s: Invalid map tile", qPrintable(dir.path()));
+		delete tile;
+		return false;
+	}
+	if (baseMap)
+		tile->markAsBasemap();
+
+	double min[2], max[2];
+	min[0] = tile->bounds().left();
+	min[1] = tile->bounds().bottom();
+	max[0] = tile->bounds().right();
+	max[1] = tile->bounds().top();
+	_tileTree.Insert(min, max, tile);
+
+	_bounds |= tile->bounds();
+	if (tile->zooms().min() < _zooms.min())
+		_zooms.setMin(tile->zooms().min());
+
+	// Limit world maps bounds so that the maps can be projected using
+	// the default Web Mercator projection
+	if (_bounds.height() > 120)
+		_bounds &= OSM::BOUNDS;
+
+	return true;
+}
+
+GMAP::GMAP(const QString &fileName) : _fileName(fileName)
+{
+	QString dataDirPath, typFilePath, baseMapPath;
+	if (!readXML(fileName, dataDirPath, typFilePath, baseMapPath))
+		return;
+
+	QDir baseDir(QFileInfo(fileName).absoluteDir());
+	if (!baseDir.exists(dataDirPath)) {
+		_errorString = "Missing/invalid map data directory";
+		return;
+	}
+	QDir dataDir(baseDir.filePath(dataDirPath));
+	QFileInfoList ml = dataDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+
+
+	QFileInfo baseMap(dataDir.filePath(baseMapPath));
+	_baseMap = !baseMapPath.isEmpty() && baseMap.exists();
+
+	for (int i = 0; i < ml.size(); i++) {
+		const QFileInfo &fi = ml.at(i);
+		if (fi.isDir())
+			loadTile(QDir(fi.absoluteFilePath()),
+			  fi.absoluteFilePath() == baseMap.absoluteFilePath());
+	}
+
+	if (baseDir.exists(typFilePath))
+		_typ = new SubFile(baseDir.filePath(typFilePath));
+
+	if (!_tileTree.Count())
+		_errorString = "No usable map tile found";
+	else
+		_valid = true;
+}
+
+bool GMAP::isGMAP(const QString &path)
+{
+	QFile file(path);
+
+	if (!file.open(QFile::ReadOnly | QFile::Text))
+		return false;
+
+	QXmlStreamReader reader(&file);
+	if (reader.readNextStartElement() && reader.name() == "MapProduct")
+		return true;
+
+	return false;
+}

src/map/IMG/gmap.h

@@ -0,0 +1,30 @@
+#ifndef GMAP_H
+#define GMAP_H
+
+#include "mapdata.h"
+
+class QXmlStreamReader;
+class QDir;
+
+class GMAP : public MapData
+{
+public:
+	GMAP(const QString &fileName);
+
+	QString fileName() const {return _fileName;}
+
+	static bool isGMAP(const QString &path);
+
+private:
+	bool readXML(const QString &path, QString &dataDir, QString &typFile,
+	  QString &baseMap);
+	void mapProduct(QXmlStreamReader &reader, QString &dataDir,
+	  QString &typFile, QString &baseMap);
+	void subProduct(QXmlStreamReader &reader, QString &dataDir,
+	  QString &baseMap);
+	bool loadTile(const QDir &dir, bool baseMap);
+
+	QString _fileName;
+};
+
+#endif // GMAP_H

src/map/IMG/huffmanstream.cpp

@@ -23,29 +23,6 @@ HuffmanStream::HuffmanStream(const SubFile &file, SubFile::Handle &hdl,
 	}
 }
 
-bool HuffmanStream::readNext(qint32 &lonDelta, qint32 &latDelta)
-{
-	if (!readDelta(_lonSign, lonDelta))
-		return false;
-	if (!readDelta(_latSign, latDelta))
-		return false;
-
-	if (!(lonDelta|latDelta))
-		return false;
-
-	return true;
-}
-
-bool HuffmanStream::readOffset(qint32 &lonDelta, qint32 &latDelta)
-{
-	if (!readDelta(1, lonDelta))
-		return false;
-	if (!readDelta(1, latDelta))
-		return false;
-
-	return true;
-}
-
 bool HuffmanStream::sign(int &val)
 {
 	quint32 bit;
@@ -64,21 +41,17 @@ bool HuffmanStream::sign(int &val)
 
 bool HuffmanStream::readDelta(int sign, qint32 &symbol)
 {
-	uchar size;
+	quint8 size;
+	quint32 next;
+	quint8 nextSize = qMin((quint32)(32 - _symbolDataSize), bitsAvailable());
 
-	if (_symbolDataSize < 32) {
-		quint32 next;
-		quint8 nextSize = qMin((quint32)(32 - _symbolDataSize),
-		  bitsAvailable());
+	if (!read(nextSize, next))
+		return false;
 
-		if (!read(nextSize, next))
-			return false;
+	_symbolData = (_symbolData << nextSize) | next;
+	_symbolDataSize += nextSize;
 
-		_symbolData = (_symbolData << nextSize) | next;
-		_symbolDataSize += nextSize;
-	}
-
-	symbol = _table.symbol(_symbolData << (32U - _symbolDataSize), size);
+	symbol = _table.symbol(_symbolData << (32 - _symbolDataSize), size);
 
 	if (size <= _symbolDataSize)
 		_symbolDataSize -= size;

src/map/IMG/huffmanstream.h

@@ -9,8 +9,16 @@ public:
 	HuffmanStream(const SubFile &file, SubFile::Handle &hdl, quint32 length,
 	  const HuffmanTable &table, bool line);
 
-	bool readNext(qint32 &lonDelta, qint32 &latDelta);
-	bool readOffset(qint32 &lonDelta, qint32 &latDelta);
+	bool readNext(qint32 &lonDelta, qint32 &latDelta)
+	{
+		if (!(readDelta(_lonSign, lonDelta) && readDelta(_latSign, latDelta)))
+			return false;
+
+		return (lonDelta || latDelta);
+	}
+
+	bool readOffset(qint32 &lonDelta, qint32 &latDelta)
+	  {return (readDelta(1, lonDelta) && readDelta(1, latDelta));}
 	bool atEnd() const
 	  {return _symbolDataSize + bitsAvailable() < _table.maxSymbolSize();}
 

src/map/IMG/huffmantable.cpp

@@ -55,7 +55,7 @@ bool HuffmanTable::getBuffer(const SubFile &file, SubFile::Handle &hdl,
 			return false;
 		if (!file.readVUInt32(hdl, recordSize))
 			return false;
-		recordOffset = hdl.pos + recordSize;
+		recordOffset = hdl.pos() + recordSize;
 		if (recordOffset > offset + size)
 			return false;
 	};

src/map/IMG/img.cpp

@@ -1,27 +1,11 @@
 #include <QMap>
 #include <QtEndian>
-#include "common/programpaths.h"
+#include "map/osm.h"
 #include "vectortile.h"
 #include "img.h"
 
 
-#define CACHE_SIZE 8388608 /* 8MB */
-
-typedef QMap<QString, VectorTile*> TileMap;
-
-struct CTX
-{
-	CTX(const RectC &rect, int bits, QList<IMG::Poly> *polygons,
-	  QList<IMG::Poly> *lines, QList<IMG::Point> *points)
-	  : rect(rect), bits(bits), polygons(polygons), lines(lines),
-	  points(points) {}
-
-	const RectC &rect;
-	int bits;
-	QList<IMG::Poly> *polygons;
-	QList<IMG::Poly> *lines;
-	QList<IMG::Point> *points;
-};
+typedef QMap<QByteArray, VectorTile*> TileMap;
 
 static SubFile::Type tileType(const char str[3])
 {
@@ -41,8 +25,7 @@ static SubFile::Type tileType(const char str[3])
 		return SubFile::Unknown;
 }
 
-IMG::IMG(const QString &fileName)
-  : _file(fileName), _typ(0), _style(0), _valid(false)
+IMG::IMG(const QString &fileName) : _file(fileName)
 {
 #define CHECK(condition) \
 	if (!(condition)) { \
@@ -52,7 +35,7 @@ IMG::IMG(const QString &fileName)
 	}
 
 	TileMap tileMap;
-	QString typFile;
+	QByteArray typFile;
 
 	if (!_file.open(QFile::ReadOnly)) {
 		_errorString = _file.errorString();
@@ -78,8 +61,6 @@ IMG::IMG(const QString &fileName)
 	QByteArray nba(QByteArray(d1, sizeof(d1)) + QByteArray(d2, sizeof(d2)));
 	_name = QString::fromLatin1(nba.constData(), nba.size()-1).trimmed();
 	_blockSize = 1 << (e1 + e2);
-	_blockCache.setMaxCost(CACHE_SIZE / _blockSize);
-
 
 	// Read the FAT table
 	quint8 flag;
@@ -107,7 +88,7 @@ IMG::IMG(const QString &fileName)
 		  && read(type, sizeof(type)) && readValue(size) && readValue(part));
 		SubFile::Type tt = tileType(type);
 
-		QString fn(QByteArray(name, sizeof(name)));
+		QByteArray fn(name, sizeof(name));
 		if (VectorTile::isTileFile(tt)) {
 			VectorTile *tile;
 			TileMap::const_iterator it = tileMap.find(fn);
@@ -152,6 +133,8 @@ IMG::IMG(const QString &fileName)
 	}
 
 	// Create tile tree
+
+	int minMapZoom = 24;
 	for (TileMap::const_iterator it = tileMap.constBegin();
 	  it != tileMap.constEnd(); ++it) {
 		VectorTile *tile = it.value();
@@ -171,73 +154,32 @@ IMG::IMG(const QString &fileName)
 		_tileTree.Insert(min, max, tile);
 
 		_bounds |= tile->bounds();
+		if (tile->zooms().min() < _zooms.min())
+			_zooms.setMin(tile->zooms().min());
+		if (tile->zooms().min() < minMapZoom)
+			minMapZoom = tile->zooms().min();
 	}
 
+	for (TileMap::const_iterator it = tileMap.constBegin();
+	  it != tileMap.constEnd(); ++it) {
+		VectorTile *tile = it.value();
+		if (tile->zooms().min() > minMapZoom)
+			_baseMap = true;
+		if (tile->zooms().min() == minMapZoom)
+			tile->markAsBasemap();
+	}
+
+	// Limit world maps bounds so that the maps can be projected using
+	// the default Web Mercator projection
+	if (_bounds.height() > 120)
+		_bounds &= OSM::BOUNDS;
+
 	if (!_tileTree.Count())
 		_errorString = "No usable map tile found";
 	else
 		_valid = true;
 }
 
-IMG::~IMG()
-{
-	TileTree::Iterator it;
-	for (_tileTree.GetFirst(it); !_tileTree.IsNull(it); _tileTree.GetNext(it))
-		delete _tileTree.GetAt(it);
-
-	delete _typ;
-	delete _style;
-}
-
-void IMG::load()
-{
-	Q_ASSERT(!_style);
-
-	if (_typ)
-		_style = new Style(_typ);
-	else {
-		QFile typFile(ProgramPaths::typFile());
-		if (typFile.open(QIODevice::ReadOnly)) {
-			SubFile typ(&typFile);
-			_style = new Style(&typ);
-		} else
-			_style = new Style();
-	}
-}
-
-void IMG::clear()
-{
-	TileTree::Iterator it;
-	for (_tileTree.GetFirst(it); !_tileTree.IsNull(it); _tileTree.GetNext(it))
-		_tileTree.GetAt(it)->clear();
-
-	delete _style;
-	_style = 0;
-
-	_blockCache.clear();
-}
-
-static bool cb(VectorTile *tile, void *context)
-{
-	CTX *ctx = (CTX*)context;
-	tile->objects(ctx->rect, ctx->bits, ctx->polygons, ctx->lines, ctx->points);
-	return true;
-}
-
-void IMG::objects(const RectC &rect, int bits, QList<Poly> *polygons,
-  QList<Poly> *lines, QList<Point> *points)
-{
-	CTX ctx(rect, bits, polygons, lines, points);
-	double min[2], max[2];
-
-	min[0] = rect.left();
-	min[1] = rect.bottom();
-	max[0] = rect.right();
-	max[1] = rect.top();
-
-	_tileTree.Search(min, max, cb, &ctx);
-}
-
 qint64 IMG::read(char *data, qint64 maxSize)
 {
 	qint64 ret = _file.read(data, maxSize);
@@ -259,33 +201,12 @@ template<class T> bool IMG::readValue(T &val)
 	return true;
 }
 
-bool IMG::readBlock(int blockNum, QByteArray &data)
+bool IMG::readBlock(int blockNum, char *data)
 {
-	QByteArray *block = _blockCache[blockNum];
-	if (!block) {
-		if (!_file.seek((qint64)blockNum * (qint64)_blockSize))
-			return false;
-		data.resize(_blockSize);
-		if (read(data.data(), _blockSize) < _blockSize)
-			return false;
-		_blockCache.insert(blockNum, new QByteArray(data));
-	} else
-		data = *block;
+	if (!_file.seek((qint64)blockNum * (qint64)_blockSize))
+		return false;
+	if (read(data, _blockSize) < _blockSize)
+		return false;
 
 	return true;
 }
-
-#ifndef QT_NO_DEBUG
-QDebug operator<<(QDebug dbg, const IMG::Point &point)
-{
-	dbg.nospace() << "Point(" << hex << point.type << ", " << point.label
-	  << ", " << point.poi << ")";
-	return dbg.space();
-}
-
-QDebug operator<<(QDebug dbg, const IMG::Poly &poly)
-{
-	dbg.nospace() << "Poly(" << hex << poly.type << ", " << poly.label << ")";
-	return dbg.space();
-}
-#endif // QT_NO_DEBUG

src/map/IMG/img.h

@@ -2,92 +2,26 @@
 #define IMG_H
 
 #include <QFile>
-#include <QByteArray>
-#include <QCache>
-#include <QDebug>
-#include "common/rtree.h"
-#include "common/rectc.h"
-#include "style.h"
-#include "label.h"
+#include "mapdata.h"
 
-class VectorTile;
-class SubFile;
-
-class IMG
+class IMG : public MapData
 {
 public:
-	struct Poly {
-		/* QPointF insted of Coordinates for performance reasons (no need to
-		   duplicate all the vectors for drawing). Note, that we do not want to
-		   ll2xy() the points in the IMG class as this can not be done in
-		   parallel. */
-		QVector<QPointF> points;
-		Label label;
-		quint32 type;
-
-		bool operator<(const Poly &other) const
-		  {return type > other.type;}
-	};
-
-	struct Point {
-		Point() : id(0) {}
-
-		Coordinates coordinates;
-		Label label;
-		quint32 type;
-		bool poi;
-		quint64 id;
-
-		bool operator<(const Point &other) const
-		  {return id < other.id;}
-	};
-
-
 	IMG(const QString &fileName);
-	~IMG();
-
-	void load();
-	void clear();
 
 	QString fileName() const {return _file.fileName();}
-	const QString &name() const {return _name;}
-	const RectC &bounds() const {return _bounds;}
-
-	void objects(const RectC &rect, int bits, QList<Poly> *polygons,
-	  QList<Poly> *lines, QList<Point> *points);
-	const Style *style() const {return _style;}
-
-	bool isValid() const {return _valid;}
-	const QString &errorString() const {return _errorString;}
 
 private:
 	friend class SubFile;
 
-	typedef RTree<VectorTile*, double, 2> TileTree;
-
 	int blockSize() const {return _blockSize;}
-	bool readBlock(int blockNum, QByteArray &data);
+	bool readBlock(int blockNum, char *data);
 	qint64 read(char *data, qint64 maxSize);
 	template<class T> bool readValue(T &val);
 
 	QFile _file;
 	quint8 _key;
 	int _blockSize;
-	QCache<int, QByteArray> _blockCache;
-
-	QString _name;
-	RectC _bounds;
-	TileTree _tileTree;
-	SubFile *_typ;
-	Style *_style;
-
-	bool _valid;
-	QString _errorString;
 };
 
-#ifndef QT_NO_DEBUG
-QDebug operator<<(QDebug dbg, const IMG::Point &point);
-QDebug operator<<(QDebug dbg, const IMG::Poly &poly);
-#endif // QT_NO_DEBUG
-
 #endif // IMG_H

src/map/IMG/lblfile.cpp

@@ -30,15 +30,20 @@ static quint8 SPECIAL_CHARS[] = {
 	'8', '9', '~', '~', '~', '~', '~', '~'
 };
 
-static QString capitalize(const QString &str)
+static bool isAllUpperCase(const QString &str)
 {
 	if (str.isEmpty())
-		return str;
+		return false;
 	for (int i = 0; i < str.size(); i++)
 		if (str.at(i).isLetter() && !(str.at(i).isUpper()
 		  || str.at(i) == QChar(0x00DF)))
-			return str;
+			return false;
 
+	return true;
+}
+
+static QString capitalized(const QString &str)
+{
 	QString ret(str);
 	for (int i = 0; i < str.size(); i++)
 		if (i && !str.at(i-1).isSpace())
@@ -77,7 +82,7 @@ bool LBLFile::init(Handle &hdl)
 	return true;
 }
 
-Label LBLFile::label6b(Handle &hdl, quint32 offset) const
+Label LBLFile::label6b(Handle &hdl, quint32 offset, bool capitalize) const
 {
 	Label::Shield::Type shieldType = Label::Shield::None;
 	QByteArray label, shieldLabel;
@@ -95,9 +100,12 @@ Label LBLFile::label6b(Handle &hdl, quint32 offset) const
 		int c[]= {b1>>2, (b1&0x3)<<4|b2>>4, (b2&0xF)<<2|b3>>6, b3&0x3F};
 
 		for (int cpt = 0; cpt < 4; cpt++) {
-			if (c[cpt] > 0x2f || (curCharSet == Normal && c[cpt] == 0x1d))
-				return Label(capitalize(QString::fromLatin1(label)),
-				  Label::Shield(shieldType, shieldLabel));
+			if (c[cpt] > 0x2f || (curCharSet == Normal && c[cpt] == 0x1d)) {
+				QString text(QString::fromLatin1(label));
+				return Label(capitalize && isAllUpperCase(text)
+				  ? capitalized(text) : text, Label::Shield(shieldType,
+				  shieldLabel));
+			}
 			switch (curCharSet) {
 				case Normal:
 					if (c[cpt] == 0x1c)
@@ -127,7 +135,7 @@ Label LBLFile::label6b(Handle &hdl, quint32 offset) const
 	}
 }
 
-Label LBLFile::label8b(Handle &hdl, quint32 offset) const
+Label LBLFile::label8b(Handle &hdl, quint32 offset, bool capitalize) const
 {
 	Label::Shield::Type shieldType = Label::Shield::None;
 	QByteArray label, shieldLabel;
@@ -157,12 +165,15 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset) const
 			bap->append(c);
 	}
 
-	return Label(capitalize(_codec ? _codec->toUnicode(label)
-	  : QString::fromLatin1(label)), Label::Shield(shieldType, _codec
-	  ? _codec->toUnicode(shieldLabel) : QString::fromLatin1(shieldLabel)));
+	QString text(_codec ? _codec->toUnicode(label) : QString::fromLatin1(label));
+	QString shieldText(_codec ? _codec->toUnicode(shieldLabel)
+	  : QString::fromLatin1(shieldLabel));
+
+	return Label(capitalize && isAllUpperCase(text) ? capitalized(text) : text,
+	  Label::Shield(shieldType, shieldText));
 }
 
-Label LBLFile::label(Handle &hdl, quint32 offset, bool poi)
+Label LBLFile::label(Handle &hdl, quint32 offset, bool poi, bool capitalize)
 {
 	if (!_multiplier && !init(hdl))
 		return QString();
@@ -183,10 +194,10 @@ Label LBLFile::label(Handle &hdl, quint32 offset, bool poi)
 
 	switch (_encoding) {
 		case 6:
-			return label6b(hdl, labelOffset);
+			return label6b(hdl, labelOffset, capitalize);
 		case 9:
 		case 10:
-			return label8b(hdl, labelOffset);
+			return label8b(hdl, labelOffset, capitalize);
 		default:
 			return Label();
 	}

src/map/IMG/lblfile.h

@@ -12,17 +12,21 @@ public:
 	LBLFile(IMG *img)
 	  : SubFile(img), _codec(0), _offset(0), _size(0), _poiOffset(0),
 	  _poiSize(0), _poiMultiplier(0), _multiplier(0), _encoding(0) {}
+	LBLFile(const QString &path)
+	  : SubFile(path), _codec(0), _offset(0), _size(0), _poiOffset(0),
+	  _poiSize(0), _poiMultiplier(0), _multiplier(0), _encoding(0) {}
 	LBLFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset),
 	  _codec(0), _offset(0), _size(0), _poiOffset(0), _poiSize(0),
 	  _poiMultiplier(0), _multiplier(0), _encoding(0) {}
 
-	Label label(Handle &hdl, quint32 offset, bool poi = false);
+	Label label(Handle &hdl, quint32 offset, bool poi = false,
+	  bool capitalize = true);
 
 private:
 	bool init(Handle &hdl);
 
-	Label label6b(Handle &hdl, quint32 offset) const;
-	Label label8b(Handle &hdl, quint32 offset) const;
+	Label label6b(Handle &hdl, quint32 offset, bool capitalize) const;
+	Label label8b(Handle &hdl, quint32 offset, bool capitalize) const;
 
 	QTextCodec *_codec;
 	quint32 _offset;

src/map/IMG/mapdata.cpp

@@ -0,0 +1,128 @@
+#include "common/programpaths.h"
+#include "vectortile.h"
+#include "style.h"
+#include "mapdata.h"
+
+
+#define CACHED_SUBDIVS_COUNT 2048 // ~32MB for both caches together
+
+struct PolyCTX
+{
+	PolyCTX(const RectC &rect, int bits, bool baseMap,
+	  QList<MapData::Poly> *polygons, QList<MapData::Poly> *lines,
+	  QCache<const SubDiv*, MapData::Polys> *polyCache)
+	  : rect(rect), bits(bits), baseMap(baseMap), polygons(polygons),
+	  lines(lines), polyCache(polyCache) {}
+
+	const RectC &rect;
+	int bits;
+	bool baseMap;
+	QList<MapData::Poly> *polygons;
+	QList<MapData::Poly> *lines;
+	QCache<const SubDiv*, MapData::Polys> *polyCache;
+};
+
+struct PointCTX
+{
+	PointCTX(const RectC &rect, int bits, bool baseMap,
+	  QList<MapData::Point> *points,
+	  QCache<const SubDiv*, QList<MapData::Point> > *pointCache)
+	  : rect(rect), bits(bits), baseMap(baseMap), points(points),
+	  pointCache(pointCache) {}
+
+	const RectC &rect;
+	int bits;
+	bool baseMap;
+	QList<MapData::Point> *points;
+	QCache<const SubDiv*, QList<MapData::Point> > *pointCache;
+};
+
+inline bool polyCb(VectorTile *tile, void *context)
+{
+	PolyCTX *ctx = (PolyCTX*)context;
+	tile->polys(ctx->rect, ctx->bits, ctx->baseMap, ctx->polygons, ctx->lines,
+	  ctx->polyCache);
+	return true;
+}
+
+inline bool pointCb(VectorTile *tile, void *context)
+{
+	PointCTX *ctx = (PointCTX*)context;
+	tile->points(ctx->rect, ctx->bits, ctx->baseMap, ctx->points,
+	  ctx->pointCache);
+	return true;
+}
+
+
+MapData::MapData() : _typ(0), _style(0), _zooms(15, 28), _baseMap(false),
+  _valid(false)
+{
+	_polyCache.setMaxCost(CACHED_SUBDIVS_COUNT);
+	_pointCache.setMaxCost(CACHED_SUBDIVS_COUNT);
+}
+
+MapData::~MapData()
+{
+	TileTree::Iterator it;
+	for (_tileTree.GetFirst(it); !_tileTree.IsNull(it); _tileTree.GetNext(it))
+		delete _tileTree.GetAt(it);
+
+	delete _typ;
+	delete _style;
+}
+
+void MapData::polys(const RectC &rect, int bits, QList<Poly> *polygons,
+  QList<Poly> *lines)
+{
+	PolyCTX ctx(rect, bits, _baseMap, polygons, lines, &_polyCache);
+	double min[2], max[2];
+
+	min[0] = rect.left();
+	min[1] = rect.bottom();
+	max[0] = rect.right();
+	max[1] = rect.top();
+
+	_tileTree.Search(min, max, polyCb, &ctx);
+}
+
+void MapData::points(const RectC &rect, int bits, QList<Point> *points)
+{
+	PointCTX ctx(rect, bits, _baseMap, points, &_pointCache);
+	double min[2], max[2];
+
+	min[0] = rect.left();
+	min[1] = rect.bottom();
+	max[0] = rect.right();
+	max[1] = rect.top();
+
+	_tileTree.Search(min, max, pointCb, &ctx);
+}
+
+void MapData::load()
+{
+	Q_ASSERT(!_style);
+
+	if (_typ)
+		_style = new Style(_typ);
+	else {
+		QString typFile(ProgramPaths::typFile());
+		if (!typFile.isEmpty()) {
+			SubFile typ(typFile);
+			_style = new Style(&typ);
+		} else
+			_style = new Style();
+	}
+}
+
+void MapData::clear()
+{
+	TileTree::Iterator it;
+	for (_tileTree.GetFirst(it); !_tileTree.IsNull(it); _tileTree.GetNext(it))
+		_tileTree.GetAt(it)->clear();
+
+	delete _style;
+	_style = 0;
+
+	_polyCache.clear();
+	_pointCache.clear();
+}

src/map/IMG/mapdata.h

@@ -0,0 +1,110 @@
+#ifndef MAPDATA_H
+#define MAPDATA_H
+
+#include <QList>
+#include <QPointF>
+#include <QCache>
+#include <QDebug>
+#include "common/rectc.h"
+#include "common/rtree.h"
+#include "common/range.h"
+#include "label.h"
+
+class Style;
+class SubDiv;
+class SubFile;
+class VectorTile;
+
+class MapData
+{
+public:
+	struct Poly {
+		/* QPointF insted of Coordinates for performance reasons (no need to
+		   duplicate all the vectors for drawing). Note, that we do not want to
+		   ll2xy() the points in the IMG class as this can not be done in
+		   parallel. */
+		QVector<QPointF> points;
+		Label label;
+		quint32 type;
+		RectC boundingRect;
+
+		bool operator<(const Poly &other) const
+		  {return type > other.type;}
+	};
+
+	struct Point {
+		Point() : id(0) {}
+
+		Coordinates coordinates;
+		Label label;
+		quint32 type;
+		bool poi;
+		quint64 id;
+
+		bool operator<(const Point &other) const
+		  {return id < other.id;}
+	};
+
+	struct Polys {
+		Polys() {}
+		Polys(const QList<Poly> &polygons, const QList<Poly> &lines)
+			: polygons(polygons), lines(lines) {}
+
+		QList<Poly> polygons;
+		QList<Poly> lines;
+	};
+
+	MapData();
+	virtual ~MapData();
+
+	const QString &name() const {return _name;}
+	const RectC &bounds() const {return _bounds;}
+	const Range &zooms() const {return _zooms;}
+	const Style *style() const {return _style;}
+	void polys(const RectC &rect, int bits, QList<Poly> *polygons,
+	  QList<Poly> *lines);
+	void points(const RectC &rect, int bits, QList<Point> *points);
+
+	void load();
+	void clear();
+
+	virtual QString fileName() const = 0;
+
+	bool isValid() const {return _valid;}
+	QString errorString() const {return _errorString;}
+
+protected:
+	typedef RTree<VectorTile*, double, 2> TileTree;
+
+	QString _name;
+	RectC _bounds;
+	SubFile *_typ;
+	Style *_style;
+	TileTree _tileTree;
+	Range _zooms;
+	bool _baseMap;
+
+	bool _valid;
+	QString _errorString;
+
+private:
+	QCache<const SubDiv*, Polys> _polyCache;
+	QCache<const SubDiv*, QList<Point> > _pointCache;
+};
+
+#ifndef QT_NO_DEBUG
+inline QDebug operator<<(QDebug dbg, const MapData::Point &point)
+{
+	dbg.nospace() << "Point(" << hex << point.type << ", " << point.label
+	  << ", " << point.poi << ")";
+	return dbg.space();
+}
+
+inline QDebug operator<<(QDebug dbg, const MapData::Poly &poly)
+{
+	dbg.nospace() << "Poly(" << hex << poly.type << ", " << poly.label << ")";
+	return dbg.space();
+}
+#endif // QT_NO_DEBUG
+
+#endif // MAPDATA_H

src/map/IMG/netfile.h

@@ -6,9 +6,12 @@
 class NETFile : public SubFile
 {
 public:
-	NETFile(IMG *img) : SubFile(img), _offset(0), _size(0), _multiplier(0) {}
-	NETFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset),
-	  _offset(0), _size(0), _multiplier(0) {}
+	NETFile(IMG *img)
+	  : SubFile(img), _offset(0), _size(0), _multiplier(0) {}
+	NETFile(const QString &path)
+	  : SubFile(path), _offset(0), _size(0), _multiplier(0) {}
+	NETFile(SubFile *gmp, quint32 offset)
+	  : SubFile(gmp, offset), _offset(0), _size(0), _multiplier(0) {}
 
 	bool lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset);
 

src/map/IMG/rgnfile.cpp

@@ -8,6 +8,20 @@
 #include "rgnfile.h"
 
 
+static quint64 pointId(const QPoint &pos, quint32 type, quint32 labelPtr)
+{
+	quint64 id;
+
+	uint hash = qHash(QPair<uint,uint>(qHash(QPair<int, int>(pos.x(),
+	  pos.y())), labelPtr & 0x3FFFFF));
+	id = ((quint64)type)<<32 | hash;
+	// Make country labels precedent over city labels
+	if (!(type >= 0x1400 && type <= 0x153f))
+		id |= 1ULL<<63;
+
+	return id;
+}
+
 bool RGNFile::skipClassFields(Handle &hdl) const
 {
 	quint8 flags;
@@ -35,11 +49,11 @@ bool RGNFile::skipClassFields(Handle &hdl) const
 			break;
 	}
 
-	return seek(hdl, hdl.pos + rs);
+	return seek(hdl, hdl.pos() + rs);
 }
 
 bool RGNFile::skipLclFields(Handle &hdl, const quint32 flags[3],
-  Segment::Type type) const
+  SegmentType type) const
 {
 	quint32 bitfield = 0xFFFFFFFF;
 
@@ -53,7 +67,7 @@ bool RGNFile::skipLclFields(Handle &hdl, const quint32 flags[3],
 				quint32 m = flags[(i >> 4) + 1] >> ((i * 2) & 0x1e) & 3;
 				switch (i) {
 					case 5:
-						if (m == 1 && type == Segment::Point) {
+						if (m == 1 && type == Point) {
 							quint16 u16;
 							if (!readUInt16(hdl, u16))
 								return false;
@@ -116,11 +130,16 @@ bool RGNFile::init(Handle &hdl)
 	return true;
 }
 
-bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
-  const Segment &segment, LBLFile *lbl, Handle &lblHdl, NETFile *net,
+bool RGNFile::polyObjects(Handle &hdl, const SubDiv *subdiv,
+  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl, NETFile *net,
   Handle &netHdl, QList<IMG::Poly> *polys) const
 {
-	if (!seek(hdl, segment.start()))
+	const SubDiv::Segment &segment = (segmentType == Line)
+	 ? subdiv->lines() : subdiv->polygons();
+
+	if (!segment.isValid())
+		return true;
+	if (!seek(hdl, segment.offset()))
 		return false;
 
 	quint32 labelPtr;
@@ -128,7 +147,7 @@ bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 	qint16 lon, lat;
 	quint16 len;
 
-	while (hdl.pos < (int)segment.end()) {
+	while (hdl.pos() < (int)segment.end()) {
 		IMG::Poly poly;
 
 		if (!(readUInt8(hdl, type) && readUInt24(hdl, labelPtr)
@@ -145,33 +164,32 @@ bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 		if (!readUInt8(hdl, bitstreamInfo))
 			return false;
 
-		poly.type = (segment.type() == Segment::Polygon)
+		poly.type = (segmentType == Polygon)
 		  ? ((quint32)(type & 0x7F)) << 8 : ((quint32)(type & 0x3F)) << 8;
 
 
-		QPoint pos(subdiv->lon() + ((qint32)lon<<(24-subdiv->bits())),
-		  subdiv->lat() + ((qint32)lat<<(24-subdiv->bits())));
+		QPoint pos(subdiv->lon() + LS(lon, 24-subdiv->bits()),
+		  subdiv->lat() + LS(lat, 24-subdiv->bits()));
 		Coordinates c(toWGS24(pos.x()), toWGS24(pos.y()));
-		RectC br(c, c);
+		poly.boundingRect = RectC(c, c);
 		poly.points.append(QPointF(c.lon(), c.lat()));
 
 		qint32 lonDelta, latDelta;
 		DeltaStream stream(*this, hdl, len, bitstreamInfo, labelPtr & 0x400000,
 		  false);
 		while (stream.readNext(lonDelta, latDelta)) {
-			pos.rx() += lonDelta<<(24-subdiv->bits());
-			pos.ry() += latDelta<<(24-subdiv->bits());
+			pos.rx() += LS(lonDelta, (24-subdiv->bits()));
+			if (pos.rx() >= 0x800000 && subdiv->lon() >= 0)
+				pos.rx() = 0x7fffff;
+			pos.ry() += LS(latDelta, (24-subdiv->bits()));
 
 			Coordinates c(toWGS24(pos.x()), toWGS24(pos.y()));
 			poly.points.append(QPointF(c.lon(), c.lat()));
-			br = br.united(c);
+			poly.boundingRect = poly.boundingRect.united(c);
 		}
 		if (!(stream.atEnd() && stream.flush()))
 			return false;
 
-		if (!rect.intersects(br))
-			continue;
-
 		if (lbl && (labelPtr & 0x3FFFFF)) {
 			if (labelPtr & 0x800000) {
 				quint32 lblOff;
@@ -188,22 +206,25 @@ bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 	return true;
 }
 
-bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
-  const SubDiv *subdiv, quint32 shift, const Segment &segment, LBLFile *lbl,
-  Handle &lblHdl, QList<IMG::Poly> *polys, bool line) const
+bool RGNFile::extPolyObjects(Handle &hdl, const SubDiv *subdiv, quint32 shift,
+  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl,
+  QList<IMG::Poly> *polys) const
 {
 	quint32 labelPtr, len;
 	quint8 type, subtype;
 	qint16 lon, lat;
+	const SubDiv::Segment &segment = (segmentType == Line)
+	 ? subdiv->extLines() : subdiv->extPolygons();
 
 
-	if (!seek(hdl, segment.start()))
+	if (!segment.isValid())
+		return true;
+	if (!seek(hdl, segment.offset()))
 		return false;
 
-	while (hdl.pos < (int)segment.end()) {
+	while (hdl.pos() < (int)segment.end()) {
 		IMG::Poly poly;
 		QPoint pos;
-		RectC br;
 
 		if (!(readUInt8(hdl, type) && readUInt8(hdl, subtype)
 		  && readInt16(hdl, lon) && readInt16(hdl, lat)
@@ -214,38 +235,41 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 		labelPtr = 0;
 
 		if (!_huffmanTable.isNull()) {
-			pos = QPoint((subdiv->lon()<<8) + ((qint32)lon<<(32-subdiv->bits())),
-			  (subdiv->lat()<<8) + ((qint32)lat<<(32-subdiv->bits())));
+			pos = QPoint(LS(subdiv->lon(), 8) + LS(lon, 32-subdiv->bits()),
+			  LS(subdiv->lat(), 8) + LS(lat, (32-subdiv->bits())));
 
 			qint32 lonDelta, latDelta;
-			HuffmanStream stream(*this, hdl, len, _huffmanTable, line);
+			HuffmanStream stream(*this, hdl, len, _huffmanTable,
+			  segmentType == Line);
 
 			if (shift) {
 				if (!stream.readOffset(lonDelta, latDelta))
 					return false;
-				pos = QPoint(pos.x() | lonDelta<<(32-subdiv->bits()-shift),
-				  pos.y() | latDelta<<(32-subdiv->bits()-shift));
+				pos = QPoint(pos.x() | LS(lonDelta, 32-subdiv->bits()-shift),
+				  pos.y() | LS(latDelta, 32-subdiv->bits()-shift));
 			}
 			Coordinates c(toWGS32(pos.x()), toWGS32(pos.y()));
-			br = RectC(c, c);
+			poly.boundingRect = RectC(c, c);
 			poly.points.append(QPointF(c.lon(), c.lat()));
 
 			while (stream.readNext(lonDelta, latDelta)) {
-				pos.rx() += lonDelta<<(32-subdiv->bits()-shift);
-				pos.ry() += latDelta<<(32-subdiv->bits()-shift);
+				pos.rx() += LS(lonDelta, 32-subdiv->bits()-shift);
+				if (pos.rx() < 0 && subdiv->lon() >= 0)
+					pos.rx() = 0x7fffffff;
+				pos.ry() += LS(latDelta, 32-subdiv->bits()-shift);
 
 				Coordinates c(toWGS32(pos.x()), toWGS32(pos.y()));
 				poly.points.append(QPointF(c.lon(), c.lat()));
-				br = br.united(c);
+				poly.boundingRect = poly.boundingRect.united(c);
 			}
 
 			if (!(stream.atEnd() && stream.flush()))
 				return false;
 		} else {
-			pos = QPoint(subdiv->lon() + ((qint32)lon<<(24-subdiv->bits())),
-			  subdiv->lat() + ((qint32)lat<<(24-subdiv->bits())));
+			pos = QPoint(subdiv->lon() + LS(lon, 24-subdiv->bits()),
+			  subdiv->lat() + LS(lat, 24-subdiv->bits()));
 			Coordinates c(toWGS24(pos.x()), toWGS24(pos.y()));
-			br = RectC(c, c);
+			poly.boundingRect = RectC(c, c);
 			poly.points.append(QPointF(c.lon(), c.lat()));
 
 			quint8 bitstreamInfo;
@@ -256,12 +280,14 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 			DeltaStream stream(*this, hdl, len - 1, bitstreamInfo, false, true);
 
 			while (stream.readNext(lonDelta, latDelta)) {
-				pos.rx() += lonDelta<<(24-subdiv->bits());
-				pos.ry() += latDelta<<(24-subdiv->bits());
+				pos.rx() += LS(lonDelta, 24-subdiv->bits());
+				if (pos.rx() >= 0x800000 && subdiv->lon() >= 0)
+					pos.rx() = 0x7fffff;
+				pos.ry() += LS(latDelta, 24-subdiv->bits());
 
 				Coordinates c(toWGS24(pos.x()), toWGS24(pos.y()));
 				poly.points.append(QPointF(c.lon(), c.lat()));
-				br = br.united(c);
+				poly.boundingRect = poly.boundingRect.united(c);
 			}
 			if (!(stream.atEnd() && stream.flush()))
 				return false;
@@ -271,13 +297,10 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 			return false;
 		if (subtype & 0x80 && !skipClassFields(hdl))
 			return false;
-		if (subtype & 0x40 && !skipLclFields(hdl, line ? _linesFlags
-		  : _polygonsFlags, segment.type()))
+		if (subtype & 0x40 && !skipLclFields(hdl, segmentType == Line
+		  ? _linesFlags : _polygonsFlags, segmentType))
 			return false;
 
-		if (!rect.intersects(br))
-			continue;
-
 		if (lbl && (labelPtr & 0x3FFFFF))
 			poly.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
 
@@ -287,19 +310,23 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 	return true;
 }
 
-bool RGNFile::pointObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
-  const Segment &segment, LBLFile *lbl, Handle &lblHdl,
+bool RGNFile::pointObjects(Handle &hdl, const SubDiv *subdiv,
+  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl,
   QList<IMG::Point> *points) const
 {
-	quint8 type, subtype;
-	qint16 lon, lat;
-	quint32 labelPtr;
+	const SubDiv::Segment &segment = (segmentType == IndexedPoint)
+	 ? subdiv->idxPoints() : subdiv->points();
 
-	if (!seek(hdl, segment.start()))
+	if (!segment.isValid())
+		return true;
+	if (!seek(hdl, segment.offset()))
 		return false;
 
-	while (hdl.pos < (int)segment.end()) {
+	while (hdl.pos() < (int)segment.end()) {
 		IMG::Point point;
+		quint8 type, subtype;
+		qint16 lon, lat;
+		quint32 labelPtr;
 
 		if (!(readUInt8(hdl, type) && readUInt24(hdl, labelPtr)
 		  && readInt16(hdl, lon) && readInt16(hdl, lat)))
@@ -310,22 +337,17 @@ bool RGNFile::pointObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 		} else
 			subtype = 0;
 
+		QPoint pos(subdiv->lon() + LS(lon, 24-subdiv->bits()),
+		  subdiv->lat() + LS(lat, 24-subdiv->bits()));
+
 		point.type = (quint16)type<<8 | subtype;
-
-		qint16 lonOffset = lon<<(24-subdiv->bits());
-		qint16 latOffset = lat<<(24-subdiv->bits());
-		point.coordinates = Coordinates(toWGS24(subdiv->lon() + lonOffset),
-		  toWGS24(subdiv->lat() + latOffset));
-
-		if (!rect.contains(point.coordinates))
-			continue;
-
+		point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y()));
+		point.id = pointId(pos, point.type, labelPtr & 0x3FFFFF);
 		point.poi = labelPtr & 0x400000;
-		if (lbl && (labelPtr & 0x3FFFFF)) {
-			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi);
-			point.id = ((quint64)point.type)<<40 | ((quint64)lbl->offset())<<24
-			  | (labelPtr & 0x3FFFFF);
-		}
+		if (lbl && (labelPtr & 0x3FFFFF))
+			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi,
+			  !(point.type == 0x1400 || point.type == 0x1500
+			  || point.type == 0x1e00));
 
 		points->append(point);
 	}
@@ -333,48 +355,47 @@ bool RGNFile::pointObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 	return true;
 }
 
-bool RGNFile::extPointObjects(const RectC &rect, Handle &hdl,
-  const SubDiv *subdiv, const Segment &segment, LBLFile *lbl,
+bool RGNFile::extPointObjects(Handle &hdl, const SubDiv *subdiv, LBLFile *lbl,
   Handle &lblHdl, QList<IMG::Point> *points) const
 {
-	quint8 type, subtype;
-	qint16 lon, lat;
-	quint32 labelPtr;
+	const SubDiv::Segment &segment = subdiv->extPoints();
 
-	if (!seek(hdl, segment.start()))
+	if (!segment.isValid())
+		return true;
+	if (!seek(hdl, segment.offset()))
 		return false;
 
-	while (hdl.pos < (int)segment.end()) {
+	while (hdl.pos() < (int)segment.end()) {
 		IMG::Point point;
+		qint16 lon, lat;
+		quint8 type, subtype;
+		quint32 labelPtr = 0;
 
 		if (!(readUInt8(hdl, type) && readUInt8(hdl, subtype)
 		  && readInt16(hdl, lon) && readInt16(hdl, lat)))
 			return false;
 
-		point.type = 0x10000 | (((quint32)type)<<8) | (subtype & 0x1F);
-
-		qint16 lonOffset = lon<<(24-subdiv->bits());
-		qint16 latOffset = lat<<(24-subdiv->bits());
-		point.coordinates = Coordinates(toWGS24(subdiv->lon() + lonOffset),
-		  toWGS24(subdiv->lat() + latOffset));
-		labelPtr = 0;
-
 		if (subtype & 0x20 && !readUInt24(hdl, labelPtr))
 			return false;
 		if (subtype & 0x80 && !skipClassFields(hdl))
 			return false;
-		if (subtype & 0x40 && !skipLclFields(hdl, _pointsFlags, segment.type()))
+		if (subtype & 0x40 && !skipLclFields(hdl, _pointsFlags, Point))
 			return false;
 
-		if (!rect.contains(point.coordinates))
+		QPoint pos(subdiv->lon() + LS(lon, 24-subdiv->bits()),
+		  subdiv->lat() + LS(lat, 24-subdiv->bits()));
+
+		point.type = 0x10000 | (((quint32)type)<<8) | (subtype & 0x1F);
+		// Discard NT points breaking style draw order logic (and causing huge
+		// performance drawback)
+		if (point.type == 0x11400)
 			continue;
 
+		point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y()));
+		point.id = pointId(pos, point.type, labelPtr & 0x3FFFFF);
 		point.poi = labelPtr & 0x400000;
-		if (lbl && (labelPtr & 0x3FFFFF)) {
+		if (lbl && (labelPtr & 0x3FFFFF))
 			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi);
-			point.id = ((quint64)point.type)<<40
-			  | ((quint64)lbl->offset())<<24 | (labelPtr & 0x3FFFFF);
-		}
 
 		points->append(point);
 	}
@@ -382,85 +403,13 @@ bool RGNFile::extPointObjects(const RectC &rect, Handle &hdl,
 	return true;
 }
 
-void RGNFile::objects(const RectC &rect, const SubDiv *subdiv,
-  LBLFile *lbl, NETFile *net, QList<IMG::Poly> *polygons,
-  QList<IMG::Poly> *lines, QList<IMG::Point> *points)
+QMap<RGNFile::SegmentType, SubDiv::Segment> RGNFile::segments(Handle &hdl,
+  SubDiv *subdiv) const
 {
-	Handle rgnHdl, lblHdl, netHdl;
+	QMap<SegmentType, SubDiv::Segment> ret;
 
-	if (!_init && !init(rgnHdl))
-		return;
-
-	QVector<Segment> seg(segments(rgnHdl, subdiv));
-
-	for (int i = 0; i < seg.size(); i++) {
-		const Segment &segment = seg.at(i);
-
-		if (segment.start() == segment.end())
-			continue;
-
-		switch (segment.type()) {
-			case Segment::Point:
-			case Segment::IndexedPoint:
-				if (points)
-					pointObjects(rect, rgnHdl, subdiv, segment, lbl, lblHdl,
-					  points);
-				break;
-			case Segment::Line:
-				if (lines)
-					polyObjects(rect, rgnHdl, subdiv, segment, lbl, lblHdl, net,
-					  netHdl, lines);
-				break;
-			case Segment::Polygon:
-				if (polygons)
-					polyObjects(rect, rgnHdl, subdiv, segment, lbl, lblHdl, net,
-					  netHdl, polygons);
-				break;
-			case Segment::RoadReference:
-				break;
-		}
-	}
-}
-
-void RGNFile::extObjects(const RectC &rect, const SubDiv *subdiv, quint32 shift,
-  LBLFile *lbl, QList<IMG::Poly> *polygons, QList<IMG::Poly> *lines,
-  QList<IMG::Point> *points)
-{
-	Handle rgnHdl, lblHdl;
-
-	if (!_init && !init(rgnHdl))
-		return;
-	if (polygons && subdiv->polygonsOffset() != subdiv->polygonsEnd()) {
-		quint32 start = _polygonsOffset + subdiv->polygonsOffset();
-		quint32 end = subdiv->polygonsEnd()
-		  ? _polygonsOffset + subdiv->polygonsEnd()
-		  : _polygonsOffset + _polygonsSize;
-		extPolyObjects(rect, rgnHdl, subdiv, shift, Segment(start, end,
-		  Segment::Polygon), lbl, lblHdl, polygons, false);
-	}
-	if (lines && subdiv->linesOffset() != subdiv->linesEnd()) {
-		quint32 start = _linesOffset + subdiv->linesOffset();
-		quint32 end = subdiv->linesEnd()
-		  ? _linesOffset + subdiv->linesEnd()
-		  : _linesOffset + _linesSize;
-		extPolyObjects(rect, rgnHdl, subdiv, shift, Segment(start, end,
-		  Segment::Line), lbl, lblHdl, lines, true);
-	}
-	if (points && subdiv->pointsOffset() != subdiv->pointsEnd()) {
-		quint32 start = _pointsOffset + subdiv->pointsOffset();
-		quint32 end = subdiv->pointsEnd()
-		  ? _pointsOffset + subdiv->pointsEnd()
-		  : _pointsOffset + _pointsSize;
-		extPointObjects(rect, rgnHdl, subdiv, Segment(start, end,
-		  Segment::Point), lbl, lblHdl, points);
-	}
-}
-
-QVector<RGNFile::Segment> RGNFile::segments(Handle &hdl, const SubDiv *subdiv)
-  const
-{
 	if (subdiv->offset() == subdiv->end() || !(subdiv->objects() & 0x1F))
-		return QVector<Segment>();
+		return ret;
 
 	quint32 offset = _offset + subdiv->offset();
 
@@ -470,57 +419,63 @@ QVector<RGNFile::Segment> RGNFile::segments(Handle &hdl, const SubDiv *subdiv)
 			no++;
 
 	if (!seek(hdl, offset))
-		return QVector<Segment>();
+		return ret;
 
-	QVector<Segment> ret;
 	quint32 start = offset + 2 * (no - 1);
-	quint16 po;
-	int cnt = 0;
+	quint32 ls = 0;
+	SegmentType lt = (SegmentType)0;
 
-	for (quint16 mask = 0x1; mask <= 0x10; mask <<= 1) {
+	for (quint8 mask = 0x1; mask <= 0x10; mask <<= 1) {
 		if (subdiv->objects() & mask) {
-			if (cnt) {
-				if (!readUInt16(hdl, po))
-					return QVector<Segment>();
+			if (ls) {
+				quint16 po;
+				if (!readUInt16(hdl, po) || !po)
+					return QMap<RGNFile::SegmentType, SubDiv::Segment>();
 				start = offset + po;
+				ret.insert(lt, SubDiv::Segment(ls, start));
 			}
-			if (!ret.isEmpty())
-				ret.last().setEnd(start);
-			ret.append(Segment(start, (Segment::Type)mask));
-			cnt++;
+
+			lt = (SegmentType)mask;
+			ls = start;
 		}
 	}
 
-	ret.last().setEnd(subdiv->end() ? _offset + subdiv->end() : _offset + _size);
+	ret.insert(lt, SubDiv::Segment(ls, subdiv->end()
+	  ? _offset + subdiv->end() : _offset + _size));
 
 	return ret;
 }
 
-#ifndef QT_NO_DEBUG
-QDebug operator<<(QDebug dbg, const RGNFile::Segment &segment)
+bool RGNFile::subdivInit(Handle &hdl, SubDiv *subdiv) const
 {
-	QString type;
-	switch (segment.type()) {
-		case RGNFile::Segment::Point:
-			type = "Point";
-			break;
-		case RGNFile::Segment::IndexedPoint:
-			type = "IndexedPoint";
-			break;
-		case RGNFile::Segment::Line:
-			type = "Line";
-			break;
-		case RGNFile::Segment::Polygon:
-			type = "Polygon";
-			break;
-		case RGNFile::Segment::RoadReference:
-			type = "RoadReference";
-			break;
+	QMap<RGNFile::SegmentType, SubDiv::Segment> seg(segments(hdl, subdiv));
+	SubDiv::Segment extPoints, extLines, extPolygons;
+
+	if (subdiv->extPointsOffset() != subdiv->extPointsEnd()) {
+		quint32 start = _pointsOffset + subdiv->extPointsOffset();
+		quint32 end = subdiv->extPointsEnd()
+		  ? _pointsOffset + subdiv->extPointsEnd()
+		  : _pointsOffset + _pointsSize;
+		extPoints = SubDiv::Segment(start, end);
+	}
+	if (subdiv->extPolygonsOffset() != subdiv->extPolygonsEnd()) {
+		quint32 start = _polygonsOffset + subdiv->extPolygonsOffset();
+		quint32 end = subdiv->extPolygonsEnd()
+		  ? _polygonsOffset + subdiv->extPolygonsEnd()
+		  : _polygonsOffset + _polygonsSize;
+		extPolygons = SubDiv::Segment(start, end);
+	}
+	if (subdiv->extLinesOffset() != subdiv->extLinesEnd()) {
+		quint32 start = _linesOffset + subdiv->extLinesOffset();
+		quint32 end = subdiv->extLinesEnd()
+		  ? _linesOffset + subdiv->extLinesEnd()
+		  : _linesOffset + _linesSize;
+		extLines = SubDiv::Segment(start, end);
 	}
 
-	dbg.nospace() << "Segment(" << segment.start() << ", " << segment.end()
-	  - segment.start() << ", " << type << ")";
+	subdiv->init(seg.value(Point), seg.value(IndexedPoint), seg.value(Line),
+	  seg.value(Polygon), seg.value(RoadReference), extPoints, extLines,
+	  extPolygons);
 
-	return dbg.space();
+	return true;
 }
-#endif // QT_NO_DEBUG

src/map/IMG/rgnfile.h

@@ -12,74 +12,50 @@ class NETFile;
 class RGNFile : public SubFile
 {
 public:
+	enum SegmentType {
+		Point = 0x1,
+		IndexedPoint = 0x2,
+		Line = 0x4,
+		Polygon = 0x8,
+		RoadReference = 0x10
+	};
+
 	RGNFile(IMG *img)
 	  : SubFile(img), _offset(0), _size(0), _polygonsOffset(0),
 	  _polygonsSize(0), _linesOffset(0), _linesSize(0), _pointsOffset(0),
 	  _pointsSize(0), _init(false) {clearFlags();}
+	RGNFile(const QString &path)
+	  : SubFile(path), _offset(0), _size(0), _polygonsOffset(0),
+	  _polygonsSize(0), _linesOffset(0), _linesSize(0), _pointsOffset(0),
+	  _pointsSize(0), _init(false) {clearFlags();}
 	RGNFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset), _offset(0),
 	  _size(0), _polygonsOffset(0), _polygonsSize(0), _linesOffset(0),
 	  _linesSize(0), _pointsOffset(0), _pointsSize(0), _init(false)
 	  {clearFlags();}
 
-	void objects(const RectC &rect, const SubDiv *subdiv,
-	  LBLFile *lbl, NETFile *net, QList<IMG::Poly> *polygons,
-	  QList<IMG::Poly> *lines, QList<IMG::Point> *points);
-	void extObjects(const RectC &rect, const SubDiv *subdiv, quint32 shift,
-	  LBLFile *lbl, QList<IMG::Poly> *polygons, QList<IMG::Poly> *lines,
-	  QList<IMG::Point> *points);
-
-private:
-	class Segment {
-	public:
-		enum Type {
-			Point = 0x1,
-			IndexedPoint = 0x2,
-			Line = 0x4,
-			Polygon = 0x8,
-			RoadReference = 0x10
-		};
-
-		Segment() : _start(0), _end(0), _type(Point) {}
-		Segment(quint32 start, Type type)
-		  : _start(start), _end(0), _type(type) {}
-		Segment(quint32 start, quint32 end, Type type)
-		  : _start(start), _end(end), _type(type) {}
-
-		void setEnd(quint32 end) {_end = end;}
-
-		quint32 start() const {return _start;}
-		quint32 end() const {return _end;}
-		Type type() const {return _type;}
-
-	private:
-		quint32 _start;
-		quint32 _end;
-		Type _type;
-	};
-
+	bool initialized() const {return _init;}
 	bool init(Handle &hdl);
 
-	QVector<Segment> segments(Handle &hdl, const SubDiv *subdiv) const;
-	bool polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
-	  const Segment &segment, LBLFile *lbl, Handle &lblHdl, NETFile *net,
-	  Handle &netHdl, QList<IMG::Poly> *polys) const;
-	bool pointObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
-	  const Segment &segment, LBLFile *lbl, Handle &lblHdl,
-	  QList<IMG::Point> *points) const;
-	bool extPolyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
-	  quint32 shift, const Segment &segment, LBLFile *lbl, Handle &lblHdl,
-	  QList<IMG::Poly> *polys, bool line) const;
-	bool extPointObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
-	  const Segment &segment, LBLFile *lbl, Handle &lblHdl,
-	  QList<IMG::Point> *points) const;
+	bool polyObjects(Handle &hdl, const SubDiv *subdiv, SegmentType segmentType,
+	  LBLFile *lbl, Handle &lblHdl, NETFile *net, Handle &netHdl,
+	  QList<IMG::Poly> *polys) const;
+	bool pointObjects(Handle &hdl, const SubDiv *subdiv, SegmentType segmentType,
+	  LBLFile *lbl, Handle &lblHdl, QList<IMG::Point> *points) const;
+	bool extPolyObjects(Handle &hdl, const SubDiv *subdiv, quint32 shift,
+	  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl,
+	  QList<IMG::Poly> *polys) const;
+	bool extPointObjects(Handle &hdl, const SubDiv *subdiv, LBLFile *lbl,
+	  Handle &lblHdl, QList<IMG::Point> *points) const;
 
+	bool subdivInit(Handle &hdl, SubDiv *subdiv) const;
+
+private:
+	QMap<SegmentType, SubDiv::Segment> segments(Handle &hdl, SubDiv *subdiv)
+	  const;
 	void clearFlags();
-
 	bool skipClassFields(Handle &hdl) const;
-	bool skipLclFields(Handle &hdl, const quint32 flags[3],
-	  Segment::Type type) const;
-
-	friend QDebug operator<<(QDebug dbg, const RGNFile::Segment &segment);
+	bool skipLclFields(Handle &hdl, const quint32 flags[3], SegmentType type)
+	  const;
 
 	quint32 _offset;
 	quint32 _size;
@@ -99,8 +75,4 @@ private:
 	bool _init;
 };
 
-#ifndef QT_NO_DEBUG
-QDebug operator<<(QDebug dbg, const RGNFile::Segment &segment);
-#endif // QT_NO_DEBUG
-
 #endif // RGNFILE_H

src/map/IMG/style.cpp

@@ -1,4 +1,5 @@
 #include <QImage>
+#include <QPainter>
 #include "style.h"
 
 
@@ -79,13 +80,19 @@ void Style::defaultPolygonStyle()
 	  << TYPE(0x13);
 }
 
+static QImage railroad()
+{
+	QImage img(16, 4, QImage::Format_ARGB32_Premultiplied);
+	img.fill(QColor("#717171"));
+	QPainter p(&img);
+	p.setPen(QPen(Qt::white, 2));
+	p.drawLine(9, 2, 15, 2);
+
+	return img;
+}
+
 void Style::defaultLineStyle()
 {
-	QVector<qreal> pattern;
-	pattern << 4 << 4;
-	QPen rr(QColor("#717171"), 3, Qt::CustomDashLine);
-	rr.setDashPattern(pattern);
-
 	_lines[TYPE(0x01)] = Line(QPen(QColor("#9bd772"), 2, Qt::SolidLine),
 	  QPen(QColor("#72a35a"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
 	_lines[TYPE(0x02)] = Line(QPen(QColor("#ffcc78"), 2, Qt::SolidLine),
@@ -109,13 +116,13 @@ void Style::defaultLineStyle()
 	  QPen(QColor("#e8a541"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
 	_lines[TYPE(0x0c)] = Line(QPen(QColor("#ffffff"), 3, Qt::SolidLine),
 	  QPen(QColor("#d5cdc0"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-	_lines[TYPE(0x14)] = Line(rr, QPen(Qt::white, 3, Qt::SolidLine,
-	  Qt::RoundCap, Qt::RoundJoin));
+	_lines[TYPE(0x14)] = Line(railroad());
 	_lines[TYPE(0x16)] = Line(QPen(QColor("#aba083"), 1, Qt::DotLine));
 	_lines[TYPE(0x18)] = Line(QPen(QColor("#9fc4e1"), 2, Qt::SolidLine));
 	_lines[TYPE(0x18)].setTextColor(QColor("#9fc4e1"));
 	//_lines[TYPE(0x1a)] = Line(QPen(QColor("#7697b7"), 1, Qt::DashLine));
 	_lines[TYPE(0x1b)] = Line(QPen(QColor("#7697b7"), 1, Qt::DashLine));
+	_lines[TYPE(0x1c)] = Line(QPen(QColor("#505145"), 1, Qt::DashLine));
 	_lines[TYPE(0x1e)] = Line(QPen(QColor("#505145"), 2, Qt::DashDotLine));
 	_lines[TYPE(0x1f)] = Line(QPen(QColor("#9fc4e1"), 3, Qt::SolidLine));
 	_lines[TYPE(0x1f)].setTextColor(QColor("#9fc4e1"));
@@ -145,6 +152,17 @@ void Style::defaultLineStyle()
 
 void Style::defaultPointStyle()
 {
+	// Countries
+	_points[TYPE(0x14)].setTextColor(QColor("#505145"));
+	_points[TYPE(0x14)].setTextFontSize(Small);
+	_points[TYPE(0x15)].setTextColor(QColor("#505145"));
+	_points[TYPE(0x15)].setTextFontSize(Small);
+
+	// Regions
+	_points[TYPE(0x1e)].setTextColor(QColor("#505145"));
+	_points[TYPE(0x1e)].setTextFontSize(ExtraSmall);
+	_points[TYPE(0x28)].setTextFontSize(Small);
+
 	// Cities
 	_points[TYPE(0x01)].setTextFontSize(Large);
 	_points[TYPE(0x02)].setTextFontSize(Large);
@@ -341,7 +359,7 @@ static bool skipLocalization(SubFile *file, SubFile::Handle &hdl)
 		len = len >> 2;
 	}
 
-	if (!file->seek(hdl, hdl.pos + len))
+	if (!file->seek(hdl, hdl.pos() + len))
 		return false;
 
 	return true;
@@ -890,7 +908,7 @@ bool Style::parseDrawOrder(SubFile *file, SubFile::Handle &hdl,
 
 bool Style::parseTYPFile(SubFile *file)
 {
-	SubFile::Handle hdl;
+	SubFile::Handle hdl(file);
 	Section points, lines, polygons, order;
 	quint16 tmp16, codepage;
 
@@ -939,9 +957,6 @@ Style::Style(SubFile *typ)
 
 	if (typ)
 		parseTYPFile(typ);
-
-	// Override stuff breaking the style display logic
-	_points[0x11400] = Point(None);
 }
 
 const Style::Line &Style::line(quint32 type) const

src/map/IMG/style.h

@@ -16,7 +16,8 @@ public:
 		None = 1,
 		Small = 2,
 		Normal = 3,
-		Large = 4
+		Large = 4,
+		ExtraSmall = 5
 	};
 
 	enum POIClass {

src/map/IMG/subdiv.h

@@ -7,55 +7,147 @@
 
 class SubDiv {
 public:
-	SubDiv(quint32 offset, qint32 lon, qint32 lat, int bits, quint8 objects)
-	  : _offset(offset), _end(0), _lon(lon), _lat(lat), _bits(bits),
-	  _objects(objects), _polygonsOffset(0), _polygonsEnd(0), _linesOffset(0),
-	  _linesEnd(0), _pointsOffset(0), _pointsEnd(0) {}
-	void setEnd(quint32 end) {_end = end;}
+	class Segment {
+	public:
+		Segment() : _offset(0), _end(0) {}
+		Segment(quint32 ofset, quint32 end) : _offset(ofset), _end(end) {}
+
+		bool isValid() const {return (_end > _offset);}
+
+		quint32 offset() const {return _offset;}
+		quint32 end() const {return _end;}
+
+	private:
+		quint32 _offset, _end;
+	};
+
+	SubDiv(quint32 offset, qint32 lon, qint32 lat, int bits, quint8 objects)
+	  : _lon(lon), _lat(lat), _bits(bits), _init(false)
+	{
+		_tre.objects = objects;
+		_tre.offset = offset;
+		_tre.end = 0;
+
+		_tre.extPolygonsOffset = 0;
+		_tre.extPolygonsEnd = 0;
+		_tre.extLinesOffset = 0;
+		_tre.extLinesEnd = 0;
+		_tre.extPointsOffset = 0;
+		_tre.extPointsEnd = 0;
+	}
+	void setEnd(quint32 end) {_tre.end = end;}
+	void setExtOffsets(quint32 polygon, quint32 line, quint32 point)
+	{
+		_tre.extPolygonsOffset = polygon;
+		_tre.extLinesOffset = line;
+		_tre.extPointsOffset = point;
+	}
+	void setExtEnds(quint32 polygon, quint32 line, quint32 point)
+	{
+		_tre.extPolygonsEnd = polygon;
+		_tre.extLinesEnd = line;
+		_tre.extPointsEnd = point;
+	}
+
+	void init(const Segment &points, const Segment &idxPoints,
+	  const Segment &lines, const Segment &polygons,
+	  const Segment &roadReferences, const Segment &extPoints,
+	  const Segment &extLines, const Segment &extPolygons)
+	{
+		_rgn.pointsOffset = points.offset();
+		_rgn.pointsEnd = points.end();
+		_rgn.idxPointsOffset = idxPoints.offset();
+		_rgn.idxPointsEnd = idxPoints.end();
+		_rgn.linesOffset = lines.offset();
+		_rgn.linesEnd = lines.end();
+		_rgn.polygonsOffset = polygons.offset();
+		_rgn.polygonsEnd = polygons.end();
+		_rgn.roadReferencesOffset = roadReferences.offset();
+		_rgn.roadReferencesEnd = roadReferences.end();
+		_rgn.extPointsOffset = extPoints.offset();
+		_rgn.extPointsEnd = extPoints.end();
+		_rgn.extLinesOffset = extLines.offset();
+		_rgn.extLinesEnd = extLines.end();
+		_rgn.extPolygonsOffset = extPolygons.offset();
+		_rgn.extPolygonsEnd = extPolygons.end();
+
+		_init = true;
+	}
+	bool initialized() const {return _init;}
 
-	quint32 offset() const {return _offset;}
-	quint32 end() const {return _end;}
 	qint32 lon() const {return _lon;}
 	qint32 lat() const {return _lat;}
 	quint8 bits() const {return _bits;}
-	quint8 objects() const {return _objects;}
 
-	// Extended types objects (TRE7)
-	void setExtOffsets(quint32 polygon, quint32 line, quint32 point)
-	  {_polygonsOffset = polygon; _linesOffset = line; _pointsOffset = point;}
-	void setExtEnds(quint32 polygon, quint32 line, quint32 point)
-	  {_polygonsEnd = polygon; _linesEnd = line; _pointsEnd = point;}
+	// Valid only after initialization
+	Segment points() const
+	  {return Segment(_rgn.pointsOffset, _rgn.pointsEnd);}
+	Segment idxPoints() const
+	  {return Segment(_rgn.idxPointsOffset, _rgn.idxPointsEnd);}
+	Segment lines() const
+	  {return Segment(_rgn.linesOffset, _rgn.linesEnd);}
+	Segment polygons() const
+	  {return Segment(_rgn.polygonsOffset, _rgn.polygonsEnd);}
+	Segment extPoints() const
+	  {return Segment(_rgn.extPointsOffset, _rgn.extPointsEnd);}
+	Segment extLines() const
+	  {return Segment(_rgn.extLinesOffset, _rgn.extLinesEnd);}
+	Segment extPolygons() const
+	  {return Segment(_rgn.extPolygonsOffset, _rgn.extPolygonsEnd);}
 
-	quint32 polygonsOffset() const {return _polygonsOffset;}
-	quint32 polygonsEnd() const {return _polygonsEnd;}
-	quint32 linesOffset() const {return _linesOffset;}
-	quint32 linesEnd() const {return _linesEnd;}
-	quint32 pointsOffset() const {return _pointsOffset;}
-	quint32 pointsEnd() const {return _pointsEnd;}
+	// Valid only until initialization
+	quint8 objects() const {return _tre.objects;}
+	quint32 offset() const {return _tre.offset;}
+	quint32 end() const {return _tre.end;}
+	quint32 extPolygonsOffset() const {return _tre.extPolygonsOffset;}
+	quint32 extPolygonsEnd() const {return _tre.extPolygonsEnd;}
+	quint32 extLinesOffset() const {return _tre.extLinesOffset;}
+	quint32 extLinesEnd() const {return _tre.extLinesEnd;}
+	quint32 extPointsOffset() const {return _tre.extPointsOffset;}
+	quint32 extPointsEnd() const {return _tre.extPointsEnd;}
 
 private:
-	quint32 _offset;
-	quint32 _end;
+	struct TRE
+	{
+		quint8 objects;
+		quint32 offset;
+		quint32 end;
+
+		quint32 extPolygonsOffset;
+		quint32 extPolygonsEnd;
+		quint32 extLinesOffset;
+		quint32 extLinesEnd;
+		quint32 extPointsOffset;
+		quint32 extPointsEnd;
+	};
+
+	struct RGN
+	{
+		quint32 pointsOffset;
+		quint32 pointsEnd;
+		quint32 idxPointsOffset;
+		quint32 idxPointsEnd;
+		quint32 linesOffset;
+		quint32 linesEnd;
+		quint32 polygonsOffset;
+		quint32 polygonsEnd;
+		quint32 roadReferencesOffset;
+		quint32 roadReferencesEnd;
+		quint32 extPointsOffset;
+		quint32 extPointsEnd;
+		quint32 extLinesOffset;
+		quint32 extLinesEnd;
+		quint32 extPolygonsOffset;
+		quint32 extPolygonsEnd;
+	};
+
 	qint32 _lon, _lat;
 	quint8 _bits;
-	quint8 _objects;
-
-	quint32 _polygonsOffset;
-	quint32 _polygonsEnd;
-	quint32 _linesOffset;
-	quint32 _linesEnd;
-	quint32 _pointsOffset;
-	quint32 _pointsEnd;
+	bool _init;
+	union {
+		TRE _tre;
+		RGN _rgn;
+	};
 };
 
-#ifndef QT_NO_DEBUG
-inline QDebug operator<<(QDebug dbg, const SubDiv &subdiv)
-{
-	Coordinates c(toWGS24(subdiv.lon()), toWGS24(subdiv.lat()));
-	dbg.nospace() << "SubDiv(" << c << ", " << subdiv.offset()
-	  << ", " << subdiv.end() << ", " << subdiv.objects() << ")";
-	return dbg.space();
-}
-#endif // QT_NO_DEBUG
-
 #endif // SUBDIV_H

src/map/IMG/subfile.cpp

@@ -5,39 +5,40 @@
 
 bool SubFile::seek(Handle &handle, quint32 pos) const
 {
-	if (_file)
-		return _file->seek(pos);
-	else {
+	if (handle._file) {
+		int blockNum = pos / BLOCK_SIZE;
+
+		if (handle._blockNum != blockNum) {
+			if (!handle._file->seek((qint64)blockNum * BLOCK_SIZE))
+				return false;
+			if (handle._file->read(handle._data.data(), BLOCK_SIZE) < 0)
+				return false;
+			handle._blockNum = blockNum;
+		}
+
+		handle._blockPos = pos % BLOCK_SIZE;
+		handle._pos = pos;
+
+		return true;
+	} else {
 		quint32 blockSize = _img->blockSize();
 		int blockNum = pos / blockSize;
 
-		if (handle.blockNum != blockNum) {
+		if (handle._blockNum != blockNum) {
 			if (blockNum >= _blocks->size())
 				return false;
-			if (!_img->readBlock(_blocks->at(blockNum), handle.data))
+			if (!_img->readBlock(_blocks->at(blockNum), handle._data.data()))
 				return false;
-			handle.blockNum = blockNum;
+			handle._blockNum = blockNum;
 		}
 
-		handle.blockPos = pos % blockSize;
-		handle.pos = pos;
+		handle._blockPos = pos % blockSize;
+		handle._pos = pos;
 
 		return true;
 	}
 }
 
-bool SubFile::readByte(Handle &handle, quint8 &val) const
-{
-	if (_file)
-		return _file->getChar((char*)&val);
-	else {
-		val = handle.data.at(handle.blockPos++);
-		handle.pos++;
-		return (handle.blockPos >= _img->blockSize())
-		  ? seek(handle, handle.pos) : true;
-	}
-}
-
 bool SubFile::readVUInt32(Handle &hdl, quint32 &val) const
 {
 	quint8 bytes, shift, b;
@@ -69,20 +70,6 @@ bool SubFile::readVUInt32(Handle &hdl, quint32 &val) const
 	return true;
 }
 
-bool SubFile::readVUInt32SW(Handle &hdl, quint32 bytes, quint32 &val) const
-{
-	quint8 b;
-
-	val = 0;
-	for (quint32 i = bytes; i; i--) {
-		if (!readByte(hdl, b))
-			return false;
-		val |= ((quint32)b) << ((i-1) * 8);
-	}
-
-	return true;
-}
-
 bool SubFile::readVBitfield32(Handle &hdl, quint32 &bitfield) const
 {
 	quint8 bits;
@@ -91,7 +78,7 @@ bool SubFile::readVBitfield32(Handle &hdl, quint32 &bitfield) const
 		return false;
 
 	if (!(bits & 1)) {
-		seek(hdl, hdl.pos - 1);
+		seek(hdl, hdl._pos - 1);
 		if (!((bits>>1) & 1)) {
 			if (!((bits>>2) & 1)) {
 				if (!readUInt32(hdl, bitfield))
@@ -111,8 +98,3 @@ bool SubFile::readVBitfield32(Handle &hdl, quint32 &bitfield) const
 
 	return true;
 }
-
-QString SubFile::fileName() const
-{
-	return _file ? _file->fileName() : _img->fileName();
-}

src/map/IMG/subfile.h

@@ -2,36 +2,56 @@
 #define SUBFILE_H
 
 #include <QVector>
-#include <QDebug>
+#include <QFile>
+#include "img.h"
 
-class QFile;
-class IMG;
+
+#define BLOCK_SIZE 4096
 
 class SubFile
 {
 public:
 	enum Type {Unknown, TRE, RGN, LBL, NET, TYP, GMP};
 
-	struct Handle
+	class Handle
 	{
-		Handle() : blockNum(-1), blockPos(-1), pos(-1) {}
+	public:
+		Handle(const SubFile *subFile)
+		  : _file(0), _blockNum(-1), _blockPos(-1), _pos(-1)
+		{
+			if (subFile && subFile->_path) {
+				_file = new QFile(*(subFile->_path));
+				_file->open(QIODevice::ReadOnly);
+				_data.resize(BLOCK_SIZE);
+			} else if (subFile)
+				_data.resize(subFile->_img->blockSize());
+		}
+		~Handle() {delete _file;}
 
-		QByteArray data;
-		int blockNum;
-		int blockPos;
-		int pos;
+		int pos() const {return _pos;}
+
+	private:
+		friend class SubFile;
+
+		QFile *_file;
+		QByteArray _data;
+		int _blockNum;
+		int _blockPos;
+		int _pos;
 	};
 
 	SubFile(IMG *img)
-	  : _gmpOffset(0), _img(img), _blocks(new QVector<quint16>()), _file(0) {}
+	  : _gmpOffset(0), _img(img), _blocks(new QVector<quint16>()), _path(0) {}
 	SubFile(SubFile *gmp, quint32 offset) : _gmpOffset(offset), _img(gmp->_img),
-	  _blocks(gmp->_blocks), _file(gmp->_file) {}
-	SubFile(QFile *file)
-	  : _gmpOffset(0), _img(0), _blocks(0), _file(file) {}
+	  _blocks(gmp->_blocks), _path(gmp->_path) {}
+	SubFile(const QString &path)
+	  : _gmpOffset(0), _img(0), _blocks(0), _path(new QString(path)) {}
 	~SubFile()
 	{
-		if (!_gmpOffset)
+		if (!_gmpOffset) {
 			delete _blocks;
+			delete _path;
+		}
 	}
 
 	void addBlock(quint16 block) {_blocks->append(block);}
@@ -97,22 +117,41 @@ public:
 		return true;
 	}
 
+	bool readVUInt32SW(Handle &hdl, quint32 bytes, quint32 &val) const
+	{
+		quint8 b;
+
+		val = 0;
+		for (quint32 i = bytes; i; i--) {
+			if (!readByte(hdl, b))
+				return false;
+			val |= ((quint32)b) << ((i-1) * 8);
+		}
+
+		return true;
+	}
+
 	bool readVUInt32(Handle &hdl, quint32 &val) const;
-	bool readVUInt32SW(Handle &hdl, quint32 bytes, quint32 &val) const;
 	bool readVBitfield32(Handle &hdl, quint32 &bitfield) const;
 
-	quint16 offset() const {return _blocks->first();}
-	QString fileName() const;
+	QString fileName() const {return _path ? *_path : _img->fileName();}
 
 protected:
 	quint32 _gmpOffset;
 
 private:
-	bool readByte(Handle &handle, quint8 &val) const;
+	bool readByte(Handle &handle, quint8 &val) const
+	{
+		int blockSize = _img ? _img->blockSize() : BLOCK_SIZE;
+		val = handle._data.at(handle._blockPos++);
+		handle._pos++;
+		return (handle._blockPos >= blockSize)
+		  ? seek(handle, handle._pos) : true;
+	}
 
 	IMG *_img;
 	QVector<quint16> *_blocks;
-	QFile *_file;
+	QString *_path;
 };
 
 #endif // SUBFILE_H

src/map/IMG/trefile.cpp

@@ -3,6 +3,11 @@
 #include "trefile.h"
 
 
+static inline double RB(qint32 val)
+{
+	return (val == -0x800000 || val == 0x800000) ? 180.0 : toWGS24(val);
+}
+
 static void demangle(quint8 *data, quint32 size, quint32 key)
 {
 	static const unsigned char shuf[] = {
@@ -39,10 +44,11 @@ TREFile::~TREFile()
 
 bool TREFile::init()
 {
-	Handle hdl;
+	Handle hdl(this);
 	quint8 locked;
 	quint16 hdrLen;
 
+
 	if (!(seek(hdl, _gmpOffset) && readUInt16(hdl, hdrLen)
 	  && seek(hdl, _gmpOffset + 0x0D) && readUInt8(hdl, locked)))
 		return false;
@@ -53,7 +59,8 @@ bool TREFile::init()
 	  && readInt24(hdl, east) && readInt24(hdl, south) && readInt24(hdl, west)))
 		return false;
 	_bounds = RectC(Coordinates(toWGS24(west), toWGS24(north)),
-	  Coordinates(toWGS24(east), toWGS24(south)));
+	  Coordinates(RB(east), toWGS24(south)));
+	Q_ASSERT(_bounds.left() <= _bounds.right());
 
 	// Levels & subdivs info
 	quint32 levelsOffset, levelsSize, subdivSize;
@@ -108,12 +115,14 @@ bool TREFile::init()
 		}
 	}
 
+	_isBaseMap = false;
+
 	return (_firstLevel >= 0);
 }
 
 bool TREFile::load(int idx)
 {
-	Handle hdl;
+	Handle hdl(this);
 	QList<SubDiv*> sl;
 	SubDiv *s = 0;
 	SubDivTree *tree = new SubDivTree();
@@ -130,8 +139,8 @@ bool TREFile::load(int idx)
 
 	for (int j = 0; j < _levels.at(idx).subdivs; j++) {
 		quint32 oo;
-		qint32 lon, lat;
-		quint16 width, height, nextLevel;
+		qint32 lon, lat, width, height;
+		quint16 nextLevel;
 
 		if (!(readUInt32(hdl, oo) && readInt24(hdl, lon) && readInt24(hdl, lat)
 		  && readUInt16(hdl, width) && readUInt16(hdl, height)))
@@ -147,17 +156,16 @@ bool TREFile::load(int idx)
 			s->setEnd(offset);
 
 		width &= 0x7FFF;
-		width <<= (24 - _levels.at(idx).bits);
-		height <<= (24 - _levels.at(idx).bits);
-
+		width = LS(width, 24 - _levels.at(idx).bits);
+		height = LS(height, 24 - _levels.at(idx).bits);
 
 		s = new SubDiv(offset, lon, lat, _levels.at(idx).bits, objects);
 		sl.append(s);
 
 		double min[2], max[2];
-		RectC bounds(Coordinates(toWGS24(lon - width),
-		  toWGS24(lat + height + 1)), Coordinates(toWGS24(lon + width + 1),
-		  toWGS24(lat - height)));
+		RectC bounds(Coordinates(toWGS24(lon - width), toWGS24(lat + height)),
+		  Coordinates(RB(lon + width), toWGS24(lat - height)));
+		Q_ASSERT(bounds.left() <= bounds.right());
 
 		min[0] = bounds.left();
 		min[1] = bounds.bottom();
@@ -199,7 +207,7 @@ bool TREFile::load(int idx)
 			if (i)
 				sl.at(i-1)->setExtEnds(polygons, lines, points);
 
-			if (!seek(hdl, hdl.pos + _extended.itemSize - 12))
+			if (!seek(hdl, hdl.pos() + _extended.itemSize - 12))
 				goto error;
 		}
 
@@ -236,8 +244,15 @@ void TREFile::clear()
 	_subdivs.clear();
 }
 
-int TREFile::level(int bits)
+int TREFile::level(int bits, bool baseMap)
 {
+	if (baseMap) {
+		if (!_isBaseMap && _levels.first().bits > bits)
+			return -1;
+		if (_isBaseMap && bits > _levels.last().bits)
+			return -1;
+	}
+
 	int idx = _firstLevel;
 
 	for (int i = idx + 1; i < _levels.size(); i++) {
@@ -259,10 +274,10 @@ static bool cb(SubDiv *subdiv, void *context)
 	return true;
 }
 
-QList<SubDiv*> TREFile::subdivs(const RectC &rect, int bits)
+QList<SubDiv*> TREFile::subdivs(const RectC &rect, int bits, bool baseMap)
 {
 	QList<SubDiv*> list;
-	SubDivTree *tree = _subdivs.value(level(bits));
+	SubDivTree *tree = _subdivs.value(level(bits, baseMap));
 	double min[2], max[2];
 
 	min[0] = rect.left();

src/map/IMG/trefile.h

@@ -14,16 +14,20 @@ class TREFile : public SubFile
 {
 public:
 	TREFile(IMG *img) : SubFile(img) {}
+	TREFile(const QString &path) : SubFile(path) {}
 	TREFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset) {}
 	~TREFile();
 
 	bool init();
+	void markAsBasemap() {_isBaseMap = true;}
 	void clear();
 
 	const RectC &bounds() const {return _bounds;}
-	QList<SubDiv*> subdivs(const RectC &rect, int bits);
+	QList<SubDiv*> subdivs(const RectC &rect, int bits, bool baseMap);
 	quint32 shift(quint8 bits) const
 	  {return (bits == _levels.last().bits) ? (_flags >> 0xb) & 7 : 0;}
+	Range zooms() const
+	  {return Range(_levels.at(_firstLevel).bits, _levels.last().bits);}
 
 private:
 	struct MapLevel {
@@ -41,7 +45,7 @@ private:
 	typedef RTree<SubDiv*, double, 2> SubDivTree;
 
 	bool load(int idx);
-	int level(int bits);
+	int level(int bits, bool baseMap);
 	bool parsePoly(Handle hdl, quint32 pos, const QMap<int, int> &level2bits,
 	  QMap<quint32, int> &map);
 	bool parsePoints(Handle hdl, quint32 pos, const QMap<int, int> &level2bits);
@@ -54,6 +58,7 @@ private:
 	Extended _extended;
 	int _firstLevel;
 	quint32 _flags;
+	bool _isBaseMap;
 
 	QMap<int, SubDivTree*> _subdivs;
 };

src/map/IMG/vectortile.cpp

@@ -1,5 +1,23 @@
 #include "vectortile.h"
 
+
+static void copyPolys(const RectC &rect, QList<IMG::Poly> *src,
+  QList<IMG::Poly> *dst)
+{
+	for (int i = 0; i < src->size(); i++)
+		if (rect.intersects(src->at(i).boundingRect))
+			dst->append(src->at(i));
+}
+
+static void copyPoints(const RectC &rect, QList<IMG::Point> *src,
+  QList<IMG::Point> *dst)
+{
+	for (int j = 0; j < src->size(); j++)
+		if (rect.contains(src->at(j).coordinates))
+			dst->append(src->at(j));
+}
+
+
 SubFile *VectorTile::file(SubFile::Type type)
 {
 	switch (type) {
@@ -41,6 +59,29 @@ SubFile *VectorTile::addFile(IMG *img, SubFile::Type type)
 	}
 }
 
+SubFile *VectorTile::addFile(const QString &path, SubFile::Type type)
+{
+	switch (type) {
+		case SubFile::TRE:
+			_tre = new TREFile(path);
+			return _tre;
+		case SubFile::RGN:
+			_rgn = new RGNFile(path);
+			return _rgn;
+		case SubFile::LBL:
+			_lbl = new LBLFile(path);
+			return _lbl;
+		case SubFile::NET:
+			_net = new NETFile(path);
+			return _net;
+		case SubFile::GMP:
+			_gmp = new SubFile(path);
+			return _gmp;
+		default:
+			return 0;
+	}
+}
+
 bool VectorTile::init()
 {
 	if (_gmp && !initGMP())
@@ -54,7 +95,7 @@ bool VectorTile::init()
 
 bool VectorTile::initGMP()
 {
-	SubFile::Handle hdl;
+	SubFile::Handle hdl(_gmp);
 	quint32 tre, rgn, lbl, net;
 
 	if (!(_gmp->seek(hdl, 0x19) && _gmp->readUInt32(hdl, tre)
@@ -62,25 +103,84 @@ bool VectorTile::initGMP()
 	  && _gmp->readUInt32(hdl, net)))
 		return false;
 
-	_tre = new TREFile(_gmp, tre);
-	_rgn = new RGNFile(_gmp, rgn);
-	_lbl = new LBLFile(_gmp, lbl);
-	_net = new NETFile(_gmp, net);
+	_tre = tre ? new TREFile(_gmp, tre) : 0;
+	_rgn = rgn ? new RGNFile(_gmp, rgn) : 0;
+	_lbl = lbl ? new LBLFile(_gmp, lbl) : 0;
+	_net = net ? new NETFile(_gmp, net) : 0;
 
 	return true;
 }
 
-void VectorTile::objects(const RectC &rect, int bits,
+void VectorTile::polys(const RectC &rect, int bits, bool baseMap,
   QList<IMG::Poly> *polygons, QList<IMG::Poly> *lines,
-  QList<IMG::Point> *points) const
+  QCache<const SubDiv *, IMG::Polys> *polyCache) const
 {
-	QList<SubDiv*> subdivs = _tre->subdivs(rect, bits);
-	for (int i = 0; i < subdivs.size(); i++) {
-		const SubDiv *subdiv = subdivs.at(i);
-		quint32 shift = _tre->shift(subdiv->bits());
+	SubFile::Handle rgnHdl(_rgn), lblHdl(_lbl), netHdl(_net);
 
-		_rgn->objects(rect, subdiv, _lbl, _net, polygons, lines, points);
-		_rgn->extObjects(rect, subdiv, shift, _lbl, polygons, lines, points);
+	if (!_rgn->initialized() && !_rgn->init(rgnHdl))
+		return;
+
+	QList<SubDiv*> subdivs = _tre->subdivs(rect, bits, baseMap);
+	for (int i = 0; i < subdivs.size(); i++) {
+		SubDiv *subdiv = subdivs.at(i);
+
+		IMG::Polys *polys = polyCache->object(subdiv);
+		if (!polys) {
+			quint32 shift = _tre->shift(subdiv->bits());
+			QList<IMG::Poly> p, l;
+
+			if (!subdiv->initialized() && !_rgn->subdivInit(rgnHdl, subdiv))
+				continue;
+
+			_rgn->polyObjects(rgnHdl, subdiv, RGNFile::Polygon, _lbl, lblHdl,
+			  _net, netHdl, &p);
+			_rgn->polyObjects(rgnHdl, subdiv, RGNFile::Line, _lbl, lblHdl,
+			  _net, netHdl, &l);
+			_rgn->extPolyObjects(rgnHdl, subdiv, shift, RGNFile::Polygon, _lbl,
+			  lblHdl, &p);
+			_rgn->extPolyObjects(rgnHdl, subdiv, shift, RGNFile::Line, _lbl,
+			  lblHdl, &l);
+
+			copyPolys(rect, &p, polygons);
+			copyPolys(rect, &l, lines);
+			polyCache->insert(subdiv, new IMG::Polys(p, l));
+		} else {
+			copyPolys(rect, &(polys->polygons), polygons);
+			copyPolys(rect, &(polys->lines), lines);
+		}
+	}
+}
+
+void VectorTile::points(const RectC &rect, int bits, bool baseMap,
+  QList<IMG::Point> *points, QCache<const SubDiv *,
+  QList<IMG::Point> > *pointCache) const
+{
+	SubFile::Handle rgnHdl(_rgn), lblHdl(_lbl);
+
+	if (!_rgn->initialized() && !_rgn->init(rgnHdl))
+		return;
+
+	QList<SubDiv*> subdivs = _tre->subdivs(rect, bits, baseMap);
+	for (int i = 0; i < subdivs.size(); i++) {
+		SubDiv *subdiv = subdivs.at(i);
+
+		QList<IMG::Point> *pl = pointCache->object(subdiv);
+		if (!pl) {
+			QList<IMG::Point> p;
+
+			if (!subdiv->initialized() && !_rgn->subdivInit(rgnHdl, subdiv))
+				continue;
+
+			_rgn->pointObjects(rgnHdl, subdiv, RGNFile::Point, _lbl, lblHdl,
+			  &p);
+			_rgn->pointObjects(rgnHdl, subdiv, RGNFile::IndexedPoint, _lbl,
+			  lblHdl, &p);
+			_rgn->extPointObjects(rgnHdl, subdiv, _lbl, lblHdl, &p);
+
+			copyPoints(rect, &p, points);
+			pointCache->insert(subdiv, new QList<IMG::Point>(p));
+		} else
+			copyPoints(rect, pl, points);
 	}
 }
 

src/map/IMG/vectortile.h

@@ -1,7 +1,6 @@
 #ifndef VECTORTILE_H
 #define VECTORTILE_H
 
-#include "img.h"
 #include "trefile.h"
 #include "trefile.h"
 #include "rgnfile.h"
@@ -17,15 +16,22 @@ public:
 	}
 
 	bool init();
+	void markAsBasemap() {_tre->markAsBasemap();}
 	void clear() {_tre->clear();}
 
 	const RectC &bounds() const {return _tre->bounds();}
+	Range zooms() const {return _tre->zooms();}
 
 	SubFile *file(SubFile::Type type);
 	SubFile *addFile(IMG *img, SubFile::Type type);
+	SubFile *addFile(const QString &path, SubFile::Type type);
 
-	void objects(const RectC &rect, int bits, QList<IMG::Poly> *polygons,
-	  QList<IMG::Poly> *lines, QList<IMG::Point> *points) const;
+	void polys(const RectC &rect, int bits, bool baseMap,
+	  QList<IMG::Poly> *polygons, QList<IMG::Poly> *lines,
+	  QCache<const SubDiv *, IMG::Polys> *polyCache) const;
+	void points(const RectC &rect, int bits, bool baseMap,
+	  QList<IMG::Point> *points, QCache<const SubDiv*,
+	  QList<IMG::Point> > *pointCache) const;
 
 	static bool isTileFile(SubFile::Type type)
 	{
@@ -34,8 +40,6 @@ public:
 		  || type == SubFile::GMP);
 	}
 
-	friend QDebug operator<<(QDebug dbg, const VectorTile &tile);
-
 private:
 	bool initGMP();
 

src/map/imgmap.cpp

@@ -13,6 +13,9 @@
 #include "IMG/textpathitem.h"
 #include "IMG/textpointitem.h"
 #include "IMG/bitmapline.h"
+#include "IMG/style.h"
+#include "IMG/img.h"
+#include "IMG/gmap.h"
 #include "pcs.h"
 #include "rectd.h"
 #include "imgmap.h"
@@ -35,9 +38,9 @@ public:
 	const QString &key() const {return _key;}
 	const QPoint &xy() const {return _xy;}
 	QImage &img() {return _img;}
-	QList<IMG::Poly> &polygons() {return _polygons;}
-	QList<IMG::Poly> &lines() {return _lines;}
-	QList<IMG::Point> &points() {return _points;}
+	QList<MapData::Poly> &polygons() {return _polygons;}
+	QList<MapData::Poly> &lines() {return _lines;}
+	QList<MapData::Point> &points() {return _points;}
 
 	void render()
 	{
@@ -70,14 +73,12 @@ private:
 	QPoint _xy;
 	QString _key;
 	QImage _img;
-	QList<IMG::Poly> _polygons;
-	QList<IMG::Poly> _lines;
-	QList<IMG::Point> _points;
+	QList<MapData::Poly> _polygons;
+	QList<MapData::Poly> _lines;
+	QList<MapData::Point> _points;
 };
 
 
-static const Range zooms(12, 28);
-
 static const QColor shieldColor(Qt::white);
 static const QColor shieldBgColor1("#dd3e3e");
 static const QColor shieldBgColor2("#379947");
@@ -126,6 +127,7 @@ static QFont *font(Style::FontSize size, Style::FontSize defaultSize
 	static QFont large = pixelSizeFont(16);
 	static QFont normal = pixelSizeFont(14);
 	static QFont small = pixelSizeFont(12);
+	static QFont extraSmall = pixelSizeFont(10);
 
 	switch (size) {
 		case Style::None:
@@ -136,6 +138,8 @@ static QFont *font(Style::FontSize size, Style::FontSize defaultSize
 			return &normal;
 		case Style::Small:
 			return &small;
+		case Style::ExtraSmall:
+			return &extraSmall;
 		default:
 			return font(defaultSize);
 	}
@@ -201,25 +205,20 @@ static qreal area(const QVector<QPointF> &polygon)
    return area;
 }
 
-static QPointF centroid(const QVector<QPointF> polygon)
+static QPointF centroid(const QVector<QPointF> &polygon)
 {
-	qreal cx = 0, cy = 0, factor = 0;
-	qreal A = area(polygon);
+	qreal cx = 0, cy = 0;
+	qreal factor = 1.0 / (6.0 * area(polygon));
 
 	for (int i = 0; i < polygon.size(); i++) {
 		int j = (i + 1) % polygon.size();
-		factor=(polygon.at(i).x() * polygon.at(j).y() - polygon[j].x()
-		  * polygon[i].y());
-		cx+=(polygon[i].x() + polygon[j].x()) * factor;
-		cy+=(polygon[i].y() + polygon[j].y()) * factor;
+		qreal f = (polygon.at(i).x() * polygon.at(j).y() - polygon.at(j).x()
+		  * polygon.at(i).y());
+		cx += (polygon.at(i).x() + polygon.at(j).x()) * f;
+		cy += (polygon.at(i).y() + polygon.at(j).y()) * f;
 	}
 
-	A *= 6.0f;
-	factor = 1/A;
-	cx *= factor;
-	cy *= factor;
-
-	return QPointF(cx, cy);
+	return QPointF(cx * factor, cy * factor);
 }
 
 static bool rectNearPolygon(const QPolygonF &polygon, const QRectF &rect)
@@ -231,15 +230,21 @@ static bool rectNearPolygon(const QPolygonF &polygon, const QRectF &rect)
 	  || polygon.containsPoint(rect.bottomRight(), Qt::OddEvenFill)));
 }
 
+
 IMGMap::IMGMap(const QString &fileName, QObject *parent)
-  : Map(parent), _img(fileName), _projection(PCS::pcs(3857)), _valid(false)
+  : Map(parent), _projection(PCS::pcs(3857)), _valid(false)
 {
-	if (!_img.isValid()) {
-		_errorString = _img.errorString();
+	if (GMAP::isGMAP(fileName))
+		_data = new GMAP(fileName);
+	else
+		_data = new IMG(fileName);
+
+	if (!_data->isValid()) {
+		_errorString = _data->errorString();
 		return;
 	}
 
-	_zoom = zooms.min();
+	_zoom = _data->zooms().min();
 	updateTransform();
 
 	_valid = true;
@@ -247,19 +252,12 @@ IMGMap::IMGMap(const QString &fileName, QObject *parent)
 
 void IMGMap::load()
 {
-	_img.load();
+	_data->load();
 }
 
 void IMGMap::unload()
 {
-	_img.clear();
-}
-
-QRectF IMGMap::bounds()
-{
-	RectD prect(_img.bounds(), _projection);
-	return QRectF(_transform.proj2img(prect.topLeft()),
-	  _transform.proj2img(prect.bottomRight()));
+	_data->clear();
 }
 
 int IMGMap::zoomFit(const QSize &size, const RectC &rect)
@@ -267,8 +265,8 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 	if (rect.isValid()) {
 		RectD pr(rect, _projection, 10);
 
-		_zoom = zooms.min();
-		for (int i = zooms.min() + 1; i <= zooms.max(); i++) {
+		_zoom = _data->zooms().min();
+		for (int i = _data->zooms().min() + 1; i <= _data->zooms().max(); i++) {
 			Transform t(transform(i));
 			QRectF r(t.proj2img(pr.topLeft()), t.proj2img(pr.bottomRight()));
 			if (size.width() < r.width() || size.height() < r.height())
@@ -276,7 +274,7 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 			_zoom = i;
 		}
 	} else
-		_zoom = zooms.max();
+		_zoom = _data->zooms().max();
 
 	updateTransform();
 
@@ -285,14 +283,14 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 
 int IMGMap::zoomIn()
 {
-	_zoom = qMin(_zoom + 1, zooms.max());
+	_zoom = qMin(_zoom + 1, _data->zooms().max());
 	updateTransform();
 	return _zoom;
 }
 
 int IMGMap::zoomOut()
 {
-	_zoom = qMax(_zoom - 1, zooms.min());
+	_zoom = qMax(_zoom - 1, _data->zooms().min());
 	updateTransform();
 	return _zoom;
 }
@@ -307,7 +305,7 @@ Transform IMGMap::transform(int zoom) const
 {
 	double scale = _projection.isGeographic()
 	  ? 360.0 / (1<<zoom) : (2.0 * M_PI * WGS84_RADIUS) / (1<<zoom);
-	PointD topLeft(_projection.ll2xy(_img.bounds().topLeft()));
+	PointD topLeft(_projection.ll2xy(_data->bounds().topLeft()));
 	return Transform(ReferencePoint(PointD(0, 0), topLeft),
 	  PointD(scale, scale));
 }
@@ -315,6 +313,10 @@ Transform IMGMap::transform(int zoom) const
 void IMGMap::updateTransform()
 {
 	_transform = transform(_zoom);
+
+	RectD prect(_data->bounds(), _projection);
+	_bounds = QRectF(_transform.proj2img(prect.topLeft()),
+	  _transform.proj2img(prect.bottomRight()));
 }
 
 QPointF IMGMap::ll2xy(const Coordinates &c)
@@ -327,15 +329,14 @@ Coordinates IMGMap::xy2ll(const QPointF &p)
 	return _projection.xy2ll(_transform.img2proj(p));
 }
 
-
-void IMGMap::drawPolygons(QPainter *painter, const QList<IMG::Poly> &polygons)
+void IMGMap::drawPolygons(QPainter *painter, const QList<MapData::Poly> &polygons)
 {
-	for (int n = 0; n < _img.style()->drawOrder().size(); n++) {
+	for (int n = 0; n < _data->style()->drawOrder().size(); n++) {
 		for (int i = 0; i < polygons.size(); i++) {
-			const IMG::Poly &poly = polygons.at(i);
-			if (poly.type != _img.style()->drawOrder().at(n))
+			const MapData::Poly &poly = polygons.at(i);
+			if (poly.type != _data->style()->drawOrder().at(n))
 				continue;
-			const Style::Polygon &style = _img.style()->polygon(poly.type);
+			const Style::Polygon &style = _data->style()->polygon(poly.type);
 
 			painter->setPen(style.pen());
 			painter->setBrush(style.brush());
@@ -344,13 +345,13 @@ void IMGMap::drawPolygons(QPainter *painter, const QList<IMG::Poly> &polygons)
 	}
 }
 
-void IMGMap::drawLines(QPainter *painter, const QList<IMG::Poly> &lines)
+void IMGMap::drawLines(QPainter *painter, const QList<MapData::Poly> &lines)
 {
 	painter->setBrush(Qt::NoBrush);
 
 	for (int i = 0; i < lines.size(); i++) {
-		const IMG::Poly &poly = lines.at(i);
-		const Style::Line &style = _img.style()->line(poly.type);
+		const MapData::Poly &poly = lines.at(i);
+		const Style::Line &style = _data->style()->line(poly.type);
 
 		if (style.background() == Qt::NoPen)
 			continue;
@@ -360,8 +361,8 @@ void IMGMap::drawLines(QPainter *painter, const QList<IMG::Poly> &lines)
 	}
 
 	for (int i = 0; i < lines.size(); i++) {
-		const IMG::Poly &poly = lines.at(i);
-		const Style::Line &style = _img.style()->line(poly.type);
+		const MapData::Poly &poly = lines.at(i);
+		const Style::Line &style = _data->style()->line(poly.type);
 
 		if (!style.img().isNull())
 			BitmapLine::draw(painter, poly.points, style.img());
@@ -378,12 +379,11 @@ void IMGMap::drawTextItems(QPainter *painter, const QList<TextItem*> &textItems)
 		textItems.at(i)->paint(painter);
 }
 
-
-void IMGMap::processPolygons(QList<IMG::Poly> &polygons,
+void IMGMap::processPolygons(QList<MapData::Poly> &polygons,
   QList<TextItem*> &textItems)
 {
 	for (int i = 0; i < polygons.size(); i++) {
-		IMG::Poly &poly = polygons[i];
+		MapData::Poly &poly = polygons[i];
 		for (int j = 0; j < poly.points.size(); j++) {
 			QPointF &p = poly.points[j];
 			p = ll2xy(Coordinates(p.x(), p.y()));
@@ -395,7 +395,7 @@ void IMGMap::processPolygons(QList<IMG::Poly> &polygons,
 		if (_zoom <= 23 && (Style::isWaterArea(poly.type)
 		  || Style::isMilitaryArea(poly.type)
 		  || Style::isNatureReserve(poly.type))) {
-			const Style::Polygon &style = _img.style()->polygon(poly.type);
+			const Style::Polygon &style = _data->style()->polygon(poly.type);
 			TextPointItem *item = new TextPointItem(
 			  centroid(poly.points).toPoint(), &poly.label.text(),
 			  poiFont(), 0, &style.brush().color());
@@ -408,13 +408,13 @@ void IMGMap::processPolygons(QList<IMG::Poly> &polygons,
 	}
 }
 
-void IMGMap::processLines(QList<IMG::Poly> &lines, const QRect &tileRect,
+void IMGMap::processLines(QList<MapData::Poly> &lines, const QRect &tileRect,
   QList<TextItem*> &textItems)
 {
 	qStableSort(lines);
 
 	for (int i = 0; i < lines.size(); i++) {
-		IMG::Poly &poly = lines[i];
+		MapData::Poly &poly = lines[i];
 		for (int j = 0; j < poly.points.size(); j++) {
 			QPointF &p = poly.points[j];
 			p = ll2xy(Coordinates(p.x(), p.y()));
@@ -426,12 +426,12 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QRect &tileRect,
 	processShields(lines, tileRect, textItems);
 }
 
-void IMGMap::processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
-  QList<TextItem*> &textItems)
+void IMGMap::processStreetNames(QList<MapData::Poly> &lines,
+  const QRect &tileRect, QList<TextItem*> &textItems)
 {
 	for (int i = 0; i < lines.size(); i++) {
-		IMG::Poly &poly = lines[i];
-		const Style::Line &style = _img.style()->line(poly.type);
+		MapData::Poly &poly = lines[i];
+		const Style::Line &style = _data->style()->line(poly.type);
 
 		if (style.img().isNull() && style.foreground() == Qt::NoPen)
 			continue;
@@ -455,7 +455,7 @@ void IMGMap::processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
 	}
 }
 
-void IMGMap::processShields(QList<IMG::Poly> &lines, const QRect &tileRect,
+void IMGMap::processShields(QList<MapData::Poly> &lines, const QRect &tileRect,
   QList<TextItem*> &textItems)
 {
 	for (int type = FIRST_SHIELD; type <= LAST_SHIELD; type++) {
@@ -466,7 +466,7 @@ void IMGMap::processShields(QList<IMG::Poly> &lines, const QRect &tileRect,
 		QHash<Label::Shield, const Label::Shield*> sp;
 
 		for (int i = 0; i < lines.size(); i++) {
-			const IMG::Poly &poly = lines.at(i);
+			const MapData::Poly &poly = lines.at(i);
 			const Label::Shield &shield = poly.label.shield();
 			if (!shield.isValid() || shield.type() != type
 			  || !Style::isMajorRoad(poly.type))
@@ -519,14 +519,14 @@ void IMGMap::processShields(QList<IMG::Poly> &lines, const QRect &tileRect,
 	}
 }
 
-void IMGMap::processPoints(QList<IMG::Point> &points,
+void IMGMap::processPoints(QList<MapData::Point> &points,
   QList<TextItem*> &textItems)
 {
 	qSort(points);
 
 	for (int i = 0; i < points.size(); i++) {
-		IMG::Point &point = points[i];
-		const Style::Point &style = _img.style()->point(point.type);
+		MapData::Point &point = points[i];
+		const Style::Point &style = _data->style()->point(point.type);
 
 		if (point.poi && _zoom < minPOIZoom(Style::poiClass(point.type)))
 			continue;
@@ -580,7 +580,7 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		for (int j = 0; j < height; j++) {
 			QPixmap pm;
 			QPoint ttl(tl.x() + i * TILE_SIZE, tl.y() + j * TILE_SIZE);
-			QString key = _img.fileName() + "-" + QString::number(_zoom) + "_"
+			QString key = _data->fileName() + "-" + QString::number(_zoom) + "_"
 			  + QString::number(ttl.x()) + "_" + QString::number(ttl.y());
 			if (QPixmapCache::find(key, pm))
 				painter->drawPixmap(ttl, pm);
@@ -588,15 +588,22 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 				tiles.append(RasterTile(this, ttl, key));
 				RasterTile &tile = tiles.last();
 
-				RectD polyRect(_transform.img2proj(ttl), _transform.img2proj(
-				  QPointF(ttl.x() + TILE_SIZE, ttl.y() + TILE_SIZE)));
-				_img.objects(polyRect.toRectC(_projection, 4), _zoom,
-				  &(tile.polygons()), &(tile.lines()), 0);
-				RectD pointRect(_transform.img2proj(QPointF(ttl.x() - TEXT_EXTENT,
-				  ttl.y() - TEXT_EXTENT)), _transform.img2proj(QPointF(ttl.x()
-				  + TILE_SIZE + TEXT_EXTENT, ttl.y() + TILE_SIZE + TEXT_EXTENT)));
-				_img.objects(pointRect.toRectC(_projection, 4), _zoom,
-				  0, 0, &(tile.points()));
+				QRectF polyRect(ttl, QPointF(ttl.x() + TILE_SIZE,
+				  ttl.y() + TILE_SIZE));
+				polyRect &= bounds().adjusted(0.5, 0.5, -0.5, -0.5);
+				RectD polyRectD(_transform.img2proj(polyRect.topLeft()),
+				  _transform.img2proj(polyRect.bottomRight()));
+				_data->polys(polyRectD.toRectC(_projection, 4), _zoom,
+				  &(tile.polygons()), &(tile.lines()));
+
+				QRectF pointRect(QPointF(ttl.x() - TEXT_EXTENT,
+				  ttl.y() - TEXT_EXTENT), QPointF(ttl.x() + TILE_SIZE
+				  + TEXT_EXTENT, ttl.y() + TILE_SIZE + TEXT_EXTENT));
+				pointRect &= bounds().adjusted(0.5, 0.5, -0.5, -0.5);
+				RectD pointRectD(_transform.img2proj(pointRect.topLeft()),
+				  _transform.img2proj(pointRect.bottomRight()));
+				_data->points(pointRectD.toRectC(_projection, 4), _zoom,
+				  &(tile.points()));
 			}
 		}
 	}

src/map/imgmap.h

@@ -4,7 +4,7 @@
 #include "map.h"
 #include "projection.h"
 #include "transform.h"
-#include "IMG/img.h"
+#include "IMG/mapdata.h"
 
 class TextItem;
 
@@ -14,10 +14,11 @@ class IMGMap : public Map
 
 public:
 	IMGMap(const QString &fileName, QObject *parent = 0);
+	~IMGMap() {delete _data;}
 
-	QString name() const {return _img.name();}
+	QString name() const {return _data->name();}
 
-	QRectF bounds();
+	QRectF bounds() {return _bounds;}
 
 	virtual int zoom() const {return _zoom;}
 	virtual void setZoom(int zoom);
@@ -43,24 +44,25 @@ private:
 
 	Transform transform(int zoom) const;
 	void updateTransform();
-	void drawPolygons(QPainter *painter, const QList<IMG::Poly> &polygons);
-	void drawLines(QPainter *painter, const QList<IMG::Poly> &lines);
+	void drawPolygons(QPainter *painter, const QList<MapData::Poly> &polygons);
+	void drawLines(QPainter *painter, const QList<MapData::Poly> &lines);
 	void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems);
 
-	void processPolygons(QList<IMG::Poly> &polygons,
+	void processPolygons(QList<MapData::Poly> &polygons,
 	  QList<TextItem *> &textItems);
-	void processLines(QList<IMG::Poly> &lines, const QRect &tileRect,
+	void processLines(QList<MapData::Poly> &lines, const QRect &tileRect,
 	  QList<TextItem*> &textItems);
-	void processPoints(QList<IMG::Point> &points, QList<TextItem*> &textItems);
-	void processShields(QList<IMG::Poly> &lines, const QRect &tileRect,
+	void processPoints(QList<MapData::Point> &points, QList<TextItem*> &textItems);
+	void processShields(QList<MapData::Poly> &lines, const QRect &tileRect,
 	  QList<TextItem*> &textItems);
-	void processStreetNames(QList<IMG::Poly> &lines, const QRect &tileRect,
+	void processStreetNames(QList<MapData::Poly> &lines, const QRect &tileRect,
 	  QList<TextItem*> &textItems);
 
-	IMG _img;
+	MapData *_data;
 	int _zoom;
 	Projection _projection;
 	Transform _transform;
+	QRectF _bounds;
 
 	bool _valid;
 	QString _errorString;