Fixed PDF export/print

Improved/fixed POI handling

gpxsee.pro

@@ -1,5 +1,5 @@
 TARGET = GPXSee
-VERSION = 2.16
+VERSION = 2.17
 QT += core \
     gui \
     network
@@ -27,7 +27,6 @@ HEADERS += src/config.h \
     src/downloader.h \
     src/units.h \
     src/scaleitem.h \
-    src/nicenum.h \
     src/waypoint.h \
     src/trackview.h \
     src/track.h \
@@ -44,7 +43,11 @@ HEADERS += src/config.h \
     src/exportdialog.h \
     src/fileselectwidget.h \
     src/margins.h \
-    src/temperaturegraph.h
+    src/temperaturegraph.h \
+    src/graphtab.h \
+    src/misc.h \
+    src/trackitem.h \
+    src/tooltip.h
 SOURCES += src/main.cpp \
     src/gui.cpp \
     src/gpx.cpp \
@@ -63,7 +66,6 @@ SOURCES += src/main.cpp \
     src/maplist.cpp \
     src/downloader.cpp \
     src/scaleitem.cpp \
-    src/nicenum.cpp \
     src/trackview.cpp \
     src/track.cpp \
     src/graphview.cpp \
@@ -76,7 +78,11 @@ SOURCES += src/main.cpp \
     src/exportdialog.cpp \
     src/fileselectwidget.cpp \
     src/temperaturegraph.cpp \
-    src/trackpoint.cpp
+    src/trackpoint.cpp \
+    src/misc.cpp \
+    src/waypoint.cpp \
+    src/trackitem.cpp \
+    src/tooltip.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts
 macx {

lang/gpxsee_cs.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs_CZ">
 <context>
     <name>ElevationGraph</name>
     <message>
@@ -10,6 +10,7 @@
     </message>
     <message>
         <location filename="../src/elevationgraph.cpp" line="15"/>
+        <location filename="../src/elevationgraph.h" line="15"/>
         <source>Elevation</source>
         <translation>Výška</translation>
     </message>
@@ -162,358 +163,331 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/gui.cpp" line="464"/>
+        <location filename="../src/gui.cpp" line="446"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
         <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="528"/>
+        <location filename="../src/gui.cpp" line="510"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="606"/>
+        <location filename="../src/gui.cpp" line="586"/>
         <source>Open POI file</source>
         <translation>Otevřít POI soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="204"/>
+        <location filename="../src/gui.cpp" line="194"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="188"/>
+        <location filename="../src/gui.cpp" line="178"/>
         <source>Quit</source>
         <translation>Ukončit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="196"/>
+        <location filename="../src/gui.cpp" line="186"/>
-        <location filename="../src/gui.cpp" line="480"/>
+        <location filename="../src/gui.cpp" line="462"/>
-        <location filename="../src/gui.cpp" line="481"/>
+        <location filename="../src/gui.cpp" line="463"/>
         <source>Keyboard controls</source>
         <translation>Ovládací klávesy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="220"/>
+        <location filename="../src/gui.cpp" line="210"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="226"/>
+        <location filename="../src/gui.cpp" line="216"/>
         <source>Reload</source>
         <translation>Znovu načíst</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="382"/>
+        <location filename="../src/gui.cpp" line="378"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="323"/>
+        <location filename="../src/gui.cpp" line="317"/>
-        <location filename="../src/gui.cpp" line="376"/>
+        <location filename="../src/gui.cpp" line="372"/>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="194"/>
+        <location filename="../src/gui.cpp" line="184"/>
-        <location filename="../src/gui.cpp" line="503"/>
+        <location filename="../src/gui.cpp" line="485"/>
-        <location filename="../src/gui.cpp" line="504"/>
+        <location filename="../src/gui.cpp" line="486"/>
         <source>Data sources</source>
         <translation>Zdroje dat</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="234"/>
+        <location filename="../src/gui.cpp" line="224"/>
         <source>Load POI file</source>
         <translation>Nahrát POI soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="237"/>
+        <location filename="../src/gui.cpp" line="227"/>
         <source>Close POI files</source>
         <translation>Zavřit POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="240"/>
+        <location filename="../src/gui.cpp" line="229"/>
+        <source>Overlap POIs</source>
+        <translation>Překrývat POI</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="234"/>
         <source>Show POIs</source>
         <translation>Zobrazit POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="248"/>
+        <location filename="../src/gui.cpp" line="242"/>
         <source>Show map</source>
         <translation>Zobrazit mapu</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="254"/>
+        <location filename="../src/gui.cpp" line="248"/>
         <source>Clear tile cache</source>
         <translation>Vymazat mezipaměť dlaždic</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="263"/>
+        <location filename="../src/gui.cpp" line="257"/>
-        <location filename="../src/gui.cpp" line="267"/>
+        <location filename="../src/gui.cpp" line="261"/>
-        <location filename="../src/gui.cpp" line="490"/>
+        <location filename="../src/gui.cpp" line="472"/>
         <source>Next map</source>
         <translation>Následující mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="274"/>
+        <location filename="../src/gui.cpp" line="268"/>
         <source>Show graphs</source>
         <translation>Zobrazovat grafy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="280"/>
+        <location filename="../src/gui.cpp" line="274"/>
         <source>Show toolbars</source>
         <translation>Zobrazovat nástrojové lišty</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="286"/>
+        <location filename="../src/gui.cpp" line="280"/>
         <source>Metric</source>
         <translation>Metrické</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="291"/>
+        <location filename="../src/gui.cpp" line="285"/>
         <source>Imperial</source>
         <translation>Imperiální</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="297"/>
+        <location filename="../src/gui.cpp" line="291"/>
         <source>Fullscreen mode</source>
         <translation>Celoobrazovkový režim</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="305"/>
+        <location filename="../src/gui.cpp" line="299"/>
         <source>Next</source>
         <translation>Následující</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="308"/>
+        <location filename="../src/gui.cpp" line="302"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="312"/>
+        <location filename="../src/gui.cpp" line="306"/>
         <source>Last</source>
         <translation>Poslední</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="315"/>
+        <location filename="../src/gui.cpp" line="309"/>
         <source>First</source>
         <translation>První</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="337"/>
+        <location filename="../src/gui.cpp" line="331"/>
         <source>Map</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="344"/>
+        <location filename="../src/gui.cpp" line="338"/>
         <source>POI</source>
         <translation>POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="345"/>
+        <location filename="../src/gui.cpp" line="339"/>
         <source>POI files</source>
         <translation>POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="353"/>
+        <location filename="../src/gui.cpp" line="349"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="354"/>
+        <location filename="../src/gui.cpp" line="350"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="363"/>
+        <location filename="../src/gui.cpp" line="359"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="426"/>
+        <location filename="../src/gui.cpp" line="474"/>
-        <source>Temperature</source>
-        <translation>Teplota</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="492"/>
         <source>Previous map</source>
         <translation>Předchozí mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="691"/>
+        <location filename="../src/gui.cpp" line="672"/>
-        <location filename="../src/gui.cpp" line="694"/>
+        <location filename="../src/gui.cpp" line="675"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="871"/>
+        <location filename="../src/gui.cpp" line="853"/>
         <source>No GPX files loaded</source>
         <translation>Nejsou načteny žádné GPX soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="423"/>
+        <location filename="../src/gui.cpp" line="465"/>
-        <source>Elevation</source>
-        <translation>Výška</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="424"/>
-        <source>Speed</source>
-        <translation>Rychlost</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="425"/>
-        <source>Heart rate</source>
-        <translation>Tep</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="483"/>
         <source>Next file</source>
         <translation>Následující soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="460"/>
+        <location filename="../src/gui.cpp" line="442"/>
         <source>Version </source>
         <translation>Verze </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="209"/>
+        <location filename="../src/gui.cpp" line="199"/>
         <source>Print...</source>
         <translation>Tisknout...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="214"/>
+        <location filename="../src/gui.cpp" line="204"/>
         <source>Export to PDF...</source>
         <translation>Exportovat do PDF...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="484"/>
+        <location filename="../src/gui.cpp" line="466"/>
         <source>Previous file</source>
         <translation>Předchozí soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="486"/>
+        <location filename="../src/gui.cpp" line="468"/>
         <source>First file</source>
         <translation>První soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="487"/>
+        <location filename="../src/gui.cpp" line="469"/>
         <source>Last file</source>
         <translation>Poslední soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="488"/>
+        <location filename="../src/gui.cpp" line="470"/>
         <source>Append modifier</source>
         <translation>Modifikátor nahradit/přidat</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="507"/>
+        <location filename="../src/gui.cpp" line="489"/>
         <source>Map (tiles) source URLs are read on program startup from the following file:</source>
         <translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="510"/>
+        <location filename="../src/gui.cpp" line="492"/>
         <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
         <translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="518"/>
+        <location filename="../src/gui.cpp" line="500"/>
         <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
         <translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="529"/>
+        <location filename="../src/gui.cpp" line="511"/>
         <source>GPX files (*.gpx);;All files (*)</source>
         <translation>Soubory GPX (*.gpx);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="597"/>
+        <location filename="../src/gui.cpp" line="577"/>
-        <location filename="../src/gui.cpp" line="623"/>
+        <location filename="../src/gui.cpp" line="603"/>
         <source>Line: %1</source>
         <translation>Řádka: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="607"/>
+        <location filename="../src/gui.cpp" line="587"/>
         <source>GPX files (*.gpx);;CSV files (*.csv);;All files (*)</source>
         <translation>Soubory GPX (*.gpx);;Soubory CSV (*.csv);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="697"/>
+        <location filename="../src/gui.cpp" line="678"/>
         <source>Tracks</source>
         <translation>Počet tras</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="703"/>
+        <location filename="../src/gui.cpp" line="684"/>
-        <location filename="../src/gui.cpp" line="886"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="883"/>
+        <location filename="../src/gui.cpp" line="189"/>
-        <source>ft</source>
+        <location filename="../src/gui.cpp" line="440"/>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="199"/>
-        <location filename="../src/gui.cpp" line="458"/>
         <source>About GPXSee</source>
         <translation>O aplikaci GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="386"/>
+        <location filename="../src/gui.cpp" line="382"/>
         <source>Navigation</source>
         <translation>Navigace</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="506"/>
+        <location filename="../src/gui.cpp" line="488"/>
         <source>Map sources</source>
         <translation>Mapové zdroje</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="517"/>
+        <location filename="../src/gui.cpp" line="499"/>
         <source>POIs</source>
         <translation>POI body</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="702"/>
+        <location filename="../src/gui.cpp" line="683"/>
-        <location filename="../src/gui.cpp" line="705"/>
+        <location filename="../src/gui.cpp" line="686"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="710"/>
+        <location filename="../src/gui.cpp" line="691"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="890"/>
+        <location filename="../src/gui.cpp" line="860"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="878"/>
         <source>%1 tracks</source>
         <translation>Počet tras: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="706"/>
+        <location filename="../src/gui.cpp" line="687"/>
-        <location filename="../src/gui.cpp" line="893"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="599"/>
+        <location filename="../src/gui.cpp" line="579"/>
-        <location filename="../src/gui.cpp" line="624"/>
+        <location filename="../src/gui.cpp" line="604"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="594"/>
+        <location filename="../src/gui.cpp" line="574"/>
         <source>Error loading GPX file:
 %1</source>
         <translation>Soubor GPX nelze otevřít:
 %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="620"/>
+        <location filename="../src/gui.cpp" line="600"/>
         <source>Error loading POI file:
 %1</source>
         <translation>Soubor POI nelze otevřít:
@@ -529,6 +503,7 @@
     </message>
     <message>
         <location filename="../src/heartrategraph.cpp" line="11"/>
+        <location filename="../src/heartrategraph.h" line="15"/>
         <source>Heart rate</source>
         <translation>Tep</translation>
     </message>
@@ -568,6 +543,31 @@
         <translation>mi</translation>
     </message>
 </context>
+<context>
+    <name>Misc</name>
+    <message>
+        <location filename="../src/misc.cpp" line="55"/>
+        <location filename="../src/misc.cpp" line="76"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../src/misc.cpp" line="58"/>
+        <source>mi</source>
+        <translation>mi</translation>
+    </message>
+    <message>
+        <location filename="../src/misc.cpp" line="62"/>
+        <location filename="../src/misc.cpp" line="73"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../src/misc.cpp" line="65"/>
+        <source>km</source>
+        <translation>km</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -600,6 +600,7 @@
     </message>
     <message>
         <location filename="../src/speedgraph.cpp" line="12"/>
+        <location filename="../src/speedgraph.h" line="16"/>
         <source>Speed</source>
         <translation>Rychlost</translation>
     </message>
@@ -653,6 +654,7 @@
     </message>
     <message>
         <location filename="../src/temperaturegraph.cpp" line="11"/>
+        <location filename="../src/temperaturegraph.h" line="15"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
@@ -697,9 +699,50 @@
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../src/temperaturegraph.cpp" line="100"/>
+        <location filename="../src/temperaturegraph.cpp" line="101"/>
         <source>F</source>
         <translation>F</translation>
     </message>
 </context>
+<context>
+    <name>TrackItem</name>
+    <message>
+        <location filename="../src/trackitem.cpp" line="16"/>
+        <source>Distance</source>
+        <translation>Vzdálenost</translation>
+    </message>
+    <message>
+        <location filename="../src/trackitem.cpp" line="19"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../src/trackitem.cpp" line="21"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+</context>
+<context>
+    <name>WaypointItem</name>
+    <message>
+        <location filename="../src/waypointitem.cpp" line="16"/>
+        <source>Coordinates</source>
+        <translation>Souřadnice</translation>
+    </message>
+    <message>
+        <location filename="../src/waypointitem.cpp" line="19"/>
+        <source>Elevation</source>
+        <translation>Výška</translation>
+    </message>
+    <message>
+        <location filename="../src/waypointitem.cpp" line="22"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../src/waypointitem.cpp" line="25"/>
+        <source>Description</source>
+        <translation>Popis</translation>
+    </message>
+</context>
 </TS>

pkg/gpxsee.nsi

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

pkg/gpxsee64.nsi

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

src/axisitem.cpp

@@ -1,7 +1,7 @@
 #include <cmath>
 #include <QPainter>
 #include "config.h"
-#include "nicenum.h"
+#include "misc.h"
 #include "axisitem.h"
 
 

src/downloader.cpp

@@ -73,7 +73,8 @@ void Downloader::downloadFinished(QNetworkReply *reply)
 			Download dl(redirect, filename);
 			doDownload(dl);
 		} else
