Merge branch 'origin/master' into Weblate.

Currently translated at 100.0% (346 of 346 strings)

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

.appveyor.yml

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

README.md

@@ -2,7 +2,7 @@
 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, IGC, NMEA, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin CSV and geotagged JPEG files.
+* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin 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).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.12
+VERSION = 7.16
 
 QT += core \
     gui \
@@ -19,6 +19,8 @@ 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/popup.h \
     src/common/staticassert.h \
     src/common/coordinates.h \
     src/common/range.h \
@@ -84,6 +86,7 @@ HEADERS += src/common/config.h \
     src/GUI/mapview.h \
     src/GUI/font.h \
     src/GUI/areaitem.h \
+    src/data/link.h \
     src/map/IMG/bitmapline.h \
     src/map/IMG/textpathitem.h \
     src/map/IMG/textpointitem.h \
@@ -183,8 +186,10 @@ HEADERS += src/common/config.h \
     src/map/IMG/textitem.h \
     src/map/IMG/label.h \
     src/data/csv.h \
-    src/data/cupparser.h
+    src/data/cupparser.h \
+    src/data/gpiparser.h
 SOURCES += src/main.cpp \
+    src/GUI/popup.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
@@ -316,7 +321,9 @@ SOURCES += src/main.cpp \
     src/GUI/pathtickitem.cpp \
     src/map/IMG/textitem.cpp \
     src/data/csv.cpp \
-    src/data/cupparser.cpp
+    src/data/cupparser.cpp \
+    src/GUI/graphicsscene.cpp \
+    src/data/gpiparser.cpp
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     HEADERS += src/data/geojsonparser.h
@@ -376,7 +383,8 @@ macx {
         icons/formats/loc.icns \
         icons/formats/slf.icns \
         icons/formats/json.icns \
-        icons/formats/cup.icns
+        icons/formats/cup.icns \
+        icons/formats/gpi.icns
     QMAKE_BUNDLE_DATA += locale maps icons csv
 }
 
@@ -394,7 +402,8 @@ win32 {
         icons/formats/loc.ico \
         icons/formats/slf.ico \
         icons/formats/json.ico \
-        icons/formats/cup.ico
+        icons/formats/cup.ico \
+        icons/formats/gpi.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }

icons/scripts/extensions

@@ -11,3 +11,4 @@ wpt:#66ff00
 loc:#556677
 slf:#881199
 cup:#20a810
+gpi:#fca314

pkg/Info.plist

@@ -227,6 +227,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>gpi</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.garmin.gpi</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/gpi.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Garmin POI File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -504,6 +520,27 @@
 				<string>application/vnd.naviter.seeyou.cup</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.garmin.gpi</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.garmin.com</string>
+			<key>UTTypeDescription</key>
+			<string>Garmin POI File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>gpi</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.garmin.cup</string>
+			</dict>
+		</dict>
 	</array>
 </dict>
 </plist>

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.12"
+!define VERSION "7.16"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -106,19 +106,20 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 6
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 7
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 8
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 9
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 10
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 11
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 12
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 14
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
-  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP file" 5
+  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
+  !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -229,6 +230,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "slf"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
   !insertmacro FILE_ASSOCIATION_REMOVE "cup"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.12"
+!define VERSION "7.16"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -113,19 +113,20 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 6
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 7
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 8
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 9
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 10
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 11
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 12
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 14
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
-  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP file" 5
+  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
+  !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -232,6 +233,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "slf"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
   !insertmacro FILE_ASSOCIATION_REMOVE "cup"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd

src/GUI/areaitem.cpp

@@ -2,12 +2,13 @@
 #include <QApplication>
 #include <QCursor>
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
 #include "map/map.h"
-#include "tooltip.h"
+#include "popup.h"
 #include "areaitem.h"
 
 
-QString AreaItem::toolTip() const
+ToolTip AreaItem::toolTip() const
 {
 	ToolTip tt;
 
@@ -17,7 +18,7 @@ QString AreaItem::toolTip() const
 		tt.insert(qApp->translate("PolygonItem", "Description"),
 		  _area.description());
 
-	return tt.toString();
+	return tt;
 }
 
 AreaItem::AreaItem(const Area &area, Map *map, QGraphicsItem *parent)
@@ -35,8 +36,6 @@ AreaItem::AreaItem(const Area &area, Map *map, QGraphicsItem *parent)
 
 	setCursor(Qt::ArrowCursor);
 	setAcceptHoverEvents(true);
-
-	setToolTip(toolTip());
 }
 
 
@@ -153,3 +152,27 @@ void AreaItem::setDigitalZoom(int zoom)
 	_digitalZoom = zoom;
 	_pen.setWidthF(_width * pow(2, -_digitalZoom));
 }
+
+void AreaItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+{
+	Q_UNUSED(event);
+
+	_pen.setWidthF((_width + 1) * pow(2, -_digitalZoom));
+	setZValue(zValue() + 1.0);
+	update();
+}
+
+void AreaItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+{
+	Q_UNUSED(event);
+
+	_pen.setWidthF(_width * pow(2, -_digitalZoom));
+	setZValue(zValue() - 1.0);
+	update();
+}
+
+void AreaItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), toolTip().toString(), event->widget());
+	QGraphicsItem::mousePressEvent(event);
+}

src/GUI/areaitem.h

@@ -3,6 +3,7 @@
 
 #include <QGraphicsItem>
 #include "data/area.h"
+#include "tooltip.h"
 
 class Map;
 
@@ -26,10 +27,15 @@ public:
 	void setStyle(Qt::PenStyle style);
 	void setDigitalZoom(int zoom);
 
+protected:
+	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+
 private:
 	QPainterPath painterPath(const Polygon &polygon);
 	void updatePainterPath();
-	QString toolTip() const;
+	ToolTip toolTip() const;
 
 	Area _area;
 	Map *_map;

src/GUI/axisitem.cpp

@@ -30,7 +30,7 @@ private:
 Ticks::Ticks(double minValue, double maxValue, int maxCount)
 {
 	double range = niceNum(maxValue - minValue, false);
-	_d = niceNum(range / maxCount, true);
+	_d = niceNum(range / maxCount, false);
 	_min = ceil(minValue / _d) * _d;
 	_max = floor(maxValue / _d) * _d;
 }

src/GUI/cadencegraph.cpp

@@ -14,6 +14,11 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+CadenceGraph::~CadenceGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void CadenceGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,28 @@ QList<GraphItem*> CadenceGraph::loadData(const Data &data)
 		const Graph &graph = track.cadence();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +85,9 @@ qreal CadenceGraph::avg() const
 
 void CadenceGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +97,13 @@ void CadenceGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/cadencegraph.h

@@ -3,18 +3,20 @@
 
 #include "graphtab.h"
 
+class CadenceGraphItem;
+
 class CadenceGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	CadenceGraph(QWidget *parent = 0);
+	~CadenceGraph();
 
 	QString label() const {return tr("Cadence");}
 	QList<GraphItem*> loadData(const Data &data);
 	void clear();
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;
@@ -24,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<CadenceGraphItem *> _tracks;
 };
 
 #endif // CADENCEGRAPH_H

src/GUI/cadencegraphitem.cpp

@@ -4,12 +4,12 @@
 
 
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
-	setToolTip(toolTip());
 }
 
-QString CadenceGraphItem::toolTip() const
+QString CadenceGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());

src/GUI/cadencegraphitem.h

@@ -8,11 +8,10 @@ class CadenceGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	CadenceGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	CadenceGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
-private:
-	QString toolTip() const;
+	QString info() const;
 };
 
 #endif // CADENCEGRAPHITEM_H

src/GUI/elevationgraph.cpp

@@ -8,26 +8,18 @@
 
 static qreal nMin(qreal a, qreal b)
 {
-	if (!std::isnan(a) && !std::isnan(b))
-		return qMin(a, b);
-	else if (!std::isnan(a))
-		return a;
-	else if (!std::isnan(b))
-		return b;
+	if (std::isnan(a))
+		return std::isnan(b) ? NAN : b;
 	else
-		return NAN;
+		return std::isnan(b) ? a : qMin(a, b);
 }
 
 static qreal nMax(qreal a, qreal b)
 {
-	if (!std::isnan(a) && !std::isnan(b))
-		return qMax(a, b);
-	else if (!std::isnan(a))
-		return a;
-	else if (!std::isnan(b))
-		return b;
+	if (std::isnan(a))
+		return std::isnan(b) ? NAN : b;
 	else
-		return NAN;
+		return std::isnan(b) ? a : qMax(a, b);
 }
 
 ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
@@ -49,6 +41,12 @@ ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
 	setMinYRange(50.0);
 }
 
+ElevationGraph::~ElevationGraph()
+{
+	qDeleteAll(_tracks);
+	qDeleteAll(_routes);
+}
+
 void ElevationGraph::setInfo()
 {
 	if (std::isnan(max()) || std::isnan(min()))
@@ -70,19 +68,28 @@ void ElevationGraph::setInfo()
 GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
 {
 	if (!graph.isValid()) {
-		skipColor();
+		_palette.nextColor();
 		return 0;
 	}
 
-	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType);
-	GraphView::addGraph(gi, type);
+	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
+	  _palette.nextColor());
+	gi->setUnits(_units);
 
 	if (type == Track) {
+		_tracks.append(gi);
+		if (_showTracks)
+			addGraph(gi);
+
 		_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());
@@ -101,7 +108,7 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 	for (int i = 0; i < data.routes().count(); i++)
 		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -111,6 +118,11 @@ QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 
 void ElevationGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+	qDeleteAll(_routes);
+	_routes.clear();
+
 	_trackAscent = 0;
 	_routeAscent = 0;
 	_trackDescent = 0;
@@ -142,12 +154,23 @@ void ElevationGraph::setUnits(Units units)
 	GraphView::setUnits(units);
 }
 
+void ElevationGraph::showItems(const QList<ElevationGraphItem *> &list,
+  bool show)
+{
+	for (int i = 0; i < list.size(); i++) {
+		if (show)
+			addGraph(list.at(i));
+		else
+			removeGraph(list.at(i));
+	}
+}
+
 void ElevationGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
+	showItems(_tracks, show);
 	setInfo();
-	showGraph(show, Track);
 
 	redraw();
 }
@@ -156,7 +179,7 @@ void ElevationGraph::showRoutes(bool show)
 {
 	_showRoutes = show;
 
-	showGraph(show, Route);
+	showItems(_routes, show);
 	setInfo();
 
 	redraw();

src/GUI/elevationgraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class ElevationGraphItem;
+
 class ElevationGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	ElevationGraph(QWidget *parent = 0);
+	~ElevationGraph();
 
 	QString label() const {return tr("Elevation");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -29,6 +32,7 @@ private:
 	void setInfo();
 
 	GraphItem *loadGraph(const Graph &graph, Type type);
+	void showItems(const QList<ElevationGraphItem *> &list, bool show);
 
 	qreal _trackAscent, _trackDescent;
 	qreal _routeAscent, _routeDescent;
@@ -36,6 +40,7 @@ private:
 	qreal _trackMin, _routeMin;
 
 	bool _showTracks, _showRoutes;
+	QList<ElevationGraphItem *> _tracks, _routes;
 };
 
 #endif // ELEVATIONGRAPH_H

src/GUI/elevationgraphitem.cpp

@@ -4,7 +4,8 @@
 
 
 ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();
@@ -23,15 +24,13 @@ ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
 				_descent += prev - cur;
 		}
 	}
-
-	setToolTip(toolTip(Metric));
 }
 
-QString ElevationGraphItem::toolTip(Units units) const
+QString ElevationGraphItem::info() const
 {
 	ToolTip tt;
-	qreal scale = (units == Metric) ? 1.0 : M2FT;
-	QString su = (units == Metric) ? tr("m") : tr("ft");
+	qreal scale = (_units == Metric) ? 1.0 : M2FT;
+	QString su = (_units == Metric) ? tr("m") : tr("ft");
 	QLocale l(QLocale::system());
 
 	tt.insert(tr("Ascent"), l.toString(ascent() * scale, 'f', 0)
@@ -45,8 +44,3 @@ QString ElevationGraphItem::toolTip(Units units) const
 
 	return tt.toString();
 }
-
-void ElevationGraphItem::setUnits(Units units)
-{
-	setToolTip(toolTip(units));
-}

src/GUI/elevationgraphitem.h

@@ -8,19 +8,17 @@ class ElevationGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	ElevationGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	ElevationGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}
 	qreal max() const {return _max;}
 	qreal min() const {return _min;}
 
-	void setUnits(Units units);
+	QString info() const;
 
 private:
-	QString toolTip(Units units) const;
-
 	qreal _ascent, _descent, _min, _max;
 };
 

src/GUI/gearratiograph.cpp

@@ -14,6 +14,11 @@ GearRatioGraph::GearRatioGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(2);
 }
 
+GearRatioGraph::~GearRatioGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void GearRatioGraph::setInfo()
 {
 	if (_showTracks) {
@@ -37,11 +42,15 @@ QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
 		const Graph &graph = data.tracks().at(i).ratio();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
 
 			for (QMap<qreal, qreal>::const_iterator it = gi->map().constBegin();
 			  it != gi->map().constEnd(); ++it)
@@ -51,12 +60,12 @@ QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -70,10 +79,7 @@ qreal GearRatioGraph::top() const
 
 	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
 	  it != _map.constEnd(); ++it) {
-		if (it == _map.constBegin()) {
-			val = it.value();
-			key = it.key();
-		} else if (it.value() > val) {
+		if (std::isnan(val) || it.value() > val) {
 			val = it.value();
 			key = it.key();
 		}
@@ -84,6 +90,9 @@ qreal GearRatioGraph::top() const
 
 void GearRatioGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_map.clear();
 
 	GraphTab::clear();
@@ -93,7 +102,13 @@ void GearRatioGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/gearratiograph.h

@@ -4,12 +4,15 @@
 #include <QMap>
 #include "graphtab.h"
 
+class GearRatioGraphItem;
+
 class GearRatioGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	GearRatioGraph(QWidget *parent = 0);
+	~GearRatioGraph();
 
 	QString label() const {return tr("Gear ratio");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -25,6 +28,7 @@ private:
 	QMap<qreal, qreal> _map;
 
 	bool _showTracks;
+	QList<GearRatioGraphItem*> _tracks;
 };
 
 #endif // GEARRATIOGRAPH_H

src/GUI/gearratiographitem.cpp

@@ -5,25 +5,29 @@
 
 
 GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent), _top(NAN)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
-	qreal val = NAN;
-
-	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
-	  it != _map.constEnd(); ++it) {
-		if (it == _map.constBegin()) {
-			val = it.value();
-			_top = it.key();
-		} else if (it.value() > val) {
-			val = it.value();
-			_top = it.key();
+	for (int i = 0; i < graph.size(); i++) {
+		const GraphSegment &segment = graph.at(i);
+		for (int j = 1; j < segment.size(); j++) {
+			qreal dx = segment.at(j).s() - segment.at(j-1).s();
+			_map.insert(segment.at(j).y(), _map.value(segment.at(j).y()) + dx);
 		}
 	}
 
-	setToolTip(toolTip());
+	qreal key = NAN, val = NAN;
+	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
+	  it != _map.constEnd(); ++it) {
+		if (std::isnan(val) || it.value() > val) {
+			val = it.value();
+			key = it.key();
+		}
+	}
+	_top = key;
 }
 
-QString GearRatioGraphItem::toolTip() const
+QString GearRatioGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());

