Version++

("less green")

.appveyor.yml

@@ -1,22 +1,33 @@
-version: 7.19.{build}
+version: 7.29.{build}
-configuration: Release
+
-platform: Any CPU
+configuration:
+  - Release
+
+image:
+  - Visual Studio 2017
+
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
   matrix:
-  - QTDIR: C:\Qt\5.11\msvc2015
+  - QTDIR: C:\Qt\5.13\msvc2017
-    PLATFORM: x86
     NSI: gpxsee.nsi
-    OPENSSLDIR: C:\OpenSSL-Win32\bin
+    VCVARS: vcvars32.bat
-  - QTDIR: C:\Qt\5.11\msvc2015_64
+    OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
-    PLATFORM: x86_amd64
+    LIBCRYPTO: libssl-1_1.dll
+    LIBSSL: libcrypto-1_1.dll
+  - QTDIR: C:\Qt\5.13\msvc2017_64
     NSI: gpxsee64.nsi
-    OPENSSLDIR: C:\OpenSSL-Win64\bin
+    VCVARS: vcvars64.bat
+    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
+    LIBCRYPTO: libssl-1_1-x64.dll
+    LIBSSL: libcrypto-1_1-x64.dll    
+
 install:
 - cmd: >-
     set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
 
-    call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\"%VCVARS%
+
 build_script:
 - cmd: >-
     lrelease gpxsee.pro
@@ -44,9 +55,9 @@ build_script:
 
     copy licence.txt installer
 
-    copy %OPENSSLDIR%\libeay32.dll installer
+    copy %OPENSSLDIR%\%LIBCRYPTO% installer
 
-    copy %OPENSSLDIR%\ssleay32.dll installer
+    copy %OPENSSLDIR%\%LIBSSL% installer
 
 
     makensis.exe installer\%NSI%

README.md

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

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.19
+VERSION = 7.29
 
 QT += core \
     gui \
@@ -20,6 +20,7 @@ equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
     src/GUI/graphicsscene.h \
+    src/GUI/mapaction.h \
     src/GUI/popup.h \
     src/common/garmin.h \
     src/common/staticassert.h \
@@ -89,6 +90,12 @@ HEADERS += src/common/config.h \
     src/GUI/areaitem.h \
     src/data/link.h \
     src/map/IMG/bitmapline.h \
+    src/map/IMG/bitstream.h \
+    src/map/IMG/deltastream.h \
+    src/map/IMG/gmap.h \
+    src/map/IMG/huffmanstream.h \
+    src/map/IMG/huffmantable.h \
+    src/map/IMG/mapdata.h \
     src/map/IMG/textpathitem.h \
     src/map/IMG/textpointitem.h \
     src/map/projection.h \
@@ -188,7 +195,8 @@ HEADERS += src/common/config.h \
     src/data/csv.h \
     src/data/cupparser.h \
     src/data/gpiparser.h \
-    src/data/address.h
+    src/data/address.h \
+    src/data/smlparser.h
 SOURCES += src/main.cpp \
     src/GUI/popup.cpp \
     src/common/coordinates.cpp \
@@ -241,7 +249,14 @@ SOURCES += src/main.cpp \
     src/GUI/gearratiographitem.cpp \
     src/GUI/mapview.cpp \
     src/GUI/areaitem.cpp \
+    src/data/waypoint.cpp \
     src/map/IMG/bitmapline.cpp \
+    src/map/IMG/bitstream.cpp \
+    src/map/IMG/deltastream.cpp \
+    src/map/IMG/gmap.cpp \
+    src/map/IMG/huffmanstream.cpp \
+    src/map/IMG/huffmantable.cpp \
+    src/map/IMG/mapdata.cpp \
     src/map/IMG/textpathitem.cpp \
     src/map/IMG/textpointitem.cpp \
     src/map/maplist.cpp \
@@ -324,7 +339,8 @@ SOURCES += src/main.cpp \
     src/data/csv.cpp \
     src/data/cupparser.cpp \
     src/GUI/graphicsscene.cpp \
-    src/data/gpiparser.cpp
+    src/data/gpiparser.cpp \
+    src/data/smlparser.cpp
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     HEADERS += src/data/geojsonparser.h
@@ -349,7 +365,8 @@ TRANSLATIONS = lang/gpxsee_en.ts \
     lang/gpxsee_tr.ts \
     lang/gpxsee_es.ts \
     lang/gpxsee_pt_BR.ts \
-    lang/gpxsee_uk.ts
+    lang/gpxsee_uk.ts \
+    lang/gpxsee_hu.ts
 
 macx {
     ICON = icons/gpxsee.icns
@@ -368,7 +385,8 @@ macx {
         lang/gpxsee_tr.qm \
         lang/gpxsee_es.qm \
         lang/gpxsee_pt_BR.qm \
-        lang/gpxsee_uk.qm
+        lang/gpxsee_uk.qm \
+        lang/gpxsee_hu.qm
     csv.path = Contents/Resources
     csv.files = pkg/csv
     maps.path = Contents/Resources
@@ -387,7 +405,8 @@ macx {
         icons/formats/slf.icns \
         icons/formats/json.icns \
         icons/formats/cup.icns \
-        icons/formats/gpi.icns
+        icons/formats/gpi.icns \
+        icons/formats/sml.icns
     QMAKE_BUNDLE_DATA += locale maps icons csv
 }
 
@@ -406,7 +425,8 @@ win32 {
         icons/formats/slf.ico \
         icons/formats/json.ico \
         icons/formats/cup.ico \
-        icons/formats/gpi.ico
+        icons/formats/gpi.ico \
+        icons/formats/sml.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }

icons/scripts/extensions

@@ -12,3 +12,4 @@ loc:#556677
 slf:#881199
 cup:#20a810
 gpi:#fca314
+sml:#6434eb

pkg/Info.plist

@@ -243,6 +243,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sml</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/sml+xml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/sml.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Suunto Markup Language</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -541,6 +557,27 @@
 				<string>application/vnd.garmin.gpi</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.suunto.sml</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.suunto.com</string>
+			<key>UTTypeDescription</key>
+			<string>Suunto Markup Language</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>sml</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/sml+xml</string>
+			</dict>
+		</dict>
 	</array>
 </dict>
 </plist>

pkg/appdata.xml

@@ -12,17 +12,18 @@
 
 		<p>Features:</p>
 		<ul>
-			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT,
+			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SIGMA SLF, Suunto SML, LOC,
-				WPT, RTE), GeoJSON, SeeYou CUP, Garmin GPI &amp; CSV and
+				OziExplorer (PLT, WPT, RTE), GeoJSON, SeeYou CUP,
-				geotagged JPEG files.</li>
+				Garmin GPI &amp; CSV and geotagged JPEG files.</li>
 			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
-				WMS, TMS).</li>
+				WMS, TMS, QuadTiles).</li>
 			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
 				TwoNav RMaps, Garmin IMG &amp; JNX, GeoTIFF images).</li>
 			<li>Elevation, speed, heart rate, cadence, power, temperature and
 				gear ratio graphs.</li>
 			<li>Support for multiple tracks in one view.</li>
 			<li>Support for POI files.</li>
+			<li>Support for DEM files (SRTM HGT).</li>
 			<li>Print/export to PDF.</li>
 			<li>Full-screen mode.</li>
 			<li>HiDPI/Retina displays &amp; maps support.</li>
@@ -70,5 +71,6 @@
 		<mimetype>application/geo+json</mimetype>
 		<mimetype>application/vnd.naviter.seeyou.cup</mimetype>
 		<mimetype>application/vnd.garmin.gpi</mimetype>
+		<mimetype>application/sml+xml</mimetype>
 	</mimetypes>
 </component>

pkg/gpxsee.desktop

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

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.19"
+!define VERSION "7.29"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -106,20 +106,21 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 7
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 8
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 8
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 9
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 9
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 10
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 10
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 11
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 11
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 12
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 12
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 13
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 14
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 14
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 15
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
   !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
   !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
+  !insertmacro FILE_ASSOCIATION_ADD "sml" "Suunto Markup Language" 7
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -147,30 +148,17 @@ Section "MSVC runtime" SEC_MSVC
 
   SectionIn RO
 
-  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
-  ${If} ${RunningX64}
-    ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
-  ${Else}
-    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
-  ${EndIf}
-
-  StrCmp $R0 "1" 0 +3
-  DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install."
-  Goto done
-
-  DetailPrint "Installing Visual C++ 2015 Redistributable..."
   SetOutPath $TEMP
-  File "vcredist_x86.exe"
+  File "vc_redist.x86.exe"
-  ExecWait '"$TEMP\vcredist_x86.exe" /install /quiet /norestart'
+  ExecWait '"$TEMP\vc_redist.x86.exe" /install /quiet /norestart'
   SetOutPath $INSTDIR    
 
-  done:
 SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
-  File "libeay32.dll"
+  File "libcrypto-1_1.dll"
-  File "ssleay32.dll"
+  File "libssl-1_1.dll"
 
 SectionEnd
 
@@ -188,6 +176,7 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Hungarian" "hu"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -232,6 +221,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
   !insertmacro FILE_ASSOCIATION_REMOVE "cup"
   !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