-			saveToDisk(filename, reply);
+			if (!saveToDisk(filename, reply))
+				_errorDownloads.insert(url);
 	}
 
 	_currentDownloads.removeAll(reply);

src/elevationgraph.cpp

@@ -3,7 +3,7 @@
 #include "elevationgraph.h"
 
 
-ElevationGraph::ElevationGraph(QWidget *parent) : GraphView(parent)
+ElevationGraph::ElevationGraph(QWidget *parent) : GraphTab(parent)
 {
 	_ascent = 0;
 	_descent = 0;

src/elevationgraph.h

@@ -1,28 +1,28 @@
 #ifndef ELEVATIONGRAPH_H
 #define ELEVATIONGRAPH_H
 
-#include "graphview.h"
+#include "graphtab.h"
-#include "units.h"
 
 class GPX;
 
-class ElevationGraph : public GraphView
+class ElevationGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	ElevationGraph(QWidget *parent = 0);
 
+	QString label() const {return tr("Elevation");}
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
 
+private:
 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}
 	qreal max() const {return bounds().bottom();}
 	qreal min() const {return bounds().top();}
 
-private:
 	void setXUnits();
 	void setYUnits();
 	void addInfo();

src/graphtab.h

@@ -0,0 +1,23 @@
+#ifndef GRAPHTAB_H
+#define GRAPHTAB_H
+
+#include "graphview.h"
+#include "units.h"
+
+class GPX;
+
+class GraphTab : public GraphView
+{
+	Q_OBJECT
+
+public:
+	GraphTab(QWidget *parent = 0) : GraphView(parent)
+	  {setFrameShape(QFrame::NoFrame);}
+
+	virtual QString label() const = 0;
+	virtual void loadGPX(const GPX &gpx) = 0;
+	virtual void clear() = 0;
+	virtual void setUnits(enum Units units) = 0;
+};
+
+#endif // GRAPHTAB_H

src/graphview.cpp

@@ -305,7 +305,7 @@ void GraphView::updateSliderInfo()
 {
 	_sliderInfo->setVisible(_graphs.size() == 1);
 
-	if (!_slider->isVisible())
+	if (!_sliderInfo->isVisible())
 		return;
 
 	const QPainterPath &path = _graphs.at(0)->path();

src/gui.cpp

@@ -34,21 +34,11 @@
 #include "filebrowser.h"
 #include "cpuarch.h"
 #include "exportdialog.h"
+#include "graphtab.h"
+#include "misc.h"
 #include "gui.h"
 
 
-static QString timeSpan(qreal time)
-{
-	unsigned h, m, s;
-
-	h = time / 3600;
-	m = (time - (h * 3600)) / 60;
-	s = time - (h * 3600) - (m * 60);
-
-	return QString("%1:%2:%3").arg(h).arg(m, 2, 10, QChar('0'))
-	  .arg(s, 2, 10, QChar('0'));
-}
-
 GUI::GUI(QWidget *parent) : QMainWindow(parent)
 {
 	loadMaps();
@@ -101,8 +91,8 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 GUI::~GUI()
 {
 	for (int i = 0; i < _tabs.size(); i++) {
-		if (_trackGraphs->indexOf(_tabs.at(i).first) < 0)
+		if (_trackGraphs->indexOf(_tabs.at(i)) < 0)
-			delete _tabs.at(i).first;
+			delete _tabs.at(i);
 	}
 }
 
@@ -236,6 +226,10 @@ void GUI::createActions()
 	_closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
 	  tr("Close POI files"), this);
 	connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles()));
+	_overlapPOIAction = new QAction(tr("Overlap POIs"), this);
+	_overlapPOIAction->setCheckable(true);
+	connect(_overlapPOIAction, SIGNAL(triggered(bool)), this,
+	  SLOT(overlapPOIs(bool)));
 	_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
 	  tr("Show POIs"), this);
 	_showPOIAction->setCheckable(true);
@@ -348,6 +342,8 @@ void GUI::createMenus()
 	_poiMenu->addAction(_openPOIAction);
 	_poiMenu->addAction(_closePOIAction);
 	_poiMenu->addSeparator();
+	_poiMenu->addAction(_overlapPOIAction);
+	_poiMenu->addSeparator();
 	_poiMenu->addAction(_showPOIAction);
 
 	_settingsMenu = menuBar()->addMenu(tr("Settings"));
@@ -400,15 +396,6 @@ void GUI::createTrackView()
 
 void GUI::createTrackGraphs()
 {
-	_elevationGraph = new ElevationGraph;
-	_elevationGraph->setFrameShape(QFrame::NoFrame);
-	_speedGraph = new SpeedGraph;
-	_speedGraph->setFrameShape(QFrame::NoFrame);
-	_heartRateGraph = new HeartRateGraph;
-	_heartRateGraph->setFrameShape(QFrame::NoFrame);
-	_temperatureGraph = new TemperatureGraph;
-	_temperatureGraph->setFrameShape(QFrame::NoFrame);
-
 	_trackGraphs = new QTabWidget;
 	connect(_trackGraphs, SIGNAL(currentChanged(int)), this,
 	  SLOT(graphChanged(int)));
@@ -420,18 +407,13 @@ void GUI::createTrackGraphs()
 	_trackGraphs->setDocumentMode(true);
 #endif // Q_OS_WIN32
 
-	_tabs.append(GraphTab(_elevationGraph, tr("Elevation")));
+	_tabs.append(new ElevationGraph);
-	_tabs.append(GraphTab(_speedGraph, tr("Speed")));
+	_tabs.append(new SpeedGraph);
-	_tabs.append(GraphTab(_heartRateGraph, tr("Heart rate")));
+	_tabs.append(new HeartRateGraph);
-	_tabs.append(GraphTab(_temperatureGraph, tr("Temperature")));
+	_tabs.append(new TemperatureGraph);
 
-	connect(_elevationGraph, SIGNAL(sliderPositionChanged(qreal)), this,
+	for (int i = 0; i < _tabs.count(); i++)
-	  SLOT(sliderPositionChanged(qreal)));
+		connect(_tabs.at(i), SIGNAL(sliderPositionChanged(qreal)), this,
-	connect(_speedGraph, SIGNAL(sliderPositionChanged(qreal)), this,
-	  SLOT(sliderPositionChanged(qreal)));
-	connect(_heartRateGraph, SIGNAL(sliderPositionChanged(qreal)), this,
-	  SLOT(sliderPositionChanged(qreal)));
-	connect(_temperatureGraph, SIGNAL(sliderPositionChanged(qreal)), this,
 		  SLOT(sliderPositionChanged(qreal)));
 }
 
@@ -565,10 +547,8 @@ bool GUI::loadFile(const QString &fileName)
 	GPX gpx;
 
 	if (gpx.loadFile(fileName)) {
-		_elevationGraph->loadGPX(gpx);
+		for (int i = 0; i < _tabs.count(); i++)
-		_speedGraph->loadGPX(gpx);
+			_tabs.at(i)->loadGPX(gpx);
-		_heartRateGraph->loadGPX(gpx);
-		_temperatureGraph->loadGPX(gpx);
 		updateGraphTabs();
 		_track->setHidden(false);
 		_track->loadGPX(gpx);
@@ -627,8 +607,9 @@ bool GUI::openPOIFile(const QString &fileName)
 	} else {
 		_showPOIAction->setChecked(true);
 		_track->loadPOI(_poi);
-		_poiFilesMenu->addAction(createPOIFileAction(
+		QAction *action = createPOIFileAction(_poi.files().indexOf(fileName));
-		  _poi.files().indexOf(fileName)));
+		action->setChecked(true);
+		_poiFilesMenu->addAction(action);
 
 		return true;
 	}
@@ -740,10 +721,8 @@ void GUI::reloadFile()
 	_dateRange = DateRange(QDate(), QDate());
 	_trackCount = 0;
 
-	_elevationGraph->clear();
+	for (int i = 0; i < _tabs.count(); i++)
-	_speedGraph->clear();
+		_tabs.at(i)->clear();
-	_heartRateGraph->clear();
-	_temperatureGraph->clear();
 	_track->clear();
 
 	_sliderPos = 0;
@@ -774,10 +753,8 @@ void GUI::closeFiles()
 
 	_sliderPos = 0;
 
-	_elevationGraph->clear();
+	for (int i = 0; i < _tabs.count(); i++)
-	_speedGraph->clear();
+		_tabs.at(i)->clear();
-	_heartRateGraph->clear();
-	_temperatureGraph->clear();
 	_track->clear();
 
 	_files.clear();
@@ -794,6 +771,11 @@ void GUI::closeAll()
 	updateTrackView();
 }
 
