Merge branch 'origin/master' into Weblate.

Translated using Weblate (Hungarian)
Currently translated at 100.0% (374 of 374 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2025-07-03 06:19:15 +02:00 · 2020-10-07 22:57:53 +02:00 · 2020-10-07 22:57:53 +02:00 · 2020-10-07 22:57:30 +02:00 · 2020-10-07 09:04:54 +02:00 · 2020-10-07 09:04:40 +02:00
195 changed files with 16855 additions and 7826 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 7.20.{build}
+version: 7.33.{build}

 configuration:
  - Release
@ -17,7 +17,7 @@ environment:
    LIBSSL: libcrypto-1_1.dll
  - QTDIR: C:\Qt\5.13\msvc2017_64
    NSI: gpxsee64.nsi
-    VCVARS: vcvars64.bat"
+    VCVARS: vcvars64.bat
    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
    LIBCRYPTO: libssl-1_1-x64.dll
    LIBSSL: libcrypto-1_1-x64.dll    
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -0,0 +1 @@
+github: tumic0
--- a/README.md
+++ b/README.md
@ -2,9 +2,9 @@
 GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.

 ## Features
-* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
+* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
 * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
-* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG & JNX maps, TwoNav RMaps, GeoTIFF images).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx {
 } else {
    TARGET = GPXSee
 }
-VERSION = 7.20
+VERSION = 7.33

 QT += core \
    gui \
@ -20,6 +20,8 @@ equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
    src/GUI/graphicsscene.h \
+    src/GUI/mapaction.h \
+    src/GUI/marginswidget.h \
    src/GUI/popup.h \
    src/common/garmin.h \
    src/common/staticassert.h \
@ -52,7 +54,6 @@ HEADERS += src/common/config.h \
    src/GUI/palette.h \
    src/GUI/heartrategraph.h \
    src/GUI/trackinfo.h \
-    src/GUI/exportdialog.h \
    src/GUI/fileselectwidget.h \
    src/GUI/margins.h \
    src/GUI/temperaturegraph.h \
@ -91,8 +92,12 @@ HEADERS += src/common/config.h \
    src/map/IMG/bitmapline.h \
    src/map/IMG/bitstream.h \
    src/map/IMG/deltastream.h \
+    src/map/IMG/gmap.h \
    src/map/IMG/huffmanstream.h \
    src/map/IMG/huffmantable.h \
+    src/map/IMG/nodfile.h \
+    src/map/IMG/mapdata.h \
+    src/map/IMG/rastertile.h \
    src/map/IMG/textpathitem.h \
    src/map/IMG/textpointitem.h \
    src/map/projection.h \
@ -193,8 +198,11 @@ HEADERS += src/common/config.h \
    src/data/cupparser.h \
    src/data/gpiparser.h \
    src/data/address.h \
-    src/data/smlparser.h
+    src/data/smlparser.h \
+    src/GUI/pdfexportdialog.h \
+    src/GUI/pngexportdialog.h
 SOURCES += src/main.cpp \
+    src/GUI/marginswidget.cpp \
    src/GUI/popup.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
@ -219,7 +227,6 @@ SOURCES += src/main.cpp \
    src/GUI/palette.cpp \
    src/GUI/heartrategraph.cpp \
    src/GUI/trackinfo.cpp \
-    src/GUI/exportdialog.cpp \
    src/GUI/fileselectwidget.cpp \
    src/GUI/temperaturegraph.cpp \
    src/GUI/trackitem.cpp \
@ -246,11 +253,16 @@ SOURCES += src/main.cpp \
    src/GUI/gearratiographitem.cpp \
    src/GUI/mapview.cpp \
    src/GUI/areaitem.cpp \
+    src/data/waypoint.cpp \
    src/map/IMG/bitmapline.cpp \
    src/map/IMG/bitstream.cpp \
    src/map/IMG/deltastream.cpp \
+    src/map/IMG/gmap.cpp \
    src/map/IMG/huffmanstream.cpp \
    src/map/IMG/huffmantable.cpp \
+    src/map/IMG/nodfile.cpp \
+    src/map/IMG/mapdata.cpp \
+    src/map/IMG/rastertile.cpp \
    src/map/IMG/textpathitem.cpp \
    src/map/IMG/textpointitem.cpp \
    src/map/maplist.cpp \
@ -334,12 +346,17 @@ SOURCES += src/main.cpp \
    src/data/cupparser.cpp \
    src/GUI/graphicsscene.cpp \
    src/data/gpiparser.cpp \
-    src/data/smlparser.cpp
+    src/data/smlparser.cpp \
+    src/GUI/pdfexportdialog.cpp \
+    src/GUI/pngexportdialog.cpp

 greaterThan(QT_MAJOR_VERSION, 4) {
    HEADERS += src/data/geojsonparser.h
    SOURCES += src/data/geojsonparser.cpp
 }
+equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4) {
+    HEADERS += src/GUI/timezoneinfo.h
+}

 DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
    QT_NO_DEPRECATED_WARNINGS
@ -359,10 +376,12 @@ TRANSLATIONS = lang/gpxsee_en.ts \
    lang/gpxsee_tr.ts \
    lang/gpxsee_es.ts \
    lang/gpxsee_pt_BR.ts \