+  !insertmacro FILE_ASSOCIATION_REMOVE "sml"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -244,7 +234,7 @@ SectionEnd
 LangString DESC_QT ${LANG_ENGLISH} \
   "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+  "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
 LangString DESC_OPENSSL ${LANG_ENGLISH} \
   "OpenSSL library. Required for HTTPS to work."
 LangString DESC_ANGLE ${LANG_ENGLISH} \

pkg/gpxsee.xml

@@ -98,4 +98,11 @@
 		<generic-icon name="application/octet-stream"/>
 		<glob pattern="*.gpi"/>
 	</mime-type>
+
+	<mime-type type="application/sml+xml">
+		<comment>Suunto Markup Language</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.sml"/>
+	</mime-type>
 </mime-info>

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.19"
+!define VERSION "7.29"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -113,20 +113,21 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 7
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 8
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 8
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 9
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 9
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 10
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 10
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 11
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 11
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 12
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 12
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 13
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 14
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 14
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 15
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
   !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
   !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
+  !insertmacro FILE_ASSOCIATION_ADD "sml" "Suunto Markup Language" 7
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -154,25 +155,17 @@ Section "MSVC runtime" SEC_MSVC
 
   SectionIn RO
 
-  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
-  ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
-  StrCmp $R0 "1" 0 +3
-  DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install."
-  Goto done
-
-  DetailPrint "Installing Visual C++ 2015 Redistributable..."
   SetOutPath $TEMP
-  File "vcredist_x64.exe"
+  File "vc_redist.x64.exe"
-  ExecWait '"$TEMP\vcredist_x64.exe" /install /quiet /norestart'
+  ExecWait '"$TEMP\vc_redist.x64.exe" /install /quiet /norestart'
   SetOutPath $INSTDIR
 
-  done:
 SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
-  File "libeay32.dll"
+  File "libcrypto-1_1-x64.dll"
-  File "ssleay32.dll"
+  File "libssl-1_1-x64.dll"
 
 SectionEnd
 
@@ -190,6 +183,7 @@ SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Hungarian" "hu"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -235,6 +229,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
   !insertmacro FILE_ASSOCIATION_REMOVE "cup"
   !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
+  !insertmacro FILE_ASSOCIATION_REMOVE "sml"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -247,7 +242,7 @@ SectionEnd
 LangString DESC_QT ${LANG_ENGLISH} \
   "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+  "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
 LangString DESC_OPENSSL ${LANG_ENGLISH} \
   "OpenSSL library. Required for HTTPS to work."
 LangString DESC_ANGLE ${LANG_ENGLISH} \

pkg/maps/4UMaps.xml

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

pkg/maps/Antarctica.xml

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

pkg/maps/OpenStreetMap.xml

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

pkg/maps/OpenTopoMap.xml

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

pkg/maps/USGS-imagery.xml

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

pkg/maps/USGS-topo.xml

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

src/GUI/cadencegraphitem.cpp

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

src/GUI/elevationgraph.cpp

@@ -65,36 +65,39 @@ 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()) {
+	if (!graph.isValid())
-		_palette.nextColor();
 		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);
 
+		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);
 
+		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++)
+	for (int i = 0; i < data.tracks().count(); i++) {
-		graphs.append(loadGraph(data.tracks().at(i).elevation(), Track));
+		QColor color(_palette.nextColor());
-	for (int i = 0; i < data.routes().count(); i++)
+		const GraphPair &gp = data.tracks().at(i).elevation();
-		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
+
+		primary = loadGraph(gp.primary(), TrackPath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), TrackPath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
+	for (int i = 0; i < data.routes().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.routes().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), RoutePath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), RoutePath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
 	for (int i = 0; i < data.areas().count(); i++)
 		_palette.nextColor();
 

src/GUI/elevationgraph.h

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

src/GUI/elevationgraphitem.cpp

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

src/GUI/elevationgraphitem.h

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

src/GUI/gearratiographitem.cpp

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

src/GUI/graphitem.cpp

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

src/GUI/graphitem.h

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

src/GUI/graphview.cpp

@@ -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)
+	if (ry.size() < _minYRange * _yScale)
-		ry.resize(_minYRange);
+		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) {
+	if (cardinal) {
-		QRectF br(_graphs.first()->bounds());
+		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()
+	  + UNIT_SPACE + _xUnits);
-	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
+	QString yText((!cardinal) ? QString() : l.toString(-y * _yScale + _yOffset,
-	  + _yUnits);
+	  '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++)
+	QSet<GraphItem*> secondary;
-		_graphs.at(i)->setColor(_palette.nextColor());
+	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)

src/GUI/graphview.h

@@ -3,7 +3,6 @@
 
 #include <QGraphicsView>
 #include <QList>
-#include <QSet>
 #include "data/graph.h"
 #include "palette.h"
 #include "units.h"

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))
+	QString poiDir(ProgramPaths::poiDir());
-		qWarning("%s", qPrintable(_poi->errorString()));
+	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++)
+	QString mapDir(ProgramPaths::mapDir());
-		createMapAction(_ml->maps().at(i));
+	if (mapDir.isNull())
+		return;
 
-	connect(_mapsSignalMapper, SIGNAL(mapped(int)), this,
+	QString unused;
-	  SLOT(mapChanged(int)));
+	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);
-
+	connect(a, SIGNAL(triggered()), this, SLOT(mapChanged()));
-	_mapActions.append(a);
-	_mapsSignalMapper->setMapping(a, _mapActions.size() - 1);
-	connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
 
 	return a;
 }
 
+void GUI::mapInitialized()
+{
+	MapAction *action = static_cast<MapAction*>(QObject::sender());
+	Map *map = action->data().value<Map*>();
+
+	if (map->isValid()) {
+		if (!_mapsActionGroup->checkedAction())
+			action->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
+	} else {
+		qWarning("%s: %s", qPrintable(map->name()), qPrintable(map->errorString()));
+		action->deleteLater();
+	}
+}
+
 void GUI::createPOIFilesActions()
 {
 	_poiFilesSignalMapper = new QSignalMapper(this);
+	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
+	  SLOT(poiFileChecked(int)));
 
 	for (int i = 0; i < _poi->files().count(); i++)
 		createPOIFileAction(_poi->files().at(i));
-
-	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
-	  SLOT(poiFileChecked(int)));
 }
 
 QAction *GUI::createPOIFileAction(const QString &fileName)
@@ -281,8 +286,10 @@ void GUI::createActions()
 	createPOIFilesActions();
 
 	// Map actions
+	createMapActions();
 	_showMapAction = new QAction(QIcon(SHOW_MAP_ICON), tr("Show map"),
 	  this);
+	_showMapAction->setEnabled(false);
 	_showMapAction->setMenuRole(QAction::NoRole);
 	_showMapAction->setCheckable(true);
 	_showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
@@ -294,10 +301,10 @@ void GUI::createActions()
 	_loadMapAction->setMenuRole(QAction::NoRole);
 	connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
 	_clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
+	_clearMapCacheAction->setEnabled(false);
 	_clearMapCacheAction->setMenuRole(QAction::NoRole);
 	connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView,
 	  SLOT(clearMapCache()));
-	createMapActions();
 	_nextMapAction = new QAction(tr("Next map"), this);
 	_nextMapAction->setMenuRole(QAction::NoRole);
 	_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
@@ -308,10 +315,6 @@ void GUI::createActions()
 	_prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
 	connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap()));
 	addAction(_prevMapAction);
-	if (_ml->maps().isEmpty()) {
-		_showMapAction->setEnabled(false);
-		_clearMapCacheAction->setEnabled(false);
-	}
 	_showCoordinatesAction = new QAction(tr("Show cursor coordinates"), this);
 	_showCoordinatesAction->setMenuRole(QAction::NoRole);
 	_showCoordinatesAction->setCheckable(true);
@@ -451,11 +454,11 @@ void GUI::createActions()
 	_degreesMinutesAction->setActionGroup(ag);
 	connect(_degreesMinutesAction, SIGNAL(triggered()), this,
 	  SLOT(setDegreesMinutes()));
-	_DMSAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
+	_dmsAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
-	_DMSAction->setMenuRole(QAction::NoRole);
+	_dmsAction->setMenuRole(QAction::NoRole);
-	_DMSAction->setCheckable(true);
+	_dmsAction->setCheckable(true);
-	_DMSAction->setActionGroup(ag);
+	_dmsAction->setActionGroup(ag);
-	connect(_DMSAction, SIGNAL(triggered()), this, SLOT(setDMS()));
+	connect(_dmsAction, SIGNAL(triggered()), this, SLOT(setDMS()));
 	_fullscreenAction = new QAction(QIcon(FULLSCREEN_ICON),
 	  tr("Fullscreen mode"), this);
 	_fullscreenAction->setMenuRole(QAction::NoRole);
@@ -506,7 +509,7 @@ void GUI::createMenus()
 #endif // Q_OS_MAC
 
 	_mapMenu = menuBar()->addMenu(tr("&Map"));
-	_mapMenu->addActions(_mapActions);
+	_mapMenu->addActions(_mapsActionGroup->actions());
 	_mapsEnd = _mapMenu->addSeparator();
 	_mapMenu->addAction(_loadMapAction);
 	_mapMenu->addAction(_clearMapCacheAction);