src/GUI/gearratiographitem.h

@@ -9,16 +9,15 @@ class GearRatioGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	GearRatioGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	GearRatioGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal top() const {return _top;}
-
 	const QMap<qreal, qreal> &map() const {return _map;}
 
-private:
-	QString toolTip() const;
+	QString info() const;
 
+private:
 	QMap<qreal, qreal> _map;
 	qreal _top;
 };

src/GUI/graphicsscene.cpp

@@ -0,0 +1,48 @@
+#include <QGraphicsSceneHelpEvent>
+#include <QGraphicsView>
+#include "popup.h"
+#include "graphicsscene.h"
+
+
+/* Standard GraphicsScene::items() is not pixel accurate, so we use the
+   following function which has the same logic as used in the original
+   QGraphicsScene::helpEvent() function. */
+QList<QGraphicsItem *> GraphicsScene::itemsAtPosition(const QPoint &screenPos,
+  const QPointF &scenePos, QWidget *widget) const
+{
+	QGraphicsView *view = widget
+	  ? qobject_cast<QGraphicsView *>(widget->parentWidget()) : 0;
+
+	if (!view)
+		return items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder,
+		  QTransform());
+
+	const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)),
+	  QSizeF(1, 1));
+	if (!view->isTransformed())
+		return items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder);
+
+	const QTransform viewTransform = view->viewportTransform();
+	if (viewTransform.type() <= QTransform::TxScale)
+		return items(viewTransform.inverted().mapRect(pointRect),
+		  Qt::IntersectsItemShape, Qt::DescendingOrder, viewTransform);
+
+	return items(viewTransform.inverted().map(pointRect),
+	  Qt::IntersectsItemShape, Qt::DescendingOrder, viewTransform);
+}
+
+void GraphicsScene::helpEvent(QGraphicsSceneHelpEvent *event)
+{
+	QList<QGraphicsItem *> list = itemsAtPosition(event->screenPos(),
+	  event->scenePos(), event->widget());
+
+	for (int i = 0; i < list.size(); i++) {
+		if (list.at(i)->type() == QGraphicsItem::UserType + 1) {
+			GraphicsItem *mi = static_cast<GraphicsItem*>(list.at(i));
+			Popup::show(event->screenPos(), mi->info(), event->widget());
+			return;
+		}
+	}
+
+	/* No need to process QGraphicsScene::helpEvent() */
+}

src/GUI/graphicsscene.h

@@ -0,0 +1,29 @@
+#ifndef GRAPHICSSCENE_H
+#define GRAPHICSSCENE_H
+
+#include <QGraphicsScene>
+#include <QGraphicsItem>
+
+class GraphicsItem : public QGraphicsItem
+{
+public:
+	GraphicsItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent) {}
+
+	virtual QString info() const = 0;
+	int type() const {return QGraphicsItem::UserType + 1;}
+};
+
+class GraphicsScene : public QGraphicsScene
+{
+public:
+	GraphicsScene(QObject *parent = 0) : QGraphicsScene(parent) {}
+
+protected:
+	void helpEvent(QGraphicsSceneHelpEvent *event);
+
+private:
+	QList<QGraphicsItem *> itemsAtPosition(const QPoint &screenPos,
+	  const QPointF &scenePos, QWidget *widget) const;
+};
+
+#endif // GRAPHICSSCENE_H

src/GUI/graphitem.cpp

@@ -1,31 +1,29 @@
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
+#include "popup.h"
 #include "graphitem.h"
 
 
-GraphItem::GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent)
-  : QGraphicsObject(parent), _graph(graph), _type(type)
+GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, QGraphicsItem *parent)
+  : GraphicsItem(parent), _graph(graph), _type(type)
 {
 	Q_ASSERT(_graph.isValid());
 
-	_id = 0;
-	_width = 1;
-	_pen = QPen(Qt::black, _width);
-	_sx = 1.0; _sy = 1.0;
+	_units = Metric;
+	_pen = QPen(color, width);
+	_sx = 0; _sy = 0;
 	_time = _graph.hasTime();
-
 	setZValue(2.0);
-
-	updatePath();
-	updateShape();
-	updateBounds();
-
 	setAcceptHoverEvents(true);
+
+	updateBounds();
 }
 
 void GraphItem::updateShape()
 {
 	QPainterPathStroker s;
-	s.setWidth(_width + 1);
+	s.setWidth(_pen.width() + 1);
 	_shape = s.createStroke(_path);
 }
 
@@ -54,7 +52,6 @@ void GraphItem::setGraphType(GraphType type)
 
 	_type = type;
 	updatePath();
-	updateShape();
 	updateBounds();
 }
 
@@ -69,12 +66,11 @@ void GraphItem::setColor(const QColor &color)
 
 void GraphItem::setWidth(int width)
 {
-	if (width == _width)
+	if (width == _pen.width())
 		return;
 
 	prepareGeometryChange();
 
-	_width = width;
 	_pen.setWidth(width);
 
 	updateShape();
@@ -170,10 +166,10 @@ void GraphItem::emitSliderPositionChanged(qreal pos)
 void GraphItem::hover(bool hover)
 {
 	if (hover) {
-		_pen.setWidth(_width + 1);
+		_pen.setWidth(_pen.width() + 1);
 		setZValue(zValue() + 1.0);
 	} else {
-		_pen.setWidth(_width);
+		_pen.setWidth(_pen.width() - 1);
 		setZValue(zValue() - 1.0);
 	}
 
@@ -189,23 +185,30 @@ void GraphItem::setScale(qreal sx, qreal sy)
 
 	_sx = sx; _sy = sy;
 	updatePath();
-	updateShape();
 }
 
 void GraphItem::updatePath()
 {
-	_path = QPainterPath();
-
-	if (_type == Time && !_time)
+	if (_sx == 0 && _sy == 0)
 		return;
 
-	for (int i = 0; i < _graph.size(); i++) {
-		const GraphSegment &segment = _graph.at(i);
+	prepareGeometryChange();
 
-		_path.moveTo(segment.first().x(_type) * _sx, -segment.first().y() * _sy);
-		for (int i = 1; i < segment.size(); i++)
-			_path.lineTo(segment.at(i).x(_type) * _sx, -segment.at(i).y() * _sy);
+	_path = QPainterPath();
+
+	if (!(_type == Time && !_time)) {
+		for (int i = 0; i < _graph.size(); i++) {
+			const GraphSegment &segment = _graph.at(i);
+
+			_path.moveTo(segment.first().x(_type) * _sx, -segment.first().y()
+			  * _sy);
+			for (int i = 1; i < segment.size(); i++)
+				_path.lineTo(segment.at(i).x(_type) * _sx, -segment.at(i).y()
+				  * _sy);
+		}
 	}
+
+	updateShape();
 }
 
 void GraphItem::updateBounds()
@@ -231,7 +234,10 @@ void GraphItem::updateBounds()
 		}
 	}
 
-	_bounds = QRectF(QPointF(left, top), QPointF(right, bottom));
+	if (left == right)
+		_bounds = QRectF();
+	else
+		_bounds = QRectF(QPointF(left, top), QPointF(right, bottom));
 }
 
 qreal GraphItem::max() const
@@ -286,7 +292,7 @@ void GraphItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width + 1);
+	_pen.setWidth(_pen.width() + 1);
 	setZValue(zValue() + 1.0);
 	update();
 
@@ -297,9 +303,15 @@ void GraphItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width);
+	_pen.setWidth(_pen.width() - 1);
 	setZValue(zValue() - 1.0);
 	update();
 
 	emit selected(false);
 }
+
+void GraphItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), info(), event->widget());
+	GraphicsItem::mousePressEvent(event);
+}

src/GUI/graphitem.h

@@ -5,15 +5,19 @@
 #include <QPen>
 #include "data/graph.h"
 #include "units.h"
+#include "graphicsscene.h"
 
-class GraphItem : public QGraphicsObject
+class GraphItem : public QObject, public GraphicsItem
 {
 	Q_OBJECT
 
 public:
-	GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent = 0);
+	GraphItem(const Graph &graph, GraphType type, int width, const QColor &color,
+	  QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
+	virtual QString info() const = 0;
+
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@@ -27,11 +31,9 @@ public:
 
 	void setScale(qreal sx, qreal sy);
 	void setGraphType(GraphType type);
-	int id() const {return _id;}
-	void setId(int id) {_id = id;}
 	void setColor(const QColor &color);
 	void setWidth(int width);
-	virtual void setUnits(Units units) {Q_UNUSED(units);}
+	void setUnits(Units units) {_units = units;}
 
 	qreal yAtX(qreal x);
 	qreal distanceAtTime(qreal time);
@@ -46,27 +48,26 @@ public slots:
 	void emitSliderPositionChanged(qreal);
 	void hover(bool hover);
 
-private:
+protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
 
+	Units _units;
+
+private:
 	const GraphSegment *segment(qreal x, GraphType type) const;
 	void updatePath();
 	void updateShape();
 	void updateBounds();
 
-	int _id;
-	QPen _pen;
-	int _width;
-
 	Graph _graph;
 	GraphType _type;
-
 	QPainterPath _path;
 	QPainterPath _shape;
 	QRectF _bounds;
 	qreal _sx, _sy;
-
+	QPen _pen;
 	bool _time;
 };
 

src/GUI/graphview.cpp

@@ -1,8 +1,7 @@
 #include <QGraphicsScene>
 #include <QEvent>
 #include <QMouseEvent>
-#include <QPaintEngine>
-#include <QPaintDevice>
+#include <QScrollBar>
 #include <QGraphicsSimpleTextItem>
 #include <QPalette>
 #include <QLocale>
@@ -16,6 +15,7 @@
 #include "graphitem.h"
 #include "pathitem.h"
 #include "format.h"
+#include "graphicsscene.h"
 #include "graphview.h"
 
 
@@ -24,7 +24,7 @@
 GraphView::GraphView(QWidget *parent)
 	: QGraphicsView(parent)
 {
-	_scene = new QGraphicsScene(this);
+	_scene = new GraphicsScene(this);
 	setScene(_scene);
 
 	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
@@ -38,9 +38,9 @@ GraphView::GraphView(QWidget *parent)
 	_yAxis = new AxisItem(AxisItem::Y);
 	_yAxis->setZValue(1.0);
 	_slider = new SliderItem();
-	_slider->setZValue(3.0);
+	_slider->setZValue(4.0);
 	_sliderInfo = new SliderInfoItem(_slider);
-	_sliderInfo->setZValue(3.0);
+	_sliderInfo->setZValue(4.0);
 	_info = new InfoItem();
 	_grid = new GridItem();
 	_message = new QGraphicsSimpleTextItem(tr("Data not available"));
@@ -64,6 +64,8 @@ GraphView::GraphView(QWidget *parent)
 	_units = Metric;
 	_graphType = Distance;
 	_xLabel = tr("Distance");
+
+	_zoom = 1.0;
 }
 
 GraphView::~GraphView()
@@ -74,8 +76,6 @@ GraphView::~GraphView()
 	delete _info;
 	delete _grid;
 	delete _message;
-
-	qDeleteAll(_graphs);
 }
 
 void GraphView::createXLabel()
@@ -166,14 +166,11 @@ void GraphView::setGraphType(GraphType type)
 	for (int i = 0; i < _graphs.count(); i++) {
 		GraphItem *gi = _graphs.at(i);
 		gi->setGraphType(type);
-		if (!_hide.contains(gi->id())) {
-			if (gi->bounds().width() > 0)
-				addItem(gi);
-			else
-				removeItem(gi);
-		}
-		if (gi->scene() == _scene)
-			_bounds |= gi->bounds();
+		if (gi->bounds().isNull())
+			removeItem(gi);
+		else
+			addItem(gi);
+		_bounds |= gi->bounds();
 	}
 
 	if (type == Distance)
@@ -195,29 +192,32 @@ void GraphView::showSliderInfo(bool show)
 	_sliderInfo->setVisible(show);
 }
 
-void GraphView::addGraph(GraphItem *graph, int id)
+void GraphView::addGraph(GraphItem *graph)
 {
-	QColor color(_palette.nextColor());
-	color.setAlpha(255);
-
-	graph->setUnits(_units);
-	graph->setId(id);
-	graph->setColor(color);
-	graph->setWidth(_width);
-
 	connect(this, SIGNAL(sliderPositionChanged(qreal)), graph,
 	  SLOT(emitSliderPositionChanged(qreal)));
 
 	_graphs.append(graph);
+	if (!graph->bounds().isNull())
+		_scene->addItem(graph);
+	_bounds |= graph->bounds();
 
-	if (!_hide.contains(id)) {
-		_visible.append(graph);
-		if (graph->bounds().width() > 0) {
-			_scene->addItem(graph);
-			_bounds |= graph->bounds();
-		}
-		setXUnits();
-	}
+	setXUnits();
+}
+
+void GraphView::removeGraph(GraphItem *graph)
+{
+	disconnect(this, SIGNAL(sliderPositionChanged(qreal)), graph,
+	  SLOT(emitSliderPositionChanged(qreal)));
+
+	_graphs.removeOne(graph);
+	_scene->removeItem(graph);
+
+	_bounds = QRectF();
+	for (int i = 0; i < _graphs.count(); i++)
+		_bounds |= _graphs.at(i)->bounds();
+
+	setXUnits();
 }
 
 void GraphView::removeItem(QGraphicsItem *item)
@@ -232,29 +232,6 @@ void GraphView::addItem(QGraphicsItem *item)
 		_scene->addItem(item);
 }
 
-void GraphView::showGraph(bool show, int id)
-{
-	if (show)
-		_hide.remove(id);
-	else
-		_hide.insert(id);
-
-	_visible.clear();
-	_bounds = QRectF();
-	for (int i = 0; i < _graphs.count(); i++) {
-		GraphItem *gi = _graphs.at(i);
-		if (_hide.contains(gi->id()))
-			removeItem(gi);
-		else {
-			_visible.append(gi);
-			if (gi->bounds().width() > 0) {
-				addItem(gi);
-				_bounds |= gi->bounds();
-			}
-		}
-	}
-}
-
 QRectF GraphView::bounds() const
 {
 	QRectF br(_bounds);
@@ -313,9 +290,10 @@ void GraphView::redraw(const QSizeF &size)
 	sx = (size.width() - (my.width() + mx.width())) / r.width();
 	sy = (size.height() - (mx.height() + my.height())
 	  - _info->boundingRect().height()) / r.height();
+	sx *= _zoom;
 
-	for (int i = 0; i < _visible.size(); i++)
-		_visible.at(i)->setScale(sx, sy);
+	for (int i = 0; i < _graphs.size(); i++)
+		_graphs.at(i)->setScale(sx, sy);
 
 	QPointF p(r.left() * sx, r.top() * sy);
 	QSizeF s(r.width() * sx, r.height() * sy);
@@ -360,6 +338,40 @@ void GraphView::mousePressEvent(QMouseEvent *e)
 	QGraphicsView::mousePressEvent(e);
 }
 