-    lang/gpxsee_uk.ts
+    lang/gpxsee_uk.ts \
+    lang/gpxsee_hu.ts \
+    lang/gpxsee_it.ts

 macx {
-    ICON = icons/gpxsee.icns
+    ICON = icons/app/gpxsee.icns
    QMAKE_INFO_PLIST = pkg/Info.plist
    locale.path = Contents/Resources/translations
    locale.files = lang/gpxsee_en.qm \
@ -378,7 +397,9 @@ macx {
        lang/gpxsee_tr.qm \
        lang/gpxsee_es.qm \
        lang/gpxsee_pt_BR.qm \
-        lang/gpxsee_uk.qm
+        lang/gpxsee_uk.qm \
+        lang/gpxsee_hu.qm \
+        lang/gpxsee_it.qm
    csv.path = Contents/Resources
    csv.files = pkg/csv
    maps.path = Contents/Resources
@ -403,7 +424,7 @@ macx {
 }

 win32 {
-    RC_ICONS = icons/gpxsee.ico \
+    RC_ICONS = icons/app/gpxsee.ico \
        icons/formats/gpx.ico \
        icons/formats/tcx.ico \
        icons/formats/kml.ico \
@ -433,8 +454,8 @@ unix:!macx {
    csv.path = $$PREFIX/share/gpxsee/csv
    locale.files = lang/*.qm
    locale.path = $$PREFIX/share/gpxsee/translations
-    icon.files = icons/gpxsee.png
-    icon.path = $$PREFIX/share/pixmaps
+    icon.files = icons/app/hicolor/*
+    icon.path = $$PREFIX/share/icons/hicolor
    desktop.files = pkg/gpxsee.desktop
    desktop.path = $$PREFIX/share/applications
    mime.files = pkg/gpxsee.xml
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -1,8 +1,8 @@
 <RCC>
 	<qresource prefix="/">
 		<!-- GUI -->
-		<file alias="gpxsee.png">icons/gpxsee.png</file>
-		<file alias="gpxsee@2x.png">icons/gpxsee@2x.png</file>
+		<file alias="gpxsee.png">icons/app/gpxsee.png</file>
+		<file alias="gpxsee@2x.png">icons/app/gpxsee@2x.png</file>
 		<file alias="dialog-close.png">icons/GUI/dialog-close.png</file>
 		<file alias="dialog-close@2x.png">icons/GUI/dialog-close@2x.png</file>
 		<file alias="document-open.png">icons/GUI/document-open.png</file>
--- a/icons/app/gpxsee.dia
+++ b/icons/app/gpxsee.dia
--- a/icons/app/gpxsee.icns
+++ b/icons/app/gpxsee.icns
--- a/icons/app/gpxsee.ico
+++ b/icons/app/gpxsee.ico
--- a/icons/app/gpxsee.png
+++ b/icons/app/gpxsee.png
--- a/icons/app/gpxsee@2x.png
+++ b/icons/app/gpxsee@2x.png
--- a/icons/app/hicolor/128x128/gpxsee.png
+++ b/icons/app/hicolor/128x128/gpxsee.png
--- a/icons/app/hicolor/16x16/gpxsee.png
+++ b/icons/app/hicolor/16x16/gpxsee.png
--- a/icons/app/hicolor/32x32/gpxsee.png
+++ b/icons/app/hicolor/32x32/gpxsee.png
--- a/icons/app/hicolor/48x48/gpxsee.png
+++ b/icons/app/hicolor/48x48/gpxsee.png
--- a/icons/app/hicolor/64x64/gpxsee.png
+++ b/icons/app/hicolor/64x64/gpxsee.png
--- a/icons/app/hicolor/scalable/gpxsee.svg
+++ b/icons/app/hicolor/scalable/gpxsee.svg
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd">
+<svg width="6cm" height="6cm" viewBox="47 79 119 119" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g>
+    <rect style="fill: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+    <rect style="fill: none; fill-opacity:0; stroke-width: 2.35099e-37; stroke-linejoin: round; stroke: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke-linejoin: round; stroke: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+  </g>
+  <polyline style="fill: none; fill-opacity:0; stroke-width: 4; stroke: #000000" points="61.5289,182.479 73.5,125.854 96,151.875 113,90.875 136.5,172.375 151.658,157.199 "/>
+  <g>
+    <ellipse style="fill: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+  </g>
+</svg>
--- a/icons/formats/scripts/extensions
+++ b/icons/formats/scripts/extensions
--- a/icons/formats/scripts/icns.sh
+++ b/icons/formats/scripts/icns.sh
--- a/icons/formats/scripts/ico.sh
+++ b/icons/formats/scripts/ico.sh
--- a/icons/formats/scripts/icon-template.svg
+++ b/icons/formats/scripts/icon-template.svg
--- a/icons/gpxsee.dia
+++ b/icons/gpxsee.dia
--- a/lang/gpxsee_cs.ts
+++ b/lang/gpxsee_cs.ts
--- a/lang/gpxsee_da.ts
+++ b/lang/gpxsee_da.ts
--- a/lang/gpxsee_de.ts
+++ b/lang/gpxsee_de.ts
--- a/lang/gpxsee_en.ts
+++ b/lang/gpxsee_en.ts
@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
+<context>
+    <name>GUI</name>
+    <message numerus="yes">
+        <location filename="../src/GUI/gui.cpp" line="1392"/>
+        <source>%n files</source>
+        <translation>
+            <numerusform>%n file</numerusform>
+            <numerusform>%n files</numerusform>
+        </translation>
+    </message>
+</context>
 </TS>
--- a/lang/gpxsee_es.ts
+++ b/lang/gpxsee_es.ts
--- a/lang/gpxsee_fi.ts
+++ b/lang/gpxsee_fi.ts
--- a/lang/gpxsee_fr.ts
+++ b/lang/gpxsee_fr.ts
--- a/lang/gpxsee_hu.ts
+++ b/lang/gpxsee_hu.ts
--- a/lang/gpxsee_it.ts
+++ b/lang/gpxsee_it.ts
--- a/lang/gpxsee_nb.ts
+++ b/lang/gpxsee_nb.ts
--- a/lang/gpxsee_pl.ts
+++ b/lang/gpxsee_pl.ts
--- a/lang/gpxsee_pt_BR.ts
+++ b/lang/gpxsee_pt_BR.ts
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
--- a/lang/gpxsee_sv.ts
+++ b/lang/gpxsee_sv.ts
--- a/lang/gpxsee_tr.ts
+++ b/lang/gpxsee_tr.ts
--- a/lang/gpxsee_uk.ts
+++ b/lang/gpxsee_uk.ts
--- a/pkg/gpxsee.desktop
+++ b/pkg/gpxsee.desktop
@ -4,6 +4,7 @@ Comment=GPS log file viewer and analyzer
 Comment[cz]=Prohlížeč a analyzátor GPS logů
 Comment[fi]=Ohjelma GPS-lokien katseluun ja analysointiin
 Comment[fr]=Visualisation et analyse de fichier GPS
+Comment[nb]=GPS-loggfilleser og analysator
 Comment[pl]=Przeglądarka i analizator plików dziennika GPS
 Comment[ru]=Программа для просмотра и анализа GPS логов
 Comment[sv]=GPS-loggfilsläsare och analysator
@ -14,4 +15,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt;
-MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;
+MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/sml+xml;
--- a/pkg/gpxsee.nsi
+++ b/pkg/gpxsee.nsi
@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.20"
+!define VERSION "7.33"

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

 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@ -183,6 +183,8 @@ SectionGroup "Localization" SEC_LOCALIZATION
  !insertmacro LOCALIZATION "Finnish" "fi"
  !insertmacro LOCALIZATION "French" "fr"
  !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Hungarian" "hu"
+  !insertmacro LOCALIZATION "Italian" "it"
  !insertmacro LOCALIZATION "Norwegian" "nb"
  !insertmacro LOCALIZATION "Polish" "pl"
  !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@ -259,4 +261,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/maps/4UMaps.xml
+++ b/pkg/maps/4UMaps.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>4UMaps</name>
 	<url>https://tileserver.4umaps.com/$z/$x/$y.png</url>
 	<zoom min="2" max="15"/>
--- a/pkg/maps/Antarctica.xml
+++ b/pkg/maps/Antarctica.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3" type="WMTS">
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
 	<name>Antarctica</name>
-	<url type="REST">https://gis.ngdc.noaa.gov/arcgis/rest/services/antarctic/antarctic_basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url>
+	<url type="REST">https://tiles.arcgis.com/tiles/C8EMgrsFcRFL6LrL/arcgis/rest/services/Antarctic_Basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url>
 	<copyright>NOAA National Centers for Environmental Information (NCEI); International Bathymetric Chart of the Southern Ocean (IBCSO); General Bathymetric Chart of the Oceans (GEBCO); Natural Earth</copyright>
-	<layer>antarctic_antarctic_basemap</layer>
+	<layer>Antarctic_Basemap</layer>
 	<set>default028mm</set>
 </map>
--- a/pkg/maps/OpenStreetMap.xml
+++ b/pkg/maps/OpenStreetMap.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Open Street Map</name>
 	<url>https://tile.openstreetmap.org/$z/$x/$y.png</url>
 	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © OpenStreetMap (CC-BY-SA)</copyright>
--- a/pkg/maps/OpenTopoMap.xml
+++ b/pkg/maps/OpenTopoMap.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Open Topo Map</name>
 	<url>https://a.tile.opentopomap.org/$z/$x/$y.png</url>
 	<zoom max="17"/>
--- a/pkg/maps/USGS-imagery.xml
+++ b/pkg/maps/USGS-imagery.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Imagery</name>
 	<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>
--- a/pkg/maps/USGS-topo.xml
+++ b/pkg/maps/USGS-topo.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Topo</name>
 	<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>
--- a/src/GUI/cadencegraphitem.cpp
+++ b/src/GUI/cadencegraphitem.cpp
@ -5,7 +5,7 @@

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

--- a/src/GUI/elevationgraph.cpp
+++ b/src/GUI/elevationgraph.cpp
@ -65,35 +65,38 @@ void ElevationGraph::setInfo()
 	}
 }

-GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
+GraphItem *ElevationGraph::loadGraph(const Graph &graph, PathType type,
+  const QColor &color, bool primary)
 {
-	if (!graph.isValid()) {
-		_palette.nextColor();
+	if (!graph.isValid())
 		return 0;
-	}

 	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
-	  _palette.nextColor());
+	  color, primary ? Qt::SolidLine : Qt::DashLine);
 	gi->setUnits(_units);

-	if (type == Track) {
+	if (type == TrackPath) {
 		_tracks.append(gi);
 		if (_showTracks)
 			addGraph(gi);

-		_trackAscent += gi->ascent();
-		_trackDescent += gi->descent();
-		_trackMax = nMax(_trackMax, gi->max());
-		_trackMin = nMin(_trackMin, gi->min());
+		if (primary) {
+			_trackAscent += gi->ascent();
+			_trackDescent += gi->descent();
+			_trackMax = nMax(_trackMax, gi->max());
+			_trackMin = nMin(_trackMin, gi->min());
+		}
 	} else {
 		_routes.append(gi);
 		if (_showRoutes)
 			addGraph(gi);

-		_routeAscent += gi->ascent();
-		_routeDescent += gi->descent();
-		_routeMax = nMax(_routeMax, gi->max());
-		_routeMin = nMin(_routeMin, gi->min());
+		if (primary) {
+			_routeAscent += gi->ascent();
+			_routeDescent += gi->descent();
+			_routeMax = nMax(_routeMax, gi->max());
+			_routeMin = nMin(_routeMin, gi->min());
+		}
 	}

 	return gi;
@ -102,11 +105,32 @@ GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
 QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 {
 	QList<GraphItem*> graphs;
+	GraphItem *primary, *secondary;

-	for (int i = 0; i < data.tracks().count(); i++)
-		graphs.append(loadGraph(data.tracks().at(i).elevation(), Track));
-	for (int i = 0; i < data.routes().count(); i++)
-		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
+	for (int i = 0; i < data.tracks().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.tracks().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), TrackPath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), TrackPath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
+	for (int i = 0; i < data.routes().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.routes().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), RoutePath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), RoutePath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
 	for (int i = 0; i < data.areas().count(); i++)
 		_palette.nextColor();

--- a/src/GUI/elevationgraph.h
+++ b/src/GUI/elevationgraph.h
@ -21,7 +21,7 @@ public:
 	void showRoutes(bool show);

 private:
-	enum Type {Track, Route};
+	enum PathType {TrackPath, RoutePath};

 	qreal max() const;
 	qreal min() const;
@ -31,7 +31,8 @@ private:
 	void setYUnits(Units units);
 	void setInfo();

-	GraphItem *loadGraph(const Graph &graph, Type type);
+	GraphItem *loadGraph(const Graph &graph, PathType type, const QColor &color,
+	  bool primary);
 	void showItems(const QList<ElevationGraphItem *> &list, bool show);

 	qreal _trackAscent, _trackDescent;
--- a/src/GUI/elevationgraphitem.cpp
+++ b/src/GUI/elevationgraphitem.cpp
@ -4,8 +4,8 @@


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

+
 	return tt.toString();
 }
--- a/src/GUI/elevationgraphitem.h
+++ b/src/GUI/elevationgraphitem.h
@ -8,8 +8,10 @@ class ElevationGraphItem : public GraphItem
 	Q_OBJECT

 public:
+	enum DataType {GPS, DEM};
+
 	ElevationGraphItem(const Graph &graph, GraphType type, int width,
-	  const QColor &color, QGraphicsItem *parent = 0);
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);

 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}
--- a/src/GUI/fileselectwidget.cpp
+++ b/src/GUI/fileselectwidget.cpp
@ -12,7 +12,8 @@ FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
 {
 	QFontMetrics fm(QApplication::font());
 	_edit = new QLineEdit();
-	_edit->setMinimumWidth(fm.boundingRect(QDir::homePath()).width());
+	_edit->setMinimumWidth(fm.averageCharWidth() * (QDir::homePath().length()
+	  + 12));
 #ifdef Q_OS_WIN32
 	_button = new QPushButton("...");
 	_button->setMaximumWidth(_button->sizeHint().width() / 2);
@ -41,3 +42,33 @@ void FileSelectWidget::browse()
 	if (!fileName.isEmpty())
 		_edit->setText(fileName);
 }
+
+bool FileSelectWidget::checkFile(QString &error) const
+{
+	if (_edit->text().isEmpty()) {
+		error = tr("No output file selected.");
+		return false;
+	}
+
+	QFile file(_edit->text());
+	QFileInfo fi(file);
+	bool exists = fi.exists();
+	bool opened = false;
+
+	if (exists && fi.isDir()) {
+		error = tr("%1 is a directory.").arg(file.fileName());
+		return false;
+	} else if ((exists && !fi.isWritable())
+	  || !(opened = file.open(QFile::Append))) {
+		error = tr("%1 is not writable.").arg(file.fileName());
+		return false;
+	}
+
+	if (opened) {
+		file.close();
+		if (!exists)
+			file.remove();
+	}
+
+	return true;
+}
--- a/src/GUI/fileselectwidget.h
+++ b/src/GUI/fileselectwidget.h
@ -14,9 +14,10 @@ class FileSelectWidget : public QWidget
 public:
 	FileSelectWidget(QWidget *parent = 0);

-	QString file() {return _edit->text();}
+	QString file() const {return _edit->text();}
 	void setFile(const QString &file) {_edit->setText(file);}
 	void setFilter(const QString &filter) {_filter = filter;}
+	bool checkFile(QString &error) const;

 private slots:
 	void browse();
--- a/src/GUI/gearratiographitem.cpp
+++ b/src/GUI/gearratiographitem.cpp
@ -6,7 +6,7 @@

 GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
  int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 	for (int i = 0; i < graph.size(); i++) {
 		const GraphSegment &segment = graph.at(i);
--- a/src/GUI/graphitem.cpp
+++ b/src/GUI/graphitem.cpp
@ -5,13 +5,13 @@


 GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
-  const QColor &color, QGraphicsItem *parent)
-  : GraphicsItem(parent), _graph(graph), _type(type)
+  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent)
+  : GraphicsItem(parent), _graph(graph), _type(type), _secondaryGraph(0)
 {
 	Q_ASSERT(_graph.isValid());

 	_units = Metric;
-	_pen = QPen(color, width);
+	_pen = QPen(color, width, style);
 	_sx = 0; _sy = 0;
 	_time = _graph.hasTime();
 	setZValue(2.0);
--- a/src/GUI/graphitem.h
+++ b/src/GUI/graphitem.h
@ -12,8 +12,8 @@ class GraphItem : public QObject, public GraphicsItem
 	Q_OBJECT

 public:
-	GraphItem(const Graph &graph, GraphType type, int width, const QColor &color,
-	  QGraphicsItem *parent = 0);
+	GraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}

 	virtual QString info() const = 0;
@ -35,6 +35,9 @@ public:
 	void setWidth(int width);
 	void setUnits(Units units) {_units = units;}

+	GraphItem *secondaryGraph() const {return _secondaryGraph;}
+	void setSecondaryGraph(GraphItem *graph) {_secondaryGraph = graph;}
+
 	qreal yAtX(qreal x);
 	qreal distanceAtTime(qreal time);

@ -69,6 +72,8 @@ private:
 	qreal _sx, _sy;
 	QPen _pen;
 	bool _time;
+
+	GraphItem *_secondaryGraph;
 };

 #endif // GRAPHITEM_H
--- a/src/GUI/graphview.cpp
+++ b/src/GUI/graphview.cpp
@ -1,3 +1,4 @@
+#include <QSet>
 #include <QGraphicsScene>
 #include <QEvent>
 #include <QMouseEvent>
@ -274,8 +275,8 @@ void GraphView::redraw(const QSizeF &size)
 	rx = RangeF(bounds().left() * _xScale, bounds().right() * _xScale);
 	ry = RangeF(bounds().top() * _yScale + _yOffset, bounds().bottom() * _yScale
 	  + _yOffset);
-	if (ry.size() < _minYRange)
-		ry.resize(_minYRange);
+	if (ry.size() < _minYRange * _yScale)
+		ry.resize(_minYRange * _yScale);

 	_xAxis->setRange(rx);
 	_yAxis->setRange(ry);
@ -419,14 +420,16 @@ void GraphView::updateSliderInfo()
 {
 	QLocale l(QLocale::system());
 	qreal r = 0, y = 0;
+	GraphItem *cardinal = (_graphs.count() == 1 || (_graphs.count() == 2
+	  && _graphs.first()->secondaryGraph())) ? _graphs.first() : 0;

-	if (_graphs.count() == 1) {
-		QRectF br(_graphs.first()->bounds());
+	if (cardinal) {
+		QRectF br(_bounds);
 		if (br.height() < _minYRange)
 			br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
 			  _minYRange/2 - br.height()/2);

-		y = _graphs.first()->yAtX(_sliderPos);
+		y = cardinal->yAtX(_sliderPos);
 		r = (y - br.bottom()) / br.height();
 	}

@ -436,11 +439,17 @@ void GraphView::updateSliderInfo()

 	_sliderInfo->setSide(s);
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
-	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
+	QString xText(_graphType == Time ? Format::timeSpan(_sliderPos,
 	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
-	  + UNIT_SPACE + _xUnits, (_graphs.count() > 1) ? QString()
-	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
-	  + _yUnits);
+	  + UNIT_SPACE + _xUnits);
+	QString yText((!cardinal) ? QString() : l.toString(-y * _yScale + _yOffset,
+	  'f', _precision) + UNIT_SPACE + _yUnits);
+	if (cardinal && cardinal->secondaryGraph()) {
+		qreal delta = y - cardinal->secondaryGraph()->yAtX(_sliderPos);
+		yText += " " + QChar(0x0394) + l.toString(-delta * _yScale + _yOffset,
+		  'f', _precision) + UNIT_SPACE + _yUnits;
+	}
+	_sliderInfo->setText(xText, yText);
 }

 void GraphView::emitSliderPositionChanged(const QPointF &pos)
@ -486,8 +495,23 @@ void GraphView::setPalette(const Palette &palette)
 	_palette = palette;
 	_palette.reset();

-	for (int i = 0; i < _graphs.count(); i++)
-		_graphs.at(i)->setColor(_palette.nextColor());
+	QSet<GraphItem*> secondary;
+	for (int i = 0; i < _graphs.count(); i++) {
+		GraphItem *g = _graphs[i];
+		if (g->secondaryGraph())
+			secondary.insert(g->secondaryGraph());
+	}
+
+	for (int i = 0; i < _graphs.count(); i++) {
+		GraphItem *g = _graphs[i];
+		if (secondary.contains(g))
+			continue;
+
+		QColor color(_palette.nextColor());
+		g->setColor(color);
+		if (g->secondaryGraph())
+			g->secondaryGraph()->setColor(color);
+	}
 }

 void GraphView::setGraphWidth(int width)
--- a/src/GUI/graphview.h
+++ b/src/GUI/graphview.h
@ -3,7 +3,6 @@

 #include <QGraphicsView>
 #include <QList>
-#include <QSet>
 #include "data/graph.h"
 #include "palette.h"
 #include "units.h"
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@ -51,6 +51,7 @@
 #include "graphtab.h"
 #include "graphitem.h"
 #include "pathitem.h"
+#include "mapaction.h"
 #include "gui.h"


@ -58,7 +59,6 @@

 GUI::GUI()
 {
-	loadMaps();
 	loadPOIs();

 	createMapView();
@ -106,24 +106,13 @@ GUI::GUI()
 	updateStatusBarInfo();
 }

-void GUI::loadMaps()
-{
-	_ml = new MapList(this);
-	QString mapDir(ProgramPaths::mapDir());
-
-	if (!mapDir.isNull() && !_ml->loadDir(mapDir))
-		qWarning("%s", qPrintable(_ml->errorString()));
-
-	_map = new EmptyMap(this);
-}
-
 void GUI::loadPOIs()
 {
 	_poi = new POI(this);
-	QString poiDir(ProgramPaths::poiDir());

-	if (!poiDir.isNull() && !_poi->loadDir(poiDir))
-		qWarning("%s", qPrintable(_poi->errorString()));
+	QString poiDir(ProgramPaths::poiDir());
+	if (!poiDir.isNull())
+		_poi->loadDir(poiDir);
 }

 void GUI::createBrowser()
@ -134,40 +123,56 @@ void GUI::createBrowser()

 void GUI::createMapActions()
 {
-	_mapsSignalMapper = new QSignalMapper(this);
 	_mapsActionGroup = new QActionGroup(this);
 	_mapsActionGroup->setExclusive(true);

-	for (int i = 0; i < _ml->maps().count(); i++)
-		createMapAction(_ml->maps().at(i));
+	QString mapDir(ProgramPaths::mapDir());
+	if (mapDir.isNull())
+		return;

-	connect(_mapsSignalMapper, SIGNAL(mapped(int)), this,
-	  SLOT(mapChanged(int)));
+	QString unused;
+	QList<Map*> maps(MapList::loadMaps(mapDir, unused));
+	for (int i = 0; i < maps.count(); i++) {
+		MapAction *a = createMapAction(maps.at(i));
+		connect(a, SIGNAL(loaded()), this, SLOT(mapInitialized()));
+	}
 }

-QAction *GUI::createMapAction(const Map *map)
+MapAction *GUI::createMapAction(Map *map)
 {
-	QAction *a = new QAction(map->name(), this);
+	MapAction *a = new MapAction(map);
 	a->setMenuRole(QAction::NoRole);
 	a->setCheckable(true);
 	a->setActionGroup(_mapsActionGroup);
-
-	_mapActions.append(a);
-	_mapsSignalMapper->setMapping(a, _mapActions.size() - 1);
-	connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
+	connect(a, SIGNAL(triggered()), this, SLOT(mapChanged()));

 	return a;
 }

+void GUI::mapInitialized()
+{
+	MapAction *action = static_cast<MapAction*>(QObject::sender());
+	Map *map = action->data().value<Map*>();
+
+	if (map->isValid()) {
+		if (!_mapsActionGroup->checkedAction())
+			action->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
+	} else {
+		qWarning("%s: %s", qPrintable(map->name()), qPrintable(map->errorString()));
+		action->deleteLater();
+	}
+}
+
 void GUI::createPOIFilesActions()
 {
 	_poiFilesSignalMapper = new QSignalMapper(this);
+	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
+	  SLOT(poiFileChecked(int)));

 	for (int i = 0; i < _poi->files().count(); i++)
 		createPOIFileAction(_poi->files().at(i));
-
-	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
-	  SLOT(poiFileChecked(int)));
 }

 QAction *GUI::createPOIFileAction(const QString &fileName)
@ -225,13 +230,20 @@ void GUI::createActions()
 	_printFileAction->setActionGroup(_fileActionGroup);
 	connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile()));
 	addAction(_printFileAction);
-	_exportFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
+	_exportPDFFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
 	  tr("Export to PDF..."), this);
-	_exportFileAction->setMenuRole(QAction::NoRole);
-	_exportFileAction->setShortcut(EXPORT_SHORTCUT);
-	_exportFileAction->setActionGroup(_fileActionGroup);
-	connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile()));
-	addAction(_exportFileAction);
+	_exportPDFFileAction->setMenuRole(QAction::NoRole);
+	_exportPDFFileAction->setShortcut(PDF_EXPORT_SHORTCUT);
+	_exportPDFFileAction->setActionGroup(_fileActionGroup);
+	connect(_exportPDFFileAction, SIGNAL(triggered()), this, SLOT(exportPDFFile()));
+	addAction(_exportPDFFileAction);
+	_exportPNGFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
+	  tr("Export to PNG..."), this);
+	_exportPNGFileAction->setMenuRole(QAction::NoRole);
+	_exportPNGFileAction->setShortcut(PNG_EXPORT_SHORTCUT);
+	_exportPNGFileAction->setActionGroup(_fileActionGroup);
+	connect(_exportPNGFileAction, SIGNAL(triggered()), this, SLOT(exportPNGFile()));
+	addAction(_exportPNGFileAction);
 	_closeFileAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close"), this);
 	_closeFileAction->setMenuRole(QAction::NoRole);
 	_closeFileAction->setShortcut(CLOSE_SHORTCUT);
@ -243,7 +255,7 @@ void GUI::createActions()
 	_reloadFileAction->setMenuRole(QAction::NoRole);
 	_reloadFileAction->setShortcut(RELOAD_SHORTCUT);
 	_reloadFileAction->setActionGroup(_fileActionGroup);
-	connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFile()));
+	connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFiles()));
 	addAction(_reloadFileAction);
 	_statisticsAction = new QAction(tr("Statistics..."), this);
 	_statisticsAction->setMenuRole(QAction::NoRole);
@ -281,8 +293,10 @@ void GUI::createActions()
 	createPOIFilesActions();

 	// Map actions
+	createMapActions();
 	_showMapAction = new QAction(QIcon(SHOW_MAP_ICON), tr("Show map"),
 	  this);
+	_showMapAction->setEnabled(false);
 	_showMapAction->setMenuRole(QAction::NoRole);
 	_showMapAction->setCheckable(true);
 	_showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
@ -294,10 +308,10 @@ void GUI::createActions()
 	_loadMapAction->setMenuRole(QAction::NoRole);
 	connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
 	_clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
+	_clearMapCacheAction->setEnabled(false);
 	_clearMapCacheAction->setMenuRole(QAction::NoRole);
 	connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView,
 	  SLOT(clearMapCache()));
-	createMapActions();
 	_nextMapAction = new QAction(tr("Next map"), this);
 	_nextMapAction->setMenuRole(QAction::NoRole);
 	_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
@ -308,10 +322,6 @@ void GUI::createActions()
 	_prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
 	connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap()));
 	addAction(_prevMapAction);
-	if (_ml->maps().isEmpty()) {
-		_showMapAction->setEnabled(false);
-		_clearMapCacheAction->setEnabled(false);
-	}
 	_showCoordinatesAction = new QAction(tr("Show cursor coordinates"), this);
 	_showCoordinatesAction->setMenuRole(QAction::NoRole);
 	_showCoordinatesAction->setCheckable(true);
@ -494,7 +504,8 @@ void GUI::createMenus()
 	fileMenu->addAction(_openFileAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(_printFileAction);
-	fileMenu->addAction(_exportFileAction);
+	fileMenu->addAction(_exportPDFFileAction);
+	fileMenu->addAction(_exportPNGFileAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(_statisticsAction);
 	fileMenu->addSeparator();
@ -506,7 +517,7 @@ void GUI::createMenus()
 #endif // Q_OS_MAC

 	_mapMenu = menuBar()->addMenu(tr("&Map"));
-	_mapMenu->addActions(_mapActions);
+	_mapMenu->addActions(_mapsActionGroup->actions());
 	_mapsEnd = _mapMenu->addSeparator();
 	_mapMenu->addAction(_loadMapAction);
 	_mapMenu->addAction(_clearMapCacheAction);
@ -608,6 +619,7 @@ void GUI::createToolBars()

 void GUI::createMapView()
 {
+	_map = new EmptyMap(this);
 	_mapView = new MapView(_map, _poi, this);
 	_mapView->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
 	  QSizePolicy::Expanding));
@ -787,7 +799,12 @@ bool GUI::loadFile(const QString &fileName)
 			_trackDistance += track.distance();
 			_time += track.time();
 			_movingTime += track.movingTime();
-			const QDate &date = track.date().date();
+#ifdef ENABLE_TIMEZONES
+			const QDateTime date = track.date().toTimeZone(
+			  _options.timeZone.zone());
+#else // ENABLE_TIMEZONES
+			const QDateTime &date = track.date();
+#endif // ENABLE_TIMEZONES
 			if (_dateRange.first.isNull() || _dateRange.first > date)
 				_dateRange.first = date;
 			if (_dateRange.second.isNull() || _dateRange.second < date)
@ -905,16 +922,21 @@ void GUI::openOptions()
 		Track::action(options.option); \
 		reload = true; \
 	}
-#define SET_DATA_OPTION(option, action) \
+#define SET_ROUTE_OPTION(option, action) \
 	if (options.option != _options.option) { \
-		Data::action(options.option); \
+		Route::action(options.option); \
+		reload = true; \
+	}
+#define SET_WAYPOINT_OPTION(option, action) \
+	if (options.option != _options.option) { \
+		Waypoint::action(options.option); \
 		reload = true; \
 	}

 	Options options(_options);
 	bool reload = false;

-	OptionsDialog dialog(&options, this);
+	OptionsDialog dialog(options, _units, this);
 	if (dialog.exec() != QDialog::Accepted)
 		return;

@ -953,13 +975,19 @@ void GUI::openOptions()
 	SET_TRACK_OPTION(pauseSpeed, setPauseSpeed);
 	SET_TRACK_OPTION(pauseInterval, setPauseInterval);
 	SET_TRACK_OPTION(useReportedSpeed, useReportedSpeed);
+	SET_TRACK_OPTION(dataUseDEM, useDEM);
+	SET_TRACK_OPTION(showSecondaryElevation, showSecondaryElevation);
+	SET_TRACK_OPTION(showSecondarySpeed, showSecondarySpeed);
+	SET_TRACK_OPTION(useSegments, useSegments);

-	SET_DATA_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(showSecondaryElevation, showSecondaryElevation);
+
+	SET_WAYPOINT_OPTION(dataUseDEM, useDEM);
+	SET_WAYPOINT_OPTION(showSecondaryElevation, showSecondaryElevation);

 	if (options.poiRadius != _options.poiRadius)
 		_poi->setRadius(options.poiRadius);
-	if (options.poiUseDEM != _options.poiUseDEM)
-		_poi->useDEM(options.poiUseDEM);

 	if (options.pixmapCache != _options.pixmapCache)
 		QPixmapCache::setCacheLimit(options.pixmapCache * 1024);
@ -976,9 +1004,16 @@ void GUI::openOptions()
 		_mapView->setDevicePixelRatio(devicePixelRatioF(),
 		  options.hidpiMap ? devicePixelRatioF() : 1.0);
 #endif // ENABLE_HIDPI
+#ifdef ENABLE_TIMEZONES
+	if (options.timeZone != _options.timeZone) {
+		_mapView->setTimeZone(options.timeZone.zone());
+		_dateRange.first = _dateRange.first.toTimeZone(options.timeZone.zone());
+		_dateRange.second = _dateRange.second.toTimeZone(options.timeZone.zone());
+	}
+#endif // ENABLE_TIMEZONES

 	if (reload)
-		reloadFile();
+		reloadFiles();

 	_options = options;
 }
@ -992,9 +1027,9 @@ void GUI::printFile()
 		plot(&printer);
 }

-void GUI::exportFile()
+void GUI::exportPDFFile()
 {
-	ExportDialog dialog(&_export, this);
+	PDFExportDialog dialog(_pdfExport, _units, this);
 	if (dialog.exec() != QDialog::Accepted)
 		return;

@ -1002,16 +1037,53 @@ void GUI::exportFile()
 	printer.setOutputFormat(QPrinter::PdfFormat);
 	printer.setCreator(QString(APP_NAME) + QString(" ")
 	  + QString(APP_VERSION));
-	printer.setResolution(_export.resolution);
-	printer.setOrientation(_export.orientation);
-	printer.setOutputFileName(_export.fileName);
-	printer.setPaperSize(_export.paperSize);
-	printer.setPageMargins(_export.margins.left(), _export.margins.top(),
-	  _export.margins.right(), _export.margins.bottom(), QPrinter::Millimeter);
+	printer.setResolution(_pdfExport.resolution);
+	printer.setOrientation(_pdfExport.orientation);
+	printer.setOutputFileName(_pdfExport.fileName);
+	printer.setPaperSize(_pdfExport.paperSize);
+	printer.setPageMargins(_pdfExport.margins.left(), _pdfExport.margins.top(),
+	  _pdfExport.margins.right(), _pdfExport.margins.bottom(),
+	  QPrinter::Millimeter);

 	plot(&printer);
 }

+void GUI::exportPNGFile()
+{
+	PNGExportDialog dialog(_pngExport, this);
+	if (dialog.exec() != QDialog::Accepted)
+		return;
+
+	QImage img(_pngExport.size, QImage::Format_ARGB32_Premultiplied);
+	QPainter p(&img);
+	QRectF rect(0, 0, img.width(), img.height());
+	QRectF contentRect(rect.adjusted(_pngExport.margins.left(),
+	  _pngExport.margins.top(), -_pngExport.margins.right(),
+	  -_pngExport.margins.bottom()));
+
+	if (_pngExport.antialiasing)
+		p.setRenderHint(QPainter::Antialiasing);
+	p.fillRect(rect, Qt::white);
+	plotMainPage(&p, contentRect, 1.0, true);
+	img.save(_pngExport.fileName);
+
+	if (!_tabs.isEmpty() && _options.separateGraphPage) {
+		QImage img2(_pngExport.size.width(), (int)graphPlotHeight(rect, 1)
+		  + _pngExport.margins.bottom(), QImage::Format_ARGB32_Premultiplied);
+		QPainter p2(&img2);
+		QRectF rect2(0, 0, img2.width(), img2.height());
+
+		if (_pngExport.antialiasing)
+			p2.setRenderHint(QPainter::Antialiasing);
+		p2.fillRect(rect2, Qt::white);
+		plotGraphsPage(&p2, contentRect, 1);
+
+		QFileInfo fi(_pngExport.fileName);
+		img2.save(fi.absolutePath() + "/" + fi.baseName() + "-graphs."
+		  + fi.suffix());
+	}
+}
+
 void GUI::statistics()
 {
 	QLocale l(QLocale::system());
@ -1083,12 +1155,13 @@ void GUI::statistics()
 	msgBox.exec();
 }

-void GUI::plot(QPrinter *printer)
+void GUI::plotMainPage(QPainter *painter, const QRectF &rect, qreal ratio,
+  bool expand)
 {
 	QLocale l(QLocale::system());
-	QPainter p(printer);
 	TrackInfo info;
-	qreal ih, gh, mh, ratio;
+	qreal ih, gh, mh;
+	int sc;


 	if (!_pathName.isNull() && _options.printName)
@ -1124,54 +1197,92 @@ void GUI::plot(QPrinter *printer)
 	if (movingTime() > 0 && _options.printMovingTime)
 		info.insert(tr("Moving time"), Format::timeSpan(movingTime()));

-	qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
-	  / (qreal)printer->resolution());
-	ratio = p.paintEngine()->paintDevice()->logicalDpiX() / fsr;
 	if (info.isEmpty()) {
 		ih = 0;
 		mh = 0;
 	} else {
 		ih = info.contentSize().height() * ratio;
 		mh = ih / 2;
-		info.plot(&p, QRectF(0, 0, printer->width(), ih), ratio);
+		info.plot(painter, QRectF(rect.x(), rect.y(), rect.width(), ih), ratio);
 	}
 	if (_graphTabWidget->isVisible() && !_options.separateGraphPage) {
-		qreal r = (((qreal)(printer)->width()) / (qreal)(printer->height()));
-		gh = (printer->width() > printer->height())
-		  ? 0.15 * r * (printer->height() - ih - 2*mh)
-		  : 0.15 * (printer->height() - ih - 2*mh);
+		qreal r = rect.width() / rect.height();
+		gh = (rect.width() > rect.height())
+		  ? 0.15 * r * (rect.height() - ih - 2*mh)
+		  : 0.15 * (rect.height() - ih - 2*mh);
+		if (gh < 150)
+			gh = 150;
+		sc = 2;
 		GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->currentWidget());
-		gt->plot(&p,  QRectF(0, printer->height() - gh, printer->width(), gh),
-		  ratio);
-	} else
+		gt->plot(painter,  QRectF(rect.x(), rect.y() + rect.height() - gh,
+		  rect.width(), gh), ratio);
+	} else {
 		gh = 0;
-	_mapView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
-	  - (ih + 2*mh + gh)), ratio, _options.hiresPrint);
+		sc = 1;
+	}

-	if (_graphTabWidget->isVisible() && _options.separateGraphPage) {
-		printer->newPage();
+	MapView::PlotFlags flags = MapView::NoFlags;
+	if (_options.hiresPrint)
+		flags |= MapView::HiRes;
+	if (expand)
+		flags |= MapView::Expand;

-		int cnt = 0;
-		for (int i = 0; i < _tabs.size(); i++)
-			if (!_tabs.at(i)->isEmpty())
-				cnt++;
+	_mapView->plot(painter, QRectF(rect.x(), rect.y() + ih + mh, rect.width(),
+	  rect.height() - (ih + sc*mh + gh)), ratio, flags);
+}

-		qreal sp = ratio * 20;
-		gh = qMin((printer->height() - ((cnt - 1) * sp))/(qreal)cnt,
-		  0.20 * printer->height());
+void GUI::plotGraphsPage(QPainter *painter, const QRectF &rect, qreal ratio)
+{
+	int cnt = 0;
+	for (int i = 0; i < _tabs.size(); i++)
+		if (!_tabs.at(i)->isEmpty())
+			cnt++;

-		qreal y = 0;
-		for (int i = 0; i < _tabs.size(); i++) {
-			if (!_tabs.at(i)->isEmpty()) {
-				_tabs.at(i)->plot(&p,  QRectF(0, y, printer->width(), gh),
-				  ratio);
-				y += gh + sp;
-			}
+	qreal sp = ratio * 20;
+	qreal gh = qMin((rect.height() - ((cnt - 1) * sp))/(qreal)cnt,
+	  0.20 * rect.height());
+
+	qreal y = 0;
+	for (int i = 0; i < _tabs.size(); i++) {
+		if (!_tabs.at(i)->isEmpty()) {
+			_tabs.at(i)->plot(painter,  QRectF(rect.x(), rect.y() + y,
+			  rect.width(), gh), ratio);
+			y += gh + sp;
 		}
 	}
 }

-void GUI::reloadFile()
+qreal GUI::graphPlotHeight(const QRectF &rect, qreal ratio)
+{
+	int cnt = 0;
+	for (int i = 0; i < _tabs.size(); i++)
+		if (!_tabs.at(i)->isEmpty())
+			cnt++;
+
+	qreal sp = ratio * 20;
+	qreal gh = qMin((rect.height() - ((cnt - 1) * sp))/(qreal)cnt,
+	  0.20 * rect.height());
+
+	return cnt * gh + (cnt - 1) * sp;
+}
+
+void GUI::plot(QPrinter *printer)
+{
+	QPainter p(printer);
+	qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
+	  / (qreal)printer->resolution());
+	qreal ratio = p.paintEngine()->paintDevice()->logicalDpiX() / fsr;
+	QRectF rect(0, 0, printer->width(), printer->height());
+
+	plotMainPage(&p, rect, ratio);
+
+	if (!_tabs.isEmpty() && _options.separateGraphPage) {
+		printer->newPage();
+		plotGraphsPage(&p, rect, ratio);
+	}
+}
+
+void GUI::reloadFiles()
 {
 	_trackCount = 0;
 	_routeCount = 0;
@ -1181,7 +1292,7 @@ void GUI::reloadFile()
 	_routeDistance = 0;
 	_time = 0;
 	_movingTime = 0;
-	_dateRange = DateRange(QDate(), QDate());
+	_dateRange = DateTimeRange(QDateTime(), QDateTime());
 	_pathName = QString();

 	for (int i = 0; i < _tabs.count(); i++)
@ -1215,7 +1326,7 @@ void GUI::closeFiles()
 	_routeDistance = 0;
 	_time = 0;
 	_movingTime = 0;
-	_dateRange = DateRange(QDate(), QDate());
+	_dateRange = DateTimeRange(QDateTime(), QDateTime());
 	_pathName = QString();

 	_sliderPos = 0;
@ -1322,22 +1433,49 @@ void GUI::loadMap()

 bool GUI::loadMap(const QString &fileName)
 {
+	// On OS X fileName may be a directory!
+
 	if (fileName.isEmpty())
 		return false;

-	if (_ml->loadFile(fileName)) {
-		QAction *a = createMapAction(_ml->maps().last());
+	QString error;
+	QList<Map*> maps = MapList::loadMaps(fileName, error);
+	if (maps.isEmpty()) {
+		error = tr("Error loading map:") + "\n\n"
+		  + fileName + "\n\n" + error;
+		QMessageBox::critical(this, APP_NAME, error);
+		return false;
+	}
+
+	for (int i = 0; i < maps.size(); i++) {
+		Map *map = maps.at(i);
+		MapAction *a = createMapAction(map);
 		_mapMenu->insertAction(_mapsEnd, a);
+		if (map->isReady()) {
+			a->trigger();
+			_showMapAction->setEnabled(true);
+			_clearMapCacheAction->setEnabled(true);
+		} else
+			connect(a, SIGNAL(loaded()), this, SLOT(mapLoaded()));
+	}
+
+	return true;
+}
+
+void GUI::mapLoaded()
+{
+	MapAction *action = static_cast<MapAction*>(QObject::sender());
+	Map *map = action->data().value<Map*>();
+
+	if (map->isValid()) {
+		action->trigger();
 		_showMapAction->setEnabled(true);
 		_clearMapCacheAction->setEnabled(true);
-		a->trigger();
-		return true;
 	} else {
 		QString error = tr("Error loading map:") + "\n\n"
-		  + fileName + "\n\n" + _ml->errorString();
+		  + map->name() + "\n\n" + map->errorString();
 		QMessageBox::critical(this, APP_NAME, error);
-
-		return false;
+		action->deleteLater();
 	}
 }

@ -1379,31 +1517,42 @@ void GUI::updateWindowTitle()
 		setWindowTitle(APP_NAME);
 }

-void GUI::mapChanged(int index)
+void GUI::mapChanged()
 {
-	_map = _ml->maps().at(index);
+	_map = _mapsActionGroup->checkedAction()->data().value<Map*>();
 	_mapView->setMap(_map);
 }

 void GUI::nextMap()
 {
-	if (_ml->maps().count() < 2)
+	QAction *checked = _mapsActionGroup->checkedAction();
+	if (!checked)
 		return;

-	int next = (_ml->maps().indexOf(_map) + 1) % _ml->maps().count();
-	_mapActions.at(next)->setChecked(true);
-	mapChanged(next);
+	QList<QAction*> maps = _mapsActionGroup->actions();
+	for (int i = 1;	i < maps.size(); i++) {
+		int next = (maps.indexOf(checked) + i) % maps.count();
+		if (maps.at(next)->isEnabled()) {
+			maps.at(next)->trigger();
+			break;
+		}
+	}
 }

 void GUI::prevMap()
 {
-	if (_ml->maps().count() < 2)
+	QAction *checked = _mapsActionGroup->checkedAction();
+	if (!checked)
 		return;

-	int prev = (_ml->maps().indexOf(_map) + _ml->maps().count() - 1)
-	  % _ml->maps().count();
-	_mapActions.at(prev)->setChecked(true);
-	mapChanged(prev);
+	QList<QAction*> maps = _mapsActionGroup->actions();
+	for (int i = 1; i < maps.size(); i++) {
+		int prev = (maps.indexOf(checked) + maps.count() - i) % maps.count();
+		if (maps.at(prev)->isEnabled()) {
+			maps.at(prev)->trigger();
+			break;
+		}
+	}
 }

 void GUI::poiFileChecked(int index)
@ -1487,8 +1636,7 @@ void GUI::setTimeType(TimeType type)

 void GUI::setUnits(Units units)
 {
-	_export.units = units;
-	_options.units = units;
+	_units = units;

 	_mapView->setUnits(units);
 	for (int i = 0; i <_tabs.count(); i++)
@ -1731,23 +1879,42 @@ void GUI::writeSettings()
 		  _showTicksAction->isChecked());
 	settings.endGroup();

-	settings.beginGroup(EXPORT_SETTINGS_GROUP);
-	if (_export.orientation != PAPER_ORIENTATION_DEFAULT)
-		settings.setValue(PAPER_ORIENTATION_SETTING, _export.orientation);
-	if (_export.resolution != RESOLUTION_DEFAULT)
-		settings.setValue(RESOLUTION_SETTING, _export.resolution);
-	if (_export.paperSize != PAPER_SIZE_DEFAULT)
-		settings.setValue(PAPER_SIZE_SETTING, _export.paperSize);
-	if (_export.margins.left() != MARGIN_LEFT_DEFAULT)
-		settings.setValue(MARGIN_LEFT_SETTING, _export.margins.left());
-	if (_export.margins.top() != MARGIN_TOP_DEFAULT)
-		settings.setValue(MARGIN_TOP_SETTING, _export.margins.top());
-	if (_export.margins.right() != MARGIN_RIGHT_DEFAULT)
-		settings.setValue(MARGIN_RIGHT_SETTING, _export.margins.right());
-	if (_export.margins.bottom() != MARGIN_BOTTOM_DEFAULT)
-		settings.setValue(MARGIN_BOTTOM_SETTING, _export.margins.bottom());
-	if (_export.fileName != EXPORT_FILENAME_DEFAULT)
-		settings.setValue(EXPORT_FILENAME_SETTING, _export.fileName);
+	settings.beginGroup(PDF_EXPORT_SETTINGS_GROUP);
+	if (_pdfExport.orientation != PAPER_ORIENTATION_DEFAULT)
+		settings.setValue(PAPER_ORIENTATION_SETTING, _pdfExport.orientation);
+	if (_pdfExport.resolution != RESOLUTION_DEFAULT)
+		settings.setValue(RESOLUTION_SETTING, _pdfExport.resolution);
+	if (_pdfExport.paperSize != PAPER_SIZE_DEFAULT)
+		settings.setValue(PAPER_SIZE_SETTING, _pdfExport.paperSize);
+	if (_pdfExport.margins.left() != PDF_MARGIN_LEFT_DEFAULT)
+		settings.setValue(PDF_MARGIN_LEFT_SETTING, _pdfExport.margins.left());
+	if (_pdfExport.margins.top() != PDF_MARGIN_TOP_DEFAULT)
+		settings.setValue(PDF_MARGIN_TOP_SETTING, _pdfExport.margins.top());
+	if (_pdfExport.margins.right() != PDF_MARGIN_RIGHT_DEFAULT)
+		settings.setValue(PDF_MARGIN_RIGHT_SETTING, _pdfExport.margins.right());
+	if (_pdfExport.margins.bottom() != PDF_MARGIN_BOTTOM_DEFAULT)
+		settings.setValue(PDF_MARGIN_BOTTOM_SETTING, _pdfExport.margins.bottom());
+	if (_pdfExport.fileName != PDF_FILENAME_DEFAULT)
+		settings.setValue(PDF_FILENAME_SETTING, _pdfExport.fileName);
+	settings.endGroup();
+
+	settings.beginGroup(PNG_EXPORT_SETTINGS_GROUP);
+	if (_pngExport.size.width() != PNG_WIDTH_DEFAULT)
+		settings.setValue(PNG_WIDTH_SETTING, _pngExport.size.width());
+	if (_pngExport.size.height() != PNG_HEIGHT_DEFAULT)
+		settings.setValue(PNG_HEIGHT_SETTING, _pngExport.size.height());
+	if (_pngExport.margins.left() != PNG_MARGIN_LEFT_DEFAULT)
+		settings.setValue(PNG_MARGIN_LEFT_SETTING, _pngExport.margins.left());
+	if (_pngExport.margins.top() != PNG_MARGIN_TOP_DEFAULT)
+		settings.setValue(PNG_MARGIN_TOP_SETTING, _pngExport.margins.top());
+	if (_pngExport.margins.right() != PNG_MARGIN_RIGHT_DEFAULT)
+		settings.setValue(PNG_MARGIN_RIGHT_SETTING, _pngExport.margins.right());
+	if (_pngExport.margins.bottom() != PNG_MARGIN_BOTTOM_DEFAULT)
+		settings.setValue(PNG_MARGIN_BOTTOM_SETTING, _pngExport.margins.bottom());
+	if (_pngExport.antialiasing != PNG_ANTIALIASING_DEFAULT)
+		settings.setValue(PNG_ANTIALIASING_SETTING, _pngExport.antialiasing);
+	if (_pngExport.fileName != PNG_FILENAME_DEFAULT)
+		settings.setValue(PNG_FILENAME_SETTING, _pngExport.fileName);
 	settings.endGroup();

 	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
@ -1809,10 +1976,21 @@ void GUI::writeSettings()
 		settings.setValue(USE_REPORTED_SPEED_SETTING, _options.useReportedSpeed);
 	if (_options.dataUseDEM != DATA_USE_DEM_DEFAULT)
 		settings.setValue(DATA_USE_DEM_SETTING, _options.dataUseDEM);
+	if (_options.showSecondaryElevation != SHOW_SECONDARY_ELEVATION_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_ELEVATION_SETTING,
+		  _options.showSecondaryElevation);
+	if (_options.showSecondarySpeed != SHOW_SECONDARY_SPEED_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_SPEED_SETTING,
+		  _options.showSecondarySpeed);
+#ifdef ENABLE_TIMEZONES
+	if (_options.timeZone != TimeZoneInfo())
+		settings.setValue(TIME_ZONE_SETTING, QVariant::fromValue(
+		  _options.timeZone));
+#endif // ENABLE_TIMEZONES
+	if (_options.useSegments != USE_SEGMENTS_DEFAULT)
+		settings.setValue(USE_SEGMENTS_SETTING, _options.useSegments);
 	if (_options.poiRadius != POI_RADIUS_DEFAULT)
 		settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
-	if (_options.poiUseDEM != POI_USE_DEM_DEFAULT)
-		settings.setValue(POI_USE_DEM_SETTING, _options.poiUseDEM);
 	if (_options.useOpenGL != USE_OPENGL_DEFAULT)
 		settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
 #ifdef ENABLE_HTTP2
@ -1896,9 +2074,11 @@ void GUI::readSettings()
 		_showMapAction->setChecked(true);
 	else
 		_mapView->showMap(false);
-	if (_ml->maps().count()) {
-		int index = mapIndex(settings.value(CURRENT_MAP_SETTING).toString());
-		_mapActions.at(index)->trigger();
+	QAction *ma = mapAction(settings.value(CURRENT_MAP_SETTING).toString());
+	if (ma) {
+		ma->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
 	}
 	if (settings.value(SHOW_COORDINATES_SETTING, SHOW_COORDINATES_DEFAULT)
 	  .toBool()) {
@ -2000,23 +2180,42 @@ void GUI::readSettings()
 	}
 	settings.endGroup();

-	settings.beginGroup(EXPORT_SETTINGS_GROUP);
-	_export.orientation = (QPrinter::Orientation) settings.value(
+	settings.beginGroup(PDF_EXPORT_SETTINGS_GROUP);
+	_pdfExport.orientation = (QPrinter::Orientation) settings.value(
 	  PAPER_ORIENTATION_SETTING, PAPER_ORIENTATION_DEFAULT).toInt();
-	_export.resolution = settings.value(RESOLUTION_SETTING, RESOLUTION_DEFAULT)
+	_pdfExport.resolution = settings.value(RESOLUTION_SETTING,
+	  RESOLUTION_DEFAULT).toInt();
+	_pdfExport.paperSize = (QPrinter::PaperSize) settings.value(
+	  PAPER_SIZE_SETTING, PAPER_SIZE_DEFAULT).toInt();
+	qreal ml = settings.value(PDF_MARGIN_LEFT_SETTING, PDF_MARGIN_LEFT_DEFAULT)
+	  .toReal();
+	qreal mt = settings.value(PDF_MARGIN_TOP_SETTING, PDF_MARGIN_TOP_DEFAULT)
+	  .toReal();
+	qreal mr = settings.value(PDF_MARGIN_RIGHT_SETTING,
+	  PDF_MARGIN_RIGHT_DEFAULT).toReal();
+	qreal mb = settings.value(PDF_MARGIN_BOTTOM_SETTING,
+	  PDF_MARGIN_BOTTOM_DEFAULT).toReal();
+	_pdfExport.margins = MarginsF(ml, mt, mr, mb);
+	_pdfExport.fileName = settings.value(PDF_FILENAME_SETTING,
+	 PDF_FILENAME_DEFAULT).toString();
+	settings.endGroup();
+
+	settings.beginGroup(PNG_EXPORT_SETTINGS_GROUP);
+	_pngExport.size = QSize(settings.value(PNG_WIDTH_SETTING, PNG_WIDTH_DEFAULT)
+	  .toInt(), settings.value(PNG_HEIGHT_SETTING, PNG_HEIGHT_DEFAULT).toInt());
+	int mli = settings.value(PNG_MARGIN_LEFT_SETTING, PNG_MARGIN_LEFT_DEFAULT)
 	  .toInt();
-	_export.paperSize = (QPrinter::PaperSize) settings.value(PAPER_SIZE_SETTING,
-	  PAPER_SIZE_DEFAULT).toInt();
-	qreal ml = settings.value(MARGIN_LEFT_SETTING, MARGIN_LEFT_DEFAULT)
-	  .toReal();
-	qreal mt = settings.value(MARGIN_TOP_SETTING, MARGIN_TOP_DEFAULT).toReal();
-	qreal mr = settings.value(MARGIN_RIGHT_SETTING, MARGIN_RIGHT_DEFAULT)
-	  .toReal();
-	qreal mb = settings.value(MARGIN_BOTTOM_SETTING, MARGIN_BOTTOM_DEFAULT)
-	  .toReal();
-	_export.margins = MarginsF(ml, mt, mr, mb);
-	_export.fileName = settings.value(EXPORT_FILENAME_SETTING,
-	 EXPORT_FILENAME_DEFAULT).toString();
+	int mti = settings.value(PNG_MARGIN_TOP_SETTING, PNG_MARGIN_TOP_DEFAULT)
+	  .toInt();
+	int mri = settings.value(PNG_MARGIN_RIGHT_SETTING, PNG_MARGIN_RIGHT_DEFAULT)
+	  .toInt();
+	int mbi = settings.value(PNG_MARGIN_BOTTOM_SETTING, PNG_MARGIN_BOTTOM_DEFAULT)
+	  .toInt();
+	_pngExport.margins = QMargins(mli, mti, mri, mbi);
+	_pngExport.antialiasing = settings.value(PNG_ANTIALIASING_SETTING,
+	  PNG_ANTIALIASING_DEFAULT).toBool();
+	_pngExport.fileName = settings.value(PNG_FILENAME_SETTING,
+	  PNG_FILENAME_DEFAULT).toString();
 	settings.endGroup();

 	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
@ -2075,14 +2274,23 @@ void GUI::readSettings()
 	  USE_REPORTED_SPEED_DEFAULT).toBool();
 	_options.dataUseDEM = settings.value(DATA_USE_DEM_SETTING,
 	  DATA_USE_DEM_DEFAULT).toBool();
+	_options.showSecondaryElevation = settings.value(
+	  SHOW_SECONDARY_ELEVATION_SETTING,
+	  SHOW_SECONDARY_ELEVATION_DEFAULT).toBool();
+	_options.showSecondarySpeed = settings.value(
+	  SHOW_SECONDARY_SPEED_SETTING,
+	  SHOW_SECONDARY_SPEED_DEFAULT).toBool();
+#ifdef ENABLE_TIMEZONES
+	_options.timeZone = settings.value(TIME_ZONE_SETTING).value<TimeZoneInfo>();
+#endif // ENABLE_TIMEZONES
+	_options.useSegments = settings.value(USE_SEGMENTS_SETTING,
+	  USE_SEGMENTS_DEFAULT).toBool();
 	_options.automaticPause = settings.value(AUTOMATIC_PAUSE_SETTING,
 	  AUTOMATIC_PAUSE_DEFAULT).toBool();
 	_options.pauseInterval = settings.value(PAUSE_INTERVAL_SETTING,
 	  PAUSE_INTERVAL_DEFAULT).toInt();
 	_options.poiRadius = settings.value(POI_RADIUS_SETTING, POI_RADIUS_DEFAULT)
 	  .toInt();
-	_options.poiUseDEM = settings.value(POI_USE_DEM_SETTING,
-	  POI_USE_DEM_DEFAULT).toBool();
 	_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
 	  .toBool();
 #ifdef ENABLE_HTTP2
@ -2141,6 +2349,9 @@ void GUI::readSettings()
 	  _options.hidpiMap ? devicePixelRatioF() : 1.0);
 #endif // ENABLE_HIDPI
 	_mapView->setProjection(_options.projection);
+#ifdef ENABLE_TIMEZONES
+	_mapView->setTimeZone(_options.timeZone.zone());
+#endif // ENABLE_TIMEZONES

 	for (int i = 0; i < _tabs.count(); i++) {
 		_tabs.at(i)->setPalette(_options.palette);
@ -2162,21 +2373,39 @@ void GUI::readSettings()
 	Track::setPauseSpeed(_options.pauseSpeed);
 	Track::setPauseInterval(_options.pauseInterval);
 	Track::useReportedSpeed(_options.useReportedSpeed);
-	Data::useDEM(_options.dataUseDEM);
+	Track::useDEM(_options.dataUseDEM);
+	Track::showSecondaryElevation(_options.showSecondaryElevation);
+	Track::showSecondarySpeed(_options.showSecondarySpeed);
+	Track::useSegments(_options.useSegments);
+	Route::useDEM(_options.dataUseDEM);
+	Route::showSecondaryElevation(_options.showSecondaryElevation);
+	Waypoint::useDEM(_options.dataUseDEM);
+	Waypoint::showSecondaryElevation(_options.showSecondaryElevation);

 	_poi->setRadius(_options.poiRadius);
-	_poi->useDEM(_options.poiUseDEM);

 	QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);

 	settings.endGroup();
 }

-int GUI::mapIndex(const QString &name)
+QAction *GUI::mapAction(const QString &name)
 {
-	for (int i = 0; i < _ml->maps().count(); i++)
-		if (_ml->maps().at(i)->name() == name)
-			return i;
+	QList<QAction *> maps = _mapsActionGroup->actions();
+
+	// Last map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->name() == name && map->isReady())
+			return maps.at(i);
+	}
+
+	// Any usable map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->isReady())
+			return maps.at(i);
+	}

 	return 0;
 }
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@ -10,7 +10,8 @@
 #include "units.h"
 #include "timetype.h"
 #include "format.h"
-#include "exportdialog.h"
+#include "pdfexportdialog.h"
+#include "pngexportdialog.h"
 #include "optionsdialog.h"

 class QMenu;
@ -26,9 +27,9 @@ class FileBrowser;
 class GraphTab;
 class MapView;
 class Map;
-class MapList;
 class POI;
 class QScreen;
+class MapAction;

 class GUI : public QMainWindow
 {
@ -45,10 +46,11 @@ private slots:
 	void keys();
 	void paths();
 	void printFile();
-	void exportFile();
+	void exportPDFFile();
+	void exportPNGFile();
 	void openFile();
 	void closeAll();
-	void reloadFile();
+	void reloadFiles();
 	void statistics();
 	void openPOIFile();
 	void closePOIFiles();
@ -64,7 +66,7 @@ private slots:
 	void prevMap();
 	void openOptions();

-	void mapChanged(int);
+	void mapChanged();
 	void graphChanged(int);
 	void poiFileChecked(int);

@ -88,16 +90,22 @@ private slots:
 	void screenChanged(QScreen *screen);
 	void logicalDotsPerInchChanged(qreal dpi);

-private:
-	typedef QPair<QDate, QDate> DateRange;
+	void mapLoaded();
+	void mapInitialized();
+
+private:
+	typedef QPair<QDateTime, QDateTime> DateTimeRange;

-	void loadMaps();
 	void loadPOIs();
 	void closeFiles();
 	void plot(QPrinter *printer);
+	void plotMainPage(QPainter *painter, const QRectF &rect, qreal ratio,
+	  bool expand = false);
+	void plotGraphsPage(QPainter *painter, const QRectF &rect, qreal ratio);
+	qreal graphPlotHeight(const QRectF &rect, qreal ratio);

 	QAction *createPOIFileAction(const QString &fileName);
-	QAction *createMapAction(const Map *map);
+	MapAction *createMapAction(Map *map);
 	void createPOIFilesActions();
 	void createMapActions();
 	void createActions();
@ -111,7 +119,6 @@ private:
 	bool openPOIFile(const QString &fileName);
 	bool loadFile(const QString &fileName);
 	bool loadMap(const QString &fileName);
-	void exportFile(const QString &fileName);
 	void updateStatusBarInfo();
 	void updateWindowTitle();
 	void updateNavigationActions();
@ -127,7 +134,7 @@ private:
 	qreal distance() const;
 	qreal time() const;
 	qreal movingTime() const;
-	int mapIndex(const QString &name);
+	QAction *mapAction(const QString &name);
 	void readSettings();
 	void writeSettings();

@ -151,7 +158,8 @@ private:
 	QAction *_aboutAction;
 	QAction *_aboutQtAction;
 	QAction *_printFileAction;
-	QAction *_exportFileAction;
+	QAction *_exportPDFFileAction;
+	QAction *_exportPNGFileAction;
 	QAction *_openFileAction;
 	QAction *_closeFileAction;
 	QAction *_reloadFileAction;
@ -196,11 +204,9 @@ private:
 	QAction *_showCoordinatesAction;
 	QAction *_openOptionsAction;
 	QAction *_mapsEnd;
-	QList<QAction*> _mapActions;
-	QList<QAction*> _poiFilesActions;

+	QList<QAction*> _poiFilesActions;
 	QSignalMapper *_poiFilesSignalMapper;
-	QSignalMapper *_mapsSignalMapper;

 	QLabel *_fileNameLabel;
 	QLabel *_distanceLabel;
@ -212,7 +218,6 @@ private:
 	QList<GraphTab*> _tabs;

 	POI *_poi;
-	MapList *_ml;
 	Map *_map;

 	FileBrowser *_browser;
@ -221,7 +226,7 @@ private:
 	int _trackCount, _routeCount, _areaCount, _waypointCount;
 	qreal _trackDistance, _routeDistance;
 	qreal _time, _movingTime;
-	DateRange _dateRange;
+	DateTimeRange _dateRange;
 	QString _pathName;

 	qreal _sliderPos;
@ -229,10 +234,13 @@ private:
 	QList<QByteArray> _windowStates;
 	int _frameStyle;

-	Export _export;
+	PDFExport _pdfExport;
+	PNGExport _pngExport;
 	Options _options;

 	QString _dataDir, _mapDir, _poiDir;
+
+	Units _units;
 };

 #endif // GUI_H
--- a/src/GUI/heartrategraphitem.cpp
+++ b/src/GUI/heartrategraphitem.cpp
@ -5,7 +5,7 @@

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

--- a/src/GUI/keys.h
+++ b/src/GUI/keys.h
@ -18,7 +18,8 @@
 #define OPEN_SHORTCUT           QKeySequence(QKeySequence::Open)
 #define CLOSE_SHORTCUT          QKeySequence(QKeySequence::Close)
 #define RELOAD_SHORTCUT         QKeySequence(QKeySequence::Refresh)
-#define EXPORT_SHORTCUT         QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PDF_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PNG_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_X)
 #define SHOW_POI_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_P)
 #define SHOW_MAP_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_M)
 #define NEXT_MAP_SHORTCUT       QKeySequence(QKeySequence::Forward)
--- a/src/GUI/mapaction.h
+++ b/src/GUI/mapaction.h
@ -0,0 +1,32 @@
+#ifndef MAPACTION_H
+#define MAPACTION_H
+
+#include <QAction>
+#include "map/map.h"
+
+class MapAction : public QAction
+{
+	Q_OBJECT
+
+public:
+	MapAction(Map *map, QObject *parent = 0) : QAction(map->name(), parent)
+	{
+		map->setParent(this);
+		setData(QVariant::fromValue(map));
+		setEnabled(map->isReady());
+		connect(map, SIGNAL(mapLoaded()), this, SLOT(mapLoaded()));
+	}
+
+signals:
+	void loaded();
+
+private slots:
+	void mapLoaded()
+	{
+		Map *map = data().value<Map*>();
+		setEnabled(map->isValid());
+		emit loaded();
+	}
+};
+
+#endif // MAPACTION_H
--- a/src/GUI/mapview.cpp
+++ b/src/GUI/mapview.cpp
@ -2,7 +2,6 @@
 #include <QGraphicsScene>
 #include <QWheelEvent>
 #include <QApplication>
-#include <QPixmapCache>
 #include <QScrollBar>
 #include "data/poi.h"
 #include "data/data.h"
@ -55,13 +54,11 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	_map = map;
 	_map->load();
 	_map->setProjection(_projection);
-	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));

 	_poi = poi;
 	connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));

-	_units = Metric;
-	_coordinatesFormat = DecimalDegrees;
 	_mapOpacity = 1.0;
 	_backgroundColor = Qt::white;
 	_markerColor = Qt::red;
@ -123,7 +120,6 @@ PathItem *MapView::addTrack(const Track &track)
 	ti->setColor(_palette.nextColor());
 	ti->setWidth(_trackWidth);
 	ti->setStyle(_trackStyle);
-	ti->setUnits(_units);
 	ti->setVisible(_showTracks);
 	ti->setDigitalZoom(_digitalZoom);
 	ti->setMarkerColor(_markerColor);
@ -150,8 +146,6 @@ PathItem *MapView::addRoute(const Route &route)
 	ri->setColor(_palette.nextColor());
 	ri->setWidth(_routeWidth);
 	ri->setStyle(_routeStyle);
-	ri->setUnits(_units);
-	ri->setCoordinatesFormat(_coordinatesFormat);
 	ri->setVisible(_showRoutes);
 	ri->showWaypoints(_showRouteWaypoints);
 	ri->showWaypointLabels(_showWaypointLabels);
@ -201,7 +195,6 @@ void MapView::addWaypoints(const QVector<Waypoint> &waypoints)
 		wi->setSize(_waypointSize);
 		wi->setColor(_waypointColor);
 		wi->showLabel(_showWaypointLabels);
-		wi->setToolTipFormat(_units, _coordinatesFormat);
 		wi->setVisible(_showWaypoints);
 		wi->setDigitalZoom(_digitalZoom);
 		_scene->addItem(wi);
@ -317,7 +310,7 @@ void MapView::setMap(Map *map)
 	RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));

 	_map->unload();
-	disconnect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	disconnect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));

 	_map = map;
 	_map->load();
@ -325,7 +318,7 @@ void MapView::setMap(Map *map)
 #ifdef ENABLE_HIDPI
 	_map->setDevicePixelRatio(_deviceRatio, _mapRatio);
 #endif // ENABLE_HIDPI
-	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
+	connect(_map, SIGNAL(tilesLoaded()), this, SLOT(reloadMap()));

 	digitalZoom(0);

@ -351,7 +344,6 @@ void MapView::setMap(Map *map)
 	centerOn(nc);

 	reloadMap();
-	QPixmapCache::clear();
 }

 void MapView::setPOI(POI *poi)
@ -403,7 +395,6 @@ void MapView::addPOI(const QList<Waypoint> &waypoints)
 		pi->showLabel(_showPOILabels);
 		pi->setVisible(_showPOI);
 		pi->setDigitalZoom(_digitalZoom);
-		pi->setToolTipFormat(_units, _coordinatesFormat);
 		_scene->addItem(pi);

 		_pois.insert(SearchPointer<Waypoint>(&(pi->waypoint())), pi);
@ -412,51 +403,38 @@ void MapView::addPOI(const QList<Waypoint> &waypoints)

 void MapView::setUnits(Units units)
 {
-	if (_units == units)
-		return;
-
-	_units = units;
-
-	_mapScale->setUnits(_units);
+	WaypointItem::setUnits(units);
+	PathItem::setUnits(units);

 	for (int i = 0; i < _tracks.count(); i++)
-		_tracks[i]->setUnits(_units);
+		_tracks[i]->updateTicks();
 	for (int i = 0; i < _routes.count(); i++)
-		_routes[i]->setUnits(_units);
-	for (int i = 0; i < _waypoints.size(); i++)
-		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
+		_routes[i]->updateTicks();

-	for (POIHash::const_iterator it = _pois.constBegin();
-	  it != _pois.constEnd(); it++)
-		it.value()->setToolTipFormat(_units, _coordinatesFormat);
+	_mapScale->setUnits(units);
 }

 void MapView::setCoordinatesFormat(CoordinatesFormat format)
 {
-	if (_coordinatesFormat == format)
-		return;
+	WaypointItem::setCoordinatesFormat(format);

-	_coordinatesFormat = format;
+	_coordinates->setFormat(format);
+}

-	_coordinates->setFormat(_coordinatesFormat);
-
-	for (int i = 0; i < _waypoints.count(); i++)
-		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
-	for (int i = 0; i < _routes.count(); i++)
-		_routes[i]->setCoordinatesFormat(_coordinatesFormat);
-
-	for (POIHash::const_iterator it = _pois.constBegin();
-	  it != _pois.constEnd(); it++)
-		it.value()->setToolTipFormat(_units, _coordinatesFormat);
+void MapView::setTimeZone(const QTimeZone &zone)
+{
+#ifdef ENABLE_TIMEZONES
+	WaypointItem::setTimeZone(zone);
+	PathItem::setTimeZone(zone);
+#else // ENABLE_TIMEZONES
+	Q_UNUSED(zone);
+#endif // ENABLE_TIMEZONES
 }

 void MapView::clearMapCache()
 {
 	_map->clearCache();
-
-	fitMapZoom();
-	rescale();
-	centerOn(contentCenter());
+	reloadMap();
 }

 void MapView::digitalZoom(int zoom)
@ -553,7 +531,7 @@ void MapView::keyPressEvent(QKeyEvent *event)
 }

 void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
-  bool hires)
+  PlotFlags flags)
 {
 	QRect orig, adj;
 	qreal ratio, diff, q;
@ -581,10 +559,18 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 		diff = (orig.height() * ratio) - orig.width();
 		adj = orig.adjusted(-diff/2, 0, diff/2, 0);
 	}
-	q = (target.width() / scale) / adj.width();
+
+	// Expand the view if plotting into a bitmap
+	if (flags & Expand) {
+		qreal xdiff = (target.width() - adj.width()) / 2.0;
+		qreal ydiff = (target.height() - adj.height()) / 2.0;
+		adj.adjust(-xdiff, -ydiff, xdiff, ydiff);
+		q = 1.0;
+	} else
+		q = (target.width() / scale) / adj.width();

 	// Adjust the view for printing
-	if (hires) {
+	if (flags & HiRes) {
 		zoom = _map->zoom();
 		QRectF vr(mapToScene(orig).boundingRect());
 		origScene = vr.center();
@ -616,7 +602,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	render(painter, target, adj);

 	// Revert view changes to display mode
-	if (hires) {
+	if (flags & HiRes) {
 		_map->setZoom(zoom);
 		rescale();
 		centerOn(origScene);
@ -982,7 +968,6 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)

 	_deviceRatio = deviceRatio;
 	_mapRatio = mapRatio;
-	QPixmapCache::clear();

 	QRectF vr(mapToScene(viewport()->rect()).boundingRect()
 	  .intersected(_map->bounds()));
--- a/src/GUI/mapview.h
+++ b/src/GUI/mapview.h
@ -5,6 +5,7 @@
 #include <QVector>
 #include <QHash>
 #include <QList>
+#include <QFlags>
 #include "common/rectc.h"
 #include "common/config.h"
 #include "data/waypoint.h"
@ -31,12 +32,20 @@ class GraphItem;
 class AreaItem;
 class Area;
 class GraphicsScene;
+class QTimeZone;

 class MapView : public QGraphicsView
 {
 	Q_OBJECT

 public:
+	enum Flag {
+		NoFlags = 0,
+		HiRes = 1,
+		Expand = 2
+	};
+	Q_DECLARE_FLAGS(PlotFlags, Flag)
+
 	MapView(Map *map, POI *poi, QWidget *parent = 0);

 	QList<PathItem *> loadData(const Data &data);
@ -45,7 +54,8 @@ public:
 	void setPOI(POI *poi);
 	void setMap(Map *map);

-	void plot(QPainter *painter, const QRectF &target, qreal scale, bool hires);
+	void plot(QPainter *painter, const QRectF &target, qreal scale,
+	  PlotFlags flags);

 	void clear();

@ -83,6 +93,7 @@ public slots:
 	void showTicks(bool show);
 	void clearMapCache();
 	void setCoordinatesFormat(CoordinatesFormat format);
+	void setTimeZone(const QTimeZone &zone);
 	void setDevicePixelRatio(qreal deviceRatio, qreal mapRatio);
 	void setProjection(int id);

@ -137,8 +148,6 @@ private:
 	POI *_poi;

 	Palette _palette;
-	Units _units;
-	CoordinatesFormat _coordinatesFormat;
 	qreal _mapOpacity;
 	Projection _projection;

--- a/src/GUI/margins.h
+++ b/src/GUI/margins.h
@ -16,15 +16,22 @@ public:
 	qreal right() const {return _right;}
 	qreal bottom() const {return _bottom;}

-	qreal &rleft() {return _left;}
-	qreal &rtop() {return _top;}
-	qreal &rright() {return _right;}
-	qreal &rbottom() {return _bottom;}
-
 private:
 	qreal _left, _top, _right, _bottom;
 };

+inline MarginsF operator*(const MarginsF &margins, qreal factor)
+{
+	return MarginsF(margins.left() * factor, margins.top() * factor,
+	  margins.right() * factor, margins.bottom() * factor);
+}
+
+inline MarginsF operator/(const MarginsF &margins, qreal factor)
+{
+	return MarginsF(margins.left() / factor, margins.top() / factor,
+	  margins.right() / factor, margins.bottom() / factor);
+}
+
 #ifndef QT_NO_DEBUG
 inline QDebug operator<<(QDebug dbg, const MarginsF &margins)
 {
--- a/src/GUI/marginswidget.cpp
+++ b/src/GUI/marginswidget.cpp
@ -0,0 +1,111 @@
+#include <QSpinBox>
+#include <QGridLayout>
+#include "units.h"
+#include "marginswidget.h"
+
+MarginsWidget::MarginsWidget(QWidget *parent) : QWidget(parent)
+{
+	_top = new QSpinBox();
+	_bottom = new QSpinBox();
+	_left = new QSpinBox();
+	_right = new QSpinBox();
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+
+	QGridLayout *layout = new QGridLayout();
+	layout->addWidget(_top, 0, 0, 1, 2, Qt::AlignCenter);
+	layout->addWidget(_left, 1, 0, 1, 1, Qt::AlignRight);
+	layout->addWidget(_right, 1, 1, 1, 1, Qt::AlignLeft);
+	layout->addWidget(_bottom, 2, 0, 1, 2, Qt::AlignCenter);
+
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	setLayout(layout);
+}
+
+void MarginsWidget::setValue(const QMargins &value)
+{
+	_top->setValue(value.top());
+	_bottom->setValue(value.bottom());
+	_left->setValue(value.left());
+	_right->setValue(value.right());
+}
+
+void MarginsWidget::setUnits(const QString &units)
+{
+	_top->setSuffix(UNIT_SPACE + units);
+	_bottom->setSuffix(UNIT_SPACE + units);
+	_left->setSuffix(UNIT_SPACE + units);
+	_right->setSuffix(UNIT_SPACE + units);
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+}
+
+QMargins MarginsWidget::value() const
+{
+	return QMargins(_left->value(), _top->value(), _right->value(),
+	  _bottom->value());
+}
+
+
+MarginsFWidget::MarginsFWidget(QWidget *parent) : QWidget(parent)
+{
+	_top = new QDoubleSpinBox();
+	_bottom = new QDoubleSpinBox();
+	_left = new QDoubleSpinBox();
+	_right = new QDoubleSpinBox();
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+
+	QGridLayout *layout = new QGridLayout();
+	layout->addWidget(_top, 0, 0, 1, 2, Qt::AlignCenter);
+	layout->addWidget(_left, 1, 0, 1, 1, Qt::AlignRight);
+	layout->addWidget(_right, 1, 1, 1, 1, Qt::AlignLeft);
+	layout->addWidget(_bottom, 2, 0, 1, 2, Qt::AlignCenter);
+
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	setLayout(layout);
+}
+
+void MarginsFWidget::setValue(const MarginsF &value)
+{
+	_top->setValue(value.top());
+	_bottom->setValue(value.bottom());
+	_left->setValue(value.left());
+	_right->setValue(value.right());
+}
+
+void MarginsFWidget::setUnits(const QString &units)
+{
+	_top->setSuffix(UNIT_SPACE + units);
+	_bottom->setSuffix(UNIT_SPACE + units);
+	_left->setSuffix(UNIT_SPACE + units);
+	_right->setSuffix(UNIT_SPACE + units);
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+}
+
+void MarginsFWidget::setSingleStep(qreal step)
+{
+	_top->setSingleStep(step);
+	_bottom->setSingleStep(step);
+	_left->setSingleStep(step);
+	_right->setSingleStep(step);
+}
+
+MarginsF MarginsFWidget::value() const
+{
+	return MarginsF(_left->value(), _top->value(), _right->value(),
+	  _bottom->value());
+}
--- a/src/GUI/marginswidget.h
+++ b/src/GUI/marginswidget.h
@ -0,0 +1,48 @@
+#ifndef MARGINSWIDGET_H
+#define MARGINSWIDGET_H
+
+#include <QWidget>
+#include <QMargins>
+#include "margins.h"
+
+class QSpinBox;
+class QDoubleSpinBox;
+
+class MarginsWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	MarginsWidget(QWidget *parent = 0);
+
+	QMargins value() const;
+	void setValue(const QMargins &value);
+	void setUnits(const QString &units);
+
+private:
+	QSpinBox *_top;
+	QSpinBox *_bottom;
+	QSpinBox *_left;
+	QSpinBox *_right;
+};
+
+class MarginsFWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	MarginsFWidget(QWidget *parent = 0);
+
+	MarginsF value() const;
+	void setValue(const MarginsF &value);
+	void setUnits(const QString &units);
+	void setSingleStep(qreal step);
+
+private:
+	QDoubleSpinBox *_top;
+	QDoubleSpinBox *_bottom;
+	QDoubleSpinBox *_left;
+	QDoubleSpinBox *_right;
+};
+
+#endif // MARGINSWIDGET_H
--- a/src/GUI/optionsdialog.cpp
+++ b/src/GUI/optionsdialog.cpp
@ -12,6 +12,7 @@
 #include <QRadioButton>
 #include <QLabel>
 #include <QSysInfo>
+#include <QButtonGroup>
 #include "map/pcs.h"
 #include "icons.h"
 #include "colorbox.h"
@ -55,12 +56,12 @@ QWidget *OptionsDialog::createMapPage()
 		  + projections.at(i).value();
 		_projection->addItem(text, QVariant(projections.at(i).key()));
 	}
-	_projection->setCurrentIndex(_projection->findData(_options->projection));
+	_projection->setCurrentIndex(_projection->findData(_options.projection));

 #ifdef ENABLE_HIDPI
 	_hidpi = new QRadioButton(tr("High-resolution"));
 	_lodpi = new QRadioButton(tr("Standard"));
-	if (_options->hidpiMap)
+	if (_options.hidpiMap)
 		_hidpi->setChecked(true);
 	else
 		_lodpi->setChecked(true);
@ -111,10 +112,10 @@ QWidget *OptionsDialog::createAppearancePage()
 {
 	// Tracks
 	_trackWidth = new QSpinBox();
-	_trackWidth->setValue(_options->trackWidth);
+	_trackWidth->setValue(_options.trackWidth);
 	_trackWidth->setMinimum(1);
 	_trackStyle = new StyleComboBox();
-	_trackStyle->setValue(_options->trackStyle);
+	_trackStyle->setValue(_options.trackStyle);
 	QFormLayout *trackLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	trackLayout->addRow(tr("Track width:"), _trackWidth);
@ -128,10 +129,10 @@ QWidget *OptionsDialog::createAppearancePage()

 	// Routes
 	_routeWidth = new QSpinBox();
-	_routeWidth->setValue(_options->routeWidth);
+	_routeWidth->setValue(_options.routeWidth);
 	_routeWidth->setMinimum(1);
 	_routeStyle = new StyleComboBox();
-	_routeStyle->setValue(_options->routeStyle);
+	_routeStyle->setValue(_options.routeStyle);
 	QFormLayout *routeLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	routeLayout->addRow(tr("Route width:"), _routeWidth);
@ -145,11 +146,11 @@ QWidget *OptionsDialog::createAppearancePage()

 	// Areas
 	_areaWidth = new QSpinBox();
-	_areaWidth->setValue(_options->areaWidth);
+	_areaWidth->setValue(_options.areaWidth);
 	_areaStyle = new StyleComboBox();
-	_areaStyle->setValue(_options->areaStyle);
+	_areaStyle->setValue(_options.areaStyle);
 	_areaOpacity = new PercentSlider();
-	_areaOpacity->setValue(_options->areaOpacity);
+	_areaOpacity->setValue(_options.areaOpacity);
 	QFormLayout *areaLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	areaLayout->addRow(tr("Area border width:"), _areaWidth);
@ -165,18 +166,15 @@ QWidget *OptionsDialog::createAppearancePage()

 	// Palette & antialiasing
 	_baseColor = new ColorBox();
-	_baseColor->setColor(_options->palette.color());
-	_colorOffset = new QDoubleSpinBox();
-	_colorOffset->setMinimum(0);
-	_colorOffset->setMaximum(1.0);
-	_colorOffset->setSingleStep(0.01);
-	_colorOffset->setValue(_options->palette.shift());
+	_baseColor->setColor(_options.palette.color());
+	_colorOffset = new PercentSlider();
+	_colorOffset->setValue(_options.palette.shift() * 100);
 	QFormLayout *paletteLayout = new QFormLayout();
 	paletteLayout->addRow(tr("Base color:"), _baseColor);
 	paletteLayout->addRow(tr("Palette shift:"), _colorOffset);

 	_pathAA = new QCheckBox(tr("Use anti-aliasing"));
-	_pathAA->setChecked(_options->pathAntiAliasing);
+	_pathAA->setChecked(_options.pathAntiAliasing);
 	QFormLayout *pathAALayout = new QFormLayout();
 	pathAALayout->addWidget(_pathAA);

@ -203,9 +201,9 @@ QWidget *OptionsDialog::createAppearancePage()
 	// Waypoints
 	_waypointSize = new QSpinBox();
 	_waypointSize->setMinimum(1);
-	_waypointSize->setValue(_options->waypointSize);
+	_waypointSize->setValue(_options.waypointSize);
 	_waypointColor = new ColorBox();
-	_waypointColor->setColor(_options->waypointColor);
+	_waypointColor->setColor(_options.waypointColor);
 	QFormLayout *waypointLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	waypointLayout->addRow(tr("Waypoint color:"), _waypointColor);
@ -219,9 +217,9 @@ QWidget *OptionsDialog::createAppearancePage()

 	_poiSize = new QSpinBox();
 	_poiSize->setMinimum(1);
-	_poiSize->setValue(_options->poiSize);
+	_poiSize->setValue(_options.poiSize);
 	_poiColor = new ColorBox();
-	_poiColor->setColor(_options->poiColor);
+	_poiColor->setColor(_options.poiColor);
 	QFormLayout *poiLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	poiLayout->addRow(tr("POI color:"), _poiColor);
@ -249,9 +247,9 @@ QWidget *OptionsDialog::createAppearancePage()

 	// Graphs
 	_sliderColor = new ColorBox();
-	_sliderColor->setColor(_options->sliderColor);
+	_sliderColor->setColor(_options.sliderColor);
 	_graphWidth = new QSpinBox();
-	_graphWidth->setValue(_options->graphWidth);
+	_graphWidth->setValue(_options.graphWidth);
 	_graphWidth->setMinimum(1);

 	QFormLayout *graphLayout = new QFormLayout();
@ -259,7 +257,7 @@ QWidget *OptionsDialog::createAppearancePage()
 	graphLayout->addRow(tr("Slider color:"), _sliderColor);

 	_graphAA = new QCheckBox(tr("Use anti-aliasing"));
-	_graphAA->setChecked(_options->graphAntiAliasing);
+	_graphAA->setChecked(_options.graphAntiAliasing);
 	QFormLayout *graphAALayout = new QFormLayout();
 	graphAALayout->addWidget(_graphAA);

@ -273,9 +271,9 @@ QWidget *OptionsDialog::createAppearancePage()

 	// Map
 	_mapOpacity = new PercentSlider();
-	_mapOpacity->setValue(_options->mapOpacity);
+	_mapOpacity->setValue(_options.mapOpacity);
 	_backgroundColor = new ColorBox();
-	_backgroundColor->setColor(_options->backgroundColor);
+	_backgroundColor->setColor(_options.backgroundColor);
 	_backgroundColor->enableAlphaChannel(false);

 	QFormLayout *mapLayout = new QFormLayout();
@ -303,19 +301,19 @@ QWidget *OptionsDialog::createDataPage()
 	QString filterToolTip = tr("Moving average window size");

 	_elevationFilter = new OddSpinBox();
-	_elevationFilter->setValue(_options->elevationFilter);
+	_elevationFilter->setValue(_options.elevationFilter);
 	_elevationFilter->setToolTip(filterToolTip);
 	_speedFilter = new OddSpinBox();
-	_speedFilter->setValue(_options->speedFilter);
+	_speedFilter->setValue(_options.speedFilter);
 	_speedFilter->setToolTip(filterToolTip);
 	_heartRateFilter = new OddSpinBox();
-	_heartRateFilter->setValue(_options->heartRateFilter);
+	_heartRateFilter->setValue(_options.heartRateFilter);
 	_heartRateFilter->setToolTip(filterToolTip);
 	_cadenceFilter = new OddSpinBox();
-	_cadenceFilter->setValue(_options->cadenceFilter);
+	_cadenceFilter->setValue(_options.cadenceFilter);
 	_cadenceFilter->setToolTip(filterToolTip);
 	_powerFilter = new OddSpinBox();
-	_powerFilter->setValue(_options->powerFilter);
+	_powerFilter->setValue(_options.powerFilter);
 	_powerFilter->setToolTip(filterToolTip);

 	QFormLayout *smoothLayout = new QFormLayout();
@ -330,7 +328,7 @@ QWidget *OptionsDialog::createDataPage()
 #endif // Q_OS_MAC

 	_outlierEliminate = new QCheckBox(tr("Eliminate GPS outliers"));
-	_outlierEliminate->setChecked(_options->outlierEliminate);
+	_outlierEliminate->setChecked(_options.outlierEliminate);

 	QFormLayout *outlierLayout = new QFormLayout();
 	outlierLayout->addWidget(_outlierEliminate);
@ -351,7 +349,7 @@ QWidget *OptionsDialog::createDataPage()

 	_automaticPause = new QRadioButton(tr("Automatic"));
 	_manualPause = new QRadioButton(tr("Custom"));
-	if (_options->automaticPause)
+	if (_options.automaticPause)
 		_automaticPause->setChecked(true);
 	else
 		_manualPause->setChecked(true);
@ -361,20 +359,20 @@ QWidget *OptionsDialog::createDataPage()
 	_pauseSpeed->setSingleStep(0.1);
 	_pauseSpeed->setMinimum(0.1);
 	_pauseSpeed->setEnabled(_manualPause->isChecked());
-	if (_options->units == Imperial) {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2MIH);
+	if (_units == Imperial) {
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2MIH);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("mi/h"));
-	} else if (_options->units == Nautical) {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2KN);
+	} else if (_units == Nautical) {
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2KN);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("kn"));
 	} else {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2KMH);
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2KMH);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("km/h"));
 	}
 	_pauseInterval = new QSpinBox();
 	_pauseInterval->setMinimum(1);
 	_pauseInterval->setSuffix(UNIT_SPACE + tr("s"));
-	_pauseInterval->setValue(_options->pauseInterval);
+	_pauseInterval->setValue(_options.pauseInterval);
 	_pauseInterval->setEnabled(_manualPause->isChecked());

 	connect(_automaticPause, SIGNAL(toggled(bool)), this,
@ -402,54 +400,129 @@ QWidget *OptionsDialog::createDataPage()

 	_computedSpeed = new QRadioButton(tr("Computed from distance/time"));
 	_reportedSpeed = new QRadioButton(tr("Recorded by device"));
-	if (_options->useReportedSpeed)
+	if (_options.useReportedSpeed)
 		_reportedSpeed->setChecked(true);
 	else
 		_computedSpeed->setChecked(true);
+	_showSecondarySpeed = new QCheckBox(tr("Show secondary speed"));
+	_showSecondarySpeed->setChecked(_options.showSecondarySpeed);

 	_dataGPSElevation = new QRadioButton(tr("GPS data"));
 	_dataDEMElevation = new QRadioButton(tr("DEM data"));
-	if (_options->dataUseDEM)
+	if (_options.dataUseDEM)
 		_dataDEMElevation->setChecked(true);
 	else
 		_dataGPSElevation->setChecked(true);
+	_showSecondaryElevation = new QCheckBox(tr("Show secondary elevation"));
+	_showSecondaryElevation->setChecked(_options.showSecondaryElevation);

+#ifdef ENABLE_TIMEZONES
+	_utcZone = new QRadioButton(tr("UTC"));
+	_systemZone = new QRadioButton(tr("System"));
+	_customZone = new QRadioButton(tr("Custom"));
+	if (_options.timeZone.type() == TimeZoneInfo::UTC)
+		_utcZone->setChecked(true);
+	else if (_options.timeZone.type() == TimeZoneInfo::System)
+		_systemZone->setChecked(true);
+	else
+		_customZone->setChecked(true);
+	_timeZone = new QComboBox();
+	_timeZone->setEnabled(_customZone->isChecked());
+	QList<QByteArray> zones = QTimeZone::availableTimeZoneIds();
+	for (int i = 0; i < zones.size(); i++)
+		_timeZone->addItem(zones.at(i));
+	_timeZone->setCurrentText(_options.timeZone.customZone().id());
+	connect(_customZone, SIGNAL(toggled(bool)), _timeZone,
+	  SLOT(setEnabled(bool)));
+	QHBoxLayout *customZoneLayout = new QHBoxLayout();
+	customZoneLayout->addSpacing(20);
+	customZoneLayout->addWidget(_timeZone);
+#endif // ENABLE_TIMEZONES
+
+	_useSegments = new QCheckBox(tr("Use segments"));
+	_useSegments->setChecked(_options.useSegments);

 	QWidget *sourceTab = new QWidget();
 	QVBoxLayout *sourceTabLayout = new QVBoxLayout();

 #ifdef Q_OS_MAC
+	QButtonGroup *speedGroup = new QButtonGroup(this);
+	speedGroup->addButton(_computedSpeed);
+	speedGroup->addButton(_reportedSpeed);
 	QVBoxLayout *speedOptions = new QVBoxLayout();
 	speedOptions->addWidget(_computedSpeed);
 	speedOptions->addWidget(_reportedSpeed);
+	speedOptions->addWidget(_showSecondarySpeed);

+	QButtonGroup *elevationGroup = new QButtonGroup(this);
+	elevationGroup->addButton(_dataGPSElevation);
+	elevationGroup->addButton(_dataDEMElevation);
 	QVBoxLayout *elevationOptions = new QVBoxLayout();
 	elevationOptions->addWidget(_dataGPSElevation);
 	elevationOptions->addWidget(_dataDEMElevation);
+	elevationOptions->addWidget(_showSecondaryElevation);
+
+#ifdef ENABLE_TIMEZONES
+	QButtonGroup *timeZoneGroup = new QButtonGroup(this);
+	timeZoneGroup->addButton(_utcZone);
+	timeZoneGroup->addButton(_systemZone);
+	timeZoneGroup->addButton(_customZone);
+	QVBoxLayout *zoneOptions = new QVBoxLayout();
+	zoneOptions->addWidget(_utcZone);
+	zoneOptions->addWidget(_systemZone);
+	zoneOptions->addWidget(_customZone);
+	zoneOptions->addItem(customZoneLayout);
+#endif // ENABLE_TIMEZONES

 	QFormLayout *formLayout = new QFormLayout();
 	formLayout->addRow(tr("Speed:"), speedOptions);
 	formLayout->addRow(tr("Elevation:"), elevationOptions);
+#ifdef ENABLE_TIMEZONES
+	formLayout->addRow(tr("Time zone:"), zoneOptions);
+#endif // ENABLE_TIMEZONES
+	formLayout->addRow(_useSegments);

 	sourceTabLayout->addLayout(formLayout);
 #else // Q_OS_MAC
 	QFormLayout *speedLayout = new QFormLayout();
 	QFormLayout *elevationLayout = new QFormLayout();
+#ifdef ENABLE_TIMEZONES
+	QFormLayout *timeZoneLayout = new QFormLayout();
+#endif // ENABLE_TIMEZONES
+	QFormLayout *segmentsLayout = new QFormLayout();

 	speedLayout->addWidget(_computedSpeed);
 	speedLayout->addWidget(_reportedSpeed);
+	speedLayout->addWidget(_showSecondarySpeed);

 	QGroupBox *speedBox = new QGroupBox(tr("Speed"));
 	speedBox->setLayout(speedLayout);

 	elevationLayout->addWidget(_dataGPSElevation);
 	elevationLayout->addWidget(_dataDEMElevation);
+	elevationLayout->addWidget(_showSecondaryElevation);

 	QGroupBox *elevationBox = new QGroupBox(tr("Elevation"));
 	elevationBox->setLayout(elevationLayout);

+#ifdef ENABLE_TIMEZONES
+	timeZoneLayout->addWidget(_utcZone);
+	timeZoneLayout->addWidget(_systemZone);
+	timeZoneLayout->addWidget(_customZone);
+	timeZoneLayout->addItem(customZoneLayout);
+
+	QGroupBox *timeZoneBox = new QGroupBox(tr("Time zone"));
+	timeZoneBox->setLayout(timeZoneLayout);
+#endif // ENABLE_TIMEZONES
+
+	segmentsLayout->addWidget(_useSegments);
+
 	sourceTabLayout->addWidget(speedBox);
 	sourceTabLayout->addWidget(elevationBox);
+#ifdef ENABLE_TIMEZONES
+	sourceTabLayout->addWidget(timeZoneBox);
+#endif // ENABLE_TIMEZONES
+	sourceTabLayout->addLayout(segmentsLayout);
 #endif // Q_OS_MAC
 	sourceTabLayout->addStretch();
 	sourceTab->setLayout(sourceTabLayout);
@ -465,34 +538,22 @@ QWidget *OptionsDialog::createDataPage()

 QWidget *OptionsDialog::createPOIPage()
 {
-	_poiGPSElevation = new QRadioButton(tr("GPS data"));
-	_poiDEMElevation = new QRadioButton(tr("DEM data"));
-	if (_options->poiUseDEM)
-		_poiDEMElevation->setChecked(true);
-	else
-		_poiGPSElevation->setChecked(true);
-
 	_poiRadius = new QDoubleSpinBox();
 	_poiRadius->setSingleStep(1);
 	_poiRadius->setDecimals(1);
-	if (_options->units == Imperial) {
-		_poiRadius->setValue(_options->poiRadius / MIINM);
+	if (_units == Imperial) {
+		_poiRadius->setValue(_options.poiRadius / MIINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("mi"));
-	} else if (_options->units == Nautical) {
-		_poiRadius->setValue(_options->poiRadius / NMIINM);
+	} else if (_units == Nautical) {
+		_poiRadius->setValue(_options.poiRadius / NMIINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("nmi"));
 	} else {
-		_poiRadius->setValue(_options->poiRadius / KMINM);
+		_poiRadius->setValue(_options.poiRadius / KMINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("km"));
 	}

-	QVBoxLayout *elevationLayout = new QVBoxLayout();
-	elevationLayout->addWidget(_poiGPSElevation);
-	elevationLayout->addWidget(_poiDEMElevation);
-
 	QFormLayout *poiLayout = new QFormLayout();
 	poiLayout->addRow(tr("Radius:"), _poiRadius);
-	poiLayout->addRow(tr("Elevation:"), elevationLayout);

 	QWidget *poiTab = new QWidget();
 	poiTab->setLayout(poiLayout);
@ -507,7 +568,7 @@ QWidget *OptionsDialog::createExportPage()
 {
 	_wysiwyg = new QRadioButton(tr("WYSIWYG"));
 	_hires = new QRadioButton(tr("High-Resolution"));
-	if (_options->hiresPrint)
+	if (_options.hiresPrint)
 		_hires->setChecked(true);
 	else
 		_wysiwyg->setChecked(true);
@ -536,17 +597,17 @@ QWidget *OptionsDialog::createExportPage()


 	_name = new QCheckBox(tr("Name"));
-	_name->setChecked(_options->printName);
+	_name->setChecked(_options.printName);
 	_date = new QCheckBox(tr("Date"));
-	_date->setChecked(_options->printDate);
+	_date->setChecked(_options.printDate);
 	_distance = new QCheckBox(tr("Distance"));
-	_distance->setChecked(_options->printDistance);
+	_distance->setChecked(_options.printDistance);
 	_time = new QCheckBox(tr("Time"));
-	_time->setChecked(_options->printTime);
+	_time->setChecked(_options.printTime);
 	_movingTime = new QCheckBox(tr("Moving time"));
-	_movingTime->setChecked(_options->printMovingTime);
+	_movingTime->setChecked(_options.printMovingTime);
 	_itemCount = new QCheckBox(tr("Item count (>1)"));
-	_itemCount->setChecked(_options->printItemCount);
+	_itemCount->setChecked(_options.printItemCount);

 	QFormLayout *headerTabLayout = new QFormLayout();
 	headerTabLayout->addWidget(_name);
@ -561,7 +622,7 @@ QWidget *OptionsDialog::createExportPage()


 	_separateGraphPage = new QCheckBox(tr("Separate graph page"));
-	_separateGraphPage->setChecked(_options->separateGraphPage);
+	_separateGraphPage->setChecked(_options.separateGraphPage);

 	QFormLayout *graphTabLayout = new QFormLayout();
 	graphTabLayout->addWidget(_separateGraphPage);
@ -580,23 +641,23 @@ QWidget *OptionsDialog::createExportPage()
 QWidget *OptionsDialog::createSystemPage()
 {
 	_useOpenGL = new QCheckBox(tr("Use OpenGL"));
-	_useOpenGL->setChecked(_options->useOpenGL);
+	_useOpenGL->setChecked(_options.useOpenGL);
 #ifdef ENABLE_HTTP2
 	_enableHTTP2 = new QCheckBox(tr("Enable HTTP/2"));
-	_enableHTTP2->setChecked(_options->enableHTTP2);
+	_enableHTTP2->setChecked(_options.enableHTTP2);
 #endif // ENABLE_HTTP2

 	_pixmapCache = new QSpinBox();
 	_pixmapCache->setMinimum(16);
 	_pixmapCache->setMaximum(1024);
 	_pixmapCache->setSuffix(UNIT_SPACE + tr("MB"));
-	_pixmapCache->setValue(_options->pixmapCache);
+	_pixmapCache->setValue(_options.pixmapCache);

 	_connectionTimeout = new QSpinBox();
 	_connectionTimeout->setMinimum(30);
 	_connectionTimeout->setMaximum(120);
 	_connectionTimeout->setSuffix(UNIT_SPACE + tr("s"));
-	_connectionTimeout->setValue(_options->connectionTimeout);
+	_connectionTimeout->setValue(_options.connectionTimeout);

 	QFormLayout *formLayout = new QFormLayout();
 	formLayout->addRow(tr("Image cache size:"), _pixmapCache);
@ -621,8 +682,8 @@ QWidget *OptionsDialog::createSystemPage()
 	return systemPage;
 }

-OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
-  : QDialog(parent), _options(options)
+OptionsDialog::OptionsDialog(Options &options, Units units, QWidget *parent)
+  : QDialog(parent), _options(options), _units(units)
 {
 	QStackedWidget *pages = new QStackedWidget();
 	pages->addWidget(createAppearancePage());
@ -674,73 +735,82 @@ OptionsDialog::OptionsDialog(Options *options, QWidget *parent)

 void OptionsDialog::accept()
 {
-	_options->palette.setColor(_baseColor->color());
-	_options->palette.setShift(_colorOffset->value());
-	_options->mapOpacity = _mapOpacity->value();
-	_options->backgroundColor = _backgroundColor->color();
-	_options->trackWidth = _trackWidth->value();
-	_options->trackStyle = (Qt::PenStyle) _trackStyle->itemData(
+	_options.palette.setColor(_baseColor->color());
+	_options.palette.setShift(_colorOffset->value() / 100.0);
+	_options.mapOpacity = _mapOpacity->value();
+	_options.backgroundColor = _backgroundColor->color();
+	_options.trackWidth = _trackWidth->value();
+	_options.trackStyle = (Qt::PenStyle) _trackStyle->itemData(
 	  _trackStyle->currentIndex()).toInt();
-	_options->routeWidth = _routeWidth->value();
-	_options->routeStyle = (Qt::PenStyle) _routeStyle->itemData(
+	_options.routeWidth = _routeWidth->value();
+	_options.routeStyle = (Qt::PenStyle) _routeStyle->itemData(
 	  _routeStyle->currentIndex()).toInt();
-	_options->pathAntiAliasing = _pathAA->isChecked();
-	_options->areaWidth = _areaWidth->value();
-	_options->areaStyle = (Qt::PenStyle) _areaStyle->itemData(
+	_options.pathAntiAliasing = _pathAA->isChecked();
+	_options.areaWidth = _areaWidth->value();
+	_options.areaStyle = (Qt::PenStyle) _areaStyle->itemData(
 	  _areaStyle->currentIndex()).toInt();
-	_options->areaOpacity = _areaOpacity->value();
-	_options->waypointSize = _waypointSize->value();
-	_options->waypointColor = _waypointColor->color();
-	_options->poiSize = _poiSize->value();
-	_options->poiColor = _poiColor->color();
-	_options->graphWidth = _graphWidth->value();
-	_options->sliderColor = _sliderColor->color();
-	_options->graphAntiAliasing = _graphAA->isChecked();
+	_options.areaOpacity = _areaOpacity->value();
+	_options.waypointSize = _waypointSize->value();
+	_options.waypointColor = _waypointColor->color();
+	_options.poiSize = _poiSize->value();
+	_options.poiColor = _poiColor->color();
+	_options.graphWidth = _graphWidth->value();
+	_options.sliderColor = _sliderColor->color();
+	_options.graphAntiAliasing = _graphAA->isChecked();

-	_options->projection = _projection->itemData(_projection->currentIndex())
+	_options.projection = _projection->itemData(_projection->currentIndex())
 	  .toInt();
 #ifdef ENABLE_HIDPI
-	_options->hidpiMap = _hidpi->isChecked();
+	_options.hidpiMap = _hidpi->isChecked();
 #endif // ENABLE_HIDPI

-	_options->elevationFilter = _elevationFilter->value();
-	_options->speedFilter = _speedFilter->value();
-	_options->heartRateFilter = _heartRateFilter->value();
-	_options->cadenceFilter = _cadenceFilter->value();
-	_options->powerFilter = _powerFilter->value();
-	_options->outlierEliminate = _outlierEliminate->isChecked();
-	_options->automaticPause = _automaticPause->isChecked();
-	qreal pauseSpeed = (_options->units == Imperial)
-		? _pauseSpeed->value() / MS2MIH : (_options->units == Nautical)
+	_options.elevationFilter = _elevationFilter->value();
+	_options.speedFilter = _speedFilter->value();
+	_options.heartRateFilter = _heartRateFilter->value();
+	_options.cadenceFilter = _cadenceFilter->value();
+	_options.powerFilter = _powerFilter->value();
+	_options.outlierEliminate = _outlierEliminate->isChecked();
+	_options.automaticPause = _automaticPause->isChecked();
+	qreal pauseSpeed = (_units == Imperial)
+		? _pauseSpeed->value() / MS2MIH : (_units == Nautical)
 		? _pauseSpeed->value() / MS2KN : _pauseSpeed->value() / MS2KMH;
-	if (qAbs(pauseSpeed - _options->pauseSpeed) > 0.01)
-		_options->pauseSpeed = pauseSpeed;
-	_options->pauseInterval = _pauseInterval->value();
-	_options->useReportedSpeed = _reportedSpeed->isChecked();
-	_options->dataUseDEM = _dataDEMElevation->isChecked();
+	if (qAbs(pauseSpeed - _options.pauseSpeed) > 0.01)
+		_options.pauseSpeed = pauseSpeed;
+	_options.pauseInterval = _pauseInterval->value();
+	_options.useReportedSpeed = _reportedSpeed->isChecked();
+	_options.dataUseDEM = _dataDEMElevation->isChecked();
+	_options.showSecondaryElevation = _showSecondaryElevation->isChecked();
+	_options.showSecondarySpeed = _showSecondarySpeed->isChecked();
+#ifdef ENABLE_TIMEZONES
+	_options.timeZone.setType(_utcZone->isChecked()
+	  ? TimeZoneInfo::UTC : _systemZone->isChecked()
+	  ? TimeZoneInfo::System : TimeZoneInfo::Custom);
+	_options.timeZone.setCustomZone(QTimeZone(_timeZone->currentText()
+	  .toLatin1()));
+#endif // ENABLE_TIMEZONES
+	_options.useSegments = _useSegments->isChecked();

-	qreal poiRadius = (_options->units == Imperial)
-		? _poiRadius->value() * MIINM : (_options->units == Nautical)
+	qreal poiRadius = (_units == Imperial)
+		? _poiRadius->value() * MIINM : (_units == Nautical)
 		? _poiRadius->value() * NMIINM : _poiRadius->value() * KMINM;
-	if (qAbs(poiRadius - _options->poiRadius) > 0.01)
-		_options->poiRadius = poiRadius;
-	_options->poiUseDEM = _poiDEMElevation->isChecked();
+	if (qAbs(poiRadius - _options.poiRadius) > 0.01)
+		_options.poiRadius = poiRadius;

-	_options->useOpenGL = _useOpenGL->isChecked();
+	_options.useOpenGL = _useOpenGL->isChecked();
 #ifdef ENABLE_HTTP2
-	_options->enableHTTP2 = _enableHTTP2->isChecked();
+	_options.enableHTTP2 = _enableHTTP2->isChecked();
 #endif // ENABLE_HTTP2
-	_options->pixmapCache = _pixmapCache->value();
-	_options->connectionTimeout = _connectionTimeout->value();
+	_options.pixmapCache = _pixmapCache->value();
+	_options.connectionTimeout = _connectionTimeout->value();

-	_options->hiresPrint = _hires->isChecked();
-	_options->printName = _name->isChecked();
-	_options->printDate = _date->isChecked();
-	_options->printDistance = _distance->isChecked();
-	_options->printTime = _time->isChecked();
-	_options->printMovingTime = _movingTime->isChecked();
-	_options->printItemCount = _itemCount->isChecked();
-	_options->separateGraphPage = _separateGraphPage->isChecked();
+	_options.hiresPrint = _hires->isChecked();
+	_options.printName = _name->isChecked();
+	_options.printDate = _date->isChecked();
+	_options.printDistance = _distance->isChecked();
+	_options.printTime = _time->isChecked();
+	_options.printMovingTime = _movingTime->isChecked();
+	_options.printItemCount = _itemCount->isChecked();
+	_options.separateGraphPage = _separateGraphPage->isChecked();

 	QDialog::accept();
 }
--- a/src/GUI/optionsdialog.h
+++ b/src/GUI/optionsdialog.h
@ -5,6 +5,9 @@
 #include "common/config.h"
 #include "palette.h"
 #include "units.h"
+#ifdef ENABLE_TIMEZONES
+#include "timezoneinfo.h"
+#endif // ENABLE_TIMEZONES

 class ColorBox;
 class StyleComboBox;
@ -17,6 +20,7 @@ class QRadioButton;
 class PercentSlider;
 class LimitedComboBox;

+
 struct Options {
 	// Appearance
 	Palette palette;
@ -54,9 +58,14 @@ struct Options {
 	int pauseInterval;
 	bool useReportedSpeed;
 	bool dataUseDEM;
+	bool showSecondaryElevation;
+	bool showSecondarySpeed;
+#ifdef ENABLE_TIMEZONES
+	TimeZoneInfo timeZone;
+#endif // ENABLE_TIMEZONES
+	bool useSegments;
 	// POI
 	int poiRadius;
-	bool poiUseDEM;
 	// System
 	bool useOpenGL;
 #ifdef ENABLE_HTTP2
@ -73,8 +82,6 @@ struct Options {
 	bool printMovingTime;
 	bool printItemCount;
 	bool separateGraphPage;
-
-	Units units;
 };

 class OptionsDialog : public QDialog
@ -85,7 +92,7 @@ public slots:
 	void accept();

 public:
-	OptionsDialog(Options *options, QWidget *parent = 0);
+	OptionsDialog(Options &options, Units units, QWidget *parent = 0);

 private slots:
 	void automaticPauseDetectionSet(bool set);
@ -98,11 +105,12 @@ private:
 	QWidget *createSystemPage();
 	QWidget *createExportPage();

-	Options *_options;
+	Options &_options;

+	Units _units;
 	// Appearance
 	ColorBox *_baseColor;
-	QDoubleSpinBox *_colorOffset;
+	PercentSlider *_colorOffset;
 	PercentSlider *_mapOpacity;
 	ColorBox *_backgroundColor;
 	QSpinBox *_trackWidth;
@ -133,7 +141,6 @@ private:
 	OddSpinBox *_cadenceFilter;
 	OddSpinBox *_powerFilter;
 	QCheckBox *_outlierEliminate;
-
 	QRadioButton *_automaticPause;
 	QRadioButton *_manualPause;
 	QDoubleSpinBox *_pauseSpeed;
@ -142,10 +149,17 @@ private:
 	QRadioButton *_reportedSpeed;
 	QRadioButton *_dataGPSElevation;
 	QRadioButton *_dataDEMElevation;
+	QCheckBox *_showSecondaryElevation;
+	QCheckBox *_showSecondarySpeed;
+#ifdef ENABLE_TIMEZONES
+	QRadioButton *_utcZone;
+	QRadioButton *_systemZone;
+	QRadioButton *_customZone;
+	QComboBox *_timeZone;
+#endif // ENABLE_TIMEZONES
+	QCheckBox *_useSegments;
 	// POI
 	QDoubleSpinBox *_poiRadius;
-	QRadioButton *_poiGPSElevation;
-	QRadioButton *_poiDEMElevation;
 	// System
 	QSpinBox *_pixmapCache;
 	QSpinBox *_connectionTimeout;
--- a/src/GUI/pathitem.cpp
+++ b/src/GUI/pathitem.cpp
@ -21,12 +21,16 @@ static inline unsigned segments(qreal distance)
 	return ceil(distance / GEOGRAPHICAL_MILE);
 }

+Units PathItem::_units = Metric;
+#ifdef ENABLE_TIMEZONES
+QTimeZone PathItem::_timeZone = QTimeZone::utc();
+#endif // ENABLE_TIMEZONES
+
 PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
  : GraphicsItem(parent), _path(path), _map(map)
 {
 	Q_ASSERT(_path.isValid());

-	_units = Metric;
 	_digitalZoom = 0;
 	_width = 3;
 	QBrush brush(Qt::SolidPattern);
@ -352,16 +356,6 @@ void PathItem::showTicks(bool show)
 	updateTicks();
 }

-void PathItem::setUnits(Units units)
-{
-	if (_units == units)
-		return;
-
-	prepareGeometryChange();
-	_units = units;
-	updateTicks();
-}
-
 void PathItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
--- a/src/GUI/pathitem.h
+++ b/src/GUI/pathitem.h
@ -1,8 +1,12 @@
 #ifndef PATHITEM_H
 #define PATHITEM_H

+#include "common/config.h"
 #include <QGraphicsObject>
 #include <QPen>
+#ifdef ENABLE_TIMEZONES
+#include <QTimeZone>
+#endif // ENABLE_TIMEZONES
 #include "data/path.h"
 #include "markeritem.h"
 #include "units.h"
@ -28,7 +32,6 @@ public:

 	void setMap(Map *map);

-	void setUnits(Units units);
 	void setColor(const QColor &color);
 	void setWidth(qreal width);
 	void setStyle(Qt::PenStyle style);
@ -37,6 +40,13 @@ public:
 	void showMarker(bool show);
 	void showTicks(bool show);

+	void updateTicks();
+
+	static void setUnits(Units units) {_units = units;}
+#ifdef ENABLE_TIMEZONES
+	static void setTimeZone(const QTimeZone &zone) {_timeZone = zone;}
+#endif // ENABLE_TIMEZONES
+
 public slots:
 	void moveMarker(qreal distance);
 	void hover(bool hover);
@ -49,7 +59,10 @@ protected:
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
 	void mousePressEvent(QGraphicsSceneMouseEvent *event);

-	Units _units;
+	static Units _units;
+#ifdef ENABLE_TIMEZONES
+	static QTimeZone _timeZone;
+#endif // ENABLE_TIMEZONES

 private:
 	const PathSegment *segment(qreal x) const;
@ -60,7 +73,6 @@ private:

 	qreal xInM() const;
 	unsigned tickSize() const;
-	void updateTicks();

 	Path _path;
 	Map *_map;
--- a/src/GUI/pdfexportdialog.cpp
+++ b/src/GUI/pdfexportdialog.cpp
@ -1,30 +1,27 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QFormLayout>
-#include <QGridLayout>
 #include <QDialogButtonBox>
 #include <QGroupBox>
 #include <QComboBox>
 #include <QRadioButton>
-#include <QPushButton>
-#include <QFileInfo>
 #include <QMessageBox>
 #include <QTabWidget>
-#include <QDoubleSpinBox>
+#include "marginswidget.h"
 #include "fileselectwidget.h"
 #include "units.h"
-#include "exportdialog.h"
+#include "pdfexportdialog.h"


-ExportDialog::ExportDialog(Export *exp, QWidget *parent)
-  : QDialog(parent), _export(exp)
+PDFExportDialog::PDFExportDialog(PDFExport &exp, Units units, QWidget *parent)
+  : QDialog(parent), _export(exp), _units(units)
 {
 	int index;

 	_fileSelect = new FileSelectWidget();
 	_fileSelect->setFilter(tr("PDF files") + " (*.pdf);;" + tr("All files")
 	  + " (*)");
-	_fileSelect->setFile(_export->fileName);
+	_fileSelect->setFile(_export.fileName);

 	_paperSize = new QComboBox();
 	_paperSize->addItem("A2", QPrinter::A2);
@ -39,14 +36,14 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	_paperSize->addItem("Tabloid", QPrinter::Tabloid);
 	_paperSize->addItem("Legal", QPrinter::Legal);
 	_paperSize->addItem("Letter", QPrinter::Letter);
-	if ((index = _paperSize->findData(_export->paperSize)) >= 0)
+	if ((index = _paperSize->findData(_export.paperSize)) >= 0)
 		_paperSize->setCurrentIndex(index);

 	_resolution = new QComboBox();
 	_resolution->addItem("150 DPI", 150);
 	_resolution->addItem("300 DPI", 300);
 	_resolution->addItem("600 DPI", 600);
-	if ((index = _resolution->findData(_export->resolution)) >= 0)
+	if ((index = _resolution->findData(_export.resolution)) >= 0)
 		_resolution->setCurrentIndex(index);

 	_portrait = new QRadioButton(tr("Portrait"));
@ -54,41 +51,16 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	QHBoxLayout *orientationLayout = new QHBoxLayout();
 	orientationLayout->addWidget(_portrait);
 	orientationLayout->addWidget(_landscape);
-	if (_export->orientation == QPrinter::Portrait)
+	if (_export.orientation == QPrinter::Portrait)
 		_portrait->setChecked(true);
 	else
 		_landscape->setChecked(true);

-	_topMargin = new QDoubleSpinBox();
-	_bottomMargin = new QDoubleSpinBox();
-	_leftMargin = new QDoubleSpinBox();
-	_rightMargin = new QDoubleSpinBox();
-	QString us = (_export->units == Metric) ? tr("mm") : tr("in");
-	_topMargin->setSuffix(UNIT_SPACE + us);
-	_bottomMargin->setSuffix(UNIT_SPACE + us);
-	_leftMargin->setSuffix(UNIT_SPACE + us);
-	_rightMargin->setSuffix(UNIT_SPACE + us);
-	if (_export->units == Metric) {
-		_topMargin->setValue(_export->margins.top());
-		_bottomMargin->setValue(_export->margins.bottom());
-		_leftMargin->setValue(_export->margins.left());
-		_rightMargin->setValue(_export->margins.right());
-	} else {
-		_topMargin->setValue(_export->margins.top() * MM2IN);
-		_bottomMargin->setValue(_export->margins.bottom() * MM2IN);
-		_leftMargin->setValue(_export->margins.left() * MM2IN);
-		_rightMargin->setValue(_export->margins.right() * MM2IN);
-		_topMargin->setSingleStep(0.1);
-		_bottomMargin->setSingleStep(0.1);
-		_leftMargin->setSingleStep(0.1);
-		_rightMargin->setSingleStep(0.1);
-	}
-
-	QGridLayout *marginsLayout = new QGridLayout();
-	marginsLayout->addWidget(_topMargin, 0, 0, 1, 2, Qt::AlignCenter);
-	marginsLayout->addWidget(_leftMargin, 1, 0, 1, 1, Qt::AlignRight);
-	marginsLayout->addWidget(_rightMargin, 1, 1, 1, 1, Qt::AlignLeft);
-	marginsLayout->addWidget(_bottomMargin, 2, 0, 1, 2, Qt::AlignCenter);
+	_margins = new MarginsFWidget();
+	_margins->setUnits((units == Metric) ? tr("cm") : tr("in"));
+	_margins->setSingleStep(0.1);
+	_margins->setValue((units == Metric)
+	  ? _export.margins * MM2CM : _export.margins * MM2IN);

 #ifndef Q_OS_MAC
 	QGroupBox *pageSetupBox = new QGroupBox(tr("Page Setup"));
@ -97,7 +69,7 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	pageSetupLayout->addRow(tr("Page size:"), _paperSize);
 	pageSetupLayout->addRow(tr("Resolution:"), _resolution);
 	pageSetupLayout->addRow(tr("Orientation:"), orientationLayout);
-	pageSetupLayout->addRow(tr("Margins:"), marginsLayout);
+	pageSetupLayout->addRow(tr("Margins:"), _margins);
 #ifdef Q_OS_MAC
 	QFrame *line = new QFrame();
 	line->setFrameShape(QFrame::HLine);
@ -111,7 +83,7 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)

 #ifndef Q_OS_MAC
 	QGroupBox *outputFileBox = new QGroupBox(tr("Output file"));
-	QHBoxLayout *outputFileLayout = new QHBoxLayout();
+	QVBoxLayout *outputFileLayout = new QVBoxLayout();
 	outputFileLayout->addWidget(_fileSelect);
 	outputFileBox->setLayout(outputFileLayout);
 #endif // Q_OS_MAC
@ -136,41 +108,13 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 }

-bool ExportDialog::checkFile()
+void PDFExportDialog::accept()
 {
-	if (_fileSelect->file().isEmpty()) {
-		QMessageBox::warning(this, tr("Error"), tr("No output file selected."));
-		return false;
-	}
-
-	QFile file(_fileSelect->file());
-	QFileInfo fi(file);
-	bool exists = fi.exists();
-	bool opened = false;
-
-	if (exists && fi.isDir()) {
-		QMessageBox::warning(this, tr("Error"), tr("%1 is a directory.")
-		  .arg(file.fileName()));
-		return false;
-	} else if ((exists && !fi.isWritable())
-	  || !(opened = file.open(QFile::Append))) {
-		QMessageBox::warning(this, tr("Error"), tr("%1 is not writable.")
-		  .arg(file.fileName()));
-		return false;
-	}
-	if (opened) {
-		file.close();
-		if (!exists)
-			file.remove();
-	}
-
-	return true;
-}
-
-void ExportDialog::accept()
-{
-	if (!checkFile())
+	QString error;
+	if (!_fileSelect->checkFile(error)) {
+		QMessageBox::warning(this, tr("Error"), error);
 		return;
+	}

 	QPrinter::Orientation orientation = _portrait->isChecked()
 	  ? QPrinter::Portrait : QPrinter::Landscape;
@ -178,17 +122,12 @@ void ExportDialog::accept()
 	  (_paperSize->itemData(_paperSize->currentIndex()).toInt());
 	int resolution = _resolution->itemData(_resolution->currentIndex()).toInt();

-	_export->fileName = _fileSelect->file();
-	_export->paperSize = paperSize;
-	_export->resolution = resolution;
-	_export->orientation = orientation;
-	if (_export->units == Imperial)
-		_export->margins = MarginsF(_leftMargin->value() / MM2IN,
-		_topMargin->value() / MM2IN, _rightMargin->value() / MM2IN,
-		_bottomMargin->value() / MM2IN);
-	else
-		_export->margins = MarginsF(_leftMargin->value(), _topMargin->value(),
-		  _rightMargin->value(), _bottomMargin->value());
+	_export.fileName = _fileSelect->file();
+	_export.paperSize = paperSize;
+	_export.resolution = resolution;
+	_export.orientation = orientation;
+	_export.margins = (_units == Imperial)
+	  ? _margins->value() / MM2IN : _margins->value() / MM2CM;

 	QDialog::accept();
 }
--- a/src/GUI/pdfexportdialog.h
+++ b/src/GUI/pdfexportdialog.h
@ -1,5 +1,5 @@
-#ifndef EXPORTDIALOG_H
-#define EXPORTDIALOG_H
+#ifndef PDFEXPORTDIALOG_H
+#define PDFEXPORTDIALOG_H

 #include <QDialog>
 #include <QPrinter>
@ -9,42 +9,37 @@
 class QComboBox;
 class QRadioButton;
 class FileSelectWidget;
-class QDoubleSpinBox;
+class MarginsFWidget;

-struct Export {
+struct PDFExport
+{
 	QString fileName;
 	QPrinter::PaperSize paperSize;
 	QPrinter::Orientation orientation;
 	MarginsF margins;
 	int resolution;
-
-	Units units;
 };

-class ExportDialog : public QDialog
+class PDFExportDialog : public QDialog
 {
 	Q_OBJECT

 public:
-	ExportDialog(Export *exp, QWidget *parent = 0);
+	PDFExportDialog(PDFExport &exp, Units units, QWidget *parent = 0);

 public slots:
 	void accept();

 private:
-	bool checkFile();
-
-	Export *_export;
+	PDFExport &_export;

+	Units _units;
 	FileSelectWidget *_fileSelect;
 	QComboBox *_paperSize;
 	QComboBox *_resolution;
 	QRadioButton *_portrait;
 	QRadioButton *_landscape;
-	QDoubleSpinBox *_topMargin;
-	QDoubleSpinBox *_bottomMargin;
-	QDoubleSpinBox *_leftMargin;
-	QDoubleSpinBox *_rightMargin;
+	MarginsFWidget *_margins;
 };

-#endif // EXPORTDIALOG_H
+#endif // PDFEXPORTDIALOG_H
--- a/src/GUI/pngexportdialog.cpp
+++ b/src/GUI/pngexportdialog.cpp
@ -0,0 +1,101 @@
+#include <QVBoxLayout>
+#include <QFormLayout>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QSpinBox>
+#include <QMessageBox>
+#include <QTabWidget>
+#include <QCheckBox>
+#include "units.h"
+#include "fileselectwidget.h"
+#include "marginswidget.h"
+#include "pngexportdialog.h"
+
+
+PNGExportDialog::PNGExportDialog(PNGExport &exp, QWidget *parent)
+  : QDialog(parent), _export(exp)
+{
+	_fileSelect = new FileSelectWidget();
+	_fileSelect->setFilter(tr("PNG files") + " (*.png);;" + tr("All files")
+	  + " (*)");
+	_fileSelect->setFile(_export.fileName);
+
+	_width = new QSpinBox();
+	_width->setMinimum(256);
+	_width->setMaximum(4096);
+	_width->setValue(_export.size.width());
+	_width->setSuffix(UNIT_SPACE + tr("px"));
+	_height = new QSpinBox();
+	_height->setMinimum(256);
+	_height->setMaximum(4096);
+	_height->setValue(_export.size.height());
+	_height->setSuffix(UNIT_SPACE + tr("px"));
+
+	_margins = new MarginsWidget();
+	_margins->setValue(_export.margins);
+	_margins->setUnits(tr("px"));
+
+	_antialiasing = new QCheckBox(tr("Use anti-aliasing"));
+	_antialiasing->setChecked(_export.antialiasing);
+
+#ifndef Q_OS_MAC
+	QGroupBox *pageSetupBox = new QGroupBox(tr("Image Setup"));
+#endif // Q_OS_MAC
+	QFormLayout *pageSetupLayout = new QFormLayout;
+	pageSetupLayout->addRow(tr("Image width:"), _width);
+	pageSetupLayout->addRow(tr("Image height:"), _height);
+	pageSetupLayout->addRow(tr("Margins:"), _margins);
+	pageSetupLayout->addWidget(_antialiasing);
+#ifdef Q_OS_MAC
+	QFrame *line = new QFrame();
+	line->setFrameShape(QFrame::HLine);
+	line->setFrameShadow(QFrame::Sunken);
+	pageSetupLayout->addRow(line);
+	pageSetupLayout->addRow(tr("File:"), _fileSelect);
+	pageSetupLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
+#else // Q_OS_MAC
+	pageSetupBox->setLayout(pageSetupLayout);
+#endif // Q_OS_MAC
+
+#ifndef Q_OS_MAC
+	QGroupBox *outputFileBox = new QGroupBox(tr("Output file"));
+	QVBoxLayout *outputFileLayout = new QVBoxLayout();
+	outputFileLayout->addWidget(_fileSelect);
+	outputFileBox->setLayout(outputFileLayout);
+#endif // Q_OS_MAC
+
+	QDialogButtonBox *buttonBox = new QDialogButtonBox();
+	buttonBox->addButton(tr("Export"), QDialogButtonBox::AcceptRole);
+	buttonBox->addButton(QDialogButtonBox::Cancel);
+	connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+	connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+	QVBoxLayout *layout = new QVBoxLayout;
+#ifdef Q_OS_MAC
+	layout->addLayout(pageSetupLayout);
+#else // Q_OS_MAC
+	layout->addWidget(pageSetupBox);
+	layout->addWidget(outputFileBox);
+#endif // Q_OS_MAC
+	layout->addWidget(buttonBox);
+	setLayout(layout);
+
+	setWindowTitle(tr("Export to PNG"));
+	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+}
+
+void PNGExportDialog::accept()
+{
+	QString error;
+	if (!_fileSelect->checkFile(error)) {
+		QMessageBox::warning(this, tr("Error"), error);
+		return;
+	}
+
+	_export.fileName = _fileSelect->file();
+	_export.size = QSize(_width->value(), _height->value());
+	_export.margins = _margins->value();
+	_export.antialiasing = _antialiasing->isChecked();
+
+	QDialog::accept();
+}
--- a/src/GUI/pngexportdialog.h
+++ b/src/GUI/pngexportdialog.h
@ -0,0 +1,41 @@
+#ifndef PNGEXPORTDIALOG_H
+#define PNGEXPORTDIALOG_H
+
+#include <QDialog>
+#include <QMargins>
+#include "margins.h"
+
+class FileSelectWidget;
+class MarginsWidget;
+class QSpinBox;
+class QCheckBox;
+
+struct PNGExport
+{
+	QString fileName;
+	QSize size;
+	QMargins margins;
+	bool antialiasing;
+};
+
+class PNGExportDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	PNGExportDialog(PNGExport &exp, QWidget *parent = 0);
+
+public slots:
+	void accept();
+
+private:
+	PNGExport &_export;
+
+	FileSelectWidget *_fileSelect;
+	QSpinBox *_width;
+	QSpinBox *_height;
+	MarginsWidget *_margins;
+	QCheckBox *_antialiasing;
+};
+
+#endif // PNGEXPORTDIALOG_H
--- a/src/GUI/powergraphitem.cpp
+++ b/src/GUI/powergraphitem.cpp
@ -5,7 +5,7 @@

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

--- a/src/GUI/routeitem.cpp
+++ b/src/GUI/routeitem.cpp
@ -15,6 +15,8 @@ QString RouteItem::info() const
 		tt.insert(tr("Name"), _name);
 	if (!_desc.isEmpty())
 		tt.insert(tr("Description"), _desc);
+	if (!_comment.isEmpty() && _comment != _desc)
+		tt.insert(tr("Comment"), _comment);
 	tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
 	  _units));
 	if (!_links.isEmpty()) {
@ -43,8 +45,8 @@ RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)

 	_name = route.name();
 	_desc = route.description();
+	_comment = route.comment();
 	_links = route.links();
-	_coordinatesFormat = DecimalDegrees;
 }

 void RouteItem::setMap(Map *map)
@ -55,28 +57,6 @@ void RouteItem::setMap(Map *map)
 	PathItem::setMap(map);
 }

-void RouteItem::setUnits(Units u)
-{
-	if (_units == u)
-		return;
-
-	for (int i = 0; i < _waypoints.count(); i++)
-		_waypoints[i]->setToolTipFormat(u, _coordinatesFormat);
-
-	PathItem::setUnits(u);
-}
-
-void RouteItem::setCoordinatesFormat(CoordinatesFormat format)
-{
-	if (_coordinatesFormat == format)
-		return;
-
-	_coordinatesFormat = format;
-
-	for (int i = 0; i < _waypoints.count(); i++)
-		_waypoints[i]->setToolTipFormat(_units, _coordinatesFormat);
-}
-
 void RouteItem::showWaypoints(bool show)
 {
 	for (int i = 0; i < _waypoints.count(); i++)
--- a/src/GUI/routeitem.h
+++ b/src/GUI/routeitem.h
@ -19,8 +19,6 @@ public:

 	void setMap(Map *map);

-	void setUnits(Units u);
-	void setCoordinatesFormat(CoordinatesFormat format);
 	void showWaypoints(bool show);
 	void showWaypointLabels(bool show);

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

 	QVector<WaypointItem*> _waypoints;
 };
--- a/src/GUI/settings.h
+++ b/src/GUI/settings.h
@ -66,26 +66,45 @@
 #define SHOW_WAYPOINT_LABELS_SETTING      "waypointLabels"
 #define SHOW_WAYPOINT_LABELS_DEFAULT      true

-#define EXPORT_SETTINGS_GROUP             "Export"
+#define PDF_EXPORT_SETTINGS_GROUP         "Export"
 #define PAPER_ORIENTATION_SETTING         "orientation"
 #define PAPER_ORIENTATION_DEFAULT         QPrinter::Portrait
 #define PAPER_SIZE_SETTING                "size"
 #define PAPER_SIZE_DEFAULT                (IMPERIAL_UNITS() ? QPrinter::Letter \
                                            : QPrinter::A4)
-#define MARGIN_LEFT_SETTING               "marginLeft"
-#define MARGIN_LEFT_DEFAULT               5 /* mm */
-#define MARGIN_TOP_SETTING                "marginTop"
-#define MARGIN_TOP_DEFAULT                5 /* mm */
-#define MARGIN_RIGHT_SETTING              "marginRight"
-#define MARGIN_RIGHT_DEFAULT              5 /* mm */
-#define MARGIN_BOTTOM_SETTING             "marginBottom"
-#define MARGIN_BOTTOM_DEFAULT             5 /* mm */
-#define EXPORT_FILENAME_SETTING           "fileName"
-#define EXPORT_FILENAME_DEFAULT           QString("%1/export.pdf"). \
+#define PDF_MARGIN_LEFT_SETTING           "marginLeft"
+#define PDF_MARGIN_LEFT_DEFAULT           5 /* mm */
+#define PDF_MARGIN_TOP_SETTING            "marginTop"
+#define PDF_MARGIN_TOP_DEFAULT            5 /* mm */
+#define PDF_MARGIN_RIGHT_SETTING          "marginRight"
+#define PDF_MARGIN_RIGHT_DEFAULT          5 /* mm */
+#define PDF_MARGIN_BOTTOM_SETTING         "marginBottom"
+#define PDF_MARGIN_BOTTOM_DEFAULT         5 /* mm */
+#define PDF_FILENAME_SETTING              "fileName"
+#define PDF_FILENAME_DEFAULT              QString("%1/export.pdf"). \
                                            arg(QDir::currentPath())
 #define RESOLUTION_SETTING                "resolution"
 #define RESOLUTION_DEFAULT                600

+#define PNG_EXPORT_SETTINGS_GROUP         "PNGExport"
+#define PNG_WIDTH_SETTING                 "width"
+#define PNG_WIDTH_DEFAULT                 600
+#define PNG_HEIGHT_SETTING                "height"
+#define PNG_HEIGHT_DEFAULT                800
+#define PNG_MARGIN_LEFT_SETTING           "marginLeft"
+#define PNG_MARGIN_LEFT_DEFAULT           5 /* px */
+#define PNG_MARGIN_TOP_SETTING            "marginTop"
+#define PNG_MARGIN_TOP_DEFAULT            5 /* px */
+#define PNG_MARGIN_RIGHT_SETTING          "marginRight"
+#define PNG_MARGIN_RIGHT_DEFAULT          5 /* px */
+#define PNG_MARGIN_BOTTOM_SETTING         "marginBottom"
+#define PNG_MARGIN_BOTTOM_DEFAULT         5 /* px */
+#define PNG_ANTIALIASING_SETTING          "antialiasing"
+#define PNG_ANTIALIASING_DEFAULT          true
+#define PNG_FILENAME_SETTING              "fileName"
+#define PNG_FILENAME_DEFAULT              QString("%1/export.png"). \
+											arg(QDir::currentPath())
+
 #define OPTIONS_SETTINGS_GROUP            "Options"
 #define PALETTE_COLOR_SETTING             "paletteColor"
 #define PALETTE_COLOR_DEFAULT             QColor(Qt::blue)
@ -145,10 +164,15 @@
 #define USE_REPORTED_SPEED_DEFAULT        false
 #define DATA_USE_DEM_SETTING              "dataUseDEM"
 #define DATA_USE_DEM_DEFAULT              false
+#define SHOW_SECONDARY_ELEVATION_SETTING  "showSecondaryElevation"
+#define SHOW_SECONDARY_ELEVATION_DEFAULT  false
+#define SHOW_SECONDARY_SPEED_SETTING      "showSecondarySpeed"
+#define SHOW_SECONDARY_SPEED_DEFAULT      false
+#define TIME_ZONE_SETTING                 "timeZone"
+#define USE_SEGMENTS_SETTING              "useSegments"
+#define USE_SEGMENTS_DEFAULT              true
 #define POI_RADIUS_SETTING                "poiRadius"
 #define POI_RADIUS_DEFAULT                (int)(IMPERIAL_UNITS() ? MIINM : KMINM)
-#define POI_USE_DEM_SETTING               "poiUseDEM"
-#define POI_USE_DEM_DEFAULT               false
 #define USE_OPENGL_SETTING                "useOpenGL"
 #define USE_OPENGL_DEFAULT                false
 #define ENABLE_HTTP2_SETTING              "enableHTTP2"
--- a/src/GUI/speedgraph.cpp
+++ b/src/GUI/speedgraph.cpp
@ -40,31 +40,46 @@ void SpeedGraph::setInfo()
 		clearInfo();
 }

+GraphItem *SpeedGraph::loadGraph(const Graph &graph, const Track &track,
+  const QColor &color, bool primary)
+{
+	if (!graph.isValid())
+		return 0;
+
+	SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,
+	  color, primary ? Qt::SolidLine : Qt::DashLine, track.movingTime());
+	gi->setTimeType(_timeType);
+	gi->setUnits(_units);
+
+	_tracks.append(gi);
+	if (_showTracks)
+		addGraph(gi);
+
+	if (primary) {
+		_avg.append(QPointF(track.distance(), gi->avg()));
+		_mavg.append(QPointF(track.distance(), gi->mavg()));
+	}
+
+	return gi;
+}
+
 QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 {
 	QList<GraphItem*> graphs;

 	for (int i = 0; i < data.tracks().count(); i++) {
+		GraphItem *primary, *secondary;
+		QColor color(_palette.nextColor());
 		const Track &track = data.tracks().at(i);
-		const Graph &graph = track.speed();
+		const GraphPair &gp = track.speed();

-		if (!graph.isValid()) {
-			_palette.nextColor();
-			graphs.append(0);
-		} else {
-			SpeedGraphItem *gi = new SpeedGraphItem(graph, _graphType, _width,
-			  _palette.nextColor(), track.movingTime());
-			gi->setTimeType(_timeType);
-			gi->setUnits(_units);
+		primary = loadGraph(gp.primary(), track, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), track, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);

-			_tracks.append(gi);
-			if (_showTracks)
-				addGraph(gi);
-
-			_avg.append(QPointF(track.distance(), gi->avg()));
-			_mavg.append(QPointF(track.distance(), gi->mavg()));
-			graphs.append(gi);
-		}
+		graphs.append(primary);
 	}

 	for (int i = 0; i < data.routes().count(); i++) {
--- a/src/GUI/speedgraph.h
+++ b/src/GUI/speedgraph.h
@ -5,6 +5,7 @@
 #include "graphtab.h"

 class SpeedGraphItem;
+class Track;

 class SpeedGraph : public GraphTab
 {
@ -22,6 +23,8 @@ public:
 	void showTracks(bool show);

 private:
+	GraphItem *loadGraph(const Graph &graph, const Track &track,
+	  const QColor &color, bool primary);
 	qreal avg() const;
 	qreal max() const {return bounds().bottom();}
 	void setYUnits();
--- a/src/GUI/speedgraphitem.cpp
+++ b/src/GUI/speedgraphitem.cpp
@ -5,8 +5,8 @@


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

--- a/src/GUI/speedgraphitem.h
+++ b/src/GUI/speedgraphitem.h
@ -10,7 +10,8 @@ class SpeedGraphItem : public GraphItem

 public:
 	SpeedGraphItem(const Graph &graph, GraphType type, int width,
-	  const QColor &color, qreal movingTime, QGraphicsItem *parent = 0);
+	  const QColor &color, Qt::PenStyle style, qreal movingTime,
+	  QGraphicsItem *parent = 0);

 	qreal avg() const {return _avg;}
 	qreal mavg() const {return _mavg;}
--- a/src/GUI/temperaturegraphitem.cpp
+++ b/src/GUI/temperaturegraphitem.cpp
@ -5,7 +5,7 @@

 TemperatureGraphItem::TemperatureGraphItem(const Graph &graph, GraphType type,
  int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();
--- a/src/GUI/timezoneinfo.h
+++ b/src/GUI/timezoneinfo.h
@ -0,0 +1,69 @@
+#ifndef TIMEZONEINFO_H
+#define TIMEZONEINFO_H
+
+#include <QTimeZone>
+#include <QDataStream>
+
+class TimeZoneInfo
+{
+public:
+	enum Type {
+		UTC,
+		System,
+		Custom
+	};
+
+	TimeZoneInfo() : _type(UTC), _customZone(QTimeZone::systemTimeZone()) {}
+
+	Type type()  const {return _type;}
+	const QTimeZone &customZone() const {return _customZone;}
+	QTimeZone zone() const
+	{
+		if (_type == UTC)
+			return QTimeZone::utc();
+		else if (_type == System)
+			return QTimeZone::systemTimeZone();
+		else
+			return _customZone;
+	}
+
+	void setType(Type type) {_type = type;}
+	void setCustomZone(const QTimeZone &zone) {_customZone = zone;}
+
+	bool operator==(const TimeZoneInfo &other) const
+	{
+		if (_type == UTC || _type == System)
+			return _type == other._type;
+		else
+			return (other._type == Custom && _customZone == other._customZone);
+	}
+	bool operator!=(const TimeZoneInfo &other) {return !(*this == other);}
+
+private:
+	friend QDataStream& operator<<(QDataStream &out, const TimeZoneInfo &info);
+	friend QDataStream& operator>>(QDataStream &in, TimeZoneInfo &info);
+
+	Type _type;
+	QTimeZone _customZone;
+};
+
+Q_DECLARE_METATYPE(TimeZoneInfo)
+
+inline QDataStream &operator<<(QDataStream &out, const TimeZoneInfo &info)
+{
+	out << static_cast<int>(info._type) << info._customZone;
+	return out;
+}
+
+inline QDataStream &operator>>(QDataStream &in, TimeZoneInfo &info)
+{
+	int t;
+
+	in >> t;
+	info._type = static_cast<TimeZoneInfo::Type>(t);
+	in >> info._customZone;
+
+	return in;
+}
+
+#endif // TIMEZONEINFO_H
--- a/src/GUI/trackitem.cpp
+++ b/src/GUI/trackitem.cpp
@ -13,6 +13,8 @@ QString TrackItem::info() const
 		tt.insert(tr("Name"), _name);
 	if (!_desc.isEmpty())
 		tt.insert(tr("Description"), _desc);
+	if (!_comment.isEmpty() && _comment != _desc)
+		tt.insert(tr("Comment"), _comment);
 	tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
 	  _units));
 	if  (_time > 0)
@ -20,7 +22,13 @@ QString TrackItem::info() const
 	if  (_movingTime > 0)
 		tt.insert(tr("Moving time"), Format::timeSpan(_movingTime));
 	if (!_date.isNull())
-		tt.insert(tr("Date"), _date.toString(Qt::SystemLocaleShortDate));
+		tt.insert(tr("Date"),
+#ifdef ENABLE_TIMEZONES
+		  _date.toTimeZone(_timeZone)
+#else // ENABLE_TIMEZONES
+		  _date
+#endif // ENABLE_TIMEZONES
+		  .toString(Qt::SystemLocaleShortDate));
 	if (!_links.isEmpty()) {
 		QString links;
 		for (int i = 0; i < _links.size(); i++) {
@ -41,6 +49,7 @@ TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)
 {
 	_name = track.name();
 	_desc = track.description();
+	_comment = track.comment();
 	_links = track.links();
 	_date = track.date();
 	_time = track.time();
--- a/src/GUI/trackitem.h
+++ b/src/GUI/trackitem.h
@ -22,6 +22,7 @@ public:
 private:
 	QString _name;
 	QString _desc;
+	QString _comment;
 	QVector<Link> _links;
 	QDateTime _date;
 	qreal _time;
--- a/src/GUI/units.h
+++ b/src/GUI/units.h
@ -16,6 +16,7 @@ enum Units {
 #define MS2KN   1.943844490000  // m/s -> kn
 #define FT2MI   0.000189393939  // ft -> mi
 #define MM2IN   0.039370100000  // mm -> in
+#define MM2CM   0.100000000000  // mm -> cm
 #define H2S     0.000277777778  // h -> s
 #define MIN2S   0.016666666667  // min -> s

--- a/src/GUI/waypointitem.cpp
+++ b/src/GUI/waypointitem.cpp
@ -13,6 +13,13 @@
 #define FS(size) \
 	((int)((qreal)size * 1.41))

+
+Units WaypointItem::_units = Metric;
+CoordinatesFormat WaypointItem::_format = DecimalDegrees;
+#ifdef ENABLE_TIMEZONES
+QTimeZone WaypointItem::_timeZone = QTimeZone::utc();
+#endif // ENABLE_TIMEZONES
+
 QString WaypointItem::info() const
 {
 	ToolTip tt;
@ -21,15 +28,28 @@ QString WaypointItem::info() const
 		tt.insert(qApp->translate("WaypointItem", "Name"), _waypoint.name());
 	tt.insert(qApp->translate("WaypointItem", "Coordinates"),
 	  Format::coordinates(_waypoint.coordinates(), _format));
-	if (_waypoint.hasElevation())
-		tt.insert(qApp->translate("WaypointItem", "Elevation"),
-		  Format::elevation(_waypoint.elevation(), _units));
+	if (!std::isnan(_waypoint.elevations().first)) {
+		QString val = Format::elevation(_waypoint.elevations().first, _units);
+		if (!std::isnan(_waypoint.elevations().second))
+			val += " (" + Format::elevation(_waypoint.elevations().second,
+			  _units) + ")";
+		tt.insert(qApp->translate("WaypointItem", "Elevation"), val);
+	}
 	if (_waypoint.timestamp().isValid())
 		tt.insert(qApp->translate("WaypointItem", "Date"),
-		  _waypoint.timestamp().toString(Qt::SystemLocaleShortDate));
+#ifdef ENABLE_TIMEZONES
+		  _waypoint.timestamp().toTimeZone(_timeZone)
+#else // ENABLE_TIMEZONES
+		  _waypoint.timestamp()
+#endif // ENABLE_TIMEZONES
+		  .toString(Qt::SystemLocaleShortDate));
 	if (!_waypoint.description().isEmpty())
 		tt.insert(qApp->translate("WaypointItem", "Description"),
 		  _waypoint.description());
+	if (!_waypoint.comment().isEmpty()
+	  && _waypoint.comment() != _waypoint.description())
+		tt.insert(qApp->translate("WaypointItem", "Comment"),
+		  _waypoint.comment());
 	if (_waypoint.address().isValid()) {
 		QString addr("<address>");
 		addr += _waypoint.address().street();
@ -70,9 +90,6 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map,
 	_font.setPixelSize(FS(_size));
 	_font.setFamily(FONT_FAMILY);

-	_units = Metric;
-	_format = DecimalDegrees;
-
 	updateCache();

 	setPos(map->ll2xy(waypoint.coordinates()));
@ -143,12 +160,6 @@ void WaypointItem::setColor(const QColor &color)
 	update();
 }

-void WaypointItem::setToolTipFormat(Units units, CoordinatesFormat format)
-{
-	_units = units;
-	_format = format;
-}
-
 void WaypointItem::showLabel(bool show)
 {
 	if (_showLabel == show)
--- a/src/GUI/waypointitem.h
+++ b/src/GUI/waypointitem.h
@ -1,9 +1,13 @@
 #ifndef WAYPOINTITEM_H
 #define WAYPOINTITEM_H

+#include "common/config.h"
 #include <cmath>
 #include <QGraphicsItem>
 #include <QFont>
+#ifdef ENABLE_TIMEZONES
+#include <QTimeZone>
+#endif // ENABLE_TIMEZONES
 #include "data/waypoint.h"
 #include "map/map.h"
 #include "units.h"
@ -23,7 +27,6 @@ public:
 	void setColor(const QColor &color);
 	void showLabel(bool show);
 	void setDigitalZoom(int zoom) {setScale(pow(2, -zoom));}
-	void setToolTipFormat(Units units, CoordinatesFormat format);

 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}
@ -32,6 +35,13 @@ public:

 	QString info() const;

+	static void setUnits(Units units) {_units = units;}
+	static void setCoordinatesFormat(CoordinatesFormat format)
+	  {_format = format;}
+#ifdef ENABLE_TIMEZONES
+	static void setTimeZone(const QTimeZone &zone) {_timeZone = zone;}
+#endif // ENABLE_TIMEZONES
+
 protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
@ -48,8 +58,11 @@ private:
 	QFont _font;
 	QRect _labelBB;

-	Units _units;
-	CoordinatesFormat _format;
+	static Units _units;
+	static CoordinatesFormat _format;
+#ifdef ENABLE_TIMEZONES
+	static QTimeZone _timeZone;
+#endif // ENABLE_TIMEZONES
 };

 #endif // WAYPOINTITEM_H
--- a/src/common/config.h
+++ b/src/common/config.h
@ -18,4 +18,8 @@
 #define ENABLE_GEOJSON
 #endif // QT >= 5.0

+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+#define ENABLE_TIMEZONES
+#endif // QT >= 5.5
+
 #endif /* CONFIG_H */
--- a/src/common/coordinates.cpp
+++ b/src/common/coordinates.cpp
@ -14,8 +14,8 @@ double Coordinates::distanceTo(const Coordinates &c) const
 #ifndef QT_NO_DEBUG
 QDebug operator<<(QDebug dbg, const Coordinates &c)
 {
-	dbg.nospace() << qSetRealNumberPrecision(10) << "Coordinates(" << c.lat()
-	  << ", " << c.lon() << ")";
+	dbg.nospace() << qSetRealNumberPrecision(10) << "Coordinates(" << c.lon()
+	  << ", " << c.lat() << ")";
 	return dbg.space();
 }
 #endif // QT_NO_DEBUG
--- a/src/common/garmin.h
+++ b/src/common/garmin.h
@ -3,14 +3,16 @@

 #include <QtGlobal>

+#define LS(val, bits) ((qint32)(((quint32)(val))<<(bits)))
+
 inline double toWGS32(qint32 v)
 {
-	return (double)(((double)v / (double)(1U<<31)) * (double)180);
+	return ((double)v / (double)(1U<<31)) * 180.0;
 }

 inline double toWGS24(qint32 v)
 {
-	return toWGS32(v<<8);
+	return toWGS32(LS(v, 8));
 }

 #endif // GARMIN_H
--- a/src/common/rectc.h
+++ b/src/common/rectc.h
@ -28,6 +28,9 @@ public:
 	double left() const {return _tl.lon();}
 	double right() const {return _br.lon();}

+	double width() const {return (right() - left());}
+	double height() const {return (top() - bottom());}
+
 	void setLeft(double val) {_tl.rlon() = val;}
 	void setRight(double val) {_br.rlon() = val;}
 	void setTop(double val) {_tl.rlat() = val;}
--- a/src/data/data.cpp
+++ b/src/data/data.cpp
@ -20,7 +20,6 @@
 #include "cupparser.h"
 #include "gpiparser.h"
 #include "smlparser.h"
-#include "dem.h"
 #include "data.h"


@ -44,78 +43,46 @@ static CUPParser cup;
 static GPIParser gpi;
 static SMLParser sml;

-static QHash<QString, Parser*> parsers()
+static QMap<QString, Parser*> parsers()
 {
-	QHash<QString, Parser*> hash;
+	QMap<QString, Parser*> map;

-	hash.insert("gpx", &gpx);
-	hash.insert("tcx", &tcx);
-	hash.insert("kml", &kml);
-	hash.insert("fit", &fit);
-	hash.insert("csv", &csv);
-	hash.insert("igc", &igc);
-	hash.insert("nmea", &nmea);
-	hash.insert("plt", &plt);
-	hash.insert("wpt", &wpt);
-	hash.insert("rte", &rte);
-	hash.insert("loc", &loc);
-	hash.insert("slf", &slf);
+	map.insert("gpx", &gpx);
+	map.insert("tcx", &tcx);
+	map.insert("kml", &kml);
+	map.insert("fit", &fit);
+	map.insert("csv", &csv);
+	map.insert("igc", &igc);
+	map.insert("nmea", &nmea);
+	map.insert("plt", &plt);
+	map.insert("wpt", &wpt);
+	map.insert("rte", &rte);
+	map.insert("loc", &loc);
+	map.insert("slf", &slf);
 #ifdef ENABLE_GEOJSON
-	hash.insert("json", &geojson);
-	hash.insert("geojson", &geojson);
+	map.insert("json", &geojson);
+	map.insert("geojson", &geojson);
 #endif // ENABLE_GEOJSON
-	hash.insert("jpeg", &exif);
-	hash.insert("jpg", &exif);
-	hash.insert("cup", &cup);
-	hash.insert("gpi", &gpi);
-	hash.insert("sml", &sml);
+	map.insert("jpeg", &exif);
+	map.insert("jpg", &exif);
+	map.insert("cup", &cup);
+	map.insert("gpi", &gpi);
+	map.insert("sml", &sml);

-	return hash;
+	return map;
 }

-
-QHash<QString, Parser*> Data::_parsers = parsers();
-bool Data::_useDEM = false;
+QMap<QString, Parser*> Data::_parsers = parsers();

 void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
 {
-	for (int i = 0; i < trackData.count(); i++) {
-		TrackData &track = trackData[i];
-		for (int j = 0; j < track.size(); j++) {
-			SegmentData &segment = track[j];
-			for (int k = 0; k < segment.size(); k++) {
-				Trackpoint &t = segment[k];
-				if (!t.hasElevation() || _useDEM) {
-					qreal elevation = DEM::elevation(t.coordinates());
-					if (!std::isnan(elevation))
-						t.setElevation(elevation);
-				}
-			}
-		}
+	for (int i = 0; i < trackData.count(); i++)
 		_tracks.append(Track(trackData.at(i)));
-	}
-	for (int i = 0; i < routeData.count(); i++) {
-		RouteData &route = routeData[i];
-		for (int j = 0; j < route.size(); j++) {
-			Waypoint &w = route[j];
-			if (!w.hasElevation() || _useDEM) {
-				qreal elevation = DEM::elevation(w.coordinates());
-				if (!std::isnan(elevation))
-					w.setElevation(elevation);
-			}
-		}
+	for (int i = 0; i < routeData.count(); i++)
 		_routes.append(Route(routeData.at(i)));
-	}
-	for (int i = 0; i < _waypoints.size(); i++) {
-		if (!_waypoints.at(i).hasElevation() || _useDEM) {
-			qreal elevation = DEM::elevation(_waypoints.at(i).coordinates());
-			if (!std::isnan(elevation))
-				_waypoints[i].setElevation(elevation);
-		}
-	}
 }

-Data::Data(const QString &fileName, bool poi)
+Data::Data(const QString &fileName)
 {
 	QFile file(fileName);
 	QFileInfo fi(fileName);
@ -130,12 +97,11 @@ Data::Data(const QString &fileName, bool poi)
 		return;
 	}

-	QHash<QString, Parser*>::iterator it;
+	QMap<QString, Parser*>::iterator it;
 	if ((it = _parsers.find(fi.suffix().toLower())) != _parsers.end()) {
 		if (it.value()->parse(&file, trackData, routeData, _polygons,
 		  _waypoints)) {
-			if (!poi)
-				processData(trackData, routeData);
+			processData(trackData, routeData);
 			_valid = true;
 			return;
 		} else {
@ -146,8 +112,7 @@ Data::Data(const QString &fileName, bool poi)
 		for (it = _parsers.begin(); it != _parsers.end(); it++) {
 			if (it.value()->parse(&file, trackData, routeData, _polygons,
 			  _waypoints)) {
-				if (!poi)
-					processData(trackData, routeData);
+				processData(trackData, routeData);
 				_valid = true;
 				return;
 			}
@ -166,17 +131,8 @@ Data::Data(const QString &fileName, bool poi)

 QString Data::formats()
 {
-	QStringList l(filter());
-	qSort(l);
-	QString supported;
-	for (int i = 0; i < l.size(); i++) {
-		supported += l.at(i);
-		if (i != l.size() - 1)
-			supported += " ";
-	}
-
 	return
-	  qApp->translate("Data", "Supported files") + " (" + supported + ");;"
+	  qApp->translate("Data", "Supported files") + " (" + filter().join(" ") + ");;"
 	  + qApp->translate("Data", "CSV files") + " (*.csv);;"
 	  + qApp->translate("Data", "CUP files") + " (*.cup);;"
 	  + qApp->translate("Data", "FIT files") + " (*.fit);;"
@ -200,15 +156,10 @@ QString Data::formats()
 QStringList Data::filter()
 {
 	QStringList filter;
-	QHash<QString, Parser*>::iterator it;

-	for (it = _parsers.begin(); it != _parsers.end(); it++)
-		filter << QString("*.%1").arg(it.key());
+	for (QMap<QString, Parser*>::iterator it = _parsers.begin();
+	  it != _parsers.end(); it++)
+		filter << "*." + it.key();

 	return filter;
 }
-
-void Data::useDEM(bool use)
-{
-	_useDEM = use;
-}
--- a/src/data/data.h
+++ b/src/data/data.h
@ -2,7 +2,7 @@
 #define DATA_H

 #include <QList>
-#include <QHash>
+#include <QMap>
 #include <QString>
 #include <QStringList>
 #include "waypoint.h"
@ -14,7 +14,7 @@
 class Data
 {
 public:
-	Data(const QString &fileName, bool poi = false);
+	Data(const QString &fileName);

 	bool isValid() const {return _valid;}
 	const QString &errorString() const {return _errorString;}
@ -28,8 +28,6 @@ public:
 	static QString formats();
 	static QStringList filter();

-	static void useDEM(bool use);
-
 private:
 	void processData(QList<TrackData> &trackData, QList<RouteData> &routeData);

@ -42,8 +40,7 @@ private:
 	QList<Area> _polygons;
 	QVector<Waypoint> _waypoints;

-	static QHash<QString, Parser*> _parsers;
-	static bool _useDEM;
+	static QMap<QString, Parser*> _parsers;
 };

 #endif // DATA_H
--- a/src/data/fitparser.cpp
+++ b/src/data/fitparser.cpp
@ -7,6 +7,7 @@

 #define RECORD_MESSAGE  20
 #define EVENT_MESSAGE   21
+#define COURSE_POINT    32
 #define TIMESTAMP_FIELD 253

 class Event {
@ -48,10 +49,12 @@ public:

 class FITParser::CTX {
 public:
-	CTX(QFile *file) : file(file), len(0), endian(0), timestamp(0),
-		lastWrite(0), ratio(NAN) {}
+	CTX(QFile *file, QVector<Waypoint> &waypoints)
+	  : file(file), waypoints(waypoints), len(0), endian(0), timestamp(0),
+	  lastWrite(0), ratio(NAN) {}

 	QFile *file;
+	QVector<Waypoint> &waypoints;
 	quint32 len;
 	quint8 endian;
 	quint32 timestamp, lastWrite;
@ -61,6 +64,41 @@ public:
 	SegmentData segment;
 };

+static QMap<int, QString> coursePointDescInit()
+{
+	QMap<int, QString> map;
+
+	map.insert(1, "Summit");
+	map.insert(2, "Valley");
+	map.insert(3, "Water");
+	map.insert(4, "Food");
+	map.insert(5, "Danger");
+	map.insert(6, "Left");
+	map.insert(7, "Right");
+	map.insert(8, "Straight");
+	map.insert(9, "First aid");
+	map.insert(10, "Fourth category");
+	map.insert(11, "Third category");
+	map.insert(12, "Second category");
+	map.insert(13, "First category");
+	map.insert(14, "Hors category");
+	map.insert(15, "Sprint");
+	map.insert(16, "Left fork");
+	map.insert(17, "Right fork");
+	map.insert(18, "Middle fork");
+	map.insert(19, "Slight left");
+	map.insert(20, "Sharp left");
+	map.insert(21, "Slight right");
+	map.insert(22, "Sharp right");
+	map.insert(23, "U-Turn");
+	map.insert(24, "Segment start");
+	map.insert(25, "Segment end");
+
+	return map;
+}
+
+static QMap<int, QString> coursePointDesc = coursePointDescInit();
+

 bool FITParser::readData(QFile *file, char *data, size_t size)
 {
@ -80,17 +118,12 @@ bool FITParser::readData(QFile *file, char *data, size_t size)

 template<class T> bool FITParser::readValue(CTX &ctx, T &val)
 {
-	T data;
-
-	if (!readData(ctx.file, (char*)&data, sizeof(T)))
+	if (!readData(ctx.file, (char*)&val, sizeof(T)))
 		return false;

 	ctx.len -= sizeof(T);
-
-	if (ctx.endian)
-		val = qFromBigEndian(data);
-	else
-		val = qFromLittleEndian(data);
+	if (sizeof(T) > 1)
+		val = (ctx.endian) ? qFromBigEndian(val) : qFromLittleEndian(val);

 	return true;
 }
@ -167,41 +200,51 @@ bool FITParser::parseDefinitionMessage(CTX &ctx, quint8 header)
 	return true;
 }

-bool FITParser::readField(CTX &ctx, Field *field, quint32 &val)
+bool FITParser::readField(CTX &ctx, Field *field, QVariant &val, bool &valid)
 {
-	quint8 v8 = (quint8)-1;
-	quint16 v16 = (quint16)-1;
 	bool ret;

-	val = (quint32)-1;
+#define VAL(type, inval) \
+	{type var; \
+	if (field->size == sizeof(var)) { \
+		ret = readValue(ctx, var); \
+		val = var; \
+		valid = (var != (inval)); \
+	} else { \
+		ret = skipValue(ctx, field->size); \
+		valid = false; \
+	}}

 	switch (field->type) {
-		case 0: // enum
 		case 1: // sint8
+			VAL(qint8, 0x7fU);
+			break;
 		case 2: // uint8
-			if (field->size == 1) {
-				ret = readValue(ctx, v8);
-				val = v8;
-			} else
-				ret = skipValue(ctx, field->size);
+		case 0: // enum
+			VAL(quint8, 0xffU);
+			break;
+		case 7: // UTF8 nul terminated string
+			{QByteArray ba(ctx.file->read(field->size));
+			ctx.len -= field->size;
+			ret = (ba.size() == field->size);
+			val = ret ? ba : QString();
+			valid = !ba.isEmpty();}
 			break;
 		case 0x83: // sint16
+			VAL(qint16, 0x7fffU);
+			break;
 		case 0x84: // uint16
-			if (field->size == 2) {
-				ret = readValue(ctx, v16);
-				val = v16;
-			} else
-				ret = skipValue(ctx, field->size);
+			VAL(quint16, 0xffffU);
 			break;
 		case 0x85: // sint32
+			VAL(qint32, 0x7fffffffU);
+			break;
 		case 0x86: // uint32
-			if (field->size == 4)
-				ret = readValue(ctx, val);
-			else
-				ret = skipValue(ctx, field->size);
+			VAL(quint32, 0xffffffffU);
 			break;
 		default:
 			ret = skipValue(ctx, field->size);
+			valid = false;
 			break;
 	}

@ -211,8 +254,10 @@ bool FITParser::readField(CTX &ctx, Field *field, quint32 &val)
 bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 {
 	Field *field;
+	QVariant val;
+	bool valid;
 	Event event;
-	quint32 val;
+	Waypoint waypoint;


 	if (!def->fields && !def->devFields) {
@ -224,69 +269,79 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)

 	for (int i = 0; i < def->numFields; i++) {
 		field = &def->fields[i];
-		if (!readField(ctx, field, val))
+		if (!readField(ctx, field, val, valid))
 			return false;
+		if (!valid)
+			continue;

 		if (field->id == TIMESTAMP_FIELD)
-			ctx.timestamp = val;
+			ctx.timestamp = val.toUInt();
 		else if (def->globalId == RECORD_MESSAGE) {
 			switch (field->id) {
 				case 0:
-					if (val != 0x7fffffff)
-						ctx.trackpoint.rcoordinates().setLat(
-						  ((qint32)val / (double)0x7fffffff) * 180);
+					ctx.trackpoint.rcoordinates().setLat(
+					  (val.toInt() / (double)0x7fffffff) * 180);
 					break;
 				case 1:
-					if (val != 0x7fffffff)
-						ctx.trackpoint.rcoordinates().setLon(
-						  ((qint32)val / (double)0x7fffffff) * 180);
+					ctx.trackpoint.rcoordinates().setLon(
+					  (val.toInt() / (double)0x7fffffff) * 180);
 					break;
 				case 2:
-					if (val != 0xffff)
-						ctx.trackpoint.setElevation((val / 5.0) - 500);
+					ctx.trackpoint.setElevation((val.toUInt() / 5.0) - 500);
 					break;
 				case 3:
-					if (val != 0xff)
-						ctx.trackpoint.setHeartRate(val);
+					ctx.trackpoint.setHeartRate(val.toUInt());
 					break;
 				case 4:
-					if (val != 0xff)
-						ctx.trackpoint.setCadence(val);
+					ctx.trackpoint.setCadence(val.toUInt());
 					break;
 				case 6:
-					if (val != 0xffff)
-						ctx.trackpoint.setSpeed(val / 1000.0f);
+					ctx.trackpoint.setSpeed(val.toUInt() / 1000.0f);
 					break;
 				case 7:
-					if (val != 0xffff)
-						ctx.trackpoint.setPower(val);
+					ctx.trackpoint.setPower(val.toUInt());
 					break;
 				case 13:
-					if (val != 0x7f)
-						ctx.trackpoint.setTemperature((qint8)val);
+					ctx.trackpoint.setTemperature(val.toInt());
 					break;
 				case 73:
-					if (val != 0xffffffff)
-						ctx.trackpoint.setSpeed(val / 1000.0f);
+					ctx.trackpoint.setSpeed(val.toUInt() / 1000.0f);
 					break;
 				case 78:
-					if (val != 0xffffffff)
-						ctx.trackpoint.setElevation((val / 5.0) - 500);
+					ctx.trackpoint.setElevation((val.toUInt() / 5.0) - 500);
 					break;
-				default:
-					break;
-
 			}
 		} else if (def->globalId == EVENT_MESSAGE) {
 			switch (field->id) {
 				case 0:
-					event.id = val;
+					event.id = val.toUInt();
 					break;
 				case 1:
-					event.type = val;
+					event.type = val.toUInt();
 					break;
 				case 3:
-					event.data = val;
+					event.data = val.toUInt();
+					break;
+			}
+		} else if (def->globalId == COURSE_POINT) {
+			switch (field->id) {
+				case 1:
+					waypoint.setTimestamp(QDateTime::fromTime_t(val.toUInt()
+					  + 631065600));
+					break;
+				case 2:
+					waypoint.rcoordinates().setLat(
+					  (val.toInt() / (double)0x7fffffff) * 180);
+					break;
+				case 3:
+					waypoint.rcoordinates().setLon(
+					  (val.toInt() / (double)0x7fffffff) * 180);
+					break;
+				case 5:
+					waypoint.setDescription(coursePointDesc.value(val.toUInt()));
+					break;
+				case 6:
+					waypoint.setName(val.toString());
 					break;
 			}
 		}
@ -294,7 +349,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)

 	for (int i = 0; i < def->numDevFields; i++) {
 		field = &def->devFields[i];
-		if (!readField(ctx, field, val))
+		if (!readField(ctx, field, val, valid))
 			return false;
 	}

@ -315,7 +370,9 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 			ctx.trackpoint = Trackpoint();
 			ctx.lastWrite = ctx.timestamp;
 		}
-	}
+	} else if (def->globalId == COURSE_POINT)
+		if (waypoint.coordinates().isValid())
+			ctx.waypoints.append(waypoint);

 	return true;
 }
@ -381,9 +438,8 @@ bool FITParser::parse(QFile *file, QList<TrackData> &tracks,
  QList<Area> &polygons, QVector<Waypoint> &waypoints)
 {
 	Q_UNUSED(routes);
-	Q_UNUSED(waypoints);
 	Q_UNUSED(polygons);
-	CTX ctx(file);
+	CTX ctx(file, waypoints);


 	if (!parseHeader(ctx))
--- a/src/data/fitparser.h
+++ b/src/data/fitparser.h
@ -21,7 +21,7 @@ private:
 	bool readData(QFile *file, char *data, size_t size);
 	template<class T> bool readValue(CTX &ctx, T &val);
 	bool skipValue(CTX &ctx, quint8 size);
-	bool readField(CTX &ctx, Field *field, quint32 &val);
+	bool readField(CTX &ctx, Field *field, QVariant &val, bool &valid);

 	bool parseHeader(CTX &ctx);
 	bool parseRecord(CTX &ctx);
--- a/src/data/gpiparser.cpp
+++ b/src/data/gpiparser.cpp
@ -282,14 +282,14 @@ static quint32 readNotes(QDataStream &stream, QTextCodec *codec,
 	if (s1 & 0x1) {
 		QList<TranslatedString> obj;
 		ds += readTranslatedObjects(stream, codec, obj);
-		if (!obj.isEmpty() && waypoint.description().isNull())
-			waypoint.setDescription(obj.first().str());
+		if (!obj.isEmpty())
+			waypoint.setComment(obj.first().str());
 	}
 	if (s1 & 0x2) {
 		QString str;
 		ds += readString(stream, codec, str);
-		if (!str.isEmpty() && waypoint.description().isNull())
-			waypoint.setDescription(str);
+		if (!str.isEmpty())
+			waypoint.setComment(str);
 	}

 	if (ds != rh.size)
--- a/Show More
+++ b/Show More