Version++

Fixed the "DEM values not used in route points" issue
Fixed percent slider updates
2025-07-03 06:19:15 +02:00 · 2019-08-29 20:18:35 +02:00 · 2019-08-29 20:15:03 +02:00 · 2019-08-27 20:19:06 +02:00 · 2019-08-27 20:18:39 +02:00 · 2019-08-26 21:03:40 +02:00
97 changed files with 993 additions and 480 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 7.11.{build}
+version: 7.13.{build}
 configuration: Release
 platform: Any CPU
 environment:
--- a/.travis.yml
+++ b/.travis.yml
@ -9,7 +9,7 @@ before_install:

 install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev libqt4-opengl-dev; fi

 script:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
--- a/README.md
+++ b/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.
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx {
 } else {
    TARGET = GPXSee
 }
-VERSION = 7.11
+VERSION = 7.13

 QT += core \
    gui \
@ -181,7 +181,9 @@ HEADERS += src/common/config.h \
    src/GUI/limitedcombobox.h \
    src/GUI/pathtickitem.h \
    src/map/IMG/textitem.h \
-    src/map/IMG/label.h
+    src/map/IMG/label.h \
+    src/data/csv.h \
+    src/data/cupparser.h
 SOURCES += src/main.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
@ -312,7 +314,9 @@ SOURCES += src/main.cpp \
    src/map/IMG/style.cpp \
    src/map/IMG/netfile.cpp \
    src/GUI/pathtickitem.cpp \
-    src/map/IMG/textitem.cpp
+    src/map/IMG/textitem.cpp \
+    src/data/csv.cpp \
+    src/data/cupparser.cpp

 greaterThan(QT_MAJOR_VERSION, 4) {
    HEADERS += src/data/geojsonparser.h
@ -371,7 +375,8 @@ macx {
        icons/formats/wpt.icns \
        icons/formats/loc.icns \
        icons/formats/slf.icns \
-        icons/formats/json.icns
+        icons/formats/json.icns \
+        icons/formats/cup.icns
    QMAKE_BUNDLE_DATA += locale maps icons csv
 }

@ -388,7 +393,8 @@ win32 {
        icons/formats/wpt.ico \
        icons/formats/loc.ico \
        icons/formats/slf.ico \
-        icons/formats/json.ico
+        icons/formats/json.ico \
+        icons/formats/cup.ico
    DEFINES += _USE_MATH_DEFINES \
        NOGDI
 }
--- a/icons/formats/cup.icns
+++ b/icons/formats/cup.icns
--- a/icons/formats/cup.ico
+++ b/icons/formats/cup.ico
--- a/icons/scripts/extensions
+++ b/icons/scripts/extensions
@ -10,3 +10,4 @@ tcx:#ffcc00
 wpt:#66ff00
 loc:#556677
 slf:#881199
+cup:#20a810
--- a/lang/gpxsee_es.ts
+++ b/lang/gpxsee_es.ts
@ -30,7 +30,7 @@
    <message>
        <location filename="../src/GUI/cadencegraphitem.cpp" line="17"/>
        <source>Maximum</source>
-        <translation>Mínima</translation>
+        <translation>Máxima</translation>
    </message>
    <message>
        <location filename="../src/GUI/cadencegraphitem.cpp" line="18"/>
--- a/lang/gpxsee_fr.ts
+++ b/lang/gpxsee_fr.ts
@ -422,7 +422,7 @@
        <location filename="../src/GUI/gui.cpp" line="721"/>
        <location filename="../src/GUI/gui.cpp" line="722"/>
        <source>Paths</source>
-        <translation>Chemin d&apos;accès</translation>
+        <translation>Chemins d&apos;accès</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="248"/>
--- a/pkg/Info.plist
+++ b/pkg/Info.plist
@ -211,6 +211,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>cup</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.naviter.seeyou.cup</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/cup.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>SeeYou CUP File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>

 	<key>UTImportedTypeDeclarations</key>
@ -467,6 +483,27 @@
 				<string>application/geo+json</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.naviter.seeyou.cup</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.naviter.com</string>
+			<key>UTTypeDescription</key>
+			<string>SeeYou CUP File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>cup</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.naviter.seeyou.cup</string>
+			</dict>
+		</dict>
 	</array>
 </dict>
 </plist>
--- a/pkg/appdata.xml
+++ b/pkg/appdata.xml
@ -13,7 +13,8 @@
 		<p>Features:</p>
 		<ul>
 			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT,
-				WPT, RTE), GeoJSON, Garmin CSV and geotagged JPEG files.</li>
+				WPT, RTE), GeoJSON, SeeYou CUP, Garmin CSV and geotagged
+				JPEG files.</li>
 			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
 				WMS, TMS).</li>
 			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
@ -67,5 +68,6 @@
 		<mimetype>application/loc+xml</mimetype>
 		<mimetype>application/slf+xml</mimetype>
 		<mimetype>application/geo+json</mimetype>
+		<mimetype>application/vnd.naviter.seeyou.cup</mimetype>
 	</mimetypes>
 </component>
--- a/pkg/gpxsee.desktop
+++ b/pkg/gpxsee.desktop
@ -11,4 +11,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt;
-MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;
+MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;
--- a/pkg/gpxsee.nsi
+++ b/pkg/gpxsee.nsi
@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.11"
+!define VERSION "7.13"

 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@ -106,18 +106,19 @@ Section "GPXSee" SEC_APP

  ; Associate file formats
  DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
+  !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 "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
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -227,6 +228,7 @@ Section "Uninstall"
  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
  !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
+  !insertmacro FILE_ASSOCIATION_REMOVE "cup" 
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -257,4 +259,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
--- a/pkg/gpxsee.xml
+++ b/pkg/gpxsee.xml
@ -84,4 +84,11 @@
 		<generic-icon name="text-plain"/>
 		<glob pattern="*.geojson"/>
 	</mime-type>
+
+	<mime-type type="application/vnd.naviter.seeyou.cup">
+		<comment>SeeYou CUP File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.cup"/>
+	</mime-type>
 </mime-info>
--- a/pkg/gpxsee64.nsi
+++ b/pkg/gpxsee64.nsi
@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.11"
+!define VERSION "7.13"

 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@ -113,18 +113,19 @@ Section "GPXSee" SEC_APP

  ; Associate file formats
  DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
+  !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 "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
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -230,6 +231,7 @@ Section "Uninstall"
  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
  !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
+  !insertmacro FILE_ASSOCIATION_REMOVE "cup"
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -260,4 +262,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
--- a/src/GUI/areaitem.cpp
+++ b/src/GUI/areaitem.cpp
@ -153,3 +153,21 @@ 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();
+}
--- a/src/GUI/areaitem.h
+++ b/src/GUI/areaitem.h
@ -27,6 +27,9 @@ public:
 	void setDigitalZoom(int zoom);

 private:
+	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+
 	QPainterPath painterPath(const Polygon &polygon);
 	void updatePainterPath();
 	QString toolTip() const;
--- a/src/GUI/axisitem.cpp
+++ b/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;
 }
--- a/src/GUI/cadencegraph.cpp
+++ b/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();
--- a/src/GUI/cadencegraph.h
+++ b/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
--- a/src/GUI/cadencegraphitem.cpp
+++ b/src/GUI/cadencegraphitem.cpp
@ -4,7 +4,8 @@


 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());
 }