+void GUI::overlapPOIs(bool checked)
+{
+	_track->setPOIOverlap(checked);
+}
+
 void GUI::showPOI(bool checked)
 {
 	if (checked)
@@ -877,21 +859,8 @@ void GUI::updateStatusBarInfo()
 	else
 		_fileNameLabel->setText(tr("%1 tracks").arg(_trackCount));
 
-	if (_imperialUnitsAction->isChecked()) {
+	Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
-		if (_distance < MIINM)
+	_distanceLabel->setText(distance(_distance, units));
-			_distanceLabel->setText(QString::number(_distance * M2FT, 'f', 0)
-			  + UNIT_SPACE + tr("ft"));
-		else
-			_distanceLabel->setText(QString::number(_distance * M2MI, 'f', 1)
-			  + UNIT_SPACE + tr("mi"));
-	} else {
-		if (_distance < KMINM)
-			_distanceLabel->setText(QString::number(_distance, 'f', 0)
-			  + UNIT_SPACE + tr("m"));
-		else
-			_distanceLabel->setText(QString::number(_distance * M2KM, 'f', 1)
-			  + UNIT_SPACE + tr("km"));
-	}
 	_timeLabel->setText(timeSpan(_time));
 }
 
@@ -977,18 +946,18 @@ void GUI::updateNavigationActions()
 void GUI::updateGraphTabs()
 {
 	int index;
-	GraphView *gv;
+	GraphTab *tab;
 
 	for (int i = 0; i < _tabs.size(); i++) {
-		gv = _tabs.at(i).first;
+		tab = _tabs.at(i);
-		if (!gv->count() && (index = _trackGraphs->indexOf(gv)) >= 0)
+		if (!tab->count() && (index = _trackGraphs->indexOf(tab)) >= 0)
 			_trackGraphs->removeTab(index);
 	}
 
 	for (int i = 0; i < _tabs.size(); i++) {
-		gv = _tabs.at(i).first;
+		tab = _tabs.at(i);
-		if (gv->count() && _trackGraphs->indexOf(gv) < 0)
+		if (tab->count() && _trackGraphs->indexOf(tab) < 0)
-			_trackGraphs->insertTab(i, gv, _tabs.at(i).second);
+			_trackGraphs->insertTab(i, tab, _tabs.at(i)->label());
 	}
 
 	if (_trackGraphs->count()) {
@@ -1009,20 +978,16 @@ void GUI::updateTrackView()
 void GUI::setMetricUnits()
 {
 	_track->setUnits(Metric);
-	_elevationGraph->setUnits(Metric);
+	for (int i = 0; i <_tabs.count(); i++)
-	_speedGraph->setUnits(Metric);
+		_tabs.at(i)->setUnits(Metric);
-	_heartRateGraph->setUnits(Metric);
-	_temperatureGraph->setUnits(Metric);
 	updateStatusBarInfo();
 }
 
 void GUI::setImperialUnits()
 {
 	_track->setUnits(Imperial);
-	_elevationGraph->setUnits(Imperial);
+	for (int i = 0; i <_tabs.count(); i++)
-	_speedGraph->setUnits(Imperial);
+		_tabs.at(i)->setUnits(Imperial);
-	_heartRateGraph->setUnits(Imperial);
-	_temperatureGraph->setUnits(Imperial);
 	updateStatusBarInfo();
 }
 
@@ -1129,6 +1094,7 @@ void GUI::writeSettings()
 
 	settings.beginGroup(POI_SETTINGS_GROUP);
 	settings.setValue(SHOW_POI_SETTING, _showPOIAction->isChecked());
+	settings.setValue(OVERLAP_POI_SETTING, _overlapPOIAction->isChecked());
 
 	settings.remove(DISABLED_POI_FILE_SETTINGS_PREFIX);
 	settings.beginWriteArray(DISABLED_POI_FILE_SETTINGS_PREFIX);
@@ -1185,6 +1151,11 @@ void GUI::readSettings()
 	settings.endGroup();
 
 	settings.beginGroup(POI_SETTINGS_GROUP);
+	if (settings.value(OVERLAP_POI_SETTING, true).toBool() == false) {
+		_track->setPOIOverlap(false);
+		_overlapPOIAction->setChecked(false);
+	} else
+		_overlapPOIAction->setChecked(true);
 	if (settings.value(SHOW_POI_SETTING, false).toBool() == true)
 		_showPOIAction->setChecked(true);
 	for (int i = 0; i < _poiFilesActions.count(); i++)

src/gui.h

@@ -18,11 +18,7 @@ class QLabel;
 class QSignalMapper;
 class QPrinter;
 class FileBrowser;
-class GraphView;
+class GraphTab;
-class ElevationGraph;
-class SpeedGraph;
-class HeartRateGraph;
-class TemperatureGraph;
 class TrackView;
 class Map;
 
@@ -47,6 +43,7 @@ private slots:
 	void reloadFile();
 	void openPOIFile();
 	void closePOIFiles();
+	void overlapPOIs(bool checked);
 	void showPOI(bool checked);
 	void showMap(bool checked);
 	void showGraphs(bool checked);
@@ -71,7 +68,6 @@ private slots:
 	void sliderPositionChanged(qreal pos);
 
 private:
-	typedef QPair<GraphView *, QString> GraphTab;
 	typedef QPair<QDate, QDate> DateRange;
 
 	void loadMaps();
@@ -133,6 +129,7 @@ private:
 	QAction *_openPOIAction;
 	QAction *_closePOIAction;
 	QAction *_showPOIAction;
+	QAction *_overlapPOIAction;
 	QAction *_showMapAction;
 	QAction *_fullscreenAction;
 	QAction *_clearMapCacheAction;
@@ -156,11 +153,7 @@ private:
 	QLabel *_timeLabel;
 
 	TrackView *_track;
-	ElevationGraph *_elevationGraph;
+	QList<GraphTab*> _tabs;
-	SpeedGraph *_speedGraph;
-	HeartRateGraph *_heartRateGraph;
-	TemperatureGraph *_temperatureGraph;
-	QList<GraphTab> _tabs;
 
 	POI _poi;
 	QList<Map*> _maps;

src/heartrategraph.cpp

@@ -2,7 +2,7 @@
 #include "heartrategraph.h"
 
 
-HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphView(parent)
+HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 {
 	_units = Metric;
 

src/heartrategraph.h

@@ -1,26 +1,25 @@
 #ifndef HEARTRATEGRAPH_H
 #define HEARTRATEGRAPH_H
 
-#include "graphview.h"
+#include "graphtab.h"
-#include "units.h"
 
 class GPX;
 
-class HeartRateGraph : public GraphView
+class HeartRateGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	HeartRateGraph(QWidget *parent = 0);
 
+	QString label() const {return tr("Heart rate");}
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
 
+private:
 	qreal avg() const;
 	qreal max() const {return bounds().bottom();}
-
-private:
 	void setXUnits();
 	void addInfo();
 

src/ll.cpp

@@ -35,6 +35,16 @@ QPointF ll2mercator(const QPointF &ll)
 	return m;
 }
 
+QPointF mercator2ll(const QPointF &m)
+{
+	QPointF ll;
+
+	ll.setX(m.x());
+	ll.setY(rad2deg(2 * atan(exp(deg2rad(m.y()))) - M_PI/2));
+
+	return ll;
+}
+
 QPoint mercator2tile(const QPointF &m, int z)
 {
 	QPoint tile;

src/ll.h

@@ -8,6 +8,7 @@
 #define ZOOM_MIN 3
 
 QPointF ll2mercator(const QPointF &ll);
+QPointF mercator2ll(const QPointF &m);
 qreal llDistance(const QPointF &p1, const QPointF &p2);
 QPoint mercator2tile(const QPointF &m, int zoom);
 QPointF tile2mercator(const QPoint &tile, int zoom);

src/misc.cpp

@@ -0,0 +1,86 @@
+#include <cmath>
+#include <QApplication>
+#include "misc.h"
+
+
+double niceNum(double x, int round)
+{
+	int expv;
+	double f;
+	double nf;
+
+	expv = (int)floor(log10(x));
+	f = x / pow(10.0, expv);
+
+	if (round) {
+		if (f < 1.5)
+			nf = 1.0;
+		else if (f < 3.0)
+			nf = 2.0;
+		else if (f < 7.0)
+			nf = 5.0;
+		else
+			nf = 10.0;
+	} else {
+		if (f <= 1.0)
+			nf = 1.0;
+		else if (f <= 2.0)
+			nf = 2.0;
+		else if (f <= 5.0)
+			nf = 5.0;
+		else
+			nf = 10.0;
+	}
+
+	return nf * pow(10.0, expv);
+}
+
+QString timeSpan(qreal time)
+{
+	unsigned h, m, s;
+
+	h = time / 3600;
+	m = (time - (h * 3600)) / 60;
+	s = time - (h * 3600) - (m * 60);
+
+	return QString("%1:%2:%3").arg(h).arg(m, 2, 10, QChar('0'))
+	  .arg(s, 2, 10, QChar('0'));
+}
+
+QString distance(qreal value, Units units)
+{
+	if (units == Imperial) {
+		if (value < MIINM)
+			return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+			  + qApp->translate("Misc", "ft");
+		else
+			return QString::number(value * M2MI, 'f', 1) + UNIT_SPACE
+			  + qApp->translate("Misc", "mi");
+	} else {
+		if (value < KMINM)
+			return QString::number(value, 'f', 0) + UNIT_SPACE
+			  + qApp->translate("Misc", "m");
+		else
+			return QString::number(value * M2KM, 'f', 1) + UNIT_SPACE
+			  + qApp->translate("Misc", "km");
+	}
+}
+
+QString elevation(qreal value, Units units)
+{
+	if (units == Metric)
+		return QString::number(value, 'f', 0) + UNIT_SPACE
+		  + qApp->translate("Misc", "m");
+	else
+		return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+		  + qApp->translate("Misc", "ft");
+}
+
+QString coordinates(const QPointF &value)
+{
+	QChar yH = (value.y() < 0) ? 'S' : 'N';
+	QChar xH = (value.x() < 0) ? 'W' : 'E';
+
+	return QString::number(qAbs(value.y()), 'f', 5) + yH + "," + QChar(0x00A0)
+	  + QString::number(qAbs(value.x()), 'f', 5) + xH;
+}

src/misc.h

@@ -0,0 +1,15 @@
+#ifndef MISC_H
+#define MISC_H
+
+#include <QString>
+#include <QPoint>
+#include "units.h"
+
+double niceNum(double x, int round);
+
+QString timeSpan(qreal time);
+QString distance(qreal value, Units units);
+QString elevation(qreal value, Units units);
+QString coordinates(const QPointF &value);
+
+#endif // MISC_H

src/nicenum.cpp

@@ -1,34 +0,0 @@
-#include <cmath>
-#include "nicenum.h"
-
-double niceNum(double x, int round)
-{
-	int expv;
-	double f;
-	double nf;
-
-	expv = (int)floor(log10(x));
-	f = x / pow(10.0, expv);
-
-	if (round) {
-		if (f < 1.5)
-			nf = 1.0;
-		else if (f < 3.0)
-			nf = 2.0;
-		else if (f < 7.0)
-			nf = 5.0;
-		else
-			nf = 10.0;
-	} else {
-		if (f <= 1.0)
-			nf = 1.0;
-		else if (f <= 2.0)
-			nf = 2.0;
-		else if (f <= 5.0)
-			nf = 5.0;
-		else
-			nf = 10.0;
-	}
-
-	return nf * pow(10.0, expv);
-}

src/nicenum.h

@@ -1,6 +0,0 @@
-#ifndef NICENUM_H
-#define NICENUM_H
-
-double niceNum(double x, int round);
-
-#endif // NICENUM_H

src/parser.cpp

@@ -1,40 +1,65 @@
 #include "parser.h"
 
 
-void Parser::handleExtensionData(QStringRef element, const QString &value)
+void Parser::handleTrackpointData(DataType type, const QString &value)
 {
-	if (element == "speed")
+	switch (type) {
-		_track->last().speed = value.toDouble();
+		case Elevation:
-	else if (element == "hr" || element == "heartrate")
+			_track->last().setElevation(value.toLatin1().toDouble());
-		_track->last().heartRate = value.toDouble();
+			break;
-	else if (element == "atemp" || element == "temp")
+		case Time:
-		_track->last().temperature = value.toDouble();
+			_track->last().setTimestamp(QDateTime::fromString(value.toLatin1(),
+			  Qt::ISODate));
+			break;
+		case Geoidheight:
+			_track->last().setGeoidHeight(value.toLatin1().toDouble());
+			break;
+		case Speed:
+			_track->last().setSpeed(value.toDouble());
+			break;
+		case HeartRate:
+			_track->last().setHeartRate(value.toDouble());
+			break;
+		case Temperature:
+			_track->last().setTemperature(value.toDouble());
+			break;
+		default:
+			break;
+	}
 }
 
-void Parser::handleTrekPointData(QStringRef element, const QString &value)
+void Parser::handleWaypointData(DataType type, const QString &value)
 {
-	if (element == "ele")
+	switch (type) {
-		_track->last().elevation = value.toLatin1().toDouble();
+		case Name:
-	else if (element == "time")
+			_waypoints.last().setName(value);
-		_track->last().timestamp = QDateTime::fromString(value.toLatin1(),
+			break;
-		  Qt::ISODate);
+		case Description:
-	else if (element == "geoidheight")
-		_track->last().geoidheight = value.toLatin1().toDouble();
-}
-
-void Parser::handleWayPointData(QStringRef element, const QString &value)
-{
-	if (element == "name")
 			_waypoints.last().setDescription(value);
+			break;
+	    case Time:
+		    _waypoints.last().setTimestamp(QDateTime::fromString(
+			  value.toLatin1(), Qt::ISODate));
+		    break;
+	    case Elevation:
+		    _waypoints.last().setElevation(value.toLatin1().toDouble());
+		    break;
+	    case Geoidheight:
+		    _waypoints.last().setGeoidHeight(value.toLatin1().toDouble());
+		    break;
+		default:
+			break;
+	}
 }
 
-void Parser::handleTrekPointAttributes(const QXmlStreamAttributes &attr)
+void Parser::handleTrackpointAttributes(const QXmlStreamAttributes &attr)
 {
-	_track->last().coordinates.setY(attr.value("lat").toLatin1().toDouble());
+	_track->last().setCoordinates(QPointF(
-	_track->last().coordinates.setX(attr.value("lon").toLatin1().toDouble());
+	  attr.value("lon").toLatin1().toDouble(),
+	  attr.value("lat").toLatin1().toDouble()));
 }
 
-void Parser::handleWayPointAttributes(const QXmlStreamAttributes &attr)
+void Parser::handleWaypointAttributes(const QXmlStreamAttributes &attr)
 {
 	_waypoints.last().setCoordinates(QPointF(
 	  attr.value("lon").toLatin1().toDouble(),
@@ -44,8 +69,10 @@ void Parser::handleWayPointAttributes(const QXmlStreamAttributes &attr)
 void Parser::tpExtension()
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "hr" || _reader.name() == "atemp")
+		if (_reader.name() == "hr")
-			handleExtensionData(_reader.name(), _reader.readElementText());
+			handleTrackpointData(HeartRate, _reader.readElementText());
+		else if (_reader.name() == "atemp")
+			handleTrackpointData(Temperature, _reader.readElementText());
 		else
 			_reader.skipCurrentElement();
 	}
@@ -54,9 +81,12 @@ void Parser::tpExtension()
 void Parser::extensions()
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "speed" || _reader.name() == "hr"
+		if (_reader.name() == "speed")
-		  || _reader.name() == "heartrate" || _reader.name() == "temp")
+			handleTrackpointData(Speed, _reader.readElementText());
-			handleExtensionData(_reader.name(), _reader.readElementText());
+		else if (_reader.name() == "hr" || _reader.name() == "heartrate")
+			handleTrackpointData(HeartRate, _reader.readElementText());
+		else if (_reader.name() == "temp")
+			handleTrackpointData(Temperature, _reader.readElementText());
 		else if (_reader.name() == "TrackPointExtension")
 			tpExtension();
 		else
@@ -64,12 +94,15 @@ void Parser::extensions()
 	}
 }
 
-void Parser::trackPointData()
+void Parser::trackpointData()
 {
 	while (_reader.readNextStartElement()) {
-		if (_reader.name() == "ele" || _reader.name() == "time"
+		if (_reader.name() == "ele")
-		  || _reader.name() == "geoidheight")
+			handleTrackpointData(Elevation, _reader.readElementText());
-			handleTrekPointData(_reader.name(), _reader.readElementText());
+		else if (_reader.name() == "time")
+			handleTrackpointData(Time, _reader.readElementText());
+		else if (_reader.name() == "geoidheight")
+			handleTrackpointData(Geoidheight, _reader.readElementText());
 		else if (_reader.name() == "extensions")
 			extensions();
 		else
@@ -77,13 +110,13 @@ void Parser::trackPointData()
 	}
 }
 
-void Parser::trackPoints()
+void Parser::trackpoints()
 {
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == "trkpt") {
 			_track->append(Trackpoint());
-			handleTrekPointAttributes(_reader.attributes());
+			handleTrackpointAttributes(_reader.attributes());
-			trackPointData();
+			trackpointData();
 		} else
 			_reader.skipCurrentElement();
 	}