+void GraphView::wheelEvent(QWheelEvent *e)
+{
+	static int deg = 0;
+
+	deg += e->delta() / 8;
+	if (qAbs(deg) < 15)
+		return;
+	deg = 0;
+
+	QPointF pos = mapToScene(e->pos());
+	QRectF gr(_grid->boundingRect());
+	QPointF r(pos.x() / gr.width(), pos.y() / gr.height());
+
+	_zoom = (e->delta() > 0) ? _zoom * 1.25 : qMax(_zoom / 1.25, 1.0);
+	redraw();
+
+	QRectF ngr(_grid->boundingRect());
+	QPointF npos(mapFromScene(QPointF(r.x() * ngr.width(),
+	  r.y() * ngr.height())));
+	QScrollBar *sb = horizontalScrollBar();
+	sb->setSliderPosition(sb->sliderPosition() + npos.x() - e->pos().x());
+
+	QGraphicsView::wheelEvent(e);
+}
+
+void GraphView::paintEvent(QPaintEvent *e)
+{
+	QRectF viewRect(mapToScene(rect()).boundingRect());
+	_info->setPos(QPointF(viewRect.left() + (viewRect.width()
+	  - _info->boundingRect().width())/2.0, _info->pos().y()));
+
+	QGraphicsView::paintEvent(e);
+}
+
 void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 {
 	QSizeF canvas = QSizeF(target.width() / scale, target.height() / scale);
@@ -376,54 +388,45 @@ void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 
 void GraphView::clear()
 {
+	_graphs.clear();
+
 	_slider->clear();
 	_info->clear();
 
-	qDeleteAll(_graphs);
-	_graphs.clear();
-	_visible.clear();
 	_palette.reset();
 
 	_bounds = QRectF();
 	_sliderPos = 0;
+	_zoom = 1.0;
 
 	_scene->setSceneRect(0, 0, 0, 0);
 }
 
 void GraphView::updateSliderPosition()
 {
-	if (bounds().width() <= 0)
-		return;
-
 	if (_sliderPos <= bounds().right() && _sliderPos >= bounds().left()) {
 		_slider->setPos((_sliderPos / bounds().width())
 		  * _slider->area().width(), _slider->area().bottom());
-		_slider->setVisible(!_visible.isEmpty());
+		_slider->setVisible(true);
+		updateSliderInfo();
 	} else {
 		_slider->setPos(_slider->area().left(), _slider->area().bottom());
 		_slider->setVisible(false);
 	}
-
-	if (_slider->isVisible())
-		updateSliderInfo();
 }
 
 void GraphView::updateSliderInfo()
 {
 	QLocale l(QLocale::system());
-	qreal r, y;
+	qreal r = 0, y = 0;
 
-
-	if (_visible.count() > 1) {
-		r = 0;
-		y = 0;
-	} else {
-		QRectF br(_visible.first()->bounds());
+	if (_graphs.count() == 1) {
+		QRectF br(_graphs.first()->bounds());
 		if (br.height() < _minYRange)
 			br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
 			  _minYRange/2 - br.height()/2);
 
-		y = _visible.first()->yAtX(_sliderPos);
+		y = _graphs.first()->yAtX(_sliderPos);
 		r = (y - br.bottom()) / br.height();
 	}
 
@@ -435,7 +438,7 @@ void GraphView::updateSliderInfo()
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
 	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
 	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
-	  + UNIT_SPACE + _xUnits, (_visible.count() > 1) ? QString()
+	  + UNIT_SPACE + _xUnits, (_graphs.count() > 1) ? QString()
 	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
 	  + _yUnits);
 }
@@ -455,7 +458,7 @@ void GraphView::emitSliderPositionChanged(const QPointF &pos)
 
 void GraphView::setSliderPosition(qreal pos)
 {
-	if (_visible.isEmpty())
+	if (_graphs.isEmpty())
 		return;
 
 	_sliderPos = pos;
@@ -483,11 +486,8 @@ void GraphView::setPalette(const Palette &palette)
 	_palette = palette;
 	_palette.reset();
 
-	for (int i = 0; i < _graphs.count(); i++) {
-		QColor color(_palette.nextColor());
-		color.setAlpha(255);
-		_graphs.at(i)->setColor(color);
-	}
+	for (int i = 0; i < _graphs.count(); i++)
+		_graphs.at(i)->setColor(_palette.nextColor());
 }
 
 void GraphView::setGraphWidth(int width)

src/GUI/graphview.h

@@ -17,6 +17,7 @@ class GraphItem;
 class PathItem;
 class GridItem;
 class QGraphicsSimpleTextItem;
+class GraphicsScene;
 
 class GraphView : public QGraphicsView
 {
@@ -46,12 +47,17 @@ signals:
 	void sliderPositionChanged(qreal);
 
 protected:
-	void addGraph(GraphItem *graph, int id = 0);
-
-	void showGraph(bool show, int id = 0);
+	void addGraph(GraphItem *graph);
+	void removeGraph(GraphItem *graph);
 	void setGraphType(GraphType type);
 	void setUnits(Units units);
 
+	void resizeEvent(QResizeEvent *e);
+	void mousePressEvent(QMouseEvent *e);
+	void wheelEvent(QWheelEvent *e);
+	void changeEvent(QEvent *e);
+	void paintEvent(QPaintEvent *e);
+
 	const QString &yLabel() const {return _yLabel;}
 	const QString &yUnits() const {return _yUnits;}
 	qreal yScale() const {return _yScale;}
@@ -68,12 +74,11 @@ protected:
 	void redraw();
 	void addInfo(const QString &key, const QString &value);
 	void clearInfo();
-	void skipColor() {_palette.nextColor();}
 
-	void changeEvent(QEvent *e);
-
-	QList<GraphItem*> _graphs;
 	GraphType _graphType;
+	Units _units;
+	Palette _palette;
+	int _width;
 
 private slots:
 	void emitSliderPositionChanged(const QPointF &pos);
@@ -89,19 +94,7 @@ private:
 	void removeItem(QGraphicsItem *item);
 	void addItem(QGraphicsItem *item);
 
-	void resizeEvent(QResizeEvent *e);
-	void mousePressEvent(QMouseEvent *e);
-
-	Units _units;
-	qreal _xScale, _yScale;
-	qreal _yOffset;
-	QString _xUnits, _yUnits;
-	QString _xLabel, _yLabel;
-	int _precision;
-	qreal _minYRange;
-	qreal _sliderPos;
-
-	QGraphicsScene *_scene;
+	GraphicsScene *_scene;
 
 	AxisItem *_xAxis, *_yAxis;
 	SliderItem *_slider;
@@ -109,12 +102,19 @@ private:
 	InfoItem *_info;
 	GridItem *_grid;
 	QGraphicsSimpleTextItem *_message;
+	QList<GraphItem*> _graphs;
 
-	QList<GraphItem*> _visible;
-	QSet<int> _hide;
 	QRectF _bounds;
-	Palette _palette;
-	int _width;
+	qreal _sliderPos;
+
+	qreal _xScale, _yScale;
+	qreal _yOffset;
+	QString _xUnits, _yUnits;
+	QString _xLabel, _yLabel;
+	int _precision;
+	qreal _minYRange;
+
+	qreal _zoom;
 };
 
 #endif // GRAPHVIEW_H

src/GUI/gui.cpp

@@ -1580,7 +1580,6 @@ void GUI::keyPressEvent(QKeyEvent *event)
 			else
 				_movingTimeAction->trigger();
 			break;
-
 		case Qt::Key_Escape:
 			if (_fullscreenAction->isChecked()) {
 				_fullscreenAction->setChecked(false);

src/GUI/heartrategraph.cpp

@@ -14,6 +14,11 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(0);
 }
 
+HeartRateGraph::~HeartRateGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void HeartRateGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,28 @@ QList<GraphItem*> HeartRateGraph::loadData(const Data &data)
 		const Graph &graph = track.heartRate();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			HeartRateGraphItem *gi = new HeartRateGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			HeartRateGraphItem *gi = new HeartRateGraphItem(graph, _graphType,
+			  _width, _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +85,9 @@ qreal HeartRateGraph::avg() const
 
 void HeartRateGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +97,13 @@ void HeartRateGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/heartrategraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class HeartRateGraphItem;
+
 class HeartRateGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	HeartRateGraph(QWidget *parent = 0);
+	~HeartRateGraph();
 
 	QString label() const {return tr("Heart rate");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -23,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<HeartRateGraphItem*> _tracks;
 };
 
 #endif // HEARTRATEGRAPH_H

src/GUI/heartrategraphitem.cpp

@@ -4,12 +4,12 @@
 
 
 HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
-	setToolTip(toolTip());
 }
 
-QString HeartRateGraphItem::toolTip() const
+QString HeartRateGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());

src/GUI/heartrategraphitem.h

@@ -8,11 +8,10 @@ class HeartRateGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	HeartRateGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	HeartRateGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
-private:
-	QString toolTip() const;
+	QString info() const;
 };
 
 #endif // HEARTRATEGRAPHITEM_H

src/GUI/mapview.cpp

@@ -16,6 +16,7 @@
 #include "scaleitem.h"
 #include "coordinatesitem.h"
 #include "keys.h"
+#include "graphicsscene.h"
 #include "mapview.h"
 
 
@@ -32,7 +33,7 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	Q_ASSERT(map != 0);
 	Q_ASSERT(poi != 0);
 
-	_scene = new QGraphicsScene(this);
+	_scene = new GraphicsScene(this);
 	setScene(_scene);
 	setDragMode(QGraphicsView::ScrollHandDrag);
 	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
@@ -215,12 +216,12 @@ QList<PathItem *> MapView::loadData(const Data &data)
 	QList<PathItem *> paths;
 	int zoom = _map->zoom();
 
+	for (int i = 0; i < data.areas().count(); i++)
+		addArea(data.areas().at(i));
 	for (int i = 0; i < data.tracks().count(); i++)
 		paths.append(addTrack(data.tracks().at(i)));
 	for (int i = 0; i < data.routes().count(); i++)
 		paths.append(addRoute(data.routes().at(i)));
-	for (int i = 0; i < data.areas().count(); i++)
-		addArea(data.areas().at(i));
 	addWaypoints(data.waypoints());
 
 	if (_tracks.empty() && _routes.empty() && _waypoints.empty()

src/GUI/mapview.h

@@ -30,6 +30,7 @@ class PathItem;
 class GraphItem;
 class AreaItem;
 class Area;
+class GraphicsScene;
 
 class MapView : public QGraphicsView
 {
@@ -120,7 +121,7 @@ private:
 	void mouseMoveEvent(QMouseEvent *event);
 	void leaveEvent(QEvent *event);
 
-	QGraphicsScene *_scene;
+	GraphicsScene *_scene;
 	ScaleItem *_mapScale;
 	CoordinatesItem *_coordinates;
 	QList<TrackItem*> _tracks;

src/GUI/pathitem.cpp

@@ -1,9 +1,11 @@
 #include <cmath>
 #include <QCursor>
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
 #include "common/greatcircle.h"
 #include "map/map.h"
 #include "pathtickitem.h"
+#include "popup.h"
 #include "pathitem.h"
 
 
@@ -20,7 +22,7 @@ static inline unsigned segments(qreal distance)
 }
 
 PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
-  : QGraphicsObject(parent), _path(path), _map(map)
+  : GraphicsItem(parent), _path(path), _map(map)
 {
 	Q_ASSERT(_path.isValid());
 
@@ -38,6 +40,7 @@ PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
 
 	_markerDistance = _path.first().first().distance();
 	_marker = new MarkerItem(this);
+	_marker->setZValue(1);
 	_marker->setPos(position(_markerDistance));
 
 	setCursor(Qt::ArrowCursor);
@@ -336,7 +339,6 @@ void PathItem::updateTicks()
 		_ticks[i] = new PathTickItem(tr, (i + 1) * ts, this);
 		_ticks[i]->setPos(position((i + 1) * ts * xInM()));
 		_ticks[i]->setColor(_pen.color());
-		_ticks[i]->setToolTip(toolTip());
 	}
 }
 
@@ -381,3 +383,9 @@ void PathItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 
 	emit selected(false);
 }
+
+void PathItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), info(), event->widget());
+	GraphicsItem::mousePressEvent(event);
+}

src/GUI/pathitem.h

@@ -6,16 +6,18 @@
 #include "data/path.h"
 #include "markeritem.h"
 #include "units.h"
+#include "graphicsscene.h"
 
 class Map;
 class PathTickItem;
 
-class PathItem : public QGraphicsObject
+class PathItem : public QObject, public GraphicsItem
 {
 	Q_OBJECT
 
 public:
 	PathItem(const Path &path, Map *map, QGraphicsItem *parent = 0);
+	virtual ~PathItem() {}
 
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}
@@ -35,8 +37,6 @@ public:
 	void showMarker(bool show);
 	void showTicks(bool show);
 
-	Units units() const {return _units;}
-
 public slots:
 	void moveMarker(qreal distance);
 	void hover(bool hover);
@@ -44,6 +44,13 @@ public slots:
 signals:
 	void selected(bool);
 
+protected:
+	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+
+	Units _units;
+
 private:
 	const PathSegment *segment(qreal x) const;
 	QPointF position(qreal distance) const;
@@ -55,15 +62,11 @@ private:
 	unsigned tickSize() const;
 	void updateTicks();
 
-	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-
 	Path _path;
 	Map *_map;
 	qreal _markerDistance;
 	int _digitalZoom;
 
-	Units _units;
 	qreal _width;
 	QPen _pen;
 	QPainterPath _shape;

src/GUI/pathtickitem.cpp

@@ -1,6 +1,9 @@
 #include <QPainter>
 #include <QCursor>
+#include <QGraphicsSceneMouseEvent>
 #include "font.h"
+#include "popup.h"
+#include "pathitem.h"
 #include "pathtickitem.h"
 
 
@@ -17,7 +20,7 @@ static QFont defaultFont()
 QFont PathTickItem::_font = defaultFont();
 
 PathTickItem::PathTickItem(const QRectF &tickRect, int value,
-  QGraphicsItem *parent) : QGraphicsItem(parent), _tickRect(tickRect),
+  QGraphicsItem *parent) : GraphicsItem(parent), _tickRect(tickRect),
   _text(QString::number(value))
 {
 	_tickRect.moveCenter(QPointF(0, -_tickRect.height()/2.0 - 3));
@@ -69,3 +72,10 @@ QRect PathTickItem::tickRect(int value)
 	return fm.boundingRect(QRect(), Qt::AlignCenter,
 	  QString::number(qMax(value, 10))).adjusted(-2, 0, 2, 0);
 }