--- a/src/GUI/cadencegraphitem.h
+++ b/src/GUI/cadencegraphitem.h
@ -8,8 +8,8 @@ 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;
--- a/src/GUI/elevationgraph.cpp
+++ b/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();
--- a/src/GUI/elevationgraph.h
+++ b/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
--- a/src/GUI/elevationgraphitem.cpp
+++ b/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();
--- a/src/GUI/elevationgraphitem.h
+++ b/src/GUI/elevationgraphitem.h
@ -8,8 +8,8 @@ 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;}
--- a/src/GUI/gearratiograph.cpp
+++ b/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();
--- a/src/GUI/gearratiograph.h
+++ b/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
--- a/src/GUI/gearratiographitem.cpp
+++ b/src/GUI/gearratiographitem.cpp
@ -5,21 +5,27 @@


 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);
 		}
 	}

+	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;
+
 	setToolTip(toolTip());
 }

--- a/src/GUI/gearratiographitem.h
+++ b/src/GUI/gearratiographitem.h
@ -9,8 +9,8 @@ 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;}

--- a/src/GUI/graphitem.cpp
+++ b/src/GUI/graphitem.cpp
@ -2,30 +2,25 @@
 #include "graphitem.h"


-GraphItem::GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent)
+GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
+  const QColor &color, QGraphicsItem *parent)
  : QGraphicsObject(parent), _graph(graph), _type(type)
 {
 	Q_ASSERT(_graph.isValid());

-	_id = 0;
-	_width = 1;
-	_pen = QPen(Qt::black, _width);
-	_sx = 1.0; _sy = 1.0;
+	_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 +49,6 @@ void GraphItem::setGraphType(GraphType type)

 	_type = type;
 	updatePath();
-	updateShape();
 	updateBounds();
 }

@ -69,12 +63,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 +163,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 +182,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()
@ -286,7 +286,7 @@ void GraphItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);

-	_pen.setWidthF(_width + 1);
+	_pen.setWidth(_pen.width() + 1);
 	setZValue(zValue() + 1.0);
 	update();

@ -297,7 +297,7 @@ void GraphItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);

-	_pen.setWidthF(_width);
+	_pen.setWidth(_pen.width() - 1);
 	setZValue(zValue() - 1.0);
 	update();

--- a/src/GUI/graphitem.h
+++ b/src/GUI/graphitem.h
@ -11,7 +11,8 @@ class GraphItem : public QGraphicsObject
 	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() {}

 	QPainterPath shape() const {return _shape;}
@ -27,8 +28,6 @@ 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);}
@ -55,17 +54,13 @@ private:
 	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;
 };
--- a/src/GUI/graphview.cpp
+++ b/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>
@ -64,6 +63,8 @@ GraphView::GraphView(QWidget *parent)
 	_units = Metric;
 	_graphType = Distance;
 	_xLabel = tr("Distance");
+
+	_zoom = 1.0;
 }

 GraphView::~GraphView()
@ -74,8 +75,6 @@ GraphView::~GraphView()
 	delete _info;
 	delete _grid;
 	delete _message;
-
-	qDeleteAll(_graphs);
 }

 void GraphView::createXLabel()
@ -166,14 +165,7 @@ 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();
+		_bounds |= gi->bounds();
 	}

 	if (type == Distance)
@ -195,29 +187,31 @@ 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);
+	_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 +226,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 +284,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 +332,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 *event)
+{
+	QRectF viewRect(mapToScene(rect()).boundingRect());
+	_info->setPos(QPointF(viewRect.left() + (viewRect.width()
+	  - _info->boundingRect().width())/2.0, _info->pos().y()));
+
+	QGraphicsView::paintEvent(event);
+}
+
 void GraphView::plot(QPainter *painter, const QRectF &target, qreal scale)
 {
 	QSizeF canvas = QSizeF(target.width() / scale, target.height() / scale);
@ -376,54 +382,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 +432,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 +452,7 @@ void GraphView::emitSliderPositionChanged(const QPointF &pos)

 void GraphView::setSliderPosition(qreal pos)
 {
-	if (_visible.isEmpty())
+	if (_graphs.isEmpty())
 		return;

 	_sliderPos = pos;
@ -483,11 +480,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)
--- a/src/GUI/graphview.h
+++ b/src/GUI/graphview.h
@ -27,7 +27,7 @@ public:
 	~GraphView();

 	bool isEmpty() const {return _graphs.isEmpty();}
-	const QList<KV> &info() const {return _info->info();}
+	const QList<KV<QString, QString> > &info() const {return _info->info();}
 	void clear();

 	void plot(QPainter *painter, const QRectF &target, qreal scale);
@ -46,9 +46,9 @@ signals:
 	void sliderPositionChanged(qreal);

 protected:
-	void addGraph(GraphItem *graph, int id = 0);
+	void addGraph(GraphItem *graph);
+	void removeGraph(GraphItem *graph);

-	void showGraph(bool show, int id = 0);
 	void setGraphType(GraphType type);
 	void setUnits(Units units);

@ -68,12 +68,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);
@ -91,15 +90,9 @@ private:

 	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;
+	void wheelEvent(QWheelEvent *e);
+	void changeEvent(QEvent *e);
+	void paintEvent(QPaintEvent *event);

 	QGraphicsScene *_scene;

@ -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
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@ -1066,7 +1066,7 @@ void GUI::statistics()

 		text.append("<tr><th colspan=\"2\">" + tab->label() + "</th></tr>");
 		for (int j = 0; j < tab->info().size(); j++) {
-			const KV &kv = tab->info().at(j);
+			const KV<QString, QString> &kv = tab->info().at(j);
 			text.append("<tr><td>" + kv.key() + ":</td><td>" + kv.value()
 			  + "</td></tr>");
 		}
--- a/src/GUI/heartrategraph.cpp
+++ b/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();
--- a/src/GUI/heartrategraph.h
+++ b/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
--- a/src/GUI/heartrategraphitem.cpp
+++ b/src/GUI/heartrategraphitem.cpp
@ -4,7 +4,8 @@


 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());
 }
--- a/src/GUI/heartrategraphitem.h
+++ b/src/GUI/heartrategraphitem.h
@ -8,8 +8,8 @@ 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;
--- a/src/GUI/infoitem.cpp
+++ b/src/GUI/infoitem.cpp
@ -16,7 +16,7 @@ void InfoItem::updateBoundingRect()
 	QFontMetrics fm(_font);
 	qreal width = 0;

-	for (QList<KV>::const_iterator i = _list.constBegin();
+	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
 		width += fm.width(i->key() + ": ");
 		width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
@ -37,7 +37,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	painter->setFont(_font);
 	painter->setRenderHint(QPainter::Antialiasing, false);

-	for (QList<KV>::const_iterator i = _list.constBegin();
+	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
 		painter->drawText(width, fm.height() - fm.descent(), i->key() + ": ");
 		width += fm.width(i->key() + ": ");
@ -61,7 +61,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,

 void InfoItem::insert(const QString &key, const QString &value)
 {
-	KV kv(key, value);
+	KV<QString, QString> kv(key, value);
 	int i;

 	prepareGeometryChange();
--- a/src/GUI/infoitem.h
+++ b/src/GUI/infoitem.h
@ -14,7 +14,7 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);

-	const QList<KV> &info() const {return _list;}
+	const QList<KV<QString, QString> > &info() const {return _list;}

 	void insert(const QString &key, const QString &value);
 	void clear();
@ -23,7 +23,7 @@ public:
 private:
 	void updateBoundingRect();

-	QList<KV> _list;
+	QList<KV<QString, QString> > _list;
 	QRectF _boundingRect;
 	QFont _font;
 };
--- a/src/GUI/mapview.cpp
+++ b/src/GUI/mapview.cpp
@ -255,17 +255,18 @@ QPointF MapView::contentCenter() const

 void MapView::updatePOIVisibility()
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it, jt;
-
 	if (!_showPOI)
 		return;

-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->show();

 	if (!_overlapPOIs) {
-		for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
-			for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
+		for (POIHash::const_iterator it = _pois.constBegin();
+		  it != _pois.constEnd(); it++) {
+			for (POIHash::const_iterator jt = _pois.constBegin();
+			  jt != _pois.constEnd(); jt++) {
 				if (it.value()->isVisible() && jt.value()->isVisible()
 				  && it != jt && it.value()->collidesWithItem(jt.value()))
 					jt.value()->hide();
@ -288,8 +289,8 @@ void MapView::rescale()
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(_map);

-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);

 	updatePOIVisibility();
@ -339,8 +340,8 @@ void MapView::setMap(Map *map)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(map);

-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 	updatePOIVisibility();

@ -364,12 +365,10 @@ void MapView::setPOI(POI *poi)

 void MapView::updatePOI()
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		_scene->removeItem(it.value());
-		delete it.value();
-	}
+	qDeleteAll(_pois);
 	_pois.clear();

 	if (_showTracks)
@ -426,8 +425,8 @@ void MapView::setUnits(Units units)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);

-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setToolTipFormat(_units, _coordinatesFormat);
 }