@@ -93,17 +126,25 @@ void Parser::track()
 {
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == "trkseg") {
-			trackPoints();
+			trackpoints();
 		} else
 			_reader.skipCurrentElement();
 	}
 }
 
-void Parser::wayPointData()
+void Parser::waypointData()
 {
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == "name")
-			handleWayPointData(_reader.name(), _reader.readElementText());
+			handleWaypointData(Name, _reader.readElementText());
+		else if (_reader.name() == "desc")
+			handleWaypointData(Description, _reader.readElementText());
+		else if (_reader.name() == "ele")
+			handleWaypointData(Elevation, _reader.readElementText());
+		else if (_reader.name() == "geoidheight")
+			handleWaypointData(Geoidheight, _reader.readElementText());
+		else if (_reader.name() == "time")
+			handleWaypointData(Time, _reader.readElementText());
 		else
 			_reader.skipCurrentElement();
 	}
@@ -118,8 +159,8 @@ void Parser::gpx()
 			track();
 		} else if (_reader.name() == "wpt") {
 			_waypoints.append(Waypoint());
-			handleWayPointAttributes(_reader.attributes());
+			handleWaypointAttributes(_reader.attributes());
-			wayPointData();
+			waypointData();
 		} else
 			_reader.skipCurrentElement();
 	}

src/parser.h

@@ -18,20 +18,24 @@ public:
 	int errorLine() const {return _reader.lineNumber();}
 
 private:
+	enum DataType {
+		Name, Description, Elevation, Time, Geoidheight, Speed, HeartRate,
+		Temperature
+	};
+
 	bool parse();
 	void gpx();
 	void track();
-	void trackPoints();
+	void trackpoints();
 	void tpExtension();
 	void extensions();
-	void trackPointData();
+	void trackpointData();
-	void wayPointData();
+	void waypointData();
 
-	void handleWayPointAttributes(const QXmlStreamAttributes &attr);
+	void handleWaypointAttributes(const QXmlStreamAttributes &attr);
-	void handleWayPointData(QStringRef element, const QString &value);
+	void handleWaypointData(DataType type, const QString &value);
-	void handleTrekPointAttributes(const QXmlStreamAttributes &attr);
+	void handleTrackpointAttributes(const QXmlStreamAttributes &attr);
-	void handleTrekPointData(QStringRef element, const QString &value);
+	void handleTrackpointData(DataType type, const QString &value);
-	void handleExtensionData(QStringRef element, const QString &value);
 
 	QXmlStreamReader _reader;
 	QList<QVector<Trackpoint> > &_tracks;