+
+void PathTickItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	const PathItem *pi = static_cast<PathItem*>(parentItem());
+	Popup::show(event->screenPos(), pi->info(), event->widget());
+	QGraphicsItem::mousePressEvent(event);
+}

src/GUI/pathtickitem.h

@@ -3,8 +3,9 @@
 
 #include <QFont>
 #include <QGraphicsItem>
+#include "graphicsscene.h"
 
-class PathTickItem : public QGraphicsItem
+class PathTickItem : public GraphicsItem
 {
 public:
 	PathTickItem(const QRectF &tickRect, int value, QGraphicsItem *parent = 0);
@@ -16,8 +17,14 @@ public:
 	void setPos(const QPointF &pos);
 	void setColor(const QColor &color) {_brush = QBrush(color);}
 
+	int type() const {return parentItem()->type();}
+	QString info() const {return static_cast<GraphicsItem*>(parentItem())->info();}
+
 	static QRect tickRect(int value);
 
+protected:
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+
 private:
 	QRectF _tickRect;
 	QString _text;

src/GUI/percentslider.cpp

@@ -24,7 +24,7 @@ PercentSlider::PercentSlider(QWidget *parent) : QWidget(parent)
 	_label->setAlignment(Qt::AlignRight);
 	_label->setText(format(_slider->value()));
 
-	connect(_slider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabel(int)));
+	connect(_slider, SIGNAL(valueChanged(int)), this, SLOT(updateLabel(int)));
 
 	QHBoxLayout *layout = new QHBoxLayout();
 	layout->addWidget(_slider);

src/GUI/popup.cpp

@@ -0,0 +1,165 @@
+#include <QToolTip>
+#include <QStyle>
+#include <QStylePainter>
+#include <QStyleOptionFrame>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QBasicTimer>
+#include "popup.h"
+
+
+class PopupLabel : public QLabel
+{
+public:
+	PopupLabel(const QString &text, QWidget *parent = 0);
+	~PopupLabel();
+
+	bool eventFilter(QObject *o, QEvent *ev);
+	void place(const QPoint &pos, QWidget *w);
+	void deleteAfterTimer();
+	void stopTimer() {_timer.stop();}
+
+	static PopupLabel *_instance;
+
+protected:
+	void paintEvent(QPaintEvent *event);
+	void timerEvent(QTimerEvent *event);
+	void contextMenuEvent(QContextMenuEvent *) {}
+
+private:
+	QBasicTimer _timer;
+};
+
+PopupLabel *PopupLabel::_instance = 0;
+
+PopupLabel::PopupLabel(const QString &text, QWidget *parent)
+  : QLabel(text, parent, Qt::ToolTip | Qt::BypassGraphicsProxyWidget
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+	| Qt::WindowDoesNotAcceptFocus
+#endif // QT5
+)
+{
+	delete _instance;
+	_instance = this;
+
+	setForegroundRole(QPalette::ToolTipText);
+	setBackgroundRole(QPalette::ToolTipBase);
+	setPalette(QToolTip::palette());
+	ensurePolished();
+	setMargin(1 + style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth, 0,
+	  this));
+	setFrameStyle(QFrame::NoFrame);
+	setAlignment(Qt::AlignLeft);
+	setIndent(1);
+	setWindowOpacity(style()->styleHint(QStyle::SH_ToolTipLabel_Opacity, 0,
+	  this) / 255.0);
+
+	setTextInteractionFlags(Qt::TextBrowserInteraction);
+	setOpenExternalLinks(true);
+	setWordWrap(true);
+
+	setMouseTracking(true);
+
+	qApp->installEventFilter(this);
+}
+
+PopupLabel::~PopupLabel()
+{
+	_instance = 0;
+}
+
+void PopupLabel::paintEvent(QPaintEvent *event)
+{
+	QStylePainter p(this);
+	QStyleOptionFrame opt;
+	opt.init(this);
+	p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
+	p.end();
+	QLabel::paintEvent(event);
+}
+
+void PopupLabel::timerEvent(QTimerEvent *event)
+{
+	if (event->timerId() == _timer.timerId()) {
+		_timer.stop();
+		deleteLater();
+	}
+}
+
+bool PopupLabel::eventFilter(QObject *o, QEvent *ev)
+{
+	Q_UNUSED(o);
+
+	switch (ev->type()) {
+		case QEvent::KeyPress:
+		case QEvent::KeyRelease: {
+			const int key = static_cast<QKeyEvent *>(ev)->key();
+			if (key == Qt::Key_Escape) {
+				deleteLater();
+				return true;
+			}
+			break;
+		}
+		case QEvent::FocusIn:
+		case QEvent::FocusOut:
+		case QEvent::WindowActivate:
+		case QEvent::WindowDeactivate:
+		case QEvent::Close:
+			deleteLater();
+			break;
+		case QEvent::MouseMove: {
+			QRectF r(geometry().adjusted(-5, -20, 5, 20));
+			QPointF p(static_cast<QMouseEvent*>(ev)->globalPos());
+			if (!r.contains(p))
+				deleteAfterTimer();
+			break;
+		}
+		default:
+			break;
+	}
+
+	return false;
+}
+
+void PopupLabel::place(const QPoint &pos, QWidget *w)
+{
+	QRect screen = QApplication::desktop()->screenGeometry(w);
+	QPoint p(pos.x() + 2, pos.y() + 16);
+
+	if (p.x() + width() > screen.x() + screen.width())
+		p.rx() -= 4 + width();
+	if (p.y() + height() > screen.y() + screen.height())
+		p.ry() -= 24 + height();
+	if (p.y() < screen.y())
+		p.setY(screen.y());
+	if (p.x() + width() > screen.x() + screen.width())
+		p.setX(screen.x() + screen.width() - width());
+	if (p.x() < screen.x())
+		p.setX(screen.x());
+	if (p.y() + height() > screen.y() + screen.height())
+		p.setY(screen.y() + screen.height() - height());
+
+	this->move(p);
+}
+
+void PopupLabel::deleteAfterTimer()
+{
+	if (!_timer.isActive())
+		_timer.start(300, this);
+}
+
+
+void Popup::show(const QPoint &pos, const QString &text, QWidget *w)
+{
+	if (PopupLabel::_instance) {
+		PopupLabel::_instance->stopTimer();
+		PopupLabel::_instance->setText(text);
+	} else
+		PopupLabel::_instance = new PopupLabel(text);
+
+	PopupLabel::_instance->resize(PopupLabel::_instance->sizeHint());
+	PopupLabel::_instance->place(pos, w);
+	PopupLabel::_instance->showNormal();
+}

src/GUI/popup.h

@@ -0,0 +1,14 @@
+#ifndef POPUP_H
+#define POPUP_H
+
+class QPoint;
+class QString;
+class QWidget;
+
+class Popup
+{
+public:
+	static void show(const QPoint &pos, const QString &text, QWidget *w);
+};
+
+#endif // POPUP_H

src/GUI/powergraph.cpp

@@ -14,6 +14,11 @@ PowerGraph::PowerGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+PowerGraph::~PowerGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void PowerGraph::setInfo()
 {
 	if (_showTracks) {
@@ -36,23 +41,27 @@ QList<GraphItem*> PowerGraph::loadData(const Data &data)
 		const Graph &graph = track.power();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			PowerGraphItem *gi = new PowerGraphItem(graph, _graphType);
-			GraphView::addGraph(gi);
+			PowerGraphItem *gi = new PowerGraphItem(graph, _graphType, _width,
+			  _palette.nextColor());
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -75,6 +84,9 @@ qreal PowerGraph::avg() const
 
 void PowerGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -84,7 +96,13 @@ void PowerGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/powergraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class PowerGraphItem;
+
 class PowerGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	PowerGraph(QWidget *parent = 0);
+	~PowerGraph();
 
 	QString label() const {return tr("Power");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -23,6 +26,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<PowerGraphItem*> _tracks;
 };
 
 #endif // POWERGRAPH_H

src/GUI/powergraphitem.cpp

@@ -3,13 +3,13 @@
 #include "powergraphitem.h"
 
 
-PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
-	setToolTip(toolTip());
 }
 
-QString PowerGraphItem::toolTip() const
+QString PowerGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());

src/GUI/powergraphitem.h

@@ -8,11 +8,10 @@ class PowerGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	PowerGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	PowerGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
-private:
-	QString toolTip() const;
+	QString info() const;
 };
 
 #endif // POWERGRAPHITEM_H

src/GUI/routeitem.cpp

@@ -7,7 +7,7 @@
 #include "routeitem.h"
 
 
-QString RouteItem::toolTip(Units units) const
+QString RouteItem::info() const
 {
 	ToolTip tt;
 
@@ -16,7 +16,18 @@ QString RouteItem::toolTip(Units units) const
 	if (!_desc.isEmpty())
 		tt.insert(tr("Description"), _desc);
 	tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
-	  units));
+	  _units));
+	if (!_links.isEmpty()) {
+		QString links;
+		for (int i = 0; i < _links.size(); i++) {
+			const Link &link = _links.at(i);
+			links.append(QString("<a href=\"%0\">%1</a>").arg(link.URL(),
+			  link.text().isEmpty() ? link.URL() : link.text()));
+			if (i != _links.size() - 1)
+				links.append("<br/>");
+		}
+		tt.insert(tr("Links"), links);
+	}
 
 	return tt.toString();
 }
@@ -24,7 +35,7 @@ QString RouteItem::toolTip(Units units) const
 RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
   : PathItem(route.path(), map, parent)
 {
-	const QVector<Waypoint> &waypoints = route.waypoints();
+	const RouteData &waypoints = route.data();
 
 	_waypoints.resize(waypoints.size());
 	for (int i = 0; i < waypoints.size(); i++)
@@ -32,9 +43,8 @@ RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
 
 	_name = route.name();
 	_desc = route.description();
+	_links = route.links();
 	_coordinatesFormat = DecimalDegrees;
-
-	setToolTip(toolTip(Metric));
 }
 
 void RouteItem::setMap(Map *map)
@@ -47,15 +57,13 @@ void RouteItem::setMap(Map *map)
 
 void RouteItem::setUnits(Units u)
 {
-	if (units() == u)
+	if (_units == u)
 		return;
 
-	PathItem::setUnits(u);
-
-	setToolTip(toolTip(units()));
-
 	for (int i = 0; i < _waypoints.count(); i++)
-		_waypoints[i]->setToolTipFormat(units(), _coordinatesFormat);
+		_waypoints[i]->setToolTipFormat(u, _coordinatesFormat);
+
+	PathItem::setUnits(u);
 }
 
 void RouteItem::setCoordinatesFormat(CoordinatesFormat format)
@@ -66,7 +74,7 @@ void RouteItem::setCoordinatesFormat(CoordinatesFormat format)
 	_coordinatesFormat = format;
 
 	for (int i = 0; i < _waypoints.count(); i++)
-		_waypoints[i]->setToolTipFormat(units(), _coordinatesFormat);
+		_waypoints[i]->setToolTipFormat(_units, _coordinatesFormat);
 }
 
 void RouteItem::showWaypoints(bool show)

src/GUI/routeitem.h

@@ -5,6 +5,7 @@
 #include "pathitem.h"
 #include "units.h"
 #include "format.h"
+#include "graphicsscene.h"
 
 class Map;
 class WaypointItem;
@@ -23,11 +24,12 @@ public:
 	void showWaypoints(bool show);
 	void showWaypointLabels(bool show);
 
-private:
-	QString toolTip(Units units) const;
+	QString info() const;
 
+private:
 	QString _name;
 	QString _desc;
+	QVector<Link> _links;
 	CoordinatesFormat _coordinatesFormat;
 
 	QVector<WaypointItem*> _waypoints;

src/GUI/settings.h

@@ -152,7 +152,7 @@
 #define ENABLE_HTTP2_SETTING              "enableHTTP2"
 #define ENABLE_HTTP2_DEFAULT              true
 #define PIXMAP_CACHE_SETTING              "pixmapCache"
-#define PIXMAP_CACHE_DEFAULT              64 /* MB */
+#define PIXMAP_CACHE_DEFAULT              256 /* MB */
 #define CONNECTION_TIMEOUT_SETTING        "connectionTimeout"
 #define CONNECTION_TIMEOUT_DEFAULT        30 /* s */
 #define HIRES_PRINT_SETTING               "hiresPrint"

src/GUI/speedgraph.cpp

@@ -18,6 +18,11 @@ SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+SpeedGraph::~SpeedGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void SpeedGraph::setInfo()
 {
 	if (_showTracks) {
@@ -44,13 +49,18 @@ QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 		const Graph &graph = track.speed();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
-			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType,
-			  track.movingTime());
+			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,
+			  _palette.nextColor(), track.movingTime());
 			gi->setTimeType(_timeType);
-			GraphView::addGraph(gi);
+			gi->setUnits(_units);
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			_mavg.append(QPointF(track.distance(), gi->mavg()));
 			graphs.append(gi);
@@ -58,12 +68,12 @@ QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -87,6 +97,9 @@ qreal SpeedGraph::avg() const
 
 void SpeedGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 	_mavg.clear();
 
@@ -121,8 +134,8 @@ void SpeedGraph::setTimeType(enum TimeType type)
 {
 	_timeType = type;
 
-	for (int i = 0; i < _graphs.size(); i++)
-		static_cast<SpeedGraphItem*>(_graphs.at(i))->setTimeType(type);
+	for (int i = 0; i < _tracks.size(); i++)
+		_tracks.at(i)->setTimeType(type);
 
 	setInfo();
 	redraw();
@@ -132,7 +145,13 @@ void SpeedGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/speedgraph.h

@@ -4,12 +4,15 @@
 #include <QList>
 #include "graphtab.h"
 
+class SpeedGraphItem;
+
 class SpeedGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	SpeedGraph(QWidget *parent = 0);
+	~SpeedGraph();
 
 	QString label() const {return tr("Speed");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -29,7 +32,9 @@ private:
 
 	Units _units;
 	TimeType _timeType;
+
 	bool _showTracks;
+	QList<SpeedGraphItem *> _tracks;
 };
 
 #endif // SPEEDGRAPH_H

src/GUI/speedgraphitem.cpp

@@ -4,20 +4,18 @@
 #include "speedgraphitem.h"
 
 
-SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type,
-  qreal movingTime, QGraphicsItem *parent) : GraphItem(graph, type, parent)
+SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, qreal movingTime, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
-	_units = Metric;
 	_timeType = Total;
 
 	_max = GraphItem::max();
 	_avg = graph.last().last().s() / graph.last().last().t();
 	_mavg = graph.last().last().s() / movingTime;
-
-	setToolTip(toolTip());
 }
 
-QString SpeedGraphItem::toolTip() const
+QString SpeedGraphItem::info() const
 {
 	ToolTip tt;
 	qreal scale = (_units == Imperial) ? MS2MIH : (_units == Nautical)
@@ -39,14 +37,7 @@ QString SpeedGraphItem::toolTip() const
 	return tt.toString();
 }
 