@ -445,8 +444,8 @@ void MapView::setCoordinatesFormat(CoordinatesFormat format)
 	for (int i = 0; i < _routes.count(); i++)
 		_routes[i]->setCoordinatesFormat(_coordinatesFormat);

-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setToolTipFormat(_units, _coordinatesFormat);
 }

@ -461,8 +460,6 @@ void MapView::clearMapCache()

 void MapView::digitalZoom(int zoom)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	if (zoom) {
 		_digitalZoom += zoom;
 		scale(pow(2, zoom), pow(2, zoom));
@ -479,7 +476,8 @@ void MapView::digitalZoom(int zoom)
 		_areas.at(i)->setDigitalZoom(_digitalZoom);
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setDigitalZoom(_digitalZoom);
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setDigitalZoom(_digitalZoom);

 	_mapScale->setDigitalZoom(_digitalZoom);
@ -747,8 +745,8 @@ void MapView::showPOI(bool show)
 {
 	_showPOI = show;

-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setVisible(show);

 	updatePOIVisibility();
@ -758,8 +756,8 @@ void MapView::showPOILabels(bool show)
 {
 	_showPOILabels = show;

-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->showLabel(show);

 	updatePOIVisibility();
@ -852,21 +850,19 @@ void MapView::setWaypointColor(const QColor &color)

 void MapView::setPOISize(int size)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	_poiSize = size;

-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setSize(size);
 }

 void MapView::setPOIColor(const QColor &color)
 {
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
 	_poiColor = color;

-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setColor(color);
 }

@ -1003,8 +999,8 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 	for (int i = 0; i < _waypoints.size(); i++)
 		_waypoints.at(i)->setMap(_map);

-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+	for (POIHash::const_iterator it = _pois.constBegin();
+	  it != _pois.constEnd(); it++)
 		it.value()->setMap(_map);
 	updatePOIVisibility();

@ -1021,13 +1017,17 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)

 void MapView::setProjection(int id)
 {
-	Projection projection(PCS::pcs(id));
-	if (!projection.isValid())
-		return;
-
-	_projection = projection;
-
+	const PCS *pcs;
+	const GCS *gcs;
 	Coordinates center = _map->xy2ll(mapToScene(viewport()->rect().center()));
+
+	if ((pcs = PCS::pcs(id)))
+		_projection = Projection(pcs);
+	else if ((gcs = GCS::gcs(id)))
+		_projection = Projection(gcs);
+	else
+		qWarning("%d: Unknown PCS/GCS id", id);
+
 	_map->setProjection(_projection);
 	rescale();
 	centerOn(_map->ll2xy(center));
--- a/src/GUI/mapview.h
+++ b/src/GUI/mapview.h
@ -92,6 +92,8 @@ private slots:
 	void reloadMap();

 private:
+	typedef QHash<SearchPointer<Waypoint>, WaypointItem*> POIHash;
+
 	PathItem *addTrack(const Track &track);
 	PathItem *addRoute(const Route &route);
 	void addArea(const Area &area);
@ -125,7 +127,7 @@ private:
 	QList<RouteItem*> _routes;
 	QList<WaypointItem*> _waypoints;
 	QList<AreaItem*> _areas;
-	QHash<SearchPointer<Waypoint>, WaypointItem*> _pois;
+	POIHash _pois;

 	RectC _tr, _rr, _wr, _ar;
 	qreal _res;
--- a/src/GUI/optionsdialog.cpp
+++ b/src/GUI/optionsdialog.cpp
@ -36,15 +36,18 @@ static QFrame *line()
 }
 #endif // Q_OS_MAC

+
 QWidget *OptionsDialog::createMapPage()
 {
 	_projection = new LimitedComboBox(200);
-	QList<PCS::Info> projections(PCS::pcsList());
+
+	QList<KV<int, QString> > projections(GCS::list() + PCS::list());
 	qSort(projections);
+
 	for (int i = 0; i < projections.size(); i++) {
-		QString text = QString::number(projections.at(i).id()) + " - "
-		  + projections.at(i).name();
-		_projection->addItem(text, QVariant(projections.at(i).id()));
+		QString text = QString::number(projections.at(i).key()) + " - "
+		  + projections.at(i).value();
+		_projection->addItem(text, QVariant(projections.at(i).key()));
 	}
 	_projection->setCurrentIndex(_projection->findData(_options->projection));

--- a/src/GUI/percentslider.cpp
+++ b/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);
--- a/src/GUI/powergraph.cpp
+++ b/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();
--- a/src/GUI/powergraph.h
+++ b/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
--- a/src/GUI/powergraphitem.cpp
+++ b/src/GUI/powergraphitem.cpp
@ -3,8 +3,9 @@
 #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());
 }
--- a/src/GUI/powergraphitem.h
+++ b/src/GUI/powergraphitem.h
@ -8,8 +8,8 @@ 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;
--- a/src/GUI/routeitem.cpp
+++ b/src/GUI/routeitem.cpp
@ -24,7 +24,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++)
--- a/src/GUI/speedgraph.cpp
+++ b/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();
--- a/src/GUI/speedgraph.h
+++ b/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
--- a/src/GUI/speedgraphitem.cpp
+++ b/src/GUI/speedgraphitem.cpp
@ -4,8 +4,9 @@
 #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;
--- a/src/GUI/speedgraphitem.h
+++ b/src/GUI/speedgraphitem.h
@ -9,8 +9,8 @@ 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;}
@ -23,9 +23,8 @@ private:
 	QString toolTip() const;

 	qreal _avg, _mavg, _max;
-
-	Units _units;
 	TimeType _timeType;
+	Units _units;
 };

 #endif // SPEEDGRAPHITEM_H
--- a/src/GUI/temperaturegraph.cpp
+++ b/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();
--- a/src/GUI/temperaturegraph.h
+++ b/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
--- a/src/GUI/temperaturegraphitem.cpp
+++ b/src/GUI/temperaturegraphitem.cpp
@ -4,7 +4,8 @@


 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();
--- a/src/GUI/temperaturegraphitem.h
+++ b/src/GUI/temperaturegraphitem.h
@ -8,8 +8,8 @@ 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;}
--- a/src/GUI/tooltip.cpp
+++ b/src/GUI/tooltip.cpp
@ -6,7 +6,7 @@

 void ToolTip::insert(const QString &key, const QString &value)
 {
-	_list.append(KV(key, value));
+	_list.append(KV<QString, QString>(key, value));
 }

 QString ToolTip::toString() const