src/poi.cpp

@@ -1,6 +1,8 @@
 #include <QFile>
 #include <QSet>
 #include <QList>
+#include <QPainterPath>
+#include "waypointitem.h"
 #include "ll.h"
 #include "gpx.h"
 #include "poi.h"
@@ -105,10 +107,18 @@ bool POI::loadCSVFile(const QString &fileName)
 			_errorLine = ln;
 			return false;
 		}
-		QByteArray ba = list[2].trimmed();
+		Waypoint wp(QPointF(lon, lat));
 
-		_data.append(Waypoint(QPointF(lon, lat),
+		QByteArray ba = list[2].trimmed();
-		  QString::fromUtf8(ba.data(), ba.size())));
+		QString name = QString::fromUtf8(ba.data(), ba.size());
+		wp.setName(name);
+
+		if (list.size() > 3) {
+			ba = list[3].trimmed();
+			wp.setDescription(QString::fromUtf8(ba.data(), ba.size()));
+		}
+
+		_data.append(wp);
 		ln++;
 	}
 	index.end = _data.size() - 1;
@@ -135,14 +145,39 @@ static bool cb(size_t data, void* context)
 	return true;
 }
 
-QVector<Waypoint> POI::points(const QVector<QPointF> &path, qreal radius) const
+QVector<Waypoint> POI::points(const QPainterPath &path, qreal radius) const
 {
 	QVector<Waypoint> ret;
 	QSet<int> set;
 	qreal min[2], max[2];
 
-	for (int i = 0; i < path.count(); i++) {
+	for (int i = 0; i < path.elementCount(); i++) {
-		const QPointF &p = path.at(i);
+		QPointF p = mercator2ll(path.elementAt(i));
+		min[0] = p.x() - radius;
+		min[1] = -p.y() - radius;
+		max[0] = p.x() + radius;
+		max[1] = -p.y() + radius;
+		_tree.Search(min, max, cb, &set);
+	}
+
+	QSet<int>::const_iterator i = set.constBegin();
+	while (i != set.constEnd()) {
+		ret.append(_data.at(*i));
+		++i;
+	}
+
+	return ret;
+}
+
+QVector<Waypoint> POI::points(const QList<WaypointItem*> &list, qreal radius)
+  const
+{
+	QVector<Waypoint> ret;
+	QSet<int> set;
+	qreal min[2], max[2];
+
+	for (int i = 0; i < list.count(); i++) {
+		const QPointF &p = list.at(i)->waypoint().coordinates();
 		min[0] = p.x() - radius;
 		min[1] = p.y() - radius;
 		max[0] = p.x() + radius;

src/poi.h

@@ -8,6 +8,10 @@
 #include "waypoint.h"
 #include "rtree.h"
 
+class QPainterPath;
+class WaypointItem;
+
+#define POI_RADIUS 0.01
 
 class POI
 {
@@ -17,8 +21,11 @@ public:
 	const QString &errorString() const {return _error;}
 	int errorLine() const {return _errorLine;}
 
-	QVector<Waypoint> points(const QVector<QPointF> &path,
+	QVector<Waypoint> points(const QPainterPath &path,
-	  qreal radius = 0.01) const;
+	  qreal radius = POI_RADIUS) const;
+	QVector<Waypoint> points(const QList<WaypointItem*> &list,
+	  qreal radius = POI_RADIUS) const;
+
 	const QStringList &files() const {return _files;}
 	void enableFile(const QString &fileName, bool enable);
 	void clear();

src/scaleitem.cpp

@@ -1,7 +1,7 @@
 #include <QPainter>
 #include "config.h"
 #include "ll.h"
-#include "nicenum.h"
+#include "misc.h"
 #include "scaleitem.h"
 
 

src/settings.h

@@ -15,6 +15,7 @@
 #define SHOW_MAP_SETTING                  "show"
 
 #define POI_SETTINGS_GROUP	              "POI"
+#define OVERLAP_POI_SETTING               "overlap"
 #define SHOW_POI_SETTING                  "show"
 #define DISABLED_POI_FILE_SETTINGS_PREFIX "disabled"
 #define DISABLED_POI_FILE_SETTING         "file"

src/speedgraph.cpp

@@ -3,7 +3,7 @@
 #include "speedgraph.h"
 
 
-SpeedGraph::SpeedGraph(QWidget *parent) : GraphView(parent)
+SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 {
 	_units = Metric;
 

src/speedgraph.h

@@ -2,26 +2,25 @@
 #define SPEEDGRAPH_H
 
 #include <QList>
-#include "graphview.h"
+#include "graphtab.h"
-#include "units.h"
 
 class GPX;
 
-class SpeedGraph : public GraphView
+class SpeedGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	SpeedGraph(QWidget *parent = 0);
 
+	QString label() const {return tr("Speed");}
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
 
+private:
 	qreal avg() const;
 	qreal max() const {return bounds().bottom();}
-
-private:
 	void setXUnits();
 	void setYUnits();
 	void addInfo();

src/temperaturegraph.cpp

@@ -2,7 +2,7 @@
 #include "temperaturegraph.h"
 
 
-TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphView(parent)
+TemperatureGraph::TemperatureGraph(QWidget *parent) : GraphTab(parent)
 {
 	_units = Metric;
 
@@ -94,11 +94,11 @@ void TemperatureGraph::setXUnits()
 void TemperatureGraph::setYUnits()
 {
 	if (_units == Metric) {
-		GraphView::setYUnits(QString::fromUtf8("\xC2\xB0") + tr("C"));
+		GraphView::setYUnits(QChar(0x00B0) + tr("C"));
 		setYScale(1);
 		setYOffset(0);
 	} else {
-		GraphView::setYUnits(QString::fromUtf8("\xC2\xB0") + tr("F"));
+		GraphView::setYUnits(QChar(0x00B0) + tr("F"));
 		setYScale(C2FS);
 		setYOffset(C2FO);
 	}

src/temperaturegraph.h

@@ -1,27 +1,26 @@
 #ifndef TEMPERATUREGRAPH_H
 #define TEMPERATUREGRAPH_H
 
-#include "units.h"
+#include "graphtab.h"
-#include "graphview.h"
 
 class GPX;
 
-class TemperatureGraph : public GraphView
+class TemperatureGraph : public GraphTab
 {
 	Q_OBJECT
 
 public:
 	TemperatureGraph(QWidget *parent = 0);
 
+	QString label() const {return tr("Temperature");}
 	void loadGPX(const GPX &gpx);
 	void clear();
 	void setUnits(enum Units units);
 
+private:
 	qreal avg() const;
 	qreal min() const {return bounds().top();}
 	qreal max() const {return bounds().bottom();}
-
-private:
 	void setXUnits();
 	void setYUnits();
 	void addInfo();

src/tooltip.cpp

@@ -0,0 +1,20 @@
+#include "tooltip.h"
+
+void ToolTip::insert(const QString &key, const QString &value)
+{
+	QPair<QString, QString> entry(key, value);
+	_list.append(entry);
+}
+
+QString ToolTip::toString()
+{
+	QString ret = "<table>";
+
+	for (int i = 0; i < _list.count(); i++)
+		ret += "<tr><td align=\"right\"><b>" + _list.at(i).first
+		  + ":&nbsp;</b></td><td>" + _list.at(i).second + "</td></tr>";
+
+	ret += "</table>";
+
+	return ret;
+}

src/tooltip.h

@@ -0,0 +1,18 @@
+#ifndef TOOLTIP_H
+#define TOOLTIP_H
+
+#include <QString>
+#include <QList>
+#include <QPair>
+
+class ToolTip
+{
+public:
+	void insert(const QString &key, const QString &value);
+	QString toString();
+
+private:
+	QList<QPair<QString, QString> > _list;
+};
+
+#endif // TOOLTIP_H

src/track.cpp

@@ -81,39 +81,35 @@ static QVector<QPointF> filter(const QVector<QPointF> &v, int window)
 
 Track::Track(const QVector<Trackpoint> &data) : _data(data)
 {
-	_distance = 0;
+	qreal dist = 0;
 
-	for (int i = 1; i < _data.count(); i++)
+	_dd.append(dist);
-		_dd.append(llDistance(_data.at(i).coordinates,
+	for (int i = 1; i < _data.count(); i++) {
-		  _data.at(i-1).coordinates));
+		dist += llDistance(_data.at(i).coordinates(),
-
+		  _data.at(i-1).coordinates());
-	for (int i = 0; i < _dd.size(); i++)
+		_dd.append(dist);
-		_distance += _dd.at(i);
+	}
 }
 
 void Track::elevationGraph(QVector<QPointF> &graph) const
 {
-	qreal dist = 0;
 	QVector<QPointF> raw;
 
 	if (!_data.size())
 		return;
 
-	if (_data.at(0).hasElevation())
+	for (int i = 0; i < _data.size(); i++)
-		raw.append(QPointF(0, _data.at(0).elevation - _data.at(0).geoidheight));
-	for (int i = 1; i < _data.size(); i++) {
-		dist += _dd.at(i-1);
 		if (_data.at(i).hasElevation())
-			raw.append(QPointF(dist,  _data.at(i).elevation
+			raw.append(QPointF(_dd.at(i), _data.at(i).elevation()
-			  - _data.at(i).geoidheight));
+			  - _data.at(i).geoidHeight()));
-	}
 
 	graph = filter(raw, WINDOW_EF);
 }
 
 void Track::speedGraph(QVector<QPointF> &graph) const
 {
-	qreal dist = 0, v, ds, dt;
+	qreal v, ds;
+	qint64 dt;
 	QVector<QPointF> raw;
 
 	if (!_data.size())
@@ -121,21 +117,18 @@ void Track::speedGraph(QVector<QPointF> &graph) const
 
 	raw.append(QPointF(0, 0));
 	for (int i = 1; i < _data.size(); i++) {
-		ds = _dd.at(i-1);
-		dist += ds;
-
 		if (_data.at(i).hasSpeed())
-			v = _data.at(i).speed;
+			v = _data.at(i).speed();
 		else if (_data.at(i).hasTimestamp()) {
-			dt = _data.at(i-1).timestamp.msecsTo(_data.at(i).timestamp)
+			dt = _data.at(i-1).timestamp().msecsTo(_data.at(i).timestamp());
-			  / 1000.0;
+			if (!dt)
-			if (dt == 0)
 				continue;
-			v = ds / dt;
+			ds = _dd.at(i) - _dd.at(i-1);
+			v = ds / ((qreal)dt / 1000.0);
 		} else
 			continue;
 
-		raw.append(QPointF(dist, v));
+		raw.append(QPointF(_dd.at(i), v));
 	}
 
 	graph = filter(eliminate(raw, WINDOW_SE), WINDOW_SF);
@@ -143,43 +136,32 @@ void Track::speedGraph(QVector<QPointF> &graph) const
 
 void Track::heartRateGraph(QVector<QPointF> &graph) const
 {
-	qreal dist = 0;
 	QVector<QPointF> raw;
 
 	if (!_data.size())
 		return;
 
-	if (_data.at(0).hasHeartRate())
+	for (int i = 0; i < _data.count(); i++)
-		raw.append(QPointF(0, _data.at(0).heartRate));
-	for (int i = 1; i < _data.count(); i++) {
-		dist += _dd.at(i-1);
 		if (_data.at(i).hasHeartRate())
-			raw.append(QPointF(dist, _data.at(i).heartRate));
+			raw.append(QPointF(_dd.at(i), _data.at(i).heartRate()));
-	}
 
 	graph = filter(eliminate(raw, WINDOW_HE), WINDOW_HF);
 }
 
 void Track::temperatureGraph(QVector<QPointF> &graph) const
 {
-	qreal dist = 0;
-
 	if (!_data.size())
 		return;
 
-	if (_data.at(0).hasTemperature())
+	for (int i = 0; i < _data.size(); i++)
-		graph.append(QPointF(0, _data.at(0).temperature));
-	for (int i = 1; i < _data.size(); i++) {
-		dist += _dd.at(i-1);
 		if (_data.at(i).hasTemperature())
-			graph.append(QPointF(dist,  _data.at(i).temperature));
+			graph.append(QPointF(_dd.at(i), _data.at(i).temperature()));
-	}
 }
 
 void Track::track(QVector<QPointF> &track) const
 {
 	for (int i = 0; i < _data.size(); i++)
-		track.append(_data.at(i).coordinates);
+		track.append(_data.at(i).coordinates());
 }
 
 qreal Track::time() const
@@ -187,14 +169,14 @@ qreal Track::time() const
 	if (_data.size() < 2)
 		return 0;
 
-	return (_data.at(0).timestamp.msecsTo(_data.at(_data.size() - 1).timestamp)
+	return (_data.first().timestamp().msecsTo(_data.last().timestamp())
 	  / 1000.0);
 }
 
 QDateTime Track::date() const
 {
 	if (_data.size())
-		return _data.at(0).timestamp;
+		return _data.first().timestamp();
 	else
 		return QDateTime();
 }

src/track.h

@@ -15,10 +15,12 @@ public:
 	void heartRateGraph(QVector<QPointF> &graph) const;
 	void temperatureGraph(QVector<QPointF> &graph) const;
 	void track(QVector<QPointF> &track) const;
-	qreal distance() const {return _distance;}
+	qreal distance() const {return _dd.last();}
 	qreal time() const;
 	QDateTime date() const;
 
+	bool isNull() const {return (_data.count() < 2) ? true : false;}
+
 private:
 	const QVector<Trackpoint> &_data;
 	QVector<qreal> _dd;

src/trackitem.cpp

@@ -0,0 +1,87 @@
+#include <QApplication>
+#include <QCursor>
+#include <QPen>
+#include "ll.h"
+#include "misc.h"
+#include "tooltip.h"
+#include "trackitem.h"
+
+
+#define TRACK_WIDTH     3
+
+QString TrackItem::toolTip()
+{
+	ToolTip tt;
+
+	tt.insert(qApp->translate("TrackItem", "Distance"),
+	  ::distance(_distance, _units));
+	if  (_time > 0)
+		tt.insert(qApp->translate("TrackItem", "Time"), ::timeSpan(_time));
+	if (!_date.isNull())
+		tt.insert(qApp->translate("TrackItem", "Date"),
+		  _date.toString(Qt::SystemLocaleShortDate));
+
+	return tt.toString();
+}
+
+void TrackItem::updateShape()
+{
+	QPainterPathStroker s;
+	s.setWidth(TRACK_WIDTH * 1.0/scale());
+	_shape = s.createStroke(path().simplified());
+}
+
+TrackItem::TrackItem(const Track &track, QGraphicsItem *parent)
+  : QGraphicsPathItem(parent)
+{
+	QVector<QPointF> t;
+	QPainterPath path;
+
+	track.track(t);
+	Q_ASSERT(t.count() >= 2);
+
+	const QPointF &p = t.at(0);
+	path.moveTo(ll2mercator(QPointF(p.x(), -p.y())));
+	for (int i = 1; i < t.size(); i++) {
+		const QPointF &p = t.at(i);
+		path.lineTo(ll2mercator(QPointF(p.x(), -p.y())));
+	}
+
+	_units = Metric;
+	_date = track.date();
+	_distance = track.distance();
+	_time = track.time();
+
+	setPath(path);
+	setToolTip(toolTip());
+	setCursor(Qt::ArrowCursor);
+
+	updateShape();
+
+	QBrush brush(Qt::SolidPattern);
+	QPen pen(brush, TRACK_WIDTH);
+	setPen(pen);
+}
+
+void TrackItem::setScale(qreal scale)
+{
+	QGraphicsPathItem::setScale(scale);
+	updateShape();
+
+	QPen p(pen());
+	p.setWidthF(TRACK_WIDTH * 1.0/scale);
+	setPen(p);
+}
+
+void TrackItem::setColor(const QColor &color)
+{
+	QPen p(pen());
+	p.setColor(color);
+	setPen(p);
+}
+
+void TrackItem::setUnits(enum Units units)
+{
+	_units = units;
+	setToolTip(toolTip());
+}

src/trackitem.h

@@ -0,0 +1,32 @@
+#ifndef TRACKITEM_H
+#define TRACKITEM_H
+
+#include <QGraphicsPathItem>
+#include <QDateTime>
+#include "units.h"
+#include "track.h"
+
+class TrackItem : public QGraphicsPathItem
+{
+public:
+	TrackItem(const Track &track, QGraphicsItem *parent = 0);
+
+	QPainterPath shape() const {return _shape;}
+	void setScale(qreal scale);
+
+	void setUnits(enum Units units);
+	void setColor(const QColor &color);
+
+private:
+	void updateShape();
+	QString toolTip();
+
+	QPainterPath _shape;
+
+	Units _units;
+	QDateTime _date;
+	qreal _time;
+	qreal _distance;
+};
+
+#endif // TRACKITEM_H

src/trackpoint.cpp

@@ -2,10 +2,10 @@
 
 QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint)
 {
-	dbg.nospace() << "Trackpoint(" << trackpoint.coordinates << ", "
+	dbg.nospace() << "Trackpoint(" << trackpoint.coordinates() << ", "
-	  << trackpoint.timestamp << ", " << trackpoint.elevation << ", "
+	  << trackpoint.timestamp() << ", " << trackpoint.elevation() << ", "
-	  << trackpoint.geoidheight << ", " << trackpoint.speed << ", "
+	  << trackpoint.geoidHeight() << ", " << trackpoint.speed() << ", "
-	  << trackpoint.heartRate << ", " << trackpoint.temperature << ")";
+	  << trackpoint.heartRate() << ", " << trackpoint.temperature() << ")";
 
 	return dbg.maybeSpace();
 }

src/trackpoint.h

@@ -10,26 +10,42 @@ class Trackpoint
 {
 public:
 	Trackpoint() {
-		elevation = NAN;
+		_elevation = NAN; _geoidHeight = 0; _speed = NAN; _heartRate = NAN;
-		geoidheight = 0;
+		_temperature = NAN;
-		speed = NAN;
-		heartRate = NAN;
-		temperature = NAN;
 	}
+	Trackpoint(const QPointF &coordinates) {_coordinates = coordinates;}
 
-	bool hasTimestamp() const {return !timestamp.isNull();}
+	const QPointF &coordinates() const {return _coordinates;}
-	bool hasElevation() const {return !std::isnan(elevation);}
+	const QDateTime &timestamp() const {return _timestamp;}
-	bool hasSpeed() const {return !std::isnan(speed);}
+	qreal elevation() const {return _elevation;}
-	bool hasHeartRate() const {return !std::isnan(heartRate);}
+	qreal geoidHeight() const {return _geoidHeight;}
-	bool hasTemperature() const {return !std::isnan(temperature);}
+	qreal speed() const {return _speed;}
+	qreal heartRate() const {return _heartRate;}
+	qreal temperature() const {return _temperature;}
 
-	QPointF coordinates;
+	void setCoordinates(const QPointF &coordinates)
-	QDateTime timestamp;
+	  {_coordinates = coordinates;}
-	qreal elevation;
+	void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
-	qreal geoidheight;
+	void setElevation(qreal elevation) {_elevation = elevation;}
-	qreal speed;
+	void setGeoidHeight(qreal geoidHeight) {_geoidHeight = geoidHeight;}
-	qreal heartRate;
+	void setSpeed(qreal speed) {_speed = speed;}
-	qreal temperature;
+	void setHeartRate(qreal heartRate) {_heartRate = heartRate;}
+	void setTemperature(qreal temperature) {_temperature = temperature;}
+
+	bool hasTimestamp() const {return !_timestamp.isNull();}
+	bool hasElevation() const {return !std::isnan(_elevation);}
+	bool hasSpeed() const {return !std::isnan(_speed);}
+	bool hasHeartRate() const {return !std::isnan(_heartRate);}
+	bool hasTemperature() const {return !std::isnan(_temperature);}
+
+private:
+	QPointF _coordinates;
+	QDateTime _timestamp;
+	qreal _elevation;
+	qreal _geoidHeight;
+	qreal _speed;
+	qreal _heartRate;
+	qreal _temperature;
 };
 
 QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint);

src/trackview.cpp

@@ -2,18 +2,18 @@
 #include <QGraphicsScene>
 #include <QPainterPath>
 #include <QWheelEvent>
+#include "ll.h"
 #include "poi.h"
 #include "gpx.h"
 #include "map.h"
+#include "trackitem.h"
 #include "waypointitem.h"
 #include "markeritem.h"
 #include "scaleitem.h"
-#include "ll.h"
 #include "trackview.h"
 
 
 #define MARGIN          10.0
-#define TRACK_WIDTH     3
 #define SCALE_OFFSET    7
 
 TrackView::TrackView(QWidget *parent)
@@ -38,6 +38,8 @@ TrackView::TrackView(QWidget *parent)
 	_maxDistance = 0;
 
 	_plot = false;
+	_units = Metric;
+	_overlap = true;
 }
 
 TrackView::~TrackView()
@@ -46,59 +48,41 @@ TrackView::~TrackView()
 		delete _mapScale;
 }
 
-void TrackView::addTrack(const QVector<QPointF> &track)
+void TrackView::addTrack(const Track &track)
 {
-	QPainterPath path;
+	if (track.isNull()) {
-	QGraphicsPathItem *pi;
-	MarkerItem *mi;
-
-
-	if (track.size() < 2) {
 		_palette.color();
 		return;
 	}
 
-	_tracks.append(track);
+	TrackItem *pi = new TrackItem(track);
-
-	const QPointF &p = track.at(0);
-	path.moveTo(ll2mercator(QPointF(p.x(), -p.y())));
-	for (int i = 1; i < track.size(); i++) {
-		const QPointF &p = track.at(i);
-		path.lineTo(ll2mercator(QPointF(p.x(), -p.y())));
-	}
-
-	_maxPath = qMax(path.length(), _maxPath);
-
-	pi = new QGraphicsPathItem(path);
 	_paths.append(pi);
 	_zoom = qMin(_zoom, scale2zoom(trackScale()));
 	_scale = mapScale(_zoom);
-	QBrush brush(_palette.color(), Qt::SolidPattern);
-	QPen pen(brush, TRACK_WIDTH * _scale);
-	pi->setPen(pen);
 	pi->setScale(1.0/_scale);
+	pi->setColor(_palette.color());
 	_scene->addItem(pi);
 
-	mi = new MarkerItem(pi);
+	MarkerItem *mi = new MarkerItem(pi);
 	_markers.append(mi);
 	mi->setPos(pi->path().pointAtPercent(0));
 	mi->setScale(_scale);
+
+	_maxPath = qMax(pi->path().length(), _maxPath);
+	_maxDistance = qMax(track.distance(), _maxDistance);
 }
 
 void TrackView::addWaypoints(const QList<Waypoint> &waypoints)
 {
 	for (int i = 0; i < waypoints.count(); i++) {
 		const Waypoint &w = waypoints.at(i);
-		WaypointItem *wi = new WaypointItem(
-		  Waypoint(ll2mercator(QPointF(w.coordinates().x(),
-		    -w.coordinates().y())), w.description()));
 
-		wi->setPos(wi->entry().coordinates() * 1.0/_scale);
+		WaypointItem *wi = new WaypointItem(w);
+		wi->setScale(1.0/_scale);
 		wi->setZValue(1);
 		_scene->addItem(wi);
 
-		_locations.append(wi);
+		_waypoints.append(wi);
-		_waypoints.append(w.coordinates());
 	}
 
 	_zoom = qMin(_zoom, scale2zoom(waypointScale()));
@@ -109,20 +93,15 @@ void TrackView::loadGPX(const GPX &gpx)
 {
 	int zoom = _zoom;
 
-	for (int i = 0; i < gpx.trackCount(); i++) {
+	for (int i = 0; i < gpx.trackCount(); i++)
-		QVector<QPointF> track;
+		addTrack(gpx.track(i));
-		gpx.track(i).track(track);
-		addTrack(track);
-		_maxDistance = qMax(gpx.track(i).distance(), _maxDistance);
-	}
-
 	addWaypoints(gpx.waypoints());
 
-	if (_paths.empty() && _locations.empty())
+	if (_paths.empty() && _waypoints.empty())
 		return;
 
 	if ((_paths.size() > 1 && _zoom < zoom)
-	  || (_locations.size() && _zoom < zoom))
+	  || (_waypoints.size() && _zoom < zoom))
 		rescale(_scale);
 
 	QRectF br = trackBoundingRect() | waypointBoundingRect();
@@ -152,17 +131,17 @@ QRectF TrackView::waypointBoundingRect() const
 {
 	qreal bottom, top, left, right;
 
-	if (_locations.empty())
+	if (_waypoints.empty())
 		return QRectF();
 
-	const QPointF &p = _locations.at(0)->pos();
+	const QPointF &p = _waypoints.at(0)->pos();
 	bottom = p.y();
 	top = p.y();
 	left = p.x();
 	right = p.x();
 
-	for (int i = 1; i < _locations.size(); i++) {
+	for (int i = 1; i < _waypoints.size(); i++) {
-		const QPointF &p = _locations.at(i)->pos();
+		const QPointF &p = _waypoints.at(i)->pos();
 		bottom = qMax(bottom, p.y());
 		top = qMin(top, p.y());
 		right = qMax(right, p.x());
@@ -192,17 +171,17 @@ qreal TrackView::waypointScale() const
 {
 	qreal bottom, top, left, right;
 
-	if (_locations.size() < 2)
+	if (_waypoints.size() < 2)
 		return mapScale(ZOOM_MAX);
 
-	const QPointF &p = _locations.at(0)->entry().coordinates();
+	const QPointF &p = _waypoints.at(0)->coordinates();
 	bottom = p.y();
 	top = p.y();
 	left = p.x();
 	right = p.x();
 
-	for (int i = 1; i < _locations.size(); i++) {
+	for (int i = 1; i < _waypoints.size(); i++) {
-		const QPointF &p = _locations.at(i)->entry().coordinates();
+		const QPointF &p = _waypoints.at(i)->coordinates();
 		bottom = qMax(bottom, p.y());
 		top = qMin(top, p.y());
 		right = qMax(right, p.x());
@@ -221,26 +200,9 @@ qreal TrackView::mapScale(int zoom) const
 	return ((360.0/(qreal)(1<<zoom))/(qreal)TILE_SIZE);
 }
 
-void TrackView::rescale(qreal scale)
+void TrackView::checkPOIOverlap()
 {
-	for (int i = 0; i < _paths.size(); i++) {
-		_markers.at(i)->setScale(scale);
-		_paths.at(i)->setScale(1.0/scale);
-
-		QPen pen(_paths.at(i)->pen());
-		pen.setWidthF(TRACK_WIDTH * scale);
-		_paths.at(i)->setPen(pen);
-	}
-
-	for (int i = 0; i < _locations.size(); i++)
-		_locations.at(i)->setPos(_locations.at(i)->entry().coordinates()
-		  * 1.0/scale);
-
 	QHash<Waypoint, WaypointItem*>::const_iterator it, jt;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
-		it.value()->setPos(it.value()->entry().coordinates() * 1.0/scale);
-		it.value()->show();
-	}
 
 	for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
 		for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
@@ -249,6 +211,26 @@ void TrackView::rescale(qreal scale)
 				jt.value()->hide();
 		}
 	}
+}
+
+void TrackView::rescale(qreal scale)
+{
+	for (int i = 0; i < _paths.size(); i++) {
+		_markers.at(i)->setScale(scale);
+		_paths.at(i)->setScale(1.0/scale);
+	}
+
+	for (int i = 0; i < _waypoints.size(); i++)
+		_waypoints.at(i)->setScale(1.0/scale);
+
+	QHash<Waypoint, WaypointItem*>::const_iterator it;
+	for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
+		it.value()->setScale(1.0/scale);
+		it.value()->show();
+	}
+
+	if (!_overlap)
+		checkPOIOverlap();
 
 	_scale = scale;
 }
@@ -261,11 +243,8 @@ void TrackView::addPOI(const QVector<Waypoint> &waypoints)
 		if (_pois.contains(w))
 			continue;
 
-		WaypointItem *pi = new WaypointItem(
+		WaypointItem *pi = new WaypointItem(w);
-		  Waypoint(ll2mercator(QPointF(w.coordinates().x(),
+		pi->setScale(1.0/_scale);
-		  -w.coordinates().y())), w.description()));
-
-		pi->setPos(pi->entry().coordinates() * 1.0/_scale);
 		pi->setZValue(1);
 		_scene->addItem(pi);
 
@@ -275,22 +254,15 @@ void TrackView::addPOI(const QVector<Waypoint> &waypoints)
 
 void TrackView::loadPOI(const POI &poi)
 {
-	QHash<Waypoint, WaypointItem*>::const_iterator it,jt;
+	if (!_paths.size() && !_waypoints.size())
-
-	if (!_tracks.size() && !_waypoints.size())
 		return;
 
-	for (int i = 0; i < _tracks.size(); i++)
+	for (int i = 0; i < _paths.size(); i++)
-		addPOI(poi.points(_tracks.at(i)));
+		addPOI(poi.points(_paths.at(i)->path()));
 	addPOI(poi.points(_waypoints));
 
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
+	if (!_overlap)
-		for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
+		checkPOIOverlap();
-			if (it != jt && it.value()->isVisible() && jt.value()->isVisible()
-			  && it.value()->collidesWithItem(jt.value()))
-				jt.value()->hide();
-		}
-	}
 }
 
 void TrackView::setMap(Map *map)
@@ -304,7 +276,19 @@ void TrackView::setMap(Map *map)
 
 void TrackView::setUnits(enum Units units)
 {
+	_units = units;
+
 	_mapScale->setUnits(units);
+
+	for (int i = 0; i < _paths.count(); i++)
+		_paths[i]->setUnits(units);
+
+	for (int i = 0; i < _waypoints.size(); i++)
+		_waypoints.at(i)->setUnits(units);
+
+	QHash<Waypoint, WaypointItem*>::const_iterator it;
+	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+		it.value()->setUnits(units);
 }
 
 void TrackView::redraw()
@@ -319,16 +303,13 @@ void TrackView::rescale()
 	_mapScale->setZoom(_zoom);
 }
 
-void TrackView::wheelEvent(QWheelEvent *event)
+void TrackView::zoom(int z, const QPointF &pos)
 {
-	if (_paths.isEmpty() && _locations.isEmpty())
+	if (_paths.isEmpty() && _waypoints.isEmpty())
 		return;
 
-	QPointF pos = mapToScene(event->pos());
 	qreal scale = _scale;
-
+	_zoom = z;
-	_zoom = (event->delta() > 0) ?
-		qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN);
 
 	rescale(mapScale(_zoom));
 	QRectF br = trackBoundingRect() | waypointBoundingRect();
@@ -346,6 +327,33 @@ void TrackView::wheelEvent(QWheelEvent *event)
 	resetCachedContent();
 }
 
+void TrackView::wheelEvent(QWheelEvent *event)
+{
+	if (_paths.isEmpty() && _waypoints.isEmpty())
+		return;
+
+	QPointF pos = mapToScene(event->pos());
+	int z = (event->delta() > 0) ?
+		qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN);
+
+	zoom(z, pos);
+}
+
+void TrackView::keyPressEvent(QKeyEvent *event)
+{
+	int z = -1;
+
+	if (event->matches(QKeySequence::ZoomIn))
+		z = qMin(_zoom + 1, ZOOM_MAX);
+	if (event->matches(QKeySequence::ZoomOut))
+		z = qMax(_zoom - 1, ZOOM_MIN);
+
+	if (z >= 0)
+		zoom(z, mapToScene(QRect(QPoint(), size()).center()));
+	else
+		QWidget::keyPressEvent(event);
+}
+
 void TrackView::plot(QPainter *painter, const QRectF &target)
 {
 	QRect orig, adj;
@@ -399,14 +407,11 @@ void TrackView::clear()
 
 	_pois.clear();
 	_paths.clear();
-	_locations.clear();
+	_waypoints.clear();
 	_markers.clear();
 	_scene->clear();
 	_palette.reset();
 
-	_tracks.clear();
-	_waypoints.clear();
-
 	_maxPath = 0;
 	_maxDistance = 0;
 	_zoom = ZOOM_MAX;
@@ -431,9 +436,21 @@ void TrackView::movePositionMarker(qreal val)
 	}
 }
 
+void TrackView::setPOIOverlap(bool overlap)
+{
+	_overlap = overlap;
+
+	if (_overlap) {
+		QHash<Waypoint, WaypointItem*>::const_iterator it;
+		for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+			it.value()->show();
+	} else
+		checkPOIOverlap();
+}
+
 void TrackView::drawBackground(QPainter *painter, const QRectF &rect)
 {
-	if ((_paths.isEmpty() && _locations.isEmpty()) || !_map) {
+	if ((_paths.isEmpty() && _waypoints.isEmpty()) || !_map) {
 		painter->fillRect(rect, Qt::white);
 		return;
 	}
@@ -464,7 +481,7 @@ void TrackView::drawBackground(QPainter *painter, const QRectF &rect)
 
 void TrackView::resizeEvent(QResizeEvent *e)
 {
-	if (_paths.isEmpty() && _locations.isEmpty())
+	if (_paths.isEmpty() && _waypoints.isEmpty())
 		return;
 
 	rescale();

src/trackview.h

@@ -12,6 +12,8 @@
 class GPX;
 class POI;
 class Map;
+class Track;
+class TrackItem;
 class WaypointItem;
 class MarkerItem;
 class ScaleItem;
@@ -32,18 +34,19 @@ public:
 
 	void setMap(Map *map);
 	void setUnits(enum Units units);
+	void setPOIOverlap(bool overlap);
 
 	void plot(QPainter *painter, const QRectF &target);
 
 	int trackCount() const {return _paths.count();}
-	int waypointCount() const {return _locations.count();}
+	int waypointCount() const {return _waypoints.count();}
 
 public slots:
 	void movePositionMarker(qreal val);
 	void redraw();
 
 private:
-	void addTrack(const QVector<QPointF> &track);
+	void addTrack(const Track &track);
 	void addWaypoints(const QList<Waypoint> &waypoints);
 	void addPOI(const QVector<Waypoint> &waypoints);
 
@@ -54,19 +57,20 @@ private:
 	qreal mapScale(int zoom) const;
 	void rescale(qreal scale);
 	void rescale();
+	void zoom(int z, const QPointF &pos);
+	void checkPOIOverlap();
 
 	void wheelEvent(QWheelEvent *event);
+	void keyPressEvent(QKeyEvent *event);
 	void drawBackground(QPainter *painter, const QRectF &rect);
 	void resizeEvent(QResizeEvent *e);
 	void paintEvent(QPaintEvent *e);
 
 	QGraphicsScene *_scene;
-	QList<QGraphicsPathItem*> _paths;
+	QList<TrackItem*> _paths;
 	QList<MarkerItem*> _markers;
-	QList<WaypointItem*> _locations;
+	QList<WaypointItem*> _waypoints;
 	QHash<Waypoint, WaypointItem*> _pois;
-	QList<QVector<QPointF> > _tracks;
-	QVector<QPointF> _waypoints;
 
 	Map *_map;
 	ScaleItem *_mapScale;
@@ -77,6 +81,8 @@ private:
 	qreal _scale;
 	int _zoom;
 
+	Units _units;
+	bool _overlap;
 	bool _plot;
 };
 

src/waypoint.cpp

@@ -0,0 +1,9 @@
+#include "waypoint.h"
+
+QDebug operator<<(QDebug dbg, const Waypoint &waypoint)
+{
+	dbg.nospace() << "Waypoint(" << waypoint.coordinates() << ", "
+	  << waypoint.name() << ", " << waypoint.description() << ")";
+
+	return dbg.maybeSpace();
+}

src/waypoint.h

@@ -3,34 +3,52 @@
 
 #include <QPointF>
 #include <QString>
+#include <QDateTime>
 #include <QHash>
+#include <QDebug>
+#include <cmath>
 
 class Waypoint
 {
 public:
-	Waypoint() {}
+	Waypoint() {_elevation = NAN; _geoidHeight = 0;}
-	Waypoint(const QPointF &coordinates, const QString &description)
+	Waypoint(const QPointF &coordinates)
-	  : _coordinates(coordinates), _description(description) {}
+	  : _coordinates(coordinates) {_elevation = NAN; _geoidHeight = 0;}
 
 	const QPointF &coordinates() const {return _coordinates;}
+	const QString &name() const {return _name;}
 	const QString &description() const {return _description;}
+	const QDateTime &timestamp() const {return _timestamp;}
+	qreal elevation() const {return _elevation;}
+	qreal geoidHeight() const {return _geoidHeight;}
+
 	void setCoordinates(const QPointF &coordinates)
 	  {_coordinates = coordinates;}
+	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &description)
 	  {_description = description;}
+	void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
+	void setElevation(qreal elevation) {_elevation = elevation;}
+	void setGeoidHeight(qreal geoidHeight) {_geoidHeight = geoidHeight;}
 
 	bool operator==(const Waypoint &other) const
-	  {return this->_description == other._description
+	  {return this->_name == other._name
 	  && this->_coordinates == other._coordinates;}
 
 private:
 	QPointF _coordinates;
+	QString _name;
 	QString _description;
+	QDateTime _timestamp;
+	qreal _elevation;
+	qreal _geoidHeight;
 };
 
 inline uint qHash(const Waypoint &key)
 {
-	return ::qHash(key.description());
+	return ::qHash(key.name());
 }
 
+QDebug operator<<(QDebug dbg, const Waypoint &Waypoint);
+
 #endif // WAYPOINT_H

src/waypointitem.cpp

@@ -1,15 +1,47 @@
+#include <QApplication>
 #include <QPainter>
 #include "config.h"
+#include "ll.h"
+#include "misc.h"
+#include "tooltip.h"
 #include "waypointitem.h"
 
 
 #define POINT_SIZE  8
 
-WaypointItem::WaypointItem(const Waypoint &entry, QGraphicsItem *parent)
+QString WaypointItem::toolTip()
+{
+	ToolTip tt;
+
+	tt.insert(qApp->translate("WaypointItem", "Coordinates"),
+	  ::coordinates(_waypoint.coordinates()));
+	if (!std::isnan(_waypoint.elevation()))
+		tt.insert(qApp->translate("WaypointItem", "Elevation"),
+		  ::elevation(_waypoint.elevation() - _waypoint.geoidHeight(), _units));
+	if (!_waypoint.timestamp().isNull())
+		tt.insert(qApp->translate("WaypointItem", "Date"),
+		  _waypoint.timestamp().toString(Qt::SystemLocaleShortDate));
+	if (!_waypoint.description().isNull())
+		tt.insert(qApp->translate("WaypointItem", "Description"),
+		  _waypoint.description());
+
+	return tt.toString();
+}
+
+WaypointItem::WaypointItem(const Waypoint &waypoint, QGraphicsItem *parent)
   : QGraphicsItem(parent)
 {
-	_entry = entry;
+	_units = Metric;
+
+	_waypoint = waypoint;
+	_coordinates = ll2mercator(QPointF(waypoint.coordinates().x(),
+	  -waypoint.coordinates().y()));
+
 	updateBoundingRect();
+
+	setPos(_coordinates);
+	setToolTip(toolTip());
+	setCursor(Qt::ArrowCursor);
 }
 
 void WaypointItem::updateBoundingRect()
@@ -18,14 +50,14 @@ void WaypointItem::updateBoundingRect()
 	font.setPixelSize(FONT_SIZE);
 	font.setFamily(FONT_FAMILY);
 	QFontMetrics fm(font);
-	QRect ts = fm.tightBoundingRect(_entry.description());
+	QRect ts = fm.tightBoundingRect(_waypoint.name());
 
 	_boundingRect = QRectF(-POINT_SIZE/2, -POINT_SIZE/2, ts.width()
 	  + POINT_SIZE, ts.height() + fm.descent() + POINT_SIZE);
 }
 
-void WaypointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+void WaypointItem::paint(QPainter *painter,
-	  QWidget *widget)
+  const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
 	Q_UNUSED(option);
 	Q_UNUSED(widget);
@@ -33,11 +65,11 @@ void WaypointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
 	font.setPixelSize(FONT_SIZE);
 	font.setFamily(FONT_FAMILY);
 	QFontMetrics fm(font);
-	QRect ts = fm.tightBoundingRect(_entry.description());
+	QRect ts = fm.tightBoundingRect(_waypoint.name());
 
 	painter->setFont(font);
 	painter->drawText(POINT_SIZE/2 - qMax(ts.x(), 0), POINT_SIZE/2 + ts.height(),
-	  _entry.description());
+	  _waypoint.name());
 	painter->setBrush(Qt::SolidPattern);
 	painter->drawEllipse(-POINT_SIZE/2, -POINT_SIZE/2, POINT_SIZE, POINT_SIZE);
 
@@ -47,3 +79,14 @@ void WaypointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
 	painter->drawRect(boundingRect());
 */
 }
+
+void WaypointItem::setScale(qreal scale)
+{
+	setPos(_coordinates * scale);
+}
+
+void WaypointItem::setUnits(enum Units units)
+{
+	_units = units;
+	setToolTip(toolTip());
+}

src/waypointitem.h

@@ -3,12 +3,18 @@
 
 #include <QGraphicsItem>
 #include "waypoint.h"
+#include "units.h"
 
 class WaypointItem : public QGraphicsItem
 {
 public:
-	WaypointItem(const Waypoint &entry, QGraphicsItem *parent = 0);
+	WaypointItem(const Waypoint &waypoint, QGraphicsItem *parent = 0);
-	const Waypoint &entry() const {return _entry;}
+
+	const Waypoint &waypoint() const {return _waypoint;}
+	const QPointF &coordinates() const {return _coordinates;}
+
+	void setUnits(enum Units units);
+	void setScale(qreal scale);
 
 	QRectF boundingRect() const {return _boundingRect;}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@@ -16,9 +22,12 @@ public:
 
 private:
 	void updateBoundingRect();
+	QString toolTip();
 
-	Waypoint _entry;
 	QRectF _boundingRect;
+	QPointF _coordinates;
+	Waypoint _waypoint;
+	Units _units;
 };
 
 #endif // WAYPOINTITEM_H