@@ -559,7 +562,7 @@ void GUI::createMenus()
 	QMenu *coordinatesMenu = settingsMenu->addMenu(tr("Coordinates format"));
 	coordinatesMenu->addAction(_decimalDegreesAction);
 	coordinatesMenu->addAction(_degreesMinutesAction);
-	coordinatesMenu->addAction(_DMSAction);
+	coordinatesMenu->addAction(_dmsAction);
 	settingsMenu->addSeparator();
 	settingsMenu->addAction(_showToolbarsAction);
 	settingsMenu->addAction(_fullscreenAction);
@@ -608,6 +611,7 @@ void GUI::createToolBars()
 
 void GUI::createMapView()
 {
+	_map = new EmptyMap(this);
 	_mapView = new MapView(_map, _poi, this);
 	_mapView->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
 	  QSizePolicy::Expanding));
@@ -905,9 +909,14 @@ void GUI::openOptions()
 		Track::action(options.option); \
 		reload = true; \
 	}
-#define SET_DATA_OPTION(option, action) \
+#define SET_ROUTE_OPTION(option, action) \
 	if (options.option != _options.option) { \
-		Data::action(options.option); \
+		Route::action(options.option); \
+		reload = true; \
+	}
+#define SET_WAYPOINT_OPTION(option, action) \
+	if (options.option != _options.option) { \
+		Waypoint::action(options.option); \
 		reload = true; \
 	}
 
@@ -953,13 +962,18 @@ void GUI::openOptions()
 	SET_TRACK_OPTION(pauseSpeed, setPauseSpeed);
 	SET_TRACK_OPTION(pauseInterval, setPauseInterval);
 	SET_TRACK_OPTION(useReportedSpeed, useReportedSpeed);
+	SET_TRACK_OPTION(dataUseDEM, useDEM);
+	SET_TRACK_OPTION(showSecondaryElevation, showSecondaryElevation);
+	SET_TRACK_OPTION(showSecondarySpeed, showSecondarySpeed);
 
-	SET_DATA_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(dataUseDEM, useDEM);
+	SET_ROUTE_OPTION(showSecondaryElevation, showSecondaryElevation);
+
+	SET_WAYPOINT_OPTION(dataUseDEM, useDEM);
+	SET_WAYPOINT_OPTION(showSecondaryElevation, showSecondaryElevation);
 
 	if (options.poiRadius != _options.poiRadius)
 		_poi->setRadius(options.poiRadius);
-	if (options.poiUseDEM != _options.poiUseDEM)
-		_poi->useDEM(options.poiUseDEM);
 
 	if (options.pixmapCache != _options.pixmapCache)
 		QPixmapCache::setCacheLimit(options.pixmapCache * 1024);
@@ -1322,22 +1336,49 @@ void GUI::loadMap()
 
 bool GUI::loadMap(const QString &fileName)
 {
+	// On OS X fileName may be a directory!
+
 	if (fileName.isEmpty())
 		return false;
 
-	if (_ml->loadFile(fileName)) {
+	QString error;
-		QAction *a = createMapAction(_ml->maps().last());
+	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);
-		a->trigger();
+		} 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);
 	} 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);
-
+		action->deleteLater();
-		return false;
 	}
 }
 
@@ -1379,31 +1420,42 @@ void GUI::updateWindowTitle()
 		setWindowTitle(APP_NAME);
 }
 
-void GUI::mapChanged(int index)
+void GUI::mapChanged()
 {
-	_map = _ml->maps().at(index);
+	_map = _mapsActionGroup->checkedAction()->data().value<Map*>();
 	_mapView->setMap(_map);
 }
 
 void GUI::nextMap()
 {
-	if (_ml->maps().count() < 2)
+	QAction *checked = _mapsActionGroup->checkedAction();
+	if (!checked)
 		return;
 
-	int next = (_ml->maps().indexOf(_map) + 1) % _ml->maps().count();
+	QList<QAction*> maps = _mapsActionGroup->actions();
-	_mapActions.at(next)->setChecked(true);
+	for (int i = 1;	i < maps.size(); i++) {
-	mapChanged(next);
+		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)
+	QList<QAction*> maps = _mapsActionGroup->actions();
-	  % _ml->maps().count();
+	for (int i = 1; i < maps.size(); i++) {
-	_mapActions.at(prev)->setChecked(true);
+		int prev = (maps.indexOf(checked) + maps.count() - i) % maps.count();
-	mapChanged(prev);
+		if (maps.at(prev)->isEnabled()) {
+			maps.at(prev)->trigger();
+			break;
+		}
+	}
 }
 
 void GUI::poiFileChecked(int index)
@@ -1655,7 +1707,7 @@ void GUI::writeSettings()
 	  : _nauticalUnitsAction->isChecked() ? Nautical : Metric;
 	if (units != UNITS_DEFAULT)
 		settings.setValue(UNITS_SETTING, units);
-	CoordinatesFormat format = _DMSAction->isChecked() ? DMS
+	CoordinatesFormat format = _dmsAction->isChecked() ? DMS
 	  : _degreesMinutesAction->isChecked() ? DegreesMinutes : DecimalDegrees;
 	if (format != COORDINATES_DEFAULT)
 		settings.setValue(COORDINATES_SETTING, format);
@@ -1809,10 +1861,14 @@ void GUI::writeSettings()
 		settings.setValue(USE_REPORTED_SPEED_SETTING, _options.useReportedSpeed);
 	if (_options.dataUseDEM != DATA_USE_DEM_DEFAULT)
 		settings.setValue(DATA_USE_DEM_SETTING, _options.dataUseDEM);
+	if (_options.showSecondaryElevation != SHOW_SECONDARY_ELEVATION_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_ELEVATION_SETTING,
+		  _options.showSecondaryElevation);
+	if (_options.showSecondarySpeed != SHOW_SECONDARY_SPEED_DEFAULT)
+		settings.setValue(SHOW_SECONDARY_SPEED_SETTING,
+		  _options.showSecondarySpeed);
 	if (_options.poiRadius != POI_RADIUS_DEFAULT)
 		settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
-	if (_options.poiUseDEM != POI_USE_DEM_DEFAULT)
-		settings.setValue(POI_USE_DEM_SETTING, _options.poiUseDEM);
 	if (_options.useOpenGL != USE_OPENGL_DEFAULT)
 		settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
 #ifdef ENABLE_HTTP2
@@ -1879,7 +1935,7 @@ void GUI::readSettings()
 
 	value = settings.value(COORDINATES_SETTING, COORDINATES_DEFAULT).toInt();
 	if (value == DMS)
-		_DMSAction->trigger();
+		_dmsAction->trigger();
 	else if (value == DegreesMinutes)
 		_degreesMinutesAction->trigger();
 	else
@@ -1896,9 +1952,11 @@ void GUI::readSettings()
 		_showMapAction->setChecked(true);
 	else
 		_mapView->showMap(false);
-	if (_ml->maps().count()) {
+	QAction *ma = mapAction(settings.value(CURRENT_MAP_SETTING).toString());
-		int index = mapIndex(settings.value(CURRENT_MAP_SETTING).toString());
+	if (ma) {
-		_mapActions.at(index)->trigger();
+		ma->trigger();
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
 	}
 	if (settings.value(SHOW_COORDINATES_SETTING, SHOW_COORDINATES_DEFAULT)
 	  .toBool()) {
@@ -2075,14 +2133,18 @@ void GUI::readSettings()
 	  USE_REPORTED_SPEED_DEFAULT).toBool();
 	_options.dataUseDEM = settings.value(DATA_USE_DEM_SETTING,
 	  DATA_USE_DEM_DEFAULT).toBool();
+	_options.showSecondaryElevation = settings.value(
+	  SHOW_SECONDARY_ELEVATION_SETTING,
+	  SHOW_SECONDARY_ELEVATION_DEFAULT).toBool();
+	_options.showSecondarySpeed = settings.value(
+	  SHOW_SECONDARY_SPEED_SETTING,
+	  SHOW_SECONDARY_SPEED_DEFAULT).toBool();
 	_options.automaticPause = settings.value(AUTOMATIC_PAUSE_SETTING,
 	  AUTOMATIC_PAUSE_DEFAULT).toBool();
 	_options.pauseInterval = settings.value(PAUSE_INTERVAL_SETTING,
 	  PAUSE_INTERVAL_DEFAULT).toInt();
 	_options.poiRadius = settings.value(POI_RADIUS_SETTING, POI_RADIUS_DEFAULT)
 	  .toInt();
-	_options.poiUseDEM = settings.value(POI_USE_DEM_SETTING,
-	  POI_USE_DEM_DEFAULT).toBool();
 	_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
 	  .toBool();
 #ifdef ENABLE_HTTP2
@@ -2162,21 +2224,38 @@ void GUI::readSettings()
 	Track::setPauseSpeed(_options.pauseSpeed);
 	Track::setPauseInterval(_options.pauseInterval);
 	Track::useReportedSpeed(_options.useReportedSpeed);
-	Data::useDEM(_options.dataUseDEM);
+	Track::useDEM(_options.dataUseDEM);
+	Track::showSecondaryElevation(_options.showSecondaryElevation);
+	Track::showSecondarySpeed(_options.showSecondarySpeed);
+	Route::useDEM(_options.dataUseDEM);
+	Route::showSecondaryElevation(_options.showSecondaryElevation);
+	Waypoint::useDEM(_options.dataUseDEM);
+	Waypoint::showSecondaryElevation(_options.showSecondaryElevation);
 
 	_poi->setRadius(_options.poiRadius);
-	_poi->useDEM(_options.poiUseDEM);
 
 	QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);
 
 	settings.endGroup();
 }
 