--- a/src/GUI/tooltip.h
+++ b/src/GUI/tooltip.h
@ -14,7 +14,7 @@ public:
 	QString toString() const;

 private:
-	QList<KV> _list;
+	QList<KV<QString, QString> > _list;
 	ImageInfo _img;
 };

--- a/src/common/kv.h
+++ b/src/common/kv.h
@ -1,21 +1,20 @@
 #ifndef KV_H
 #define KV_H

-#include <QString>
-
+template <class KEY, class VALUE>
 class KV {
 public:
-	KV(const QString &key, const QString &value) : _key(key), _value(value) {}
+	KV(const KEY &key, const VALUE &value) : _key(key), _value(value) {}

-	const QString &key() const {return _key;}
-	const QString &value() const {return _value;}
+	const KEY &key() const {return _key;}
+	const VALUE &value() const {return _value;}

-	bool operator==(const KV &other) const
-	  {return this->key() == other.key();}
+	bool operator==(const KV &other) const {return _key == other._key;}
+	bool operator<(const KV &other) const {return _key < other._key;}

 private:
-	QString _key;
-	QString _value;
+	KEY _key;
+	VALUE _value;
 };

 #endif // KV_H
--- a/src/common/tifffile.h
+++ b/src/common/tifffile.h
@ -17,6 +17,7 @@ public:
 	TIFFFile(QIODevice *device);

 	bool isValid() const {return _ifd != 0;}
+	bool isBE() const {return _be;}
 	quint32 ifd() const {return _ifd;}

 	bool seek(qint64 pos) {return _device->seek(_offset + pos);}
--- a/src/data/csv.cpp
+++ b/src/data/csv.cpp
@ -0,0 +1,67 @@
+#include <QStringList>
+#include "csv.h"
+
+/*
+RFC 4180 parser with the following enchancements:
+ - allows an arbitrary delimiter
+ - allows LF line ends in addition to CRLF line ends
+*/
+
+bool CSV::readEntry(QStringList &list)
+{
+	int state = 0;
+	char c;
+	QByteArray field;
+
+	while (_device->getChar(&c)) {
+		switch (state) {
+			case 0:
+				if (c == '\r')
+					state = 3;
+				else if (c == '\n') {
+					list.append(field);
+					_line++;
+					return true;
+				} else if (c == _delimiter) {
+					list.append(field);
+					field.clear();
+				} else if (c == '"') {
+					if (!field.isEmpty())
+						return false;
+					state = 1;
+				} else
+					field.append(c);
+				break;
+			case 1:
+				if (c == '"')
+					state = 2;
+				else {
+					field.append(c);
+					if (c == '\n')
+						_line++;
+				}
+				break;
+			case 2:
+				if (c == '"') {
+					field.append('"');
+					state = 1;
+				} else if (c == _delimiter || c == '\r' || c == '\n') {
+					_device->ungetChar(c);
+					state = 0;
+				} else
+					return false;
+				break;
+			case 3:
+				if (c == '\n') {
+					_device->ungetChar(c);
+					state = 0;
+				} else
+					return false;
+				break;
+		}
+	}
+
+	list.append(field);
+
+	return (state == 0);
+}
--- a/src/data/csv.h
+++ b/src/data/csv.h
@ -0,0 +1,22 @@
+#ifndef CSV_H
+#define CSV_H
+
+#include <QIODevice>
+
+class CSV
+{
+public:
+	CSV(QIODevice *device, char delimiter = ',')
+	  : _device(device), _delimiter(delimiter), _line(1) {}
+
+	bool readEntry(QStringList &list);
+	bool atEnd() const {return _device->atEnd();}
+	int line() const {return _line;}
+
+private:
+	QIODevice *_device;
+	char _delimiter;
+	int _line;
+};
+
+#endif // CSV_H
--- a/src/data/csvparser.cpp
+++ b/src/data/csvparser.cpp
@ -1,3 +1,5 @@
+#include <QStringList>
+#include "csv.h"
 #include "csvparser.h"

 bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
@ -7,42 +9,38 @@ bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
 	Q_UNUSED(tracks);
 	Q_UNUSED(routes);
 	Q_UNUSED(polygons);
-	bool res;
+	CSV csv(file);
+	QStringList entry;
+	bool ok;

-	_errorLine = 1;
-	_errorString.clear();

-	while (!file->atEnd()) {
-		QByteArray line = file->readLine();
-		QList<QByteArray> list = line.split(',');
-		if (list.size() < 3) {
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry) || entry.size() < 3) {
 			_errorString = "Parse error";
+			_errorLine = csv.line();
 			return false;
 		}

-		qreal lon = list[0].trimmed().toDouble(&res);
-		if (!res || (lon < -180.0 || lon > 180.0)) {
+		double lon = entry.at(0).trimmed().toDouble(&ok);
+		if (!ok || (lon < -180.0 || lon > 180.0)) {
 			_errorString = "Invalid longitude";
+			_errorLine = csv.line();
 			return false;
 		}
-		qreal lat = list[1].trimmed().toDouble(&res);
-		if (!res || (lat < -90.0 || lat > 90.0)) {
+		double lat = entry.at(1).trimmed().toDouble(&ok);
+		if (!ok || (lat < -90.0 || lat > 90.0)) {
 			_errorString = "Invalid latitude";
+			_errorLine = csv.line();
 			return false;
 		}
 		Waypoint wp(Coordinates(lon, lat));
-
-		QByteArray ba = list[2].trimmed();
-		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()));
-		}
+		wp.setName(entry.at(2).trimmed());
+		if (entry.size() > 3)
+			wp.setDescription(entry.at(3).trimmed());

 		waypoints.append(wp);
-		_errorLine++;
+
+		entry.clear();
 	}

 	return true;