-void SpeedGraphItem::setUnits(Units units)
-{
-	_units = units;
-	setToolTip(toolTip());
-}
-
 void SpeedGraphItem::setTimeType(TimeType type)
 {
 	_timeType = type;
-	setToolTip(toolTip());
 }

src/GUI/speedgraphitem.h

@@ -9,22 +9,19 @@ class SpeedGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	SpeedGraphItem(const Graph &graph, GraphType type, qreal movingTime,
-	  QGraphicsItem *parent = 0);
+	SpeedGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, qreal movingTime, QGraphicsItem *parent = 0);
 
 	qreal avg() const {return _avg;}
 	qreal mavg() const {return _mavg;}
 	qreal max() const {return _max;}
 
-	void setUnits(Units units);
+	QString info() const;
+
 	void setTimeType(TimeType type);
 
 private:
-	QString toolTip() const;
-
 	qreal _avg, _mavg, _max;
-
-	Units _units;
 	TimeType _timeType;
 };
 

src/GUI/temperaturegraph.cpp

@@ -14,6 +14,11 @@ TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
 	setSliderPrecision(1);
 }
 
+TemperatureGraph::~TemperatureGraph()
+{
+	qDeleteAll(_tracks);
+}
+
 void TemperatureGraph::setInfo()
 {
 	if (_showTracks) {
@@ -38,24 +43,29 @@ QList<GraphItem*> TemperatureGraph::loadData(const Data &data)
 		const Graph &graph = track.temperature();
 
 		if (!graph.isValid()) {
-			skipColor();
+			_palette.nextColor();
 			graphs.append(0);
 		} else {
 			TemperatureGraphItem *gi = new TemperatureGraphItem(graph,
-			  _graphType);
-			GraphView::addGraph(gi);
+			  _graphType, _width, _palette.nextColor());
+			gi->setUnits(_units);
+
+			_tracks.append(gi);
+			if (_showTracks)
+				addGraph(gi);
+
 			_avg.append(QPointF(track.distance(), gi->avg()));
 			graphs.append(gi);
 		}
 	}
 
 	for (int i = 0; i < data.routes().count(); i++) {
-		skipColor();
+		_palette.nextColor();
 		graphs.append(0);
 	}
 
 	for (int i = 0; i < data.areas().count(); i++)
-		skipColor();
+		_palette.nextColor();
 
 	setInfo();
 	redraw();
@@ -78,6 +88,9 @@ qreal TemperatureGraph::avg() const
 
 void TemperatureGraph::clear()
 {
+	qDeleteAll(_tracks);
+	_tracks.clear();
+
 	_avg.clear();
 
 	GraphTab::clear();
@@ -108,7 +121,13 @@ void TemperatureGraph::showTracks(bool show)
 {
 	_showTracks = show;
 
-	showGraph(show);
+	for (int i = 0; i < _tracks.size(); i++) {
+		if (show)
+			addGraph(_tracks.at(i));
+		else
+			removeGraph(_tracks.at(i));
+	}
+
 	setInfo();
 
 	redraw();

src/GUI/temperaturegraph.h

@@ -3,12 +3,15 @@
 
 #include "graphtab.h"
 
+class TemperatureGraphItem;
+
 class TemperatureGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	TemperatureGraph(QWidget *parent = 0);
+	~TemperatureGraph();
 
 	QString label() const {return tr("Temperature");}
 	QList<GraphItem*> loadData(const Data &data);
@@ -26,6 +29,7 @@ private:
 	QVector<QPointF> _avg;
 
 	bool _showTracks;
+	QList<TemperatureGraphItem *> _tracks;
 };
 
 #endif // TEMPERATUREGRAPH_H

src/GUI/temperaturegraphitem.cpp

@@ -4,21 +4,20 @@
 
 
 TemperatureGraphItem::TemperatureGraphItem(const Graph &graph, GraphType type,
-  QGraphicsItem *parent) : GraphItem(graph, type, parent)
+  int width, const QColor &color, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();
 	_avg = GraphItem::avg();
-
-	setToolTip(toolTip(Metric));
 }
 
-QString TemperatureGraphItem::toolTip(Units units) const
+QString TemperatureGraphItem::info() const
 {
 	ToolTip tt;
-	qreal scale = (units == Metric) ? 1.0 : C2FS;
-	qreal offset = (units == Metric) ? 0 : C2FO;
-	QString su = (units == Metric) ?
+	qreal scale = (_units == Metric) ? 1.0 : C2FS;
+	qreal offset = (_units == Metric) ? 0 : C2FO;
+	QString su = (_units == Metric) ?
 	  QChar(0x00B0) + tr("C") : QChar(0x00B0) + tr("F");
 	QLocale l(QLocale::system());
 
@@ -31,8 +30,3 @@ QString TemperatureGraphItem::toolTip(Units units) const
 
 	return tt.toString();
 }
-
-void TemperatureGraphItem::setUnits(Units units)
-{
-	setToolTip(toolTip(units));
-}

src/GUI/temperaturegraphitem.h

@@ -8,18 +8,16 @@ class TemperatureGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
-	TemperatureGraphItem(const Graph &graph, GraphType type,
-	  QGraphicsItem *parent = 0);
+	TemperatureGraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, QGraphicsItem *parent = 0);
 
 	qreal max() const {return _max;}
 	qreal min() const {return _min;}
 	qreal avg() const {return _avg;}
 
-	void setUnits(Units units);
+	QString info() const;
 
 private:
-	QString toolTip(Units units) const;
-
 	qreal _min, _max, _avg;
 };
 

src/GUI/tooltip.cpp

@@ -1,4 +1,6 @@
 #include <QImageReader>
+#include <QLabel>
+#include "popup.h"
 #include "tooltip.h"
 
 
@@ -26,7 +28,8 @@ QString ToolTip::toString() const
 		}
 
 		html += "<div align=\"center\">";
-		html += QString("<img src=\"file:%0\" width=\"%1\" height=\"%2\"/>")
+		html += QString("<a href=\"file:%0\">"
+		  "<img src=\"%0\" width=\"%1\" height=\"%2\"/></a>")
 		  .arg(_img.path(), QString::number(width), QString::number(height));
 		html += "</div>";
 	}

src/GUI/trackitem.cpp

@@ -5,7 +5,7 @@
 #include "trackitem.h"
 
 
-QString TrackItem::toolTip(Units units) const
+QString TrackItem::info() const
 {
 	ToolTip tt;
 
@@ -14,13 +14,24 @@ QString TrackItem::toolTip(Units units) const
 	if (!_desc.isEmpty())
 		tt.insert(tr("Description"), _desc);
 	tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
-	  units));
+	  _units));
 	if  (_time > 0)
 		tt.insert(tr("Total time"), Format::timeSpan(_time));
 	if  (_movingTime > 0)
 		tt.insert(tr("Moving time"), Format::timeSpan(_movingTime));
 	if (!_date.isNull())
 		tt.insert(tr("Date"), _date.toString(Qt::SystemLocaleShortDate));
+	if (!_links.isEmpty()) {
+		QString links;
+		for (int i = 0; i < _links.size(); i++) {
+			const Link &link = _links.at(i);
+			links.append(QString("<a href=\"%0\">%1</a>").arg(link.URL(),
+			  link.text().isEmpty() ? link.URL() : link.text()));
+			if (i != _links.size() - 1)
+				links.append("<br/>");
+		}
+		tt.insert(tr("Links"), links);
+	}
 
 	return tt.toString();
 }
@@ -30,15 +41,8 @@ TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)
 {
 	_name = track.name();
 	_desc = track.description();
+	_links = track.links();
 	_date = track.date();
 	_time = track.time();
 	_movingTime = track.movingTime();
-
-	setToolTip(toolTip(Metric));
-}
-
-void TrackItem::setUnits(Units units)
-{
-	PathItem::setUnits(units);
-	setToolTip(toolTip(units));
 }

src/GUI/trackitem.h

@@ -6,6 +6,7 @@
 #include "data/track.h"
 #include "pathitem.h"
 #include "units.h"
+#include "graphicsscene.h"
 
 class Map;
 
@@ -16,13 +17,12 @@ class TrackItem : public PathItem
 public:
 	TrackItem(const Track &track, Map *map, QGraphicsItem *parent = 0);
 
-	void setUnits(Units units);
+	QString info() const;
 
 private:
-	QString toolTip(Units units) const;
-
 	QString _name;
 	QString _desc;
+	QVector<Link> _links;
 	QDateTime _date;
 	qreal _time;
 	qreal _movingTime;

src/GUI/waypointitem.cpp

@@ -1,7 +1,10 @@
 #include <QApplication>
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
+#include <QLabel>
 #include "font.h"
 #include "tooltip.h"
+#include "popup.h"
 #include "waypointitem.h"
 
 
@@ -10,30 +13,41 @@
 #define FS(size) \
 	((int)((qreal)size * 1.41))
 
-QString WaypointItem::toolTip(Units units, CoordinatesFormat format)
+QString WaypointItem::info() const
 {
 	ToolTip tt;
 
 	if (!_waypoint.name().isEmpty())
 		tt.insert(qApp->translate("WaypointItem", "Name"), _waypoint.name());
 	tt.insert(qApp->translate("WaypointItem", "Coordinates"),
-	  Format::coordinates(_waypoint.coordinates(), format));
+	  Format::coordinates(_waypoint.coordinates(), _format));
 	if (_waypoint.hasElevation())
 		tt.insert(qApp->translate("WaypointItem", "Elevation"),
-		  Format::elevation(_waypoint.elevation(), units));
+		  Format::elevation(_waypoint.elevation(), _units));
 	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.links().isEmpty()) {
+		QString links;
+		for (int i = 0; i < _waypoint.links().size(); i++) {
+			const Link &link = _waypoint.links().at(i);
+			links.append(QString("<a href=\"%0\">%1</a>").arg(link.URL(),
+			  link.text().isEmpty() ? link.URL() : link.text()));
+			if (i != _waypoint.links().size() - 1)
+				links.append("<br/>");
+		}
+		tt.insert(qApp->translate("WaypointItem", "Links"), links);
+	}
 	tt.setImage(_waypoint.image());
 
 	return tt.toString();
 }
 
 WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map,
-  QGraphicsItem *parent) : QGraphicsItem(parent)
+  QGraphicsItem *parent) : GraphicsItem(parent)
 {
 	_waypoint = waypoint;
 	_showLabel = true;
@@ -43,10 +57,12 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map,
 	_font.setPixelSize(FS(_size));
 	_font.setFamily(FONT_FAMILY);
 
+	_units = Metric;
+	_format = DecimalDegrees;
+
 	updateCache();
 
 	setPos(map->ll2xy(waypoint.coordinates()));
-	setToolTip(toolTip(Metric, DecimalDegrees));
 	setCursor(Qt::ArrowCursor);
 	setAcceptHoverEvents(true);
 }
@@ -116,7 +132,8 @@ void WaypointItem::setColor(const QColor &color)
 
 void WaypointItem::setToolTipFormat(Units units, CoordinatesFormat format)
 {
-	setToolTip(toolTip(units, format));
+	_units = units;
+	_format = format;
 }
 
 void WaypointItem::showLabel(bool show)
@@ -148,3 +165,10 @@ void WaypointItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 	updateCache();
 	setZValue(zValue() - 1.0);
 }
+
+void WaypointItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), info(), event->widget());
+	/* Do not propagate the event any further as lower stacked items (path
+	   items) would replace the popup with their own popup */
+}

src/GUI/waypointitem.h

@@ -3,12 +3,15 @@
 
 #include <cmath>
 #include <QGraphicsItem>
+#include <QFont>
 #include "data/waypoint.h"
 #include "map/map.h"
 #include "units.h"
+#include "graphicsscene.h"
 #include "format.h"
 
-class WaypointItem : public QGraphicsItem
+
+class WaypointItem : public GraphicsItem
 {
 public:
 	WaypointItem(const Waypoint &waypoint, Map *map, QGraphicsItem *parent = 0);
@@ -16,23 +19,26 @@ public:
 	const Waypoint &waypoint() const {return _waypoint;}
 
 	void setMap(Map *map) {setPos(map->ll2xy(_waypoint.coordinates()));}
-	void setToolTipFormat(Units units, CoordinatesFormat format);
 	void setSize(int size);
 	void setColor(const QColor &color);
 	void showLabel(bool show);
 	void setDigitalZoom(int zoom) {setScale(pow(2, -zoom));}
+	void setToolTipFormat(Units units, CoordinatesFormat format);
 
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-private:
+	QString info() const;
+
+protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
 
+private:
 	void updateCache();
-	QString toolTip(Units units, CoordinatesFormat format);
 
 	Waypoint _waypoint;
 	QPainterPath _shape;
@@ -41,6 +47,9 @@ private:
 	bool _showLabel;
 	QFont _font;
 	QRect _labelBB;
+
+	Units _units;
+	CoordinatesFormat _format;
 };
 
 #endif // WAYPOINTITEM_H

src/data/data.cpp

@@ -18,6 +18,7 @@
 #endif // ENABLE_GEOJSON
 #include "exifparser.h"
 #include "cupparser.h"
+#include "gpiparser.h"
 #include "dem.h"
 #include "data.h"
 
@@ -39,6 +40,7 @@ static GeoJSONParser geojson;
 #endif // ENABLE_GEOJSON
 static EXIFParser exif;
 static CUPParser cup;
+static GPIParser gpi;
 
 static QHash<QString, Parser*> parsers()
 {
@@ -63,6 +65,7 @@ static QHash<QString, Parser*> parsers()
 	hash.insert("jpeg", &exif);
 	hash.insert("jpg", &exif);
 	hash.insert("cup", &cup);
+	hash.insert("gpi", &gpi);
 
 	return hash;
 }
@@ -71,13 +74,35 @@ static QHash<QString, Parser*> parsers()
 QHash<QString, Parser*> Data::_parsers = parsers();
 bool Data::_useDEM = false;
 
-void Data::processData(const QList<TrackData> &trackData,
-  const QList<RouteData> &routeData)
+void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
 {
-	for (int i = 0; i < trackData.count(); i++)
+	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);
+				}
+			}
+		}
 		_tracks.append(Track(trackData.at(i)));
-	for (int i = 0; i < routeData.count(); 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);
+			}
+		}
 		_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());
@@ -155,6 +180,7 @@ QString Data::formats()
 #ifdef ENABLE_GEOJSON
 	  + qApp->translate("Data", "GeoJSON files") + " (*.geojson *.json);;"
 #endif // ENABLE_GEOJSON
+	  + qApp->translate("Data", "GPI files") + " (*.gpi);;"
 	  + qApp->translate("Data", "GPX files") + " (*.gpx);;"
 	  + qApp->translate("Data", "IGC files") + " (*.igc);;"
 	  + qApp->translate("Data", "JPEG images") + " (*.jpg *.jpeg);;"
@@ -181,6 +207,4 @@ QStringList Data::filter()
 void Data::useDEM(bool use)
 {
 	_useDEM = use;
-	Route::useDEM(use);
-	Track::useDEM(use);
 }

src/data/data.h

@@ -31,8 +31,7 @@ public:
 	static void useDEM(bool use);
 
 private:
-	void processData(const QList<TrackData> &trackData,
-	  const QList<RouteData> &routeData);
+	void processData(QList<TrackData> &trackData, QList<RouteData> &routeData);
 
 	bool _valid;
 	QString _errorString;

src/data/fitparser.cpp

@@ -265,6 +265,14 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 					if (val != 0x7f)
 						ctx.trackpoint.setTemperature((qint8)val);
 					break;
+				case 73:
+					if (val != 0xffffffff)
+						ctx.trackpoint.setSpeed(val / 1000.0f);
+					break;
+				case 78:
+					if (val != 0xffffffff)
+						ctx.trackpoint.setElevation((val / 5.0) - 500);
+					break;
 				default:
 					break;
 

src/data/gpiparser.cpp

@@ -0,0 +1,446 @@
+#include <QDataStream>
+#include <QTextCodec>
+#include <QtEndian>
+#include <QUrl>
+#include "gpiparser.h"
+
+
+struct RecordHeader {
+	quint16 type;
+	quint16 flags;
+	quint32 size;
+	quint32 extra;
+};
+
+class TranslatedString {
+public:
+	TranslatedString() {}
+	TranslatedString(const QString &lang, const QString &str)
+		: _lang(lang), _str(str) {}
+
+	const QString &str() const {return _str;}
+	const QString &lang() const {return _lang;}
+
+private:
+	QString _lang;
+	QString _str;
+};
+
+static inline double toWGS(qint32 v)
+{
+	return (double)(((double)v / (double)(1U<<31)) * (double)180);
+}
+
+static quint16 nextHeaderType(QDataStream &stream)
+{
+	quint16 type = 0;
+	stream.device()->peek((char*)&type, sizeof(type));
+	return qFromLittleEndian(type);
+}
+
+static quint8 readRecordHeader(QDataStream &stream, RecordHeader &hdr)
+{
+	stream >> hdr.type >> hdr.flags >> hdr.size;
+	if (hdr.flags & 0xA)
+		stream >> hdr.extra;
+	return (hdr.flags & 0xA) ? 12 : 8;
+}
+
+static quint32 skipRecord(QDataStream &stream)
+{
+	RecordHeader rh;
+	quint8 rs = readRecordHeader(stream, rh);
+	stream.skipRawData(rh.size);
+
+	return rs + rh.size;
+}
+
+static quint32 readFprsRecord(QDataStream &stream)
+{
+	RecordHeader rh;
+	quint16 s1;
+	quint8 rs, s2, s3, s4;
+
+	rs = readRecordHeader(stream, rh);
+	stream >> s1 >> s2 >> s3 >> s4;
+
+	return rs + 5;
+}
+
+static quint16 readString(QDataStream &stream, QTextCodec *codec, QString &str)
+{
+	quint16 len;
+	stream >> len;
+	QByteArray ba;
+	ba.resize(len);
+	stream.readRawData(ba.data(), len);
+	str = codec ? codec->toUnicode(ba) : QString::fromLatin1(ba);
+
+	return len + 2;
+}
+
+static quint32 readTranslatedObjects(QDataStream &stream, QTextCodec *codec,
+  QList<TranslatedString> &objects)
+{
+	qint32 size = 0, ret;
+	char lang[2];
+
+	objects.clear();
+
+	stream >> size;
+	ret = size + 4;
+	while (size > 0) {
+		QString str;
+		stream.readRawData(lang, sizeof(lang));
+		size -= readString(stream, codec, str) + 2;
+		objects.append(TranslatedString(lang, str));
+	}
+
+	if (size < 0)
+		stream.setStatus(QDataStream::ReadCorruptData);
+
+	return ret;
+}
+
+static quint32 readDescription(QDataStream &stream, QTextCodec *codec,
+  Waypoint &waypoint)
+{
+	RecordHeader rh;
+	quint8 rs;
+	quint32 ds;
+	QList<TranslatedString> obj;
+
+	rs = readRecordHeader(stream, rh);
+	ds = readTranslatedObjects(stream, codec, obj);
+	if (!obj.isEmpty())
+		waypoint.setDescription(obj.first().str());
+
+	if (ds != rh.size)
+		stream.setStatus(QDataStream::ReadCorruptData);
+
+	return rs + rh.size;
+}
+
+static quint32 readNotes(QDataStream &stream, QTextCodec *codec,
+  Waypoint &waypoint)
+{
+	RecordHeader rh;
+	quint8 rs, s1;
+	quint32 ds = 1;
+
+	rs = readRecordHeader(stream, rh);
+	stream >> s1;
+	if (s1 & 0x1) {
+		QList<TranslatedString> obj;
+		ds += readTranslatedObjects(stream, codec, obj);
+		if (!obj.isEmpty() && waypoint.description().isNull())
+			waypoint.setDescription(obj.first().str());
+	}
+	if (s1 & 0x2) {
+		QString str;
+		ds += readString(stream, codec, str);
+		if (!str.isEmpty() && waypoint.description().isNull())
+			waypoint.setDescription(str);
+	}
+
+	if (ds != rh.size)
+		stream.setStatus(QDataStream::ReadCorruptData);
+
+	return rs + rh.size;
+}
+
+static quint32 readContact(QDataStream &stream, QTextCodec *codec,
+  Waypoint &waypoint)
+{
+	RecordHeader rh;
+	quint8 rs;
+	quint16 s1;
+	quint32 ds = 2;
+	QString str;
+	QList<TranslatedString> obj;
+
+	rs = readRecordHeader(stream, rh);
+	stream >> s1;
+
+	if (s1 & 0x1) // phone
+		ds += readString(stream, codec, str);
+	if (s1 & 0x2) // phone2
+		ds += readString(stream, codec, str);
+	if (s1 & 0x4) // fax
+		ds += readString(stream, codec, str);
+	if (s1 & 0x8) // mail
+		ds += readString(stream, codec, str);
+	if (s1 & 0x10) { // web
+		ds += readString(stream, codec, str);
+		QUrl url(str);
+		waypoint.addLink(Link(url.scheme().isEmpty()
+		  ? "http://" + str : str, str));
+	}
+	if (s1 & 0x20) // unknown
+		ds += readTranslatedObjects(stream, codec, obj);
+
+	if (ds != rh.size)
+		stream.setStatus(QDataStream::ReadCorruptData);
+
+	return rs + rh.size;
+}
+
+static quint32 readPOI(QDataStream &stream, QTextCodec *codec,
+  QVector<Waypoint> &waypoints)
+{
+	RecordHeader rh;
+	quint8 rs;
+	quint32 ds;
+	qint32 s1, s2;
+	quint16 s3;
+	QList<TranslatedString> obj;
+
+	rs = readRecordHeader(stream, rh);
+	stream >> s1 >> s2 >> s3;
+	stream.skipRawData(s3);
+	ds = 10 + s3;
+	ds += readTranslatedObjects(stream, codec, obj);
+
+	waypoints.append(Waypoint(Coordinates(toWGS(s2), toWGS(s1))));
+	if (!obj.isEmpty())
+		waypoints.last().setName(obj.first().str());
+
+	while (ds < rh.size) {
+		switch(nextHeaderType(stream)) {
+			case 10:
+				ds += readDescription(stream, codec, waypoints.last());
+				break;
+			case 12:
+				ds += readContact(stream, codec, waypoints.last());
+				break;
+			case 14:
+				ds += readNotes(stream, codec, waypoints.last());
+				break;
+			default:
+				ds += skipRecord(stream);
+		}
+	}
+
+	if (ds != rh.size)
+		stream.setStatus(QDataStream::ReadCorruptData);
+
+	return rs + rh.size;
+}
+
+static quint32 readSpatialIndex(QDataStream &stream, QTextCodec *codec,
+  QVector<Waypoint> &waypoints)
+{
+	RecordHeader rh;
+	quint32 ds, s5;
+	qint32 top, right, bottom, left;
+	quint16 s6;
+	quint8 rs;
+
+	rs = readRecordHeader(stream, rh);
+	stream >> top >> right >> bottom >> left >> s5 >> s6;
+	stream.skipRawData(s6);
+	ds = 22 + s6;
+	if (rh.flags & 0x8) {
+		while (ds < rh.size) {
+			switch(nextHeaderType(stream)) {
+				case 2:
+					ds += readPOI(stream, codec, waypoints);
+					break;
+				case 8:
+					ds += readSpatialIndex(stream, codec, waypoints);
+					break;
+				default:
+					ds += skipRecord(stream);
+			}
+		}
+	}
+
+	if (ds != rh.size)
+		stream.setStatus(QDataStream::ReadCorruptData);
+
+	return rs + rh.size;
+}
+
+static quint32 readFileDataRecord(QDataStream &stream, QTextCodec *codec)
+{
+	RecordHeader rh;
+	quint32 ds, s1;
+	quint16 s2, s3;
+	quint8 rs;
+	QList<TranslatedString> obj;
+
+	rs = readRecordHeader(stream, rh);
+	stream >> s1 >> s2 >> s3;
+	ds = 8;
+	ds += readTranslatedObjects(stream, codec, obj);
+	ds += readTranslatedObjects(stream, codec, obj);
+
+	if (s1 & 0x10) {
+		quint8 ss1, ss2;
+		quint16 ss3;
+		stream >> ss1 >> ss2 >> ss3;
+		ds += 4;
+	}
+	if (s1 & 0x100) {
+		quint32 ss1;
+		stream >> ss1;
+		if (ss1)
+			stream.skipRawData(ss1);
+		ds += ss1 + 4;
+	}
+	if (s1 & 0x400) {
+		QString str;
+		ds += readString(stream, codec, str);
+	}
+	if (s1 & 0x400000) {
+		quint16 ss1;
+		stream >> ss1;
+		if (ss1)
+			stream.skipRawData(ss1);
+		ds += ss1 + 2;
+	}
+
+	if (ds != rh.size)
+		stream.setStatus(QDataStream::ReadCorruptData);
+
+	return rs + rh.size;
+}
+
+bool GPIParser::readFileHeader(QDataStream &stream)
+{
+	RecordHeader rh;
+	quint32 ds, s7;
+	quint16 s10;
+	quint8 s5, s6, s8, s9;
+	char magic[6];
+
+	readRecordHeader(stream, rh);
+	stream.readRawData(magic, sizeof(magic));
+	if (memcmp(magic, "GRMREC", sizeof(magic))) {
+		_errorString = "Not a GPI file";
+		return false;
+	}
+	stream >> s5 >> s6 >> s7 >> s8 >> s9 >> s10;
+	stream.skipRawData(s10);
+	ds = sizeof(magic) + 10 + s10;
+	if (rh.flags & 8)
+		ds += readFprsRecord(stream);
+
+	if (s8 & 0x4) {
+		_errorString = "Encrypted GPI files not supported";
+		return false;
+	}
+
+	if (stream.status() != QDataStream::Ok || ds != rh.size) {
+		_errorString = "Invalid file header";
+		return false;
+	} else
+		return true;
+}
+
+bool GPIParser::readGPIHeader(QDataStream &stream, QTextCodec *codec)
+{
+	RecordHeader rh;
+	char m1[6], m2[2];
+	quint16 codepage = 0;
+	quint8 s2, s3;
+	quint32 ds;
+
+	readRecordHeader(stream, rh);
+	stream.readRawData(m1, sizeof(m1));
+	stream.readRawData(m2, sizeof(m2));
+	stream >> codepage >> s2 >> s3;
+	ds = sizeof(m1) + sizeof(m2) + 4;
+
+	if (codepage == 65001)
+		codec = QTextCodec::codecForName("UTF-8");
+	else if (codepage == 0)
+		codec = 0;
+	else
+		codec = QTextCodec::codecForName(QString("CP%1").arg(codepage)
+		  .toLatin1());
+
+	if (s2 & 0x10)
+		ds += readFileDataRecord(stream, codec);
+
+	if (stream.status() != QDataStream::Ok || ds != rh.size) {
+		_errorString = "Invalid GPI header";
+		return false;
+	} else
+		return true;
+}
+
+void GPIParser::readPOIDatabase(QDataStream &stream, QTextCodec *codec,
+  QVector<Waypoint> &waypoints)
+{
+	RecordHeader rh;
+	QList<TranslatedString> obj;
+	quint32 ds;
+
+	readRecordHeader(stream, rh);
+	ds = readTranslatedObjects(stream, codec, obj);
+	ds += readSpatialIndex(stream, codec, waypoints);
+	if (rh.flags & 0x8) {
+		while (ds < rh.size) {
+			switch(nextHeaderType(stream)) {
+				case 5: // symbol
+				case 7: // category
+				default:
+					ds += skipRecord(stream);
+			}
+		}
+	}
+
+	if (ds != rh.size)
+		stream.setStatus(QDataStream::ReadCorruptData);
+}
+
+bool GPIParser::readEntry(QDataStream &stream, QTextCodec *codec,
+  QVector<Waypoint> &waypoints)
+{
+	switch (nextHeaderType(stream)) {
+		case 0x09:   // POI database
+			readPOIDatabase(stream, codec, waypoints);
+			break;
+		case 0xffff: // EOF
+			skipRecord(stream);
+			return false;
+		case 0x16:   // route
+		case 0x15:   // info header
+		default:
+			skipRecord(stream);
+	}
+
+	return true;
+}
+
+bool GPIParser::readData(QDataStream &stream, QTextCodec *codec,
+  QVector<Waypoint> &waypoints)
+{
+	while (stream.status() == QDataStream::Ok)
+		if (!readEntry(stream, codec, waypoints))
+			return stream.atEnd();
+
+	return false;
+}
+
+bool GPIParser::parse(QFile *file, QList<TrackData> &tracks,
+  QList<RouteData> &routes, QList<Area> &polygons, QVector<Waypoint> &waypoints)
+{
+	Q_UNUSED(tracks);
+	Q_UNUSED(routes);
+	Q_UNUSED(polygons);
+	QDataStream stream(file);
+	QTextCodec *codec = 0;
+
+	stream.setByteOrder(QDataStream::LittleEndian);
+
+	if (!readFileHeader(stream) || !readGPIHeader(stream, codec))
+		return false;
+
+	if (!readData(stream, codec, waypoints)) {
+		_errorString = "Invalid/corrupted GPI data";
+		return false;
+	} else
+		return true;
+}

src/data/gpiparser.h

@@ -0,0 +1,30 @@
+#ifndef GPIPARSER_H
+#define GPIPARSER_H
+
+#include "parser.h"
+
+class QDataStream;
+class QTextCodec;
+
+class GPIParser : public Parser
+{
+public:
+	bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
+	  QList<Area> &polygons, QVector<Waypoint> &waypoints);
+	QString errorString() const {return _errorString;}
+	int errorLine() const {return 0;}
+
+private:
+	bool readFileHeader(QDataStream &stream);
+	bool readGPIHeader(QDataStream &stream, QTextCodec *codec);
+	bool readData(QDataStream &stream, QTextCodec *codec,
+	  QVector<Waypoint> &waypoints);
+	bool readEntry(QDataStream &stream, QTextCodec *codec,
+	  QVector<Waypoint> &waypoints);
+	void readPOIDatabase(QDataStream &stream, QTextCodec *codec,
+	  QVector<Waypoint> &waypoints);
+
+	QString _errorString;
+};
+
+#endif // GPIPARSER_H

src/data/gpxparser.cpp

@@ -23,6 +23,21 @@ QDateTime GPXParser::time()
 	return d;
 }
 
+Link GPXParser::link()
+{
+	QString URL = _reader.attributes().value("href").toString();
+	QString text;
+
+	while (_reader.readNextStartElement()) {
+		if (_reader.name() == QLatin1String("text"))
+			text = _reader.readElementText();
+		else
+			_reader.skipCurrentElement();
+	}
+
+	return Link(URL, text);
+}
+
 Coordinates GPXParser::coordinates()
 {
 	bool res;
@@ -134,6 +149,7 @@ void GPXParser::trackpointData(Trackpoint &trackpoint)
 void GPXParser::waypointData(Waypoint &waypoint, SegmentData *autoRoute)
 {
 	qreal gh = NAN;
+	Link link10;
 
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("name"))
@@ -146,12 +162,22 @@ void GPXParser::waypointData(Waypoint &waypoint, SegmentData *autoRoute)
 			gh = number();
 		else if (_reader.name() == QLatin1String("time"))
 			waypoint.setTimestamp(time());
+		else if (_reader.name() == QLatin1String("link")) {
+			Link l(link());
+			if (!l.URL().isEmpty())
+				waypoint.addLink(l);
+		} else if (_reader.name() == QLatin1String("url"))
+			link10.setURL(_reader.readElementText());
+		else if (_reader.name() == QLatin1String("urlname"))
+			link10.setText(_reader.readElementText());
 		else if (autoRoute && _reader.name() == QLatin1String("extensions"))
 			rteptExtensions(autoRoute);
 		else
 			_reader.skipCurrentElement();
 	}
 
+	if (!link10.URL().isEmpty())
+		waypoint.addLink(link10);
 	if (!std::isnan(gh) && !std::isnan(waypoint.elevation()))
 		waypoint.setElevation(waypoint.elevation() - gh);
 }
@@ -172,6 +198,7 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
 	TrackData autoRoute;
 	autoRoute.append(SegmentData());
 	SegmentData &autoRouteSegment = autoRoute.last();
+	Link link10;
 
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("rtept")) {
@@ -181,10 +208,21 @@ 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("link")) {
+			Link l(link());
+			if (!l.URL().isEmpty())
+				route.addLink(l);
+		} else if (_reader.name() == QLatin1String("url"))
+			link10.setURL(_reader.readElementText());
+		else if (_reader.name() == QLatin1String("urlname"))
+			link10.setText(_reader.readElementText());
 		else
 			_reader.skipCurrentElement();
 	}
 
+	if (!link10.URL().isEmpty())
+		route.addLink(link10);
+
 	if (!autoRouteSegment.isEmpty()) {
 		autoRoute.setName(route.name());
 		autoRoute.setDescription(route.description());
@@ -194,6 +232,8 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
 
 void GPXParser::track(TrackData &track)
 {
+	Link link10;
+
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("trkseg")) {
 			track.append(SegmentData());
@@ -202,9 +242,20 @@ void GPXParser::track(TrackData &track)
 			track.setName(_reader.readElementText());
 		else if (_reader.name() == QLatin1String("desc"))
 			track.setDescription(_reader.readElementText());
+		else if (_reader.name() == QLatin1String("link")) {
+			Link l(link());
+			if (!l.URL().isEmpty())
+				track.addLink(l);
+		} else if (_reader.name() == QLatin1String("url"))
+			link10.setURL(_reader.readElementText());
+		else if (_reader.name() == QLatin1String("urlname"))
+			link10.setText(_reader.readElementText());
 		else
 			_reader.skipCurrentElement();
 	}
+
+	if (!link10.URL().isEmpty())
+		track.addLink(link10);
 }
 
 void GPXParser::area(Area &area)

src/data/gpxparser.h

@@ -4,7 +4,6 @@
 #include <QXmlStreamReader>
 #include "parser.h"
 
-
 class GPXParser : public Parser
 {
 public:
@@ -30,6 +29,7 @@ private:
 	qreal number();
 	QDateTime time();
 	Coordinates coordinates();
+	Link link();
 
 	QXmlStreamReader _reader;
 };

src/data/graph.h

@@ -54,6 +54,7 @@ public:
 				return false;
 		return true;
 	}
+
 	bool hasTime() const
 	{
 		for (int i = 0; i < size(); i++) {

src/data/igcparser.cpp

@@ -130,6 +130,8 @@ bool IGCParser::readBRecord(SegmentData &segment, const char *line,
 
 	if (len < 35)
 		return false;
+	if (line[24] != 'A')
+		return true;
 
 	if (!readTimestamp(line + 1, time)) {
 		_errorString = "Invalid timestamp";

src/data/link.h

@@ -0,0 +1,22 @@
+#ifndef LINK_H
+#define LINK_H
+
+#include <QString>
+
+class Link {
+public:
+	Link() {}
+	Link(const QString &URL, const QString &text = QString())
+		: _URL(URL), _text(text) {}
+
+	void setURL(const QString &URL) {_URL = URL;}
+	void setText(const QString &text) {_text = text;}
+	const QString &URL() const {return _URL;}
+	const QString &text() const {return _text;}
+
+private:
+	QString _URL;
+	QString _text;
+};
+
+#endif // LINK_H

src/data/locparser.cpp

@@ -38,6 +38,11 @@ void LOCParser::waypoint(Waypoint &waypoint)
 		} else if (_reader.name() == QLatin1String("coord")) {
 			waypoint.setCoordinates(coordinates());
 			_reader.skipCurrentElement();
+		} else if (_reader.name() == QLatin1String("link")) {
+			const QXmlStreamAttributes &attr = _reader.attributes();
+			QString URL(_reader.readElementText());
+			if (!URL.isEmpty())
+				waypoint.addLink(Link(URL, attr.value("text").toString()));
 		} else
 			_reader.skipCurrentElement();
 	}

src/data/route.cpp

@@ -1,9 +1,6 @@
-#include "dem.h"
 #include "route.h"
 
 
-bool Route::_useDEM = false;
-
 Route::Route(const RouteData &data) : _data(data)
 {
 	qreal dist = 0;
@@ -34,19 +31,9 @@ Graph Route::elevation() const
 	graph.append(GraphSegment());
 	GraphSegment &gs = graph.last();
 
-	for (int i = 0; i < _data.size(); i++) {
-		if (_data.at(i).hasElevation() && !_useDEM)
-			gs.append(GraphPoint(_distance.at(i), NAN,
-			  _data.at(i).elevation()));
-		else {
-			qreal elevation = DEM::elevation(_data.at(i).coordinates());
-			if (!std::isnan(elevation))
-				gs.append(GraphPoint(_distance.at(i), NAN, elevation));
-			else if (_data.at(i).hasElevation())
-				gs.append(GraphPoint(_distance.at(i), NAN,
-				  _data.at(i).elevation()));
-		}
-	}
+	for (int i = 0; i < _data.size(); i++)
+		if (_data.at(i).hasElevation())
+			gs.append(GraphPoint(_distance.at(i), NAN, _data.at(i).elevation()));
 
 	return graph;
 }

src/data/route.h

@@ -13,7 +13,7 @@ public:
 
 	Path path() const;
 
-	const QVector<Waypoint> &waypoints() const {return _data;}
+	const RouteData &data() const {return _data;}
 
 	Graph elevation() const;
 
@@ -21,16 +21,13 @@ public:
 
 	const QString &name() const {return _data.name();}
 	const QString &description() const {return _data.description();}
+	const QVector<Link> &links() const {return _data.links();}
 
 	bool isValid() const {return _data.size() >= 2;}
 
-	static void useDEM(bool use) {_useDEM = use;}
-
 private:
 	RouteData _data;
 	QVector<qreal> _distance;
-
-	static bool _useDEM;
 };
 
 #endif // ROUTE_H

src/data/routedata.h

@@ -4,18 +4,23 @@
 #include <QVector>
 #include <QString>
 #include "waypoint.h"
+#include "link.h"
 
 class RouteData : public QVector<Waypoint>
 {
 public:
-	const QString& name() const {return _name;}
-	const QString& description() const {return _desc;}
+	const QString &name() const {return _name;}
+	const QString &description() const {return _desc;}
+	const QVector<Link> &links() const {return _links;}
+
 	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &desc) {_desc = desc;}
+	void addLink(const Link &link) {_links.append(link);}
 
 private:
 	QString _name;
 	QString _desc;
+	QVector<Link> _links;
 };
 
 #endif // ROUTEDATA_H

src/data/track.cpp

@@ -1,4 +1,3 @@
-#include "dem.h"
 #include "track.h"
 
 
@@ -13,7 +12,6 @@ int Track::_pauseInterval = 10;
 
 bool Track::_outlierEliminate = true;
 bool Track::_useReportedSpeed = false;
-bool Track::_useDEM = false;
 
 
 static qreal median(QVector<qreal> &v)
@@ -90,19 +88,34 @@ Track::Track(const TrackData &data) : _data(data), _pause(0)
 		  sd.first().hasTimestamp() ? 0 : NAN);
 		seg.speed.append(sd.first().hasTimestamp() ? 0 : NAN);
 		acceleration.append(sd.first().hasTimestamp() ? 0 : NAN);
+		bool hasTime = !std::isnan(seg.time.first());
 
 		for (int j = 1; j < sd.size(); j++) {
 			ds = sd.at(j).coordinates().distanceTo(
 			  sd.at(j-1).coordinates());
 			seg.distance.append(seg.distance.last() + ds);
 
-			if (sd.at(j).timestamp() >= sd.at(j-1).timestamp())
-				dt = sd.at(j-1).timestamp().msecsTo(
-				  sd.at(j).timestamp()) / 1000.0;
-			else {
-				qWarning("%s: %s: time skew detected", qPrintable(_data.name()),
-				  qPrintable(sd.at(j).timestamp().toString(Qt::ISODate)));
-				dt = 0;
+			if (hasTime && sd.at(j).timestamp().isValid()) {
+				if (sd.at(j).timestamp() > sd.at(j-1).timestamp())
+					dt = sd.at(j-1).timestamp().msecsTo(
+					  sd.at(j).timestamp()) / 1000.0;
+				else {
+					qWarning("%s: %s: time skew detected", qPrintable(
+					  _data.name()), qPrintable(sd.at(j).timestamp().toString(
+					  Qt::ISODate)));
+					dt = 0;
+				}
+			} else {
+				dt = NAN;
+				if (hasTime) {
+					qWarning("%s: missing timestamp(s), time graphs disabled",
+					  qPrintable(_data.name()));
+					hasTime = false;
+					for (int i = 0; i < seg.time.size(); i++)
+						seg.time[i] = NAN;
+					for (int i = 0; i < seg.speed.size(); i++)
+						seg.speed[i] = NAN;
+				}
 			}
 			seg.time.append(seg.time.last() + dt);
 
@@ -127,7 +140,7 @@ Track::Track(const TrackData &data) : _data(data), _pause(0)
 			}
 		}
 
-		if (!_outlierEliminate)
+		if (!_outlierEliminate || !hasTime)
 			continue;
 
 
@@ -178,21 +191,10 @@ Graph Track::elevation() const
 		GraphSegment gs;
 
 		for (int j = 0; j < sd.size(); j++) {
-			if (seg.outliers.contains(j))
+			if (!sd.at(j).hasElevation() || seg.outliers.contains(j))
 				continue;
-
-			if (sd.at(j).hasElevation() && !_useDEM)
-				gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-				  sd.at(j).elevation()));
-			else {
-				qreal elevation = DEM::elevation(sd.at(j).coordinates());
-				if (!std::isnan(elevation))
-					gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-					  elevation));
-				else if (sd.at(j).hasElevation())
-					gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
-					  sd.at(j).elevation()));
-			}
+			gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j),
+			  sd.at(j).elevation()));
 		}
 
 		ret.append(filter(gs, _elevationWindow));

src/data/track.h

@@ -32,6 +32,7 @@ public:
 
 	const QString &name() const {return _data.name();}
 	const QString &description() const {return _data.description();}
+	const QVector<Link> &links() const {return _data.links();}
 
 	bool isValid() const;
 
@@ -45,7 +46,6 @@ public:
 	static void setOutlierElimination(bool eliminate)
 	  {_outlierEliminate = eliminate;}
 	static void useReportedSpeed(bool use) {_useReportedSpeed = use;}
-	static void useDEM(bool use) {_useDEM = use;}
 
 private:
 	struct Segment {
@@ -71,7 +71,6 @@ private:
 	static qreal _pauseSpeed;
 	static int _pauseInterval;
 	static bool _useReportedSpeed;
-	static bool _useDEM;
 };
 
 #endif // TRACK_H

src/data/trackdata.h

@@ -5,20 +5,25 @@
 #include <QVector>
 #include <QString>
 #include "trackpoint.h"
+#include "link.h"
 
 typedef QVector<Trackpoint> SegmentData;
 
 class TrackData : public QList<SegmentData>
 {
 public:
-	const QString& name() const {return _name;}
-	const QString& description() const {return _desc;}
+	const QString &name() const {return _name;}
+	const QString &description() const {return _desc;}
+	const QVector<Link> &links() const {return _links;}
+
 	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &desc) {_desc = desc;}
+	void addLink(const Link &link) {_links.append(link);}
 
 private:
 	QString _name;
 	QString _desc;
+	QVector<Link> _links;
 };
 
 #endif // TRACKDATA_H

src/data/waypoint.h

@@ -7,6 +7,7 @@
 #include <QDebug>
 #include "common/coordinates.h"
 #include "imageinfo.h"
+#include "link.h"
 
 class Waypoint
 {
@@ -19,6 +20,7 @@ public:
 	const QString &name() const {return _name;}
 	const QString &description() const {return _description;}
 	const ImageInfo &image() const {return _image;}
+	const QVector<Link> &links() const {return _links;}
 	const QDateTime &timestamp() const {return _timestamp;}
 	qreal elevation() const {return _elevation;}
 
@@ -30,6 +32,7 @@ public:
 	void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
 	void setElevation(qreal elevation) {_elevation = elevation;}
 	void setImage(const ImageInfo &image) {_image = image;}
+	void addLink(const Link &link) {_links.append(link);}
 
 	bool hasElevation() const {return !std::isnan(_elevation);}
 
@@ -42,6 +45,7 @@ private:
 	QString _name;
 	QString _description;
 	ImageInfo _image;
+	QVector<Link> _links;
 	QDateTime _timestamp;
 	qreal _elevation;
 };

src/map/IMG/img.cpp

@@ -9,7 +9,7 @@
 
 #define CHECK(condition) \
 	if (!(condition)) { \
-		_errorString = "Invalid/corrupted IMG file"; \
+		_errorString = "Unsupported or invalid IMG file"; \
 		return; \
 	}
 
@@ -85,11 +85,6 @@ IMG::IMG(const QString &fileName)
 		  && read(type, sizeof(type)) && readValue(size) && readValue(part));
 		SubFile::Type tt = SubFile::type(type);
 
-		if (tt == SubFile::GMP) {
-			_errorString = "NT maps not supported";
-			return;
-		}
-
 		QString fn(QByteArray(name, sizeof(name)));
 		if (SubFile::isTileFile(tt)) {
 			VectorTile *tile;
@@ -101,7 +96,7 @@ IMG::IMG(const QString &fileName)
 				tile = *it;
 
 			SubFile *file = part ? tile->file(tt)
-			  : tile->addFile(this, tt, size);
+			  : tile->addFile(this, tt);
 			CHECK(file);
 
 			_file.seek(offset + 0x20);
@@ -114,7 +109,7 @@ IMG::IMG(const QString &fileName)
 		} else if (tt == SubFile::TYP) {
 			SubFile *typ = 0;
 			if (typFile.isNull()) {
-				_typ = new SubFile(this, size);
+				_typ = new SubFile(this);
 				typ = _typ;
 				typFile = fn;
 			} else if (fn == typFile)
@@ -166,7 +161,7 @@ void IMG::load()
 {
 	Q_ASSERT(!_style);
 
-	if (_typ && _typ->isValid())
+	if (_typ)
 		_style = new Style(_typ);
 	else {
 		QFile typFile(ProgramPaths::typFile());

src/map/IMG/lblfile.cpp

@@ -56,11 +56,11 @@ bool LBLFile::init()
 	quint16 codepage;
 	quint8 multiplier, poiMultiplier;
 
-	if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
+	if (!(seek(hdl, _gmpOffset + 0x15) && readUInt32(hdl, _offset)
 	  && readUInt32(hdl, _size) && readByte(hdl, multiplier)
-	  && readByte(hdl, _encoding) && seek(hdl, 0x57)
+	  && readByte(hdl, _encoding) && seek(hdl, _gmpOffset + 0x57)
 	  && readUInt32(hdl, _poiOffset) && readUInt32(hdl, _poiSize)
-	  && readByte(hdl, poiMultiplier) && seek(hdl, 0xAA)
+	  && readByte(hdl, poiMultiplier) && seek(hdl, _gmpOffset + 0xAA)
 	  && readUInt16(hdl, codepage)))
 		return false;
 

src/map/IMG/lblfile.h

@@ -9,9 +9,12 @@ class QTextCodec;
 class LBLFile : public SubFile
 {
 public:
-	LBLFile(IMG *img, quint32 size)
-	  : SubFile(img, size), _codec(0), _offset(0), _size(0), _poiOffset(0),
+	LBLFile(IMG *img)
+	  : SubFile(img), _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);
 

src/map/IMG/netfile.cpp

@@ -5,7 +5,7 @@ bool NETFile::init()
 	Handle hdl;
 	quint8 multiplier;
 
-	if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
+	if (!(seek(hdl, _gmpOffset + 0x15) && readUInt32(hdl, _offset)
 	  && readUInt32(hdl, _size) && readByte(hdl, multiplier)))
 		return false;
 

src/map/IMG/netfile.h

@@ -6,8 +6,9 @@
 class NETFile : public SubFile
 {
 public:
-	NETFile(IMG *img, quint32 size)
-	  : SubFile(img, size), _offset(0), _size(0), _multiplier(0) {}
+	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) {}
 
 	bool lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset);
 

src/map/IMG/rgnfile.cpp

@@ -1,10 +1,26 @@
-#include "trefile.h"
+#include "common/rectc.h"
 #include "units.h"
 #include "lblfile.h"
 #include "netfile.h"
 #include "rgnfile.h"
 
 
+static int bitSize(quint8 baseSize, bool variableSign, bool extraBit)
+{
+	int bits = 2;
+	if (baseSize <= 9)
+		bits += baseSize;
+	else
+		bits += 2 * baseSize - 9;
+
+	if (variableSign)
+		bits++;
+	if (extraBit)
+		bits++;
+
+	return bits;
+}
+
 bool RGNFile::BitStream::read(int bits, quint32 &val)
 {
 	val = 0;
@@ -34,29 +50,42 @@ bool RGNFile::BitStream::read(int bits, quint32 &val)
 	return true;
 }
 
-bool RGNFile::BitStream::readDelta(int bits, int sign, bool extraBit,
+RGNFile::DeltaStream::DeltaStream(const SubFile &file, Handle &hdl,
+  quint32 length, quint8 info, bool extraBit, bool extended)
+  : BitStream(file, hdl, length), _readBits(0xFFFFFFFF)
+{
+	_extraBit = extraBit ? 1 : 0;
+	if (!(sign(_lonSign) && sign(_latSign)))
+		return;
+	if (extended) {
+		quint32 b;
+		if (!read(1, b))
+			return;
+	}
+	_lonBits = bitSize(info & 0x0F, !_lonSign, extraBit);
+	_latBits = bitSize(info >> 4, !_latSign, false);
+	_readBits = _lonBits + _latBits;
+}
+
+bool RGNFile::DeltaStream::readDelta(int bits, int sign, int extraBit,
   qint32 &delta)
 {
 	quint32 value;
-	int bo = 0;
 
 	if (!read(bits, value))
 		return false;
 
-	if (extraBit) {
-		value>>=1;
-		bo = 1;
-	}
+	value >>= extraBit;
 
 	if (!sign) {
-		qint32 signMask = 1 << (bits - bo - 1);
+		qint32 signMask = 1 << (bits - extraBit - 1);
 		if (value & signMask) {
 			qint32 comp = value ^ signMask;
 			if (comp)
 				delta = comp - signMask;
 			else {
 				qint32 other;
-				if (!readDelta(bits - bo, sign, false, other))
+				if (!readDelta(bits - extraBit, sign, false, other))
 					return false;
 				if (other < 0)
 					delta = 1 - signMask + other;
@@ -73,42 +102,15 @@ bool RGNFile::BitStream::readDelta(int bits, int sign, bool extraBit,
 	return true;
 }
 
-bool RGNFile::BitStream::finish()
-{
-	while (_length--)
-		if (!_file.readByte(_hdl, _data))
-			return false;
-	return true;
-}
-
-
-bool RGNFile::init()
-{
-	Handle hdl;
-
-	if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
-	  && readUInt32(hdl, _size) && readUInt32(hdl, _polygonsOffset)
-	  && readUInt32(hdl, _polygonsSize) && seek(hdl, 0x39)
-	  && readUInt32(hdl, _linesOffset) && readUInt32(hdl, _linesSize)
-	  && seek(hdl, 0x55) && readUInt32(hdl, _pointsOffset)
-	  && readUInt32(hdl, _pointsSize)))
-		return false;
-
-	if (_offset + _size > size())
-		return false;
-
-	return true;
-}
-
-bool RGNFile::sign(BitStream &bs, int &val)
+bool RGNFile::DeltaStream::sign(int &val)
 {
 	quint32 bit;
 	val = 0;
 
-	if (!bs.read(1, bit))
+	if (!read(1, bit))
 		return false;
 	if (bit) {
-		if (!bs.read(1, bit))
+		if (!read(1, bit))
 			return false;
 		val = bit ? -1 : 1;
 	}
@@ -116,20 +118,41 @@ bool RGNFile::sign(BitStream &bs, int &val)
 	return true;
 }
 
-int RGNFile::bitSize(quint8 baseSize, bool variableSign, bool extraBit)
+
+bool RGNFile::init()
 {
-	int bits = 2;
-	if (baseSize <= 9)
-		bits += baseSize;
-	else
-		bits += 2 * baseSize - 9;
+	Handle hdl;
+	quint16 hdrLen;
 
-	if (variableSign)
-		bits++;
-	if (extraBit)
-		bits++;
+	if (!(seek(hdl, _gmpOffset) && readUInt16(hdl, hdrLen)
+	  && seek(hdl, _gmpOffset + 0x15) && readUInt32(hdl, _offset)
+	  && readUInt32(hdl, _size)))
+		return false;
 
-	return bits;
+	if (hdrLen >= 0x5D) {
+		if (!(readUInt32(hdl, _polygonsOffset) && readUInt32(hdl, _polygonsSize)
+		  && seek(hdl, _gmpOffset + 0x39) && readUInt32(hdl, _linesOffset)
+		  && readUInt32(hdl, _linesSize) && seek(hdl, _gmpOffset + 0x55)
+		  && readUInt32(hdl, _pointsOffset) && readUInt32(hdl, _pointsSize)))
+			return false;
+	}
+
+	if (hdrLen >= 0x7D) {
+		quint32 dictOffset, dictSize;
+		if (!(seek(hdl, _gmpOffset + 0x71) && readUInt32(hdl, dictOffset)
+		  && readUInt32(hdl, dictSize)))
+			return false;
+
+		// NT maps
+		if (dictSize || dictOffset) {
+			qWarning("NT compression not supported");
+			return false;
+		}
+	}
+
+	_init = true;
+
+	return true;
 }
 
 bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
@@ -167,28 +190,17 @@ bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 		poly.type = (segment.type() == Segment::Polygon)
 		  ? ((quint32)(type & 0x7F)) << 8 : ((quint32)(type & 0x3F)) << 8;
 
-		RectC br;
+
 		QPoint pos(subdiv->lon() + ((qint32)lon<<(24-subdiv->bits())),
 		  subdiv->lat() + ((qint32)lat<<(24-subdiv->bits())));
 		Coordinates c(toWGS84(pos.x()), toWGS84(pos.y()));
-		br = br.united(c);
+		RectC br(c, c);
 		poly.points.append(QPointF(c.lon(), c.lat()));
 
-		BitStream bs(*this, hdl, len);
-		int lonSign, latSign;
-		if (!sign(bs, lonSign) || !sign(bs, latSign))
-			return false;
-		bool extraBit = labelPtr & 0x400000;
-		int lonBits = bitSize(bitstreamInfo & 0x0F, !lonSign, extraBit);
-		int latBits = bitSize(bitstreamInfo >> 4, !latSign, false);
-
-		while (bs.hasNext(lonBits + latBits)) {
-			qint32 lonDelta, latDelta;
-
-			if (!(bs.readDelta(lonBits, lonSign, extraBit, lonDelta)
-			  &&  bs.readDelta(latBits, latSign, false, latDelta)))
-				return false;
-
+		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());
 
@@ -196,7 +208,7 @@ bool RGNFile::polyObjects(const RectC &rect, Handle &hdl, const SubDiv *subdiv,
 			poly.points.append(QPointF(c.lon(), c.lat()));
 			br = br.united(c);
 		}
-		if (!bs.finish())
+		if (!(stream.atEnd() && stream.flush()))
 			return false;
 
 		if (!rect.intersects(br))
@@ -222,10 +234,9 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
   const SubDiv *subdiv, const Segment &segment, LBLFile *lbl, Handle &lblHdl,
   QList<IMG::Poly> *polys) const
 {
-	quint32 labelPtr;
-	quint8 type, subtype, len8, len82, bitstreamInfo;
+	quint32 len, labelPtr = 0;
+	quint8 type, subtype, bitstreamInfo;
 	qint16 lon, lat;
-	quint16 len;
 
 
 	if (!seek(hdl, segment.start()))
@@ -235,7 +246,8 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 		IMG::Poly poly;
 
 		if (!(readByte(hdl, type) && readByte(hdl, subtype)
-		  && readInt16(hdl, lon) && readInt16(hdl, lat) && readByte(hdl, len8)))
+		  && readInt16(hdl, lon) && readInt16(hdl, lat)
+		  && readVUInt32(hdl, len) && readByte(hdl, bitstreamInfo)))
 			return false;
 
 		if (subtype & 0x80) {
@@ -243,40 +255,17 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 			return false;
 		}
 
-		if (len8 & 0x01)
-			len = (len8>>1) - 1;
-		else {
-			if (!readByte(hdl, len82))
-				return false;
-			len = ((len8 | ((quint16)len82<<8))>>2) - 1;
-		}
-		if (!readByte(hdl, bitstreamInfo))
-			return false;
 		poly.type = 0x10000 + (quint16(type) << 8) + (subtype & 0x1F);
 
-		RectC br;
 		QPoint pos(subdiv->lon() + ((qint32)lon<<(24-subdiv->bits())),
 		  subdiv->lat() + ((qint32)lat<<(24-subdiv->bits())));
 		Coordinates c(toWGS84(pos.x()), toWGS84(pos.y()));
-		br = br.united(c);
+		RectC br(c, c);
 		poly.points.append(QPointF(c.lon(), c.lat()));
 
-		BitStream bs(*this, hdl, len);
-		int lonSign, latSign;
-		if (!sign(bs, lonSign) || !sign(bs, latSign))
-			return false;
-		quint32 extraBit;
-		bs.read(1, extraBit);
-		int lonBits = bitSize(bitstreamInfo & 0x0F, !lonSign, extraBit);
-		int latBits = bitSize(bitstreamInfo >> 4, !latSign, extraBit);
-
-		while (bs.hasNext(lonBits + latBits)) {
-			qint32 lonDelta, latDelta;
-
-			if (!(bs.readDelta(lonBits, lonSign, false, lonDelta)
-			  &&  bs.readDelta(latBits, latSign, false, latDelta)))
-				return false;
-
+		qint32 lonDelta, latDelta;
+		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());
 
@@ -284,19 +273,21 @@ bool RGNFile::extPolyObjects(const RectC &rect, Handle &hdl,
 			poly.points.append(QPointF(c.lon(), c.lat()));
 			br = br.united(c);
 		}
-		if (!bs.finish())
+		if (!(stream.atEnd() && stream.flush()))
 			return false;
 
-		if (subtype & 0x20) {
+		if ((subtype & 0x20)) {
 			if (!readUInt24(hdl, labelPtr))
 				return false;
-			if (lbl && (labelPtr & 0x3FFFFF))
-				poly.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
-		}
+		} else
+			labelPtr = 0;
 
 		if (!rect.intersects(br))
 			continue;
 
+		if (lbl && (labelPtr & 0x3FFFFF))
+			poly.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
+
 		polys->append(poly);
 	}
 
@@ -404,7 +395,7 @@ void RGNFile::objects(const RectC &rect, const SubDiv *subdiv, LBLFile *lbl,
 {
 	Handle rgnHdl, lblHdl, netHdl;
 
-	if (!_size && !init())
+	if (!_init && !init())
 		return;
 
 	QVector<RGNFile::Segment> seg(segments(rgnHdl, subdiv));
@@ -436,7 +427,7 @@ void RGNFile::extObjects(const RectC &rect, const SubDiv *subdiv, LBLFile *lbl,
 {
 	Handle rgnHdl, lblHdl;
 
-	if (!_size && !init())
+	if (!_init && !init())
 		return;
 
 	if (polygons && subdiv->polygonsOffset() != subdiv->polygonsEnd()) {