-int GUI::mapIndex(const QString &name)
+QAction *GUI::mapAction(const QString &name)
 {
-	for (int i = 0; i < _ml->maps().count(); i++)
+	QList<QAction *> maps = _mapsActionGroup->actions();
-		if (_ml->maps().at(i)->name() == name)
+
-			return i;
+	// Last map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->name() == name && map->isReady())
+			return maps.at(i);
+	}
+
+	// Any usable map
+	for (int i = 0; i < maps.count(); i++) {
+		Map *map = maps.at(i)->data().value<Map*>();
+		if (map->isReady())
+			return maps.at(i);
+	}
 
 	return 0;
 }

src/GUI/gui.h

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

src/GUI/heartrategraphitem.cpp

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

src/GUI/mapaction.h

@@ -0,0 +1,32 @@
+#ifndef MAPACTION_H
+#define MAPACTION_H
+
+#include <QAction>
+#include "map/map.h"
+
+class MapAction : public QAction
+{
+	Q_OBJECT
+
+public:
+	MapAction(Map *map, QObject *parent = 0) : QAction(map->name(), parent)
+	{
+		map->setParent(this);
+		setData(QVariant::fromValue(map));
+		setEnabled(map->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

src/GUI/mapview.cpp

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

src/GUI/optionsdialog.cpp

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

src/GUI/optionsdialog.h

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

src/GUI/powergraphitem.cpp

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

src/GUI/routeitem.cpp

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

src/GUI/routeitem.h

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

src/GUI/settings.h

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

src/GUI/speedgraph.cpp

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

src/GUI/speedgraph.h

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

src/GUI/speedgraphitem.cpp

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

src/GUI/speedgraphitem.h

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

src/GUI/temperaturegraphitem.cpp

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

src/GUI/trackitem.cpp

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

src/GUI/trackitem.h

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

src/GUI/waypointitem.cpp

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

src/common/coordinates.cpp

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

src/common/garmin.h

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

src/common/rectc.h

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

src/common/tifffile.h

@@ -9,6 +9,7 @@
 #define TIFF_SHORT     3
 #define TIFF_LONG      4
 #define TIFF_RATIONAL  5
+#define TIFF_SRATIONAL 10
 #define TIFF_DOUBLE    12
 
 class TIFFFile

src/data/data.cpp

@@ -19,7 +19,7 @@
 #include "exifparser.h"
 #include "cupparser.h"
 #include "gpiparser.h"
-#include "dem.h"
+#include "smlparser.h"
 #include "data.h"
 
 
@@ -41,78 +41,48 @@ static GeoJSONParser geojson;
 static EXIFParser exif;
 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);
+	map.insert("gpx", &gpx);
-	hash.insert("tcx", &tcx);
+	map.insert("tcx", &tcx);
-	hash.insert("kml", &kml);
+	map.insert("kml", &kml);
-	hash.insert("fit", &fit);
+	map.insert("fit", &fit);
-	hash.insert("csv", &csv);
+	map.insert("csv", &csv);
-	hash.insert("igc", &igc);
+	map.insert("igc", &igc);
-	hash.insert("nmea", &nmea);
+	map.insert("nmea", &nmea);
-	hash.insert("plt", &plt);
+	map.insert("plt", &plt);
-	hash.insert("wpt", &wpt);
+	map.insert("wpt", &wpt);
-	hash.insert("rte", &rte);
+	map.insert("rte", &rte);
-	hash.insert("loc", &loc);
+	map.insert("loc", &loc);
-	hash.insert("slf", &slf);
+	map.insert("slf", &slf);
 #ifdef ENABLE_GEOJSON
-	hash.insert("json", &geojson);
+	map.insert("json", &geojson);
-	hash.insert("geojson", &geojson);
+	map.insert("geojson", &geojson);
 #endif // ENABLE_GEOJSON
-	hash.insert("jpeg", &exif);
+	map.insert("jpeg", &exif);
-	hash.insert("jpg", &exif);
+	map.insert("jpg", &exif);
-	hash.insert("cup", &cup);
+	map.insert("cup", &cup);
-	hash.insert("gpi", &gpi);
+	map.insert("gpi", &gpi);
+	map.insert("sml", &sml);
 
-	return hash;
+	return map;
 }
 
-
+QMap<QString, Parser*> Data::_parsers = parsers();
-QHash<QString, Parser*> Data::_parsers = parsers();
-bool Data::_useDEM = false;
 
 void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
 {
-	for (int i = 0; i < trackData.count(); i++) {
+	for (int i = 0; i < trackData.count(); i++)
-		TrackData &track = trackData[i];
-		for (int j = 0; j < track.size(); j++) {
-			SegmentData &segment = track[j];
-			for (int k = 0; k < segment.size(); k++) {
-				Trackpoint &t = segment[k];
-				if (!t.hasElevation() || _useDEM) {
-					qreal elevation = DEM::elevation(t.coordinates());
-					if (!std::isnan(elevation))
-						t.setElevation(elevation);
-				}
-			}
-		}
 		_tracks.append(Track(trackData.at(i)));
-	}
+	for (int i = 0; i < routeData.count(); i++)
-	for (int i = 0; i < routeData.count(); i++) {
-		RouteData &route = routeData[i];
-		for (int j = 0; j < route.size(); j++) {
-			Waypoint &w = route[j];
-			if (!w.hasElevation() || _useDEM) {
-				qreal elevation = DEM::elevation(w.coordinates());
-				if (!std::isnan(elevation))
-					w.setElevation(elevation);
-			}
-		}
 		_routes.append(Route(routeData.at(i)));
-	}
-	for (int i = 0; i < _waypoints.size(); i++) {
-		if (!_waypoints.at(i).hasElevation() || _useDEM) {
-			qreal elevation = DEM::elevation(_waypoints.at(i).coordinates());
-			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);
@@ -127,11 +97,10 @@ 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);
 			_valid = true;
 			return;
@@ -143,7 +112,6 @@ 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);
 				_valid = true;
 				return;
@@ -163,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);;"
@@ -189,6 +148,7 @@ QString Data::formats()
 	  + qApp->translate("Data", "NMEA files") + " (*.nmea);;"
 	  + qApp->translate("Data", "OziExplorer files") + " (*.plt *.rte *.wpt);;"
 	  + qApp->translate("Data", "SLF files") + " (*.slf);;"
+	  + qApp->translate("Data", "SML files") + " (*.sml);;"
 	  + qApp->translate("Data", "TCX files") + " (*.tcx);;"
 	  + qApp->translate("Data", "All files") + " (*)";
 }
@@ -196,15 +156,10 @@ QString Data::formats()
 QStringList Data::filter()
 {
 	QStringList filter;
-	QHash<QString, Parser*>::iterator it;
 
-	for (it = _parsers.begin(); it != _parsers.end(); it++)
+	for (QMap<QString, Parser*>::iterator it = _parsers.begin();
-		filter << QString("*.%1").arg(it.key());
+	  it != _parsers.end(); it++)
+		filter << "*." + it.key();
 
 	return filter;
 }
-
-void Data::useDEM(bool use)
-{
-	_useDEM = use;
-}

src/data/data.h

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

src/data/exifparser.cpp

@@ -82,7 +82,10 @@ double EXIFParser::altitude(TIFFFile &file, const IFDEntry &alt,
 
 double EXIFParser::coordinate(TIFFFile &file, const IFDEntry &ll) const
 {
-	if (!(ll.type == TIFF_RATIONAL && ll.count == 3))
+	// Some broken image creators like NOKIA phones use a wrong (SRATIONAL)
+	// data type
+	if (!((ll.type == TIFF_RATIONAL || ll.type == TIFF_SRATIONAL)
+	  && ll.count == 3))
 		return NAN;
 
 	if (!file.seek(ll.offset))

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),
+	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*)&val, sizeof(T)))
-
-	if (!readData(ctx.file, (char*)&data, sizeof(T)))
 		return false;
 
 	ctx.len -= sizeof(T);
-
+	if (sizeof(T) > 1)
-	if (ctx.endian)
+		val = (ctx.endian) ? qFromBigEndian(val) : qFromLittleEndian(val);
-		val = qFromBigEndian(data);
-	else
-		val = qFromLittleEndian(data);
 
 	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) {
+		case 0: // enum
-				ret = readValue(ctx, v8);
+			VAL(quint8, 0xffU);
-				val = v8;
+			break;
-			} else
+		case 7: // UTF8 nul terminated string
-				ret = skipValue(ctx, field->size);
+			{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) {
+			VAL(quint16, 0xffffU);
-				ret = readValue(ctx, v16);
-				val = v16;
-			} else
-				ret = skipValue(ctx, field->size);
 			break;
 		case 0x85: // sint32
+			VAL(qint32, 0x7fffffffU);
+			break;
 		case 0x86: // uint32
-			if (field->size == 4)
+			VAL(quint32, 0xffffffffU);
-				ret = readValue(ctx, val);
-			else
-				ret = skipValue(ctx, field->size);
 			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);
+					  (val.toInt() / (double)0x7fffffff) * 180);
 					break;
 				case 1:
-					if (val != 0x7fffffff)
 					ctx.trackpoint.rcoordinates().setLon(
-						  ((qint32)val / (double)0x7fffffff) * 180);
+					  (val.toInt() / (double)0x7fffffff) * 180);
 					break;
 				case 2:
-					if (val != 0xffff)
+					ctx.trackpoint.setElevation((val.toUInt() / 5.0) - 500);
-						ctx.trackpoint.setElevation((val / 5.0) - 500);
 					break;
 				case 3:
-					if (val != 0xff)
+					ctx.trackpoint.setHeartRate(val.toUInt());
-						ctx.trackpoint.setHeartRate(val);
 					break;
 				case 4:
-					if (val != 0xff)
+					ctx.trackpoint.setCadence(val.toUInt());
-						ctx.trackpoint.setCadence(val);
 					break;
 				case 6:
-					if (val != 0xffff)
+					ctx.trackpoint.setSpeed(val.toUInt() / 1000.0f);
-						ctx.trackpoint.setSpeed(val / 1000.0f);
 					break;
 				case 7:
-					if (val != 0xffff)
+					ctx.trackpoint.setPower(val.toUInt());
-						ctx.trackpoint.setPower(val);
 					break;
 				case 13:
-					if (val != 0x7f)
+					ctx.trackpoint.setTemperature(val.toInt());
-						ctx.trackpoint.setTemperature((qint8)val);
 					break;
 				case 73:
-					if (val != 0xffffffff)
+					ctx.trackpoint.setSpeed(val.toUInt() / 1000.0f);
-						ctx.trackpoint.setSpeed(val / 1000.0f);
 					break;
 				case 78:
-					if (val != 0xffffffff)
+					ctx.trackpoint.setElevation((val.toUInt() / 5.0) - 500);
-						ctx.trackpoint.setElevation((val / 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))

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

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())
+		if (!obj.isEmpty())
-			waypoint.setDescription(obj.first().str());
+			waypoint.setComment(obj.first().str());
 	}
 	if (s1 & 0x2) {
 		QString str;
 		ds += readString(stream, codec, str);
-		if (!str.isEmpty() && waypoint.description().isNull())
+		if (!str.isEmpty())
-			waypoint.setDescription(str);
+			waypoint.setComment(str);
 	}
 
 	if (ds != rh.size)

src/data/gpxparser.cpp

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

src/data/graph.h

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

src/data/igcparser.cpp

@@ -87,16 +87,18 @@ static bool readTimestamp(const char *data, QTime &time)
 
 static bool readARecord(const char *line, qint64 len)
 {
-	if (len < 7 || line[0] != 'A')
+	/* The minimal A record length should be 7 according to the specification,
+	   but records with length of 6 exist in the wild */
+	if (len < 6 || line[0] != 'A')
 		return false;
 
-	for (int i = 1; i < 7; i++)
+	for (int i = 1; i < 6; i++)
 		if (!::isprint(line[i]))
 			return false;
 	return true;
 }
 
-bool IGCParser::readHRecord(const char *line, int len)
+bool IGCParser::readHRecord(CTX &ctx, const char *line, int len)
 {
 	if (len < 11 || ::strncmp(line, "HFDTE", 5))
 		return true;
@@ -112,9 +114,9 @@ bool IGCParser::readHRecord(const char *line, int len)
 		return false;
 	}
 
-	_date = QDate(y + 2000 <= QDate::currentDate().year() ? 2000 + y : 1900 + y,
+	ctx.date = QDate(y + 2000 <= QDate::currentDate().year()
-	  m, d);
+	  ? 2000 + y : 1900 + y, m, d);
-	if (!_date.isValid()) {
+	if (!ctx.date.isValid()) {
 		_errorString = "Invalid date";
 		return false;
 	}
@@ -122,8 +124,8 @@ bool IGCParser::readHRecord(const char *line, int len)
 	return true;
 }
 
-bool IGCParser::readBRecord(SegmentData &segment, const char *line,
+bool IGCParser::readBRecord(CTX &ctx, const char *line, int len,
-  int len)
+  SegmentData &segment)
 {
 	qreal lat, lon, ele;
 	QTime time;
@@ -152,20 +154,20 @@ bool IGCParser::readBRecord(SegmentData &segment, const char *line,
 		return false;
 	}
 
-	if (time < _time && !segment.isEmpty()
+	if (time < ctx.time && !segment.isEmpty()
-	  && _date == segment.last().timestamp().date())
+	  && ctx.date == segment.last().timestamp().date())
-		_date = _date.addDays(1);
+		ctx.date = ctx.date.addDays(1);
-	_time = time;
+	ctx.time = time;
 
 	Trackpoint t(Coordinates(lon, lat));
-	t.setTimestamp(QDateTime(_date, _time, Qt::UTC));
+	t.setTimestamp(QDateTime(ctx.date, ctx.time, Qt::UTC));
 	t.setElevation(ele);
 	segment.append(t);
 
 	return true;
 }
 
-bool IGCParser::readCRecord(RouteData &route, const char *line, int len)
+bool IGCParser::readCRecord(const char *line, int len, RouteData &route)
 {
 	qreal lat, lon;
 
@@ -202,6 +204,7 @@ bool IGCParser::parse(QFile *file, QList<TrackData> &tracks,
 	qint64 len;
 	char line[76 + 2 + 1 + 1];
 	bool route = false, track = false;
+	CTX ctx;
 
 
 	_errorLine = 1;
@@ -225,28 +228,28 @@ bool IGCParser::parse(QFile *file, QList<TrackData> &tracks,
 			}
 		} else {
 			if (line[0] == 'H') {
-				if (!readHRecord(line, len))
+				if (!readHRecord(ctx, line, len))
 					return false;
 			} else if (line[0] == 'C') {
 				if (route) {
-					if (!readCRecord(routes.last() ,line, len))
+					if (!readCRecord(line, len, routes.last()))
 						return false;
 				} else {
 					route = true;
 					routes.append(RouteData());
 				}
 			} else if (line[0] == 'B') {
-				if (_date.isNull()) {
+				if (ctx.date.isNull()) {
 					_errorString = "Missing date header";
 					return false;
 				}
 				if (!track) {
 					tracks.append(TrackData());
 					tracks.last().append(SegmentData());
-					_time = QTime(0, 0);
+					ctx.time = QTime(0, 0);
 					track = true;
 				}
-				if (!readBRecord(tracks.last().last(), line, len))
+				if (!readBRecord(ctx, line, len, tracks.last().last()))
 					return false;
 			}
 		}

src/data/igcparser.h

@@ -17,15 +17,17 @@ public:
 	int errorLine() const {return _errorLine;}
 
 private:
-	bool readHRecord(const char *line, int len);
+	struct CTX {
-	bool readBRecord(SegmentData &segment, const char *line, int len);
+		QDate date;
-	bool readCRecord(RouteData &route, const char *line, int len);
+		QTime time;
+	};
+
+	bool readHRecord(CTX &ctx, const char *line, int len);
+	bool readBRecord(CTX &ctx, const char *line, int len, SegmentData &segment);
+	bool readCRecord(const char *line, int len, RouteData &route);
 
 	int _errorLine;
 	QString _errorString;
-
-	QDate _date;
-	QTime _time;
 };
 
 #endif // IGCPARSER_H

src/data/link.h

@@ -7,15 +7,15 @@ class Link {
 public:
 	Link() {}
 	Link(const QString &URL, const QString &text = QString())
-		: _URL(URL), _text(text) {}
+		: _url(URL), _text(text) {}
 
-	void setURL(const QString &URL) {_URL = URL;}
+	void setURL(const QString &URL) {_url = URL;}
 	void setText(const QString &text) {_text = text;}
-	const QString &URL() const {return _URL;}
+	const QString &URL() const {return _url;}
 	const QString &text() const {return _text;}
 
 private:
-	QString _URL;
+	QString _url;
 	QString _text;
 };
 

src/data/nmeaparser.cpp

@@ -227,7 +227,8 @@ bool NMEAParser::readEW(const char *data, int len, qreal &lon)
 	return true;
 }
 
-bool NMEAParser::readRMC(SegmentData &segment, const char *line, int len)
+bool NMEAParser::readRMC(CTX &ctx, const char *line, int len,
+  SegmentData &segment)
 {
 	int col = 1;
 	const char *vp = line;
@@ -280,23 +281,24 @@ bool NMEAParser::readRMC(SegmentData &segment, const char *line, int len)
 	}
 
 	if (!date.isNull()) {
-		if (_date.isNull() && !_time.isNull() && !segment.isEmpty())
+		if (ctx.date.isNull() && !ctx.time.isNull() && !segment.isEmpty())
-			segment.last().setTimestamp(QDateTime(date, _time, Qt::UTC));
+			segment.last().setTimestamp(QDateTime(date, ctx.time, Qt::UTC));
-		_date = date;
+		ctx.date = date;
 	}
 
 	Coordinates c(lon, lat);
-	if (valid && !_GGA && c.isValid()) {
+	if (valid && !ctx.GGA && c.isValid()) {
 		Trackpoint t(c);
-		if (!_date.isNull() && !time.isNull())
+		if (!ctx.date.isNull() && !time.isNull())
-			t.setTimestamp(QDateTime(_date, time, Qt::UTC));
+			t.setTimestamp(QDateTime(ctx.date, time, Qt::UTC));
 		segment.append(t);
 	}
 
 	return true;
 }
 
-bool NMEAParser::readGGA(SegmentData &segment, const char *line, int len)
+bool NMEAParser::readGGA(CTX &ctx, const char *line, int len,
+  SegmentData &segment)
 {
 	int col = 1;
 	const char *vp = line;
@@ -306,7 +308,7 @@ bool NMEAParser::readGGA(SegmentData &segment, const char *line, int len)
 		if (*lp == ',' || *lp == '*') {
 			switch (col) {
 				case 1:
-					if (!readTime(vp, lp - vp, _time))
+					if (!readTime(vp, lp - vp, ctx.time))
 						return false;
 					break;
 				case 2:
@@ -360,19 +362,19 @@ bool NMEAParser::readGGA(SegmentData &segment, const char *line, int len)
 	Coordinates c(lon, lat);
 	if (c.isValid()) {
 		Trackpoint t(c);
-		if (!(_time.isNull() || _date.isNull()))
+		if (!(ctx.time.isNull() || ctx.date.isNull()))
-			t.setTimestamp(QDateTime(_date, _time, Qt::UTC));
+			t.setTimestamp(QDateTime(ctx.date, ctx.time, Qt::UTC));
 		if (!std::isnan(ele))
 			t.setElevation(ele - gh);
 		segment.append(t);
 
-		_GGA = true;
+		ctx.GGA = true;
 	}
 
 	return true;
 }
 
-bool NMEAParser::readWPL(QVector<Waypoint> &waypoints, const char *line, int len)
+bool NMEAParser::readWPL(const char *line, int len, QVector<Waypoint> &waypoints)
 {
 	int col = 1;
 	const char *vp = line;
@@ -423,7 +425,7 @@ bool NMEAParser::readWPL(QVector<Waypoint> &waypoints, const char *line, int len
 	return true;
 }
 
-bool NMEAParser::readZDA(const char *line, int len)
+bool NMEAParser::readZDA(CTX &ctx, const char *line, int len)
 {
 	int col = 1;
 	const char *vp = line;
@@ -468,8 +470,8 @@ bool NMEAParser::readZDA(const char *line, int len)
 		return false;
 	}
 
-	_date = QDate(y, m, d);
+	ctx.date = QDate(y, m, d);
-	if (!_date.isValid()) {
+	if (!ctx.date.isValid()) {
 		_errorString = "Invalid date";
 		return false;
 	}
@@ -486,13 +488,11 @@ bool NMEAParser::parse(QFile *file, QList<TrackData> &tracks,
 	qint64 len;
 	char line[80 + 2 + 1 + 1];
 	SegmentData segment;
+	CTX ctx;
 
 
 	_errorLine = 1;
 	_errorString.clear();
-	_date = QDate();
-	_time = QTime();
-	_GGA = false;
 
 	while (!file->atEnd()) {
 		len = file->readLine(line, sizeof(line));
@@ -507,16 +507,16 @@ bool NMEAParser::parse(QFile *file, QList<TrackData> &tracks,
 
 		if (validSentence(line, len)) {
 			if (!memcmp(line + 3, "RMC,", 4)) {
-				if (!readRMC(segment, line + 7, len - 7))
+				if (!readRMC(ctx, line + 7, len - 7, segment))
 					return false;
 			} else if (!memcmp(line + 3, "GGA,", 4)) {
-				if (!readGGA(segment, line + 7, len - 7))
+				if (!readGGA(ctx, line + 7, len - 7, segment))
 					return false;
 			} else if (!memcmp(line + 3, "WPL,", 4)) {
-				if (!readWPL(waypoints, line + 7, len - 7))
+				if (!readWPL(line + 7, len - 7, waypoints))
 					return false;
 			} else if (!memcmp(line + 3, "ZDA,", 4)) {
-				if (!readZDA(line + 7, len - 7))
+				if (!readZDA(ctx, line + 7, len - 7))
 					return false;
 			}
 		}

src/data/nmeaparser.h

@@ -8,7 +8,7 @@
 class NMEAParser : public Parser
 {
 public:
-	NMEAParser() : _errorLine(0), _GGA(false) {}
+	NMEAParser() : _errorLine(0) {}
 
 	bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
 	  QList<Area> &polygons, QVector<Waypoint> &waypoints);
@@ -16,6 +16,14 @@ public:
 	int errorLine() const {return _errorLine;}
 
 private:
+	struct CTX {
+		CTX() : GGA(false) {}
+
+		QDate date;
+		QTime time;
+		bool GGA;
+	};
+
 	bool readEW(const char *data, int len, qreal &lon);
 	bool readLon(const char *data, int len, qreal &lon);
 	bool readNS(const char *data, int len, qreal &lat);
@@ -25,17 +33,13 @@ private:
 	bool readAltitude(const char *data, int len, qreal &ele);
 	bool readGeoidHeight(const char *data, int len, qreal &gh);
 
-	bool readRMC(SegmentData &segment, const char *line, int len);
+	bool readRMC(CTX &ctx, const char *line, int len, SegmentData &segment);
-	bool readGGA(SegmentData &segment, const char *line, int len);
+	bool readGGA(CTX &ctx, const char *line, int len, SegmentData &segment);
-	bool readWPL(QVector<Waypoint> &waypoints, const char *line, int len);
+	bool readWPL(const char *line, int len, QVector<Waypoint> &waypoints);
-	bool readZDA(const char *line, int len);
+	bool readZDA(CTX &ctx, const char *line, int len);
 
 	int _errorLine;
 	QString _errorString;
-
-	QDate _date;
-	QTime _time;
-	bool _GGA;
 };
 
 #endif // NMEAPARSER_H

src/data/poi.cpp

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

src/data/poi.h

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

src/data/route.cpp

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

src/data/route.h

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

src/data/routedata.h

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

src/data/smlparser.cpp

@@ -0,0 +1,163 @@
+#include "smlparser.h"
+
+
+#ifndef QT_NO_DEBUG
+QDebug operator<<(QDebug dbg, const SMLParser::Sensors &sensors)
+{
+	dbg.nospace() << "Sensors(" << sensors.cadence << ", "
+	  << sensors.temperature << ", " << sensors.hr << "," << sensors.power
+	  << ", " << sensors.speed << ")";
+
+	return dbg.space();
+}
+#endif // QT_NO_DEBUG
+
+
+void SMLParser::sample(SegmentData &segment, QMap<QDateTime, Sensors> &map)
+{
+	QDateTime timestamp;
+	Sensors sensors;
+	qreal lat = NAN, lon = NAN, altitude = NAN;
+	bool ok, periodic = false;
+
+	while (_reader.readNextStartElement()) {
+		if (_reader.name() == QLatin1String("Latitude")) {
+			lat = _reader.readElementText().toDouble(&ok);
+			if (!ok || lat < -90 || lon > 90) {
+				_reader.raiseError("Invalid Latitude");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("Longitude")) {
+			lon = _reader.readElementText().toDouble(&ok);
+			if (!ok || lat < -180 || lon > 180) {
+				_reader.raiseError("Invalid Longitude");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("UTC")) {
+			timestamp = QDateTime::fromString(_reader.readElementText(),
+			  Qt::ISODate);
+			if (!timestamp.isValid()) {
+				_reader.raiseError("Invalid timestamp");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("GPSAltitude")) {
+			altitude = _reader.readElementText().toDouble(&ok);
+			if (!ok) {
+				_reader.raiseError("Invalid GPS altitude");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("SampleType")) {
+			if (_reader.readElementText() == "periodic")
+				periodic = true;
+		} else if (_reader.name() == QLatin1String("Cadence")) {
+			sensors.cadence = _reader.readElementText().toDouble(&ok);
+			if (!ok || sensors.cadence < 0) {
+				_reader.raiseError("Invalid Cadence");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("Temperature")) {
+			sensors.temperature = _reader.readElementText().toDouble(&ok);
+			// Temperature is in Kelvin units
+			if (!ok || sensors.temperature < 0) {
+				_reader.raiseError("Invalid Temperature");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("HR")) {
+			sensors.hr = _reader.readElementText().toDouble(&ok);
+			if (!ok || sensors.hr < 0) {
+				_reader.raiseError("Invalid HR");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("BikePower")) {
+			sensors.power = _reader.readElementText().toDouble(&ok);
+			if (!ok || sensors.power < 0) {
+				_reader.raiseError("Invalid BikePower");
+				return;
+			}
+		} else if (_reader.name() == QLatin1String("Speed")) {
+			sensors.speed = _reader.readElementText().toDouble(&ok);
+			if (!ok || sensors.speed < 0) {
+				_reader.raiseError("Invalid Speed");
+				return;
+			}
+		} else
+			_reader.skipCurrentElement();
+	}
+
+	if (periodic && timestamp.isValid())
+		map.insert(timestamp, sensors);
+	else if (!(std::isnan(lon) || std::isnan(lat))) {
+		Trackpoint t(Coordinates(rad2deg(lon), rad2deg(lat)));
+		t.setTimestamp(timestamp);
+		t.setElevation(altitude);
+
+		segment.append(t);
+	}
+}
+
+void SMLParser::samples(SegmentData &segment)
+{
+	QMap<QDateTime, Sensors> sensors;
+	QMap<QDateTime, Sensors>::const_iterator it;
+
+	while (_reader.readNextStartElement()) {
+		if (_reader.name() == QLatin1String("Sample")) {
+			sample(segment, sensors);
+		} else
+			_reader.skipCurrentElement();
+	}
+
+	for (int i = 0; i < segment.size(); i++) {
+		Trackpoint &t = segment[i];
+		if ((it = sensors.lowerBound(t.timestamp())) != sensors.constEnd()) {
+			t.setCadence(it->cadence * 60);
+			t.setTemperature(it->temperature - 273.15);
+			t.setHeartRate(it->hr * 60);
+			t.setPower(it->power);
+			t.setSpeed(it->speed);
+		}
+	}
+}
+
+void SMLParser::deviceLog(TrackData &track)
+{
+	while (_reader.readNextStartElement()) {
+		if (_reader.name() == QLatin1String("Samples")) {
+			track.append(SegmentData());
+			samples(track.last());
+		} else
+			_reader.skipCurrentElement();
+	}
+}
+
+void SMLParser::sml(QList<TrackData> &tracks)
+{
+	while (_reader.readNextStartElement()) {
+		if (_reader.name() == QLatin1String("DeviceLog")) {
+			tracks.append(TrackData());
+			deviceLog(tracks.last());
+		} else
+			_reader.skipCurrentElement();
+	}
+}
+
+bool SMLParser::parse(QFile *file, QList<TrackData> &tracks,
+  QList<RouteData> &routes, QList<Area> &polygons,
+  QVector<Waypoint> &waypoints)
+{
+	Q_UNUSED(routes);
+	Q_UNUSED(polygons);
+	Q_UNUSED(waypoints);
+
+	_reader.clear();
+	_reader.setDevice(file);
+
+	if (_reader.readNextStartElement()) {
+		if (_reader.name() == QLatin1String("sml"))
+			sml(tracks);
+		else
+			_reader.raiseError("Not a SML file");
+	}
+
+	return !_reader.error();
+}

src/data/smlparser.h

@@ -0,0 +1,38 @@
+#ifndef SMLPARSER_H
+#define SMLPARSER_H
+
+#include <QXmlStreamReader>
+#include <QMap>
+#include <QDebug>
+#include "parser.h"
+
+class SMLParser : public Parser
+{
+public:
+	bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
+	  QList<Area> &polygons, QVector<Waypoint> &waypoints);
+	QString errorString() const {return _reader.errorString();}
+	int errorLine() const {return _reader.lineNumber();}
+
+private:
+	struct Sensors
+	{
+		Sensors()
+		  : cadence(NAN), temperature(NAN), hr(NAN), power(NAN), speed(NAN) {}
+
+		qreal cadence, temperature, hr, power, speed;
+	};
+
+	void sml(QList<TrackData> &tracks);
+	void deviceLog(TrackData &track);
+	void samples(SegmentData &segment);
+	void sample(SegmentData &segment, QMap<QDateTime, Sensors> &map);
+
+#ifndef QT_NO_DEBUG
+	friend QDebug operator<<(QDebug dbg, const Sensors &sensors);
+#endif // QT_NO_DEBUG
+
+	QXmlStreamReader _reader;
+};
+
+#endif // SMLPARSER_H

src/data/track.cpp

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

src/data/track.h

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

src/data/trackdata.h

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

src/data/waypoint.cpp

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

src/data/waypoint.h

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

src/map/IMG/bitmapline.cpp

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

src/map/IMG/bitstream.cpp

@@ -0,0 +1,79 @@
+#include "bitstream.h"
+
+
+bool BitStream1::read(int bits, quint32 &val)
+{
+	val = 0;
+
+	for (int pos = 0; pos < bits; ) {
+		if (!_remaining) {
+			if (!_length || !_file.readUInt8(_hdl, _data))
+				return false;
+			_remaining = 8;
+			_length--;
+		}
+
+		quint32 get = bits - pos;
+		if (get >= _remaining) {
+			val |= _data << pos;
+			pos += _remaining;
+			_remaining = 0;
+		} else {
+			quint32 mask = (1<<get) - 1;
+			val |= (_data & mask)<<pos;
+			_data >>= get;
+			_remaining -= get;
+			break;
+		}
+	}
+
+	return true;
+}
+
+bool BitStream1::flush()
+{
+	if (_length && !_file.seek(_hdl, _hdl.pos() + _length))
+		return false;
+
+	_length = 0;
+	_remaining = 0;
+
+	return true;
+}
+
+
+bool BitStream4::read(int bits, quint32 &val)
+{
+	if (bits <= 32 - (int)(_used + _unused)) {
+		val = bits ? (_data << _used) >> (32 - bits) : 0;
+		_used += bits;
+		return true;
+	}
+
+	quint32 old = (_used < 32) ? (_data << _used) >> (32 - bits) : 0;
+	quint32 bytes = qMin(_length, 4U);
+
+	if (!_file.readVUInt32SW(_hdl, bytes, _data))
+		return false;
+
+	_used -= 32 - bits;
+	_length -= bytes;
+	_unused = (4 - bytes) * 8;
+	_data <<= _unused;
+
+	val = _data >> (32 - _used) | old;
+
+	return true;
+}
+
+bool BitStream4::flush()
+{
+	if (_length && !_file.seek(_hdl, _hdl.pos() + _length))
+		return false;
+
+	_length = 0;
+	_used = 32;
+	_unused = 0;
+
+	return true;
+}

src/map/IMG/bitstream.h

@@ -0,0 +1,39 @@
+#ifndef BITSTREAM_H
+#define BITSTREAM_H
+
+#include "subfile.h"
+
+class BitStream1 {
+public:
+	BitStream1(const SubFile &file, SubFile::Handle &hdl, quint32 length)
+	  : _file(file), _hdl(hdl), _length(length), _remaining(0) {}
+
+	bool read(int bits, quint32 &val);
+	bool flush();
+	quint32 bitsAvailable() const {return _length * 8 + _remaining;}
+
+private:
+	const SubFile &_file;
+	SubFile::Handle &_hdl;
+	quint32 _length, _remaining;
+	quint8 _data;
+};
+
+class BitStream4 {
+public:
+	BitStream4(const SubFile &file, SubFile::Handle &hdl, quint32 length)
+	  : _file(file), _hdl(hdl), _length(length), _used(32), _unused(0),
+	  _data(0) {}
+
+	bool read(int bits, quint32 &val);
+	bool flush();
+	quint32 bitsAvailable() const {return _length * 8 + (32 - _used) - _unused;}
+
+private:
+	const SubFile &_file;
+	SubFile::Handle &_hdl;
+	quint32 _length, _used, _unused;
+	quint32 _data;
+};
+
+#endif // BITSTREAM_H

src/map/IMG/deltastream.cpp

@@ -0,0 +1,86 @@
+#include "deltastream.h"
+
+
+static int bitSize(quint8 baseSize, bool variableSign, bool extraBit)
+{
+	int bits = 2;
+	if (baseSize <= 9)
+		bits += baseSize;
+	else
+		bits += 2 * baseSize - 9;
+
+	if (variableSign)
+		bits++;
+	if (extraBit)
+		bits++;
+
+	return bits;
+}
+
+DeltaStream::DeltaStream(const SubFile &file, SubFile::Handle &hdl,
+  quint32 length, quint8 info, bool extraBit, bool extended)
+  : BitStream1(file, hdl, length), _readBits(0xFFFFFFFF)
+{
+	_extraBit = extraBit ? 1 : 0;
+	if (!(sign(_lonSign) && sign(_latSign)))
+		return;
+	if (extended) {
+		quint32 b;
+		if (!read(1, b))
+			return;
+	}
+	_lonBits = bitSize(info & 0x0F, !_lonSign, extraBit);
+	_latBits = bitSize(info >> 4, !_latSign, false);
+	_readBits = _lonBits + _latBits;
+}
+
+bool DeltaStream::readDelta(int bits, int sign, int extraBit,
+  qint32 &delta)
+{
+	quint32 value;
+
+	if (!read(bits, value))
+		return false;
+
+	value >>= extraBit;
+
+	if (!sign) {
+		qint32 signMask = 1 << (bits - extraBit - 1);
+		if (value & signMask) {
+			qint32 comp = value ^ signMask;
+			if (comp)
+				delta = comp - signMask;
+			else {
+				qint32 other;
+				if (!readDelta(bits - extraBit, sign, false, other))
+					return false;
+				if (other < 0)
+					delta = 1 - signMask + other;
+				else
+					delta = signMask - 1 + other;
+			}
+		} else {
+			delta = value;
+		}
+	} else {
+		delta = value * sign;
+	}
+
+	return true;
+}
+
+bool DeltaStream::sign(int &val)
+{
+	quint32 bit;
+	val = 0;
+
+	if (!read(1, bit))
+		return false;
+	if (bit) {
+		if (!read(1, bit))
+			return false;
+		val = bit ? -1 : 1;
+	}
+
+	return true;
+}

src/map/IMG/deltastream.h

@@ -0,0 +1,28 @@
+#ifndef DELTASTREAM_H
+#define DELTASTREAM_H
+
+#include "bitstream.h"
+
+class DeltaStream : public BitStream1 {
+public:
+	DeltaStream(const SubFile &file, SubFile::Handle &hdl, quint32 length,
+	  quint8 info, bool extraBit, bool extended);
+
+	bool readNext(qint32 &lonDelta, qint32 &latDelta)
+	{
+		return hasNext()
+			? (readDelta(_lonBits, _lonSign, _extraBit, lonDelta)
+			  && readDelta(_latBits, _latSign, false, latDelta)) : false;
+	}
+	bool atEnd() const {return (_readBits != 0xFFFFFFFF && !hasNext());}
+
+private:
+	bool hasNext() const {return bitsAvailable() >= _readBits;}
+	bool sign(int &val);
+	bool readDelta(int bits, int sign, int extraBit, qint32 &delta);
+
+	int _lonSign, _latSign, _extraBit;
+	quint32 _lonBits, _latBits, _readBits;
+};
+
+#endif // DELTASTREAM_H

src/map/IMG/gmap.cpp

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

src/map/IMG/gmap.h

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

src/map/IMG/huffmanstream.cpp

@@ -0,0 +1,74 @@
+#include "huffmanstream.h"
+
+
+HuffmanStream::HuffmanStream(const SubFile &file, SubFile::Handle &hdl,
+  quint32 length, const HuffmanTable &table, bool line)
+  : BitStream4(file, hdl, length), _table(table), _symbolDataSize(0),
+  _symbolData(0)
+{
+	if (line) {
+		if (!(sign(_lonSign) && sign(_latSign)))
+			return;
+	} else {
+		_lonSign = 0;
+		_latSign = 0;
+	}
+
+	quint32 eb;
+	if (!read(1, eb))
+		return;
+	if (eb) {
+		qWarning("Extended polygon/lines not supported");
+		flush();
+	}
+}
+
+bool HuffmanStream::sign(int &val)
+{
+	quint32 bit;
+	val = 0;
+
+	if (!read(1, bit))
+		return false;
+	if (bit) {
+		if (!read(1, bit))
+			return false;
+		val = bit ? -1 : 1;
+	}
+
+	return true;
+}
+
+bool HuffmanStream::readDelta(int sign, qint32 &symbol)
+{
+	quint8 size;
+	quint32 next;
+	quint8 nextSize = qMin((quint32)(32 - _symbolDataSize), bitsAvailable());
+
+	if (!read(nextSize, next))
+		return false;
+
+	_symbolData = (_symbolData << nextSize) | next;
+	_symbolDataSize += nextSize;
+
+	symbol = _table.symbol(_symbolData << (32 - _symbolDataSize), size);
+
+	if (size <= _symbolDataSize)
+		_symbolDataSize -= size;
+	else
+		return false;
+
+	if (symbol && !sign) {
+		if (!_symbolDataSize)
+			return false;
+		else {
+			sign = ((1U << (_symbolDataSize - 1)) & _symbolData) ? -1 : 1;
+			_symbolDataSize--;
+		}
+	}
+	symbol = sign * symbol;
+
+	return true;
+}
+
+

src/map/IMG/huffmanstream.h

@@ -0,0 +1,35 @@
+#ifndef HUFFMANSTREAM_H
+#define HUFFMANSTREAM_H
+
+#include "bitstream.h"
+#include "huffmantable.h"
+
+class HuffmanStream : public BitStream4 {
+public:
+	HuffmanStream(const SubFile &file, SubFile::Handle &hdl, quint32 length,
+	  const HuffmanTable &table, bool line);
+
+	bool readNext(qint32 &lonDelta, qint32 &latDelta)
+	{
+		if (!(readDelta(_lonSign, lonDelta) && readDelta(_latSign, latDelta)))
+			return false;
+
+		return (lonDelta || latDelta);
+	}
+
+	bool readOffset(qint32 &lonDelta, qint32 &latDelta)
+	  {return (readDelta(1, lonDelta) && readDelta(1, latDelta));}
+	bool atEnd() const
+	  {return _symbolDataSize + bitsAvailable() < _table.maxSymbolSize();}
+
+private:
+	bool sign(int &val);
+	bool readDelta(int sign, qint32 &delta);
+
+	const HuffmanTable &_table;
+	quint32 _symbolDataSize;
+	quint32 _symbolData;
+	int _lonSign, _latSign;
+};
+
+#endif // HUFFMANSTREAM_H

src/map/IMG/huffmantable.cpp

@@ -0,0 +1,139 @@
+#include "huffmantable.h"
+
+
+static quint8 vs(const quint8 b0)
+{
+	static const quint8 sizes[] = {4, 1, 2, 1, 3, 1, 2, 1};
+	return sizes[b0 & 0x07];
+}
+
+static inline quint8 bs(const quint8 val)
+{
+	return (val + 7) >> 3;
+}
+
+static inline quint32 readVUint32(const quint8 *buffer, quint32 bytes)
+{
+	quint32 val = 0;
+
+	for (quint32 i = bytes; i; i--)
+		val |= ((quint32)*(buffer + i)) << ((i-1) * 8);
+
+	return val;
+}
+
+bool HuffmanTable::load(const SubFile &file, SubFile::Handle &hdl,
+  quint32 offset, quint32 size, quint32 id)
+{
+	if (!getBuffer(file, hdl, offset, size, id))
+		return false;
+
+	_s0 = (quint8)_buffer.at(0) & 0x0F;
+	_s1e = (quint8)_buffer.at(0) & 0x10 ? 1 : 8;
+	_s2 = (quint8)_buffer.at(1);
+	_s3 = bs(_s2);
+	_s1d = (quint8)_buffer.at(2);
+	_s1f = (quint8)_buffer.at(3);
+	_s20 = bs(_s1f);
+	_s1 = _s20 + 1;
+	_s22 = vs(_buffer.at(4));
+	_s1c = _s3 + 1 + _s22;
+	_s14 = (quint8*)(_buffer.data()) + 4 + _s22;
+	_s10 = _s14 + _s1c * _s1d;
+	_s18 = _s10 + (_s1 << _s0);
+
+	return true;
+}
+
+bool HuffmanTable::getBuffer(const SubFile &file, SubFile::Handle &hdl,
+  quint32 offset, quint32 size, quint8 id)
+{
+	quint32 recordSize, recordOffset = offset;
+
+	for (int i = 0; i <= id; i++) {
+		if (!file.seek(hdl, recordOffset))
+			return false;
+		if (!file.readVUInt32(hdl, recordSize))
+			return false;
+		recordOffset = hdl.pos() + recordSize;
+		if (recordOffset > offset + size)
+			return false;
+	};
+
+	_buffer.resize(recordSize);
+	for (int i = 0; i < _buffer.size(); i++)
+		if (!file.readUInt8(hdl, *((quint8*)(_buffer.data() + i))))
+			return false;
+
+	return true;
+}
+
+quint32 HuffmanTable::symbol(quint32 data, quint8 &size) const
+{
+	quint32 ss, sym;
+	quint8 *tp;
+
+
+	if (_s0 == 0) {
+		sym = _s1d - 1;
+		ss = 0;
+	} else {
+		quint32 offset = _s1 * (data >> (0x20U - _s0));
+		tp = _s10 + offset;
+
+		if ((*tp & 1) != 0) {
+			sym = readVUint32(tp, _s20);
+			size = *tp >> 1;
+			return sym;
+		}
+
+		ss = *tp >> 1;
+		sym = tp[1];
+	}
+
+	tp = ss * _s1c + _s14;
+	data = data >> (0x20U - _s2);
+
+	quint8 *prev = tp;
+	while (ss < sym) {
+		quint32 cnt = (ss + 1 + sym) >> 1;
+		tp = _s14 + (cnt * _s1c);
+		quint32 nd = readVUint32(tp - 1, _s3);
+
+		if (data <= nd) {
+			if (data == nd)
+				ss = cnt;
+			else
+				tp = prev;
+
+			sym = cnt - (data < nd);
+			cnt = ss;
+		}
+		ss = cnt;
+		prev = tp;
+	}
+
+	sym = readVUint32(tp - 1, _s3);
+	tp = tp + _s3;
+	ss = readVUint32(tp, _s22);
+	size = *tp;
+	sym = (data - sym) >> (_s2 - *tp);
+
+	if (_s1e == 8)
+		sym = readVUint32(tp, _s20);
+	else {
+		sym = (sym + ss) * _s1f;
+		ss = sym >> 3;
+		sym = sym & 7;
+		quint32 shift = 8 - sym;
+		sym = *(_s18 + ss) >> sym;
+
+		if (shift < _s1f) {
+			tp = _s18 + ss;
+			ss = readVUint32(tp, ((_s1f + 7) - shift) >> 3);
+			sym = (ss << shift) | sym;
+		}
+	}
+
+	return sym;
+}