--- a/src/data/cupparser.cpp
+++ b/src/data/cupparser.cpp
@ -0,0 +1,167 @@
+#include <cmath>
+#include <QStringList>
+#include "csv.h"
+#include "cupparser.h"
+
+
+enum SegmentType {
+	Header, Waypoints, Tasks
+};
+
+static double latitude(const QString &str)
+{
+	bool ok;
+
+	if (str.length() != 9)
+		return NAN;
+	int deg = str.left(2).toInt(&ok);
+	if (!ok || deg > 90)
+		return NAN;
+	double min = str.mid(2, 6).toDouble(&ok);
+	if (!ok || min > 60)
+		return NAN;
+
+	double dd = deg + min/60.0;
+	return (str.right(1) == "S") ? -dd : dd;
+}
+
+static double longitude(const QString &str)
+{
+	bool ok;
+
+	if (str.length() != 10)
+		return NAN;
+	int deg = str.left(3).toInt(&ok);
+	if (!ok || deg > 180)
+		return NAN;
+	double min = str.mid(3, 6).toDouble(&ok);
+	if (!ok || min > 60)
+		return NAN;
+
+	double dd = deg + min/60.0;
+	return (str.right(1) == "W") ? -dd : dd;
+}
+
+static double elevation(const QString &str)
+{
+	bool ok;
+	double ele;
+
+	if (str.right(2) == "ft")
+		ele = str.left(str.length() - 2).toDouble(&ok) * 0.3048;
+	else if (str.right(1) == "m")
+		ele = str.left(str.length() - 1).toDouble(&ok);
+	else
+		return NAN;
+
+	return ok ? ele : NAN;
+}
+
+
+bool CUPParser::waypoint(const QStringList &entry, QVector<Waypoint> &waypoints)
+{
+	if (entry.size() < 11) {
+		_errorString = "Invalid number of fields";
+		return false;
+	}
+
+	double lon = longitude(entry.at(4));
+	if (std::isnan(lon)) {
+		_errorString = "Invalid longitude";
+		return false;
+	}
+	double lat = latitude(entry.at(3));
+	if (std::isnan(lat)) {
+		_errorString = "Invalid latitude";
+		return false;
+	}
+
+	Waypoint wp(Coordinates(lon, lat));
+	wp.setName(entry.at(0));
+	wp.setDescription(entry.at(10));
+	wp.setElevation(elevation(entry.at(5)));
+	waypoints.append(wp);
+
+	return true;
+}
+
+bool CUPParser::task(const QStringList &entry,
+  const QVector<Waypoint> &waypoints, QList<RouteData> &routes)
+{
+	if (entry.size() < 3) {
+		_errorString = "Invalid number of fields";
+		return false;
+	}
+
+	RouteData r;
+	r.setName(entry.at(0));
+	for (int i = 1; i < entry.size(); i++) {
+		if (entry.at(i) == "???")
+			continue;
+
+		Waypoint w;
+		for (int j = 0; j < waypoints.size(); j++) {
+			if (waypoints.at(j).name() == entry.at(i)) {
+				w = waypoints.at(j);
+				break;
+			}
+		}
+		if (w.coordinates().isNull()) {
+			_errorString = entry.at(i) + ": unknown turnpoint";
+			return false;
+		}
+		r.append(w);
+	}
+
+	routes.append(r);
+
+	return true;
+}
+
+bool CUPParser::parse(QFile *file, QList<TrackData> &tracks,
+  QList<RouteData> &routes, QList<Area> &polygons,
+  QVector<Waypoint> &waypoints)
+{
+	Q_UNUSED(tracks);
+	Q_UNUSED(polygons);
+	CSV csv(file);
+	QStringList entry;
+	SegmentType segment = Header;
+
+
+	while (!csv.atEnd()) {
+		if (!csv.readEntry(entry)) {
+			_errorString = "CSV parse error";
+			_errorLine = csv.line();
+			return false;
+		}
+
+		if (segment == Header) {
+			segment = Waypoints;
+			if (entry.size() >= 11 && entry.at(3) == "lat"
+			  && entry.at(4) == "lon") {
+				entry.clear();
+				continue;
+			}
+		} else if (segment == Waypoints && entry.size() == 1
+		  && entry.at(0) == "-----Related Tasks-----") {
+			segment = Tasks;
+			entry.clear();
+			continue;
+		}
+
+		if (segment == Waypoints) {
+			if (!waypoint(entry, waypoints))
+				return false;
+		} else if (segment == Tasks) {
+			if (entry.at(0) != "Options" && !entry.at(0).startsWith("ObsZone=")
+			  && !task(entry, waypoints, routes))
+				return false;
+		}
+
+		entry.clear();
+		_errorLine = csv.line();
+	}
+
+	return true;
+}
--- a/src/data/cupparser.h
+++ b/src/data/cupparser.h
@ -0,0 +1,25 @@
+#ifndef CUPPARSER_H
+#define CUPPARSER_H
+
+#include "parser.h"
+
+class CUPParser : public Parser
+{
+public:
+	CUPParser() : _errorLine(0) {}
+
+	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 _errorLine;}
+
+private:
+	bool waypoint(const QStringList &entry, QVector<Waypoint> &waypoints);
+	bool task(const QStringList &entry, const QVector<Waypoint> &waypoints,
+	  QList<RouteData> &routes);
+
+	QString _errorString;
+	int _errorLine;
+};
+
+#endif // CUPPARSER_H
--- a/src/data/data.cpp
+++ b/src/data/data.cpp
@ -17,6 +17,7 @@
 #include "geojsonparser.h"
 #endif // ENABLE_GEOJSON
 #include "exifparser.h"
+#include "cupparser.h"
 #include "dem.h"
 #include "data.h"

@ -37,6 +38,7 @@ static SLFParser slf;
 static GeoJSONParser geojson;
 #endif // ENABLE_GEOJSON
 static EXIFParser exif;
+static CUPParser cup;

 static QHash<QString, Parser*> parsers()
 {
@ -60,6 +62,7 @@ static QHash<QString, Parser*> parsers()
 #endif // ENABLE_GEOJSON
 	hash.insert("jpeg", &exif);
 	hash.insert("jpg", &exif);
+	hash.insert("cup", &cup);

 	return hash;
 }
@ -68,13 +71,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());
@ -147,6 +172,7 @@ QString Data::formats()
 	return
 	  qApp->translate("Data", "Supported files") + " (" + supported + ");;"
 	  + qApp->translate("Data", "CSV files") + " (*.csv);;"
+	  + qApp->translate("Data", "CUP files") + " (*.cup);;"
 	  + qApp->translate("Data", "FIT files") + " (*.fit);;"
 #ifdef ENABLE_GEOJSON
 	  + qApp->translate("Data", "GeoJSON files") + " (*.geojson *.json);;"
@ -177,6 +203,4 @@ QStringList Data::filter()
 void Data::useDEM(bool use)
 {
 	_useDEM = use;
-	Route::useDEM(use);
-	Track::useDEM(use);
 }
--- a/src/data/data.h
+++ b/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;
--- a/src/data/exifparser.cpp
+++ b/src/data/exifparser.cpp
@ -113,9 +113,12 @@ Coordinates EXIFParser::coordinates(TIFFFile &file, const IFDEntry &lon,
 	if (!c.isValid())
 		return Coordinates();

-	if (lonRef.offset == 'W')
+	char ew = file.isBE() ? lonRef.offset >> 24 : lonRef.offset;
+	char ns = file.isBE() ? latRef.offset >> 24 : latRef.offset;
+
+	if (ew == 'W')
 		c.rlon() = -c.lon();
-	if (latRef.offset == 'S')
+	if (ns == 'S')
 		c.rlat() = -c.lat();

 	return c;
--- a/src/data/fitparser.cpp
+++ b/src/data/fitparser.cpp
@ -87,13 +87,10 @@ template<class T> bool FITParser::readValue(CTX &ctx, T &val)

 	ctx.len -= sizeof(T);

-	if (sizeof(T) > 1) {
-		if (ctx.endian)
-			val = qFromBigEndian(data);
-		else
-			val = qFromLittleEndian(data);
-	} else
-		val = data;
+	if (ctx.endian)
+		val = qFromBigEndian(data);
+	else
+		val = qFromLittleEndian(data);

 	return true;
 }
--- a/src/data/igcparser.cpp
+++ b/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";
--- a/src/data/route.cpp
+++ b/src/data/route.cpp
@ -2,8 +2,6 @@
 #include "route.h"


-bool Route::_useDEM = false;
-
 Route::Route(const RouteData &data) : _data(data)
 {
 	qreal dist = 0;
@ -34,19 +32,8 @@ 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++)
+		gs.append(GraphPoint(_distance.at(i), NAN, _data.at(i).elevation()));

 	return graph;
 }
--- a/src/data/route.h
+++ b/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;

@ -24,13 +24,9 @@ public:

 	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
--- a/src/data/track.cpp
+++ b/src/data/track.cpp
@ -13,7 +13,6 @@ int Track::_pauseInterval = 10;

 bool Track::_outlierEliminate = true;
 bool Track::_useReportedSpeed = false;
-bool Track::_useDEM = false;


 static qreal median(QVector<qreal> &v)
@ -180,19 +179,8 @@ Graph Track::elevation() const
 		for (int j = 0; j < sd.size(); j++) {
 			if (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));
--- a/src/data/track.h
+++ b/src/data/track.h
@ -45,7 +45,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 +70,6 @@ private:
 	static qreal _pauseSpeed;
 	static int _pauseInterval;
 	static bool _useReportedSpeed;
-	static bool _useDEM;
 };

 #endif // TRACK_H
--- a/src/map/IMG/img.cpp
+++ b/src/map/IMG/img.cpp
@ -91,7 +91,7 @@ IMG::IMG(const QString &fileName)
 		}

 		QString fn(QByteArray(name, sizeof(name)));
-		if (VectorTile::isTileFile(tt)) {
+		if (SubFile::isTileFile(tt)) {
 			VectorTile *tile;
 			QMap<QString, VectorTile*>::iterator it = tileMap.find(fn);
 			if (it == tileMap.end()) {
@ -227,10 +227,7 @@ template<class T> bool IMG::readValue(T &val)
 	if (read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
 		return false;

-	if (sizeof(T) > 1)
-		val = qFromLittleEndian(data);
-	else
-		val = data;
+	val = qFromLittleEndian(data);

 	return true;
 }
--- a/src/map/IMG/lblfile.cpp
+++ b/src/map/IMG/lblfile.cpp
@ -35,7 +35,8 @@ static QString capitalize(const QString &str)
 	if (str.isEmpty())
 		return str;
 	for (int i = 0; i < str.size(); i++)
-		if (str.at(i).isLetter() && !str.at(i).isUpper())
+		if (str.at(i).isLetter() && !(str.at(i).isUpper()
+		  || str.at(i) == QChar(0x00DF)))
 			return str;

 	QString ret(str);
@ -53,15 +54,18 @@ bool LBLFile::init()
 {
 	Handle hdl;
 	quint16 codepage;
+	quint8 multiplier, poiMultiplier;

 	if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
-	  && readUInt32(hdl, _size) && readByte(hdl, _multiplier)
+	  && readUInt32(hdl, _size) && readByte(hdl, multiplier)
 	  && readByte(hdl, _encoding) && seek(hdl, 0x57)
 	  && readUInt32(hdl, _poiOffset) && readUInt32(hdl, _poiSize)
-	  && seek(hdl, 0xAA) && readUInt16(hdl, codepage)))
+	  && readByte(hdl, poiMultiplier) && seek(hdl, 0xAA)
+	  && readUInt16(hdl, codepage)))
 		return false;

-	_multiplier = 1<<_multiplier;
+	_multiplier = 1<<multiplier;
+	_poiMultiplier = 1<<poiMultiplier;

 	if (codepage == 65001)
 		_codec = QTextCodec::codecForName("UTF-8");
@ -161,14 +165,15 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset) const

 Label LBLFile::label(Handle &hdl, quint32 offset, bool poi)
 {
-	if (!_size && !init())
+	if (!_multiplier && !init())
 		return QString();

 	quint32 labelOffset;
 	if (poi) {
 		quint32 poiOffset;
-		if (!(seek(hdl, _poiOffset + offset) && readUInt24(hdl, poiOffset)
-		  && (poiOffset & 0x3FFFFF)))
+		if (!(_poiSize >= offset * _poiMultiplier
+		  && seek(hdl, _poiOffset + offset * _poiMultiplier)
+		  && readUInt24(hdl, poiOffset) && (poiOffset & 0x3FFFFF)))
 			return QString();
 		labelOffset = _offset + (poiOffset & 0x3FFFFF) * _multiplier;
 	} else
--- a/src/map/IMG/lblfile.h
+++ b/src/map/IMG/lblfile.h
@ -10,8 +10,8 @@ class LBLFile : public SubFile
 {
 public:
 	LBLFile(IMG *img, quint32 size)
-	  : SubFile(img, size), _offset(0), _size(0), _poiOffset(0), _poiSize(0),
-	  _multiplier(0), _encoding(0), _codec(0) {}
+	  : SubFile(img, size), _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);

@ -21,13 +21,14 @@ private:
 	Label label6b(Handle &hdl, quint32 offset) const;
 	Label label8b(Handle &hdl, quint32 offset) const;

+	QTextCodec *_codec;
 	quint32 _offset;
 	quint32 _size;
 	quint32 _poiOffset;
 	quint32 _poiSize;
+	quint8 _poiMultiplier;
 	quint8 _multiplier;
 	quint8 _encoding;
-	QTextCodec *_codec;
 };

 #endif // LBLFILE_H
--- a/src/map/IMG/netfile.cpp
+++ b/src/map/IMG/netfile.cpp
@ -3,22 +3,21 @@
 bool NETFile::init()
 {
 	Handle hdl;
+	quint8 multiplier;

 	if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
-	  && readUInt32(hdl, _size) && readByte(hdl, _multiplier)))
+	  && readUInt32(hdl, _size) && readByte(hdl, multiplier)))
 		return false;

-	_multiplier = 1<<_multiplier;
+	_multiplier = 1<<multiplier;

 	return true;
 }

 bool NETFile::lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset)
 {
-	if (!_init) {
-		if (!(_init = init()))
-			return false;
-	}
+	if (!_multiplier && !init())
+		return false;

 	if (!(seek(hdl, _offset + netOffset * _multiplier)
 	  && readUInt24(hdl, lblOffset)))
--- a/src/map/IMG/netfile.h
+++ b/src/map/IMG/netfile.h
@ -6,7 +6,8 @@
 class NETFile : public SubFile
 {
 public:
-	NETFile(IMG *img, quint32 size) : SubFile(img, size), _init(false) {}
+	NETFile(IMG *img, quint32 size)
+	  : SubFile(img, size), _offset(0), _size(0), _multiplier(0) {}

 	bool lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset);

@ -16,8 +17,6 @@ private:
 	quint32 _offset;
 	quint32 _size;
 	quint8 _multiplier;
-
-	bool _init;
 };

 #endif // NETFILE_H
--- a/src/map/IMG/subfile.cpp
+++ b/src/map/IMG/subfile.cpp
@ -76,12 +76,12 @@ bool SubFile::readByte(Handle &handle, quint8 &val) const

 quint32 SubFile::size() const
 {
-	return _img ? _size : (quint32)_file->size();
+	return _file ? (quint32)_file->size() : _size;
 }

 QString SubFile::fileName() const
 {
-	return _img ? _img->fileName() : _file->fileName();
+	return _file ? _file->fileName() : _img->fileName();
 }

 #ifndef QT_NO_DEBUG
--- a/src/map/IMG/subfile.h
+++ b/src/map/IMG/subfile.h
@ -84,6 +84,8 @@ public:
 	QString fileName() const;

 	static Type type(const char str[3]);
+	static bool isTileFile(Type type)
+	  {return (type == TRE || type == LBL || type == RGN || type == NET);}

 	friend QDebug operator<<(QDebug dbg, const SubFile &file);

--- a/src/map/IMG/vectortile.h
+++ b/src/map/IMG/vectortile.h
@ -26,12 +26,6 @@ public:

 	friend QDebug operator<<(QDebug dbg, const VectorTile &tile);

-	static bool isTileFile(SubFile::Type type)
-	{
-		return (type == SubFile::TRE || type == SubFile::LBL
-		  || type == SubFile::RGN || type == SubFile::NET);
-	}
-
 private:
 	TREFile *_tre;
 	RGNFile *_rgn;
--- a/src/map/gcs.cpp
+++ b/src/map/gcs.cpp
@ -229,6 +229,18 @@ Coordinates GCS::fromWGS84(const Coordinates &c) const
 	return Coordinates(_primeMeridian.fromGreenwich(ds.lon()), ds.lat());
 }

+QList<KV<int, QString> > GCS::list()
+{
+	QList<KV<int, QString> > list;
+
+	for (int i = 0; i < _gcss.size(); i++)
+		if (_gcss.at(i).id())
+			list.append(KV<int, QString>(_gcss.at(i).id(), _gcss.at(i).name()
+			  + " / Geographic 2D"));
+
+	return list;
+}
+
 #ifndef QT_NO_DEBUG
 QDebug operator<<(QDebug dbg, const GCS &gcs)
 {
--- a/src/map/gcs.h
+++ b/src/map/gcs.h
@ -1,6 +1,7 @@
 #ifndef GCS_H
 #define GCS_H

+#include "common/kv.h"
 #include "datum.h"
 #include "angularunits.h"
 #include "primemeridian.h"
@ -32,6 +33,7 @@ public:
 	static const GCS &WGS84();

 	static void loadList(const QString &path);
+	static QList<KV<int, QString> > list();

 private:
 	class Entry;
--- a/src/map/imgmap.cpp
+++ b/src/map/imgmap.cpp
@ -73,12 +73,12 @@ private:
 };


-static Range zooms(12, 28);
+static const Range zooms(12, 28);

-static QColor shieldColor(Qt::white);
-static QColor shieldBgColor1("#dd3e3e");
-static QColor shieldBgColor2("#379947");
-static QColor shieldBgColor3("#4a7fc1");
+static const QColor shieldColor(Qt::white);
+static const QColor shieldBgColor1("#dd3e3e");
+static const QColor shieldBgColor2("#379947");
+static const QColor shieldBgColor3("#4a7fc1");

 static QString convertUnits(const QString &str)
 {
@ -259,7 +259,8 @@ void IMGMap::setZoom(int zoom)

 Transform IMGMap::transform(int zoom) const
 {
-	double scale = (2.0 * M_PI * WGS84_RADIUS) / (1<<zoom);
+	double scale = _projection.isGeographic()
+	  ? 360.0 / (1<<zoom) : (2.0 * M_PI * WGS84_RADIUS) / (1<<zoom);
 	PointD topLeft(_projection.ll2xy(_img.bounds().topLeft()));
 	return Transform(ReferencePoint(PointD(0, 0), topLeft),
 	  PointD(scale, scale));
--- a/src/map/jnxmap.cpp
+++ b/src/map/jnxmap.cpp
@ -34,10 +34,7 @@ template<class T> bool JNXMap::readValue(T &val)
 	if (_file.read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
 		return false;

-	if (sizeof(T) > 1)
-		val = qFromLittleEndian(data);
-	else
-		val = data;
+	val = qFromLittleEndian(data);

 	return true;
 }
--- a/src/map/mapsource.cpp
+++ b/src/map/mapsource.cpp
@ -196,8 +196,8 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
 			if (!attr.hasAttribute("id"))
 				reader.raiseError("Missing dimension id");
 			else
-				config.dimensions.append(KV(attr.value("id").toString(),
-				  reader.readElementText()));
+				config.dimensions.append(KV<QString, QString>
+				  (attr.value("id").toString(), reader.readElementText()));
 		} else if (reader.name() == "crs") {
 			config.coordinateSystem = coordinateSystem(reader);
 			config.crs = reader.readElementText();
--- a/src/map/mapsource.h
+++ b/src/map/mapsource.h
@ -38,7 +38,7 @@ private:
 		QString crs;
 		CoordinateSystem coordinateSystem;
 		bool rest;
-		QList<KV> dimensions;
+		QList<KV<QString, QString> > dimensions;
 		Authorization authorization;
 		qreal tileRatio;
 		int tileSize;
--- a/src/map/ozf.cpp
+++ b/src/map/ozf.cpp
@ -32,10 +32,7 @@ template<class T> bool OZF::readValue(T &val)
 	if (_decrypt)
 		decrypt(&data, sizeof(T), _key);

-	if (sizeof(T) > 1)
-		val = qFromLittleEndian(data);
-	else
-		val = data;
+	val = qFromLittleEndian(data);

 	return true;
 }
--- a/src/map/pcs.cpp
+++ b/src/map/pcs.cpp
@ -223,12 +223,12 @@ void PCS::loadList(const QString &path)
 	}
 }

-QList<PCS::Info> PCS::pcsList()
+QList<KV<int, QString> > PCS::list()
 {
-	QList<Info> list;
+	QList<KV<int, QString> > list;

 	for (int i = 0; i < _pcss.size(); i++)
-		list.append(Info(_pcss.at(i).id(), _pcss.at(i).name()));
+		list.append(KV<int, QString>(_pcss.at(i).id(), _pcss.at(i).name()));

 	return list;
 }
--- a/src/map/pcs.h
+++ b/src/map/pcs.h
@ -3,6 +3,7 @@

 #include <QDebug>
 #include <QList>
+#include "common/kv.h"
 #include "gcs.h"
 #include "linearunits.h"
 #include "coordinatesystem.h"
@ -11,20 +12,6 @@
 class PCS
 {
 public:
-	class Info {
-	public:
-		Info(int id, const QString &name) : _id(id), _name(name) {}
-
-		int id() const {return _id;}
-		const QString &name() const {return _name;}
-
-		bool operator<(const Info &other) const {return _id < other._id;}
-
-	private:
-		int _id;
-		QString _name;
-	};
-
 	PCS() : _gcs(0) {}
 	PCS(const GCS *gcs, const Projection::Method &method,
 	  const Projection::Setup &setup, const LinearUnits &units,
@ -48,7 +35,7 @@ public:
 	static void loadList(const QString &path);
 	static const PCS *pcs(int id);
 	static const PCS *pcs(const GCS *gcs, int proj);
-	static QList<Info> pcsList();
+	static QList<KV<int, QString> > list();

 private:
 	class Entry;
--- a/src/map/wms.h
+++ b/src/map/wms.h
@ -20,7 +20,7 @@ public:
 	public:
 		Setup(const QString &url, const QString &layer, const QString &style,
 		  const QString &format, const QString &crs, const CoordinateSystem &cs,
-		  const QList<KV> &dimensions,
+		  const QList<KV<QString, QString> > &dimensions,
 		  const Authorization &authorization = Authorization())
 			: _url(url), _layer(layer), _style(style), _format(format),
 			  _crs(crs), _cs(cs), _dimensions(dimensions),
@ -33,7 +33,8 @@ public:
 		const QString &format() const {return _format;}
 		const QString &crs() const {return _crs;}
 		const CoordinateSystem &coordinateSystem() const {return _cs;}
-		const QList<KV> &dimensions() const {return _dimensions;}
+		const QList<KV<QString, QString> > &dimensions() const
+		  {return _dimensions;}

 	private:
 		QString _url;
@ -42,7 +43,7 @@ public:
 		QString _format;
 		QString _crs;
 		CoordinateSystem _cs;
-		QList<KV> _dimensions;
+		QList<KV<QString, QString> > _dimensions;
 		Authorization _authorization;
 	};

--- a/src/map/wmsmap.cpp
+++ b/src/map/wmsmap.cpp
@ -34,7 +34,7 @@ QString WMSMap::tileUrl(const QString &version) const
 		url.append(QString("&SRS=%1").arg(_setup.crs()));

 	for (int i = 0; i < _setup.dimensions().size(); i++) {
-		const KV &dim = _setup.dimensions().at(i);
+		const KV<QString, QString> &dim = _setup.dimensions().at(i);
 		url.append(QString("&%1=%2").arg(dim.key(), dim.value()));
 	}

--- a/src/map/wmts.cpp
+++ b/src/map/wmts.cpp
@ -335,7 +335,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
 		  setup.url().contains('?') ? "&" : "?" , setup.format(),
 		  setup.layer(), style, setup.set());
 		for (int i = 0; i < setup.dimensions().size(); i++) {
-			const KV &dim = setup.dimensions().at(i);
+			const KV<QString, QString> &dim = setup.dimensions().at(i);
 			_tileUrl.append(QString("&%1=%2").arg(dim.key(), dim.value()));
 		}
 	} else {
@ -345,7 +345,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
 		_tileUrl.replace("{TileRow}", "$y", Qt::CaseInsensitive);
 		_tileUrl.replace("{TileCol}", "$x", Qt::CaseInsensitive);
 		for (int i = 0; i < setup.dimensions().size(); i++) {
-			const KV &dim = setup.dimensions().at(i);
+			const KV<QString, QString> &dim = setup.dimensions().at(i);
 			_tileUrl.replace(QString("{%1}").arg(dim.key()), dim.value(),
 			  Qt::CaseInsensitive);
 		}
--- a/src/map/wmts.h
+++ b/src/map/wmts.h
@ -22,7 +22,8 @@ public:
 	public:
 		Setup(const QString &url, const QString &layer, const QString &set,
 		  const QString &style, const QString &format, bool rest,
-		  const CoordinateSystem &cs, const QList<KV> &dimensions,
+		  const CoordinateSystem &cs,
+		  const QList<KV<QString, QString> > &dimensions,
 		  const Authorization &authorization = Authorization())
 			: _url(url), _layer(layer), _set(set), _style(style),
 			  _format(format), _rest(rest), _cs(cs), _dimensions(dimensions),
@ -36,7 +37,8 @@ public:
 		const QString &format() const {return _format;}
 		bool rest() const {return _rest;}
 		const CoordinateSystem &coordinateSystem() const {return _cs;}
-		const QList<KV> &dimensions() const {return _dimensions;}
+		const QList<KV<QString, QString> > &dimensions() const
+		  {return _dimensions;}

 	private:
 		QString _url;
@ -46,7 +48,7 @@ public:
 		QString _format;
 		bool _rest;
 		CoordinateSystem _cs;
-		QList<KV> _dimensions;
+		QList<KV<QString, QString> > _dimensions;
 		Authorization _authorization;
 	};
Author	SHA1	Message	Date
Martin Tůma	fcaacb4b6a	Version++	2019-08-29 20:18:35 +02:00
Martin Tůma	f9c593e6d1	Fixed the "DEM values not used in route points" issue	2019-08-29 20:15:03 +02:00
Martin Tůma	37e07accd4	Fixed percent slider updates	2019-08-27 20:19:06 +02:00
Martin Tůma	a7117361be	Cosmetics	2019-08-27 20:18:39 +02:00
Martin Tůma	548c03d543	Added support for graph zooming	2019-08-26 21:03:40 +02:00
Martin Tůma	1addb1118d	Fixed broken maximal ticks count limitation	2019-08-26 20:40:14 +02:00
Martin Tůma	ae64ef9d83	Only use B records with a valid fix in IGC files	2019-08-25 13:05:27 +02:00
Martin Tůma	3d16cf2500	Removed forgotten debug stuff	2019-08-25 11:38:41 +02:00
Martin Tůma	609ac0c57a	Graph loading performance improvement + code/API cleanup	2019-08-25 10:54:25 +02:00
Martin Tůma	a70c6f0f24	Fixed broken gear ratio statistics	2019-08-22 19:56:55 +02:00
Martin Tůma	3ad0c89511	Added missing area-under-mouse highlighting	2019-08-19 19:22:16 +02:00
Martin Tůma	1497d42bd5	Added CUP files support info	2019-08-18 00:13:04 +02:00
Martin Tůma	a4906e7d01	Translated using Weblate (Spanish) Currently translated at 98.5% (337 of 342 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/es/	2019-08-17 20:15:59 +02:00
Hosted Weblate	f56dfd95e3	Merge branch 'origin/master' into Weblate.	2019-08-17 11:07:57 +02:00
Martin Tůma	2bda7ba714	Ignore "???" turnpoints in CUP tasks	2019-08-17 11:07:28 +02:00
Hosted Weblate	940bd0511e	Merge branch 'origin/master' into Weblate.	2019-08-17 10:45:16 +02:00
Martin Tůma	30518cebc0	Fixed CUP task parsing	2019-08-17 10:44:53 +02:00
Hosted Weblate	696bc50ba1	Merge branch 'origin/master' into Weblate.	2019-08-16 21:33:03 +02:00
Martin Tůma	b91358a6bd	Added CUP files OS X desktop integration	2019-08-16 21:32:31 +02:00
Hosted Weblate	94eab9fba0	Merge branch 'origin/master' into Weblate.	2019-08-16 20:51:20 +02:00
Martin Tůma	44b98754d7	Version++	2019-08-16 20:50:59 +02:00
Hosted Weblate	8451178808	Merge branch 'origin/master' into Weblate.	2019-08-16 20:47:25 +02:00
Martin Tůma	7eedcc083e	CUP files Windows & Linux desktop integration	2019-08-16 20:46:42 +02:00
Hosted Weblate	cd32b21aca	Merge branch 'origin/master' into Weblate.	2019-08-16 18:33:27 +02:00
Martin Tůma	e1bda86b35	Use the whole waypoint info in the route points + Optimize for waypoint reading	2019-08-16 18:32:55 +02:00
Martin Tůma	967e307be9	Fixed QT4 build	2019-08-15 22:10:25 +02:00
Hosted Weblate	7cf1e3e1a5	Merge branch 'origin/master' into Weblate.	2019-08-15 22:10:11 +02:00
Hosted Weblate	0f44feebb1	Merge branch 'origin/master' into Weblate.	2019-08-15 21:28:40 +02:00
Martin Tůma	ecb82952f6	Added support for SeeYou CUP files	2019-08-15 21:27:55 +02:00
Martin Tůma	ab6ea84255	Some more cleanup	2019-08-13 20:50:43 +02:00
Hosted Weblate	0b2d610a34	Merge branch 'origin/master' into Weblate.	2019-08-13 20:50:30 +02:00
Martin Tůma	f67eaa8dec	Various code cleanup	2019-08-12 22:20:12 +02:00
Hosted Weblate	2a619aa0ef	Merge branch 'origin/master' into Weblate.	2019-08-12 22:20:03 +02:00
Hosted Weblate	dd292bc995	Merge branch 'origin/master' into Weblate.	2019-08-11 09:28:08 +02:00
Martin Tůma	680104fec3	Fixed lat/lon reference parsing in big endian EXIF entries Closes #218	2019-08-11 09:26:54 +02:00
Martin Tůma	b72a9e67fe	Cosmetics	2019-08-01 18:58:19 +02:00
Hosted Weblate	24b7b9d996	Merge branch 'origin/master' into Weblate.	2019-08-01 18:58:18 +02:00
Hosted Weblate	7965f2ff34	Merge branch 'origin/master' into Weblate.	2019-08-01 08:38:29 +02:00
Martin Tůma	5f5b391cd9	Added support for Geographic 2D projections (coordinate systems) in vector maps	2019-08-01 08:36:58 +02:00
Hosted Weblate	faed6fc203	Merge branch 'origin/master' into Weblate.	2019-07-28 11:59:40 +02:00
Martin Tůma	38b62c0121	Added missing libqt4-opengl-dev package install	2019-07-28 11:58:56 +02:00
Hosted Weblate	f26f8a95ac	Merge branch 'origin/master' into Weblate.	2019-07-28 10:34:32 +02:00
Martin Tůma	1297db26f6	Properly de-capitalize strings with "scharfes S"	2019-07-28 10:31:03 +02:00
Estébastien Robespi	2ee955172d	Translated using Weblate (French) Currently translated at 100.0% (342 of 342 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/	2019-07-26 14:31:49 +02:00