Decreased outlier detection window

Update gpxsee_sv.ts

README.md

@@ -3,7 +3,8 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
 KML, FIT, IGC and NMEA files.
 
 ## Features
-* User-definable map sources.
+* User-definable online maps.
+* Offline maps (OziExplorer maps and TrekBuddy maps/atlases).
 * Elevation, speed, heart rate, cadence, power and temperature graphs.
 * Support for multiple tracks in one view.
 * Support for POI files.
@@ -12,25 +13,21 @@ KML, FIT, IGC and NMEA files.
 * Native GUI for Windows, Mac OS X and Linux.
 * Opens GPX, TCX, FIT, KML, IGC, NMEA and Garmin CSV files.
 
-![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux.png)
+![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
 
 ## Build
-### Linux/OS X
 ```shell
 lrelease gpxsee.pro
 qmake gpxsee.pro
 make
 ```
-### Windows
-```shell
-lrelease gpxsee.pro
-qmake gpxsee.pro
-nmake release
-```
 
-## Binaries
-* Windows & OS X builds: http://sourceforge.net/projects/gpxsee
-* Linux packages: https://build.opensuse.org/project/repositories/home:tumic:GPXSee
+## Download
+* [Windows & OS X builds](http://sourceforge.net/projects/gpxsee)
+* [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
+
+## Changelog
+[Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes)
 
 ## Homepage
 GPXSee homepage: http://tumic.wz.cz/gpxsee

build/env.bat

@@ -1,6 +0,0 @@
-CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 
-set PATH=C:\qt\qtbase\bin;%PATH%
-set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
-set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
-set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib;%LIB%
-set CL=/D_USING_V110_SDK71_

build/env64.bat

@@ -1,6 +0,0 @@
-CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 
-set PATH=C:\qt64\qtbase\bin;%PATH% 
-set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
-set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
-set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib\x64;%LIB%
-set CL=/D_USING_V110_SDK71_

gpxsee.pro

@@ -1,11 +1,12 @@
 TARGET = GPXSee
-VERSION = 3.4
+VERSION = 4.8
 QT += core \
     gui \
     network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
 lessThan(QT_VERSION, 5.4): QT += opengl
+macx: QT += opengl
 HEADERS += src/config.h \
     src/icons.h \
     src/gui.h \
@@ -21,7 +22,7 @@ HEADERS += src/config.h \
     src/sliderinfoitem.h \
     src/filebrowser.h \
     src/map.h \
-    src/maplist.h \
+    src/onlinemap.h \
     src/downloader.h \
     src/units.h \
     src/scaleitem.h \
@@ -74,7 +75,26 @@ HEADERS += src/config.h \
     src/nmeaparser.h \
     src/optionsdialog.h \
     src/colorbox.h \
-    src/stylecombobox.h
+    src/stylecombobox.h \
+    src/opengl.h \
+    src/timetype.h \
+    src/emptymap.h \
+    src/offlinemap.h \
+    src/matrix.h \
+    src/tar.h \
+    src/atlas.h \
+    src/projection.h \
+    src/mercator.h \
+    src/transversemercator.h \
+    src/latlon.h \
+    src/utm.h \
+    src/lambertconic.h \
+    src/ellipsoid.h \
+    src/ozf.h \
+    src/datum.h \
+    src/maplist.h \
+    src/albersequal.h \
+    src/oddspinbox.h
 SOURCES += src/main.cpp \
     src/gui.cpp \
     src/poi.cpp \
@@ -86,8 +106,7 @@ SOURCES += src/main.cpp \
     src/speedgraph.cpp \
     src/sliderinfoitem.cpp \
     src/filebrowser.cpp \
-    src/map.cpp \
-    src/maplist.cpp \
+    src/onlinemap.cpp \
     src/downloader.cpp \
     src/scaleitem.cpp \
     src/track.cpp \
@@ -128,9 +147,26 @@ SOURCES += src/main.cpp \
     src/nmeaparser.cpp \
     src/optionsdialog.cpp \
     src/colorbox.cpp \
-    src/stylecombobox.cpp
+    src/stylecombobox.cpp \
+    src/emptymap.cpp \
+    src/offlinemap.cpp \
+    src/matrix.cpp \
+    src/tar.cpp \
+    src/atlas.cpp \
+    src/mercator.cpp \
+    src/transversemercator.cpp \
+    src/utm.cpp \
+    src/lambertconic.cpp \
+    src/ellipsoid.cpp \
+    src/ozf.cpp \
+    src/datum.cpp \
+    src/maplist.cpp \
+    src/albersequal.cpp \
+    src/oddspinbox.cpp
 RESOURCES += gpxsee.qrc
-TRANSLATIONS = lang/gpxsee_cs.ts
+TRANSLATIONS = lang/gpxsee_cs.ts \
+    lang/gpxsee_sv.ts \
+    lang/gpxsee_de.ts
 macx {
     ICON = icons/gpxsee.icns
     QMAKE_INFO_PLIST = Info.plist
@@ -140,7 +176,9 @@ macx {
         icons/fit.icns \
         icons/igc.icns \
         icons/nmea.icns \
-        pkg/maps.txt
+        pkg/maps.txt \
+        pkg/ellipsoids.csv \
+        pkg/datums.csv
     APP_RESOURCES.path = Contents/Resources
     QMAKE_BUNDLE_DATA += APP_RESOURCES
 }

gpxsee.qrc

@@ -14,10 +14,14 @@
         <file>icons/arrow-left-double.png</file>
         <file>icons/arrow-right-double.png</file>
         <file>icons/view-fullscreen.png</file>
-        <file>icons/office-chart-line-stacked.png</file>
+        <file>icons/office-chart-line.png</file>
         <file>icons/preferences-desktop-display.png</file>
         <file>icons/flag_48.png</file>
         <file>icons/system-run.png</file>
+        <file>icons/document-print-preview.png</file>
+        <file>icons/view-filter.png</file>
         <file>lang/gpxsee_cs.qm</file>
+        <file>lang/gpxsee_sv.qm</file>
+        <file>lang/gpxsee_de.qm</file>
     </qresource>
 </RCC>

pkg/datums.csv

@@ -0,0 +1,123 @@
+Adindan,4201,5,-162,-12,206
+Afgooye,4205,15,-43,-163,45
+Ain el Abd 1970,4204,14,-150,-251,-2
+Anna 1 Astro 1965,4708,2,-491,-22,435
+Arc 1950,4209,5,-143,-90,-294
+Arc 1960,4210,5,-160,-8,-300
+Ascension Island 1958,4712,14,-207,107,52
+Astro B4 Sorol Atoll,4707,14,114,-116,-333
+Astro Beacon 1945,4709,14,145,75,-272
+Astro DOS 71/4,4710,14,-320,550,-494
+Astronomic Stn 1952,4711,14,124,-234,-25
+Australian Geodetic 1966,4202,2,-133,-48,148
+Australian Geodetic 1984,4203,2,-134,-48,149
+Australian Geocentric 1994 (GDA94),4283,11,0,0,0 
+Austrian,4312,3,594,84,471
+Bellevue (IGN),4714,14,-127,-769,472
+Bermuda 1957,4216,4,-73,213,296
+Bogota Observatory,4218,14,307,304,-318
+Campo Inchauspe,4221,14,-148,136,90
+Canton Astro 1966,4716,14,298,-304,-375
+Cape,4222,5,-136,-108,-292
+Cape Canaveral,4717,4,-2,150,181
+Carthage,4223,5,-263,6,431
+CH-1903,4149,3,674,15,405
+Chatham 1971,4672,14,175,-38,113
+Chua Astro,4224,14,-134,229,-29
+Corrego Alegre,4225,14,-206,172,-6
+Djakarta (Batavia),4211,3,-377,681,-50
+DOS 1968,,14,230,-199,-752
+Easter Island 1967,4719,14,211,147,111
+Egypt,,14,-130,-117,-151
+European 1950,4230,14,-87,-98,-121
+European 1950 (Mean France),,14,-87,-96,-120
+European 1950 (Spain and Portugal),,14,-84,-107,-120 
+European 1979,4668,14,-86,-98,-119
+Finland Hayford,4123,14,-78,-231,-97
+Gandajika Base,4233,14,-133,-321,50
+Geodetic Datum 1949,4272,14,84,-22,209
+GGRS 87,4121,11,-199.87,74.79,246.62
+Guam 1963,4675,4,-100,-248,259
+GUX 1 Astro,4718,14,252,-209,-751
+Hartebeeshoek94,4148,20,0,0,0
+Hermannskogel,3906,3,653,-212,449
+Hjorsey 1955,4658,14,-73,46,-86
+Hong Kong 1963,4739,14,-156,-271,-189
+Hu-Tzu-Shan,4236,14,-634,-549,-201
+Indian Bangladesh,4682,6,289,734,257
+Indian Thailand,4240,6,214,836,303
+Israeli,4281,23,-235,-85,264
+Ireland 1965,4299,1,506,-122,611
+ISTS 073 Astro 1969,4724,14,208,-435,-229
+Johnston Island,4725,14,191,-77,-204
+Kandawala,4244,6,-97,787,86
+Kerguelen Island,4698,14,145,-187,103
+Kertau 1948,4245,7,-11,851,5
+L.C. 5 Astro,4726,4,42,124,147
+Liberia 1964,4251,5,-90,40,88
+Luzon Mindanao,,4,-133,-79,-72
+Luzon Philippines,4253,4,-133,-77,-51
+Mahe 1971,4256,5,41,-220,-134
+Marco Astro,4616,14,-289,-124,60
+Massawa,4262,3,639,405,60
+Merchich,4261,5,31,146,47
+Midway Astro 1961,4727,14,912,-58,1227
+Minna,4263,5,-92,-93,122
+NAD27 Alaska,,4,-5,135,172
+NAD27 Bahamas,,4,-4,154,178
+NAD27 Canada,,4,-10,158,187
+NAD27 Canal Zone,,4,0,125,201
+NAD27 Caribbean,,4,-7,152,178
+NAD27 Central,,4,0,125,194
+NAD27 CONUS,,4,-8,160,176
+NAD27 Cuba,,4,-9,152,178
+NAD27 Greenland,,4,11,114,195
+NAD27 Mexico,,4,-12,130,190
+NAD27 San Salvador,,4,1,140,165
+NAD83,4269,11,0,0,0
+Nahrwn Masirah Ilnd,,5,-247,-148,369
+Nahrwn Saudi Arbia,,5,-231,-196,482
+Nahrwn United Arab,,5,-249,-156,381
+Naparima BWI,4271,14,-2,374,172
+NGO1948,4273,27,315,-217,528
+NTF France,4275,24,-168,-60,320
+Norsk,4817,27,278,93,474
+NZGD1949,4272,14,84,-22,209
+NZGD2000,4167,20,0,0,0
+Observatorio 1966,4182,14,-425,-169,81
+Old Egyptian,4229,12,-130,110,-13
+Old Hawaiian,4135,4,61,-285,-181
+Oman,4232,5,-346,-1,224
+Ord Srvy Grt Britn,4277,0,375,-111,431
+Pico De Las Nieves,4728,14,-307,-92,127
+Pitcairn Astro 1967,4729,14,185,165,42
+Potsdam Rauenberg DHDN,4314,3,606,23,413
+Prov So Amrican 1956,4248,14,-288,175,-376
+Prov So Chilean 1963,4254,14,16,196,93
+Puerto Rico,4139,4,11,72,-101
+Pulkovo 1942 (1),4284,15,28,-130,-95
+Pulkovo 1942 (2),4284,15,28,-130,-95
+Qatar National,4285,14,-128,-283,22
+Qornoq,4287,14,164,138,-189
+Reunion,4626,14,94,-948,-1262
+Rijksdriehoeksmeting,4289,3,593,26,478
+Rome 1940,4806,14,-225,-65,9
+RT 90,4124,3,498,-36,568
+S42,4179,15,28,-121,-77
+Santo (DOS),4730,14,170,42,84
+Sao Braz,4184,14,-203,141,53
+Sapper Hill 1943,4292,14,-355,16,74
+Schwarzeck,4293,21,616,97,-251
+South American 1969,4291,16,-57,1,-41
+South Asia,,8,7,-10,-26
+Southeast Base,4615,14,-499,-249,314
+Southwest Base,4183,14,-104,167,-38
+Timbalai 1948,4298,6,-689,691,-46
+Tokyo,4301,3,-128,481,664
+Tristan Astro 1968,4734,14,-632,438,-609
+Viti Levu 1916,4731,5,51,391,-36
+Wake-Eniwetok 1960,4732,13,101,52,-39
+WGS 72,4322,19,0,0,5
+WGS 84,4326,20,0,0,0
+Yacare,4309,14,-155,171,37
+Zanderij,4311,14,-265,120,-358

pkg/ellipsoids.csv

@@ -0,0 +1,30 @@
+0,Airy 1830,6377563.396,299.3249646
+1,Modified Airy,6377340.189,299.3249646
+2,Australian National,6378160.0,298.25 
+3,Bessel 1841,6377397.155,299.1528128
+4,Clarke 1866,6378206.4,294.9786982
+5,Clarke 1880,6378249.145,293.465
+6,Everest (India 1830),6377276.345,300.8017
+7,Everest (1948),6377304.063,300.8017
+8,Modified Fischer 1960,6378155.0,298.3
+9,Everest (Pakistan),6377309.613,300.8017
+10,Indonesian 1974,6378160.0,298.247
+11,GRS 80,6378137.0,298.257222101
+12,Helmert 1906,6378200.0,298.3
+13,Hough 1960,6378270.0,297.0
+14,International 1924,6378388.0,297.0
+15,Krassovsky 1940,6378245.0,298.3
+16,South American 1969,6378160.0,298.25
+17,Everest (Malaysia 1969),6377295.664,300.8017
+18,Everest (Sabah Sarawak),6377298.556,300.8017
+19,WGS 72,6378135.0,298.26
+20,WGS 84,6378137.0,298.257223563
+21,Bessel 1841 (Namibia),6377483.865,299.1528128
+22,Everest (India 1956),6377301.243,300.8017
+23,Clarke 1880 Palestine,6378300.789,293.466 
+24,Clarke 1880 IGN,6378249.2,293.466021
+25,Hayford 1909,6378388.0,296.959263
+26,Clarke 1858,6378350.87,294.26
+27,Bessel 1841 (Norway),6377492.0176,299.1528
+28,Plessis 1817 (France),6376523.0,308.6409971
+29,Hayford 1924,6378388.0,297.0

pkg/gpxsee.nsi

@@ -1,10 +1,11 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
+!include "WinVer.nsh"
 
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "3.4"
+!define VERSION "4.8"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -15,6 +16,14 @@ RequestExecutionLevel admin
 ; The default installation directory
 InstallDir "$PROGRAMFILES\GPXSee"
 
+; Installer executable info
+VIProductVersion "${VERSION}.0.0"
+VIAddVersionKey "ProductVersion" ${VERSION}
+VIAddVersionKey "FileVersion" "${VERSION}.0.0"
+VIAddVersionKey "ProductName" "GPXSee"
+VIAddVersionKey "LegalCopyright" "GPXSee project"
+VIAddVersionKey "FileDescription" "GPXSee installer"
+
 ; Registry key to check for directory (so if you install again, it will 
 ; overwrite the old one automatically)
 InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
@@ -55,9 +64,15 @@ Var StartMenuFolder
 ; Languages
 !insertmacro MUI_LANGUAGE "English"
 
+Function .onInit
+  ${IfNot} ${AtLeastWin7}
+    MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
+    Abort
+  ${EndIf}
+FunctionEnd 
 
 ; The stuff to install
-Section "GPXSee (required)" SEC_APP
+Section "GPXSee" SEC_APP
 
   SectionIn RO
   
@@ -67,6 +82,8 @@ Section "GPXSee (required)" SEC_APP
   ; Put the files there
   File "gpxsee.exe"
   File "maps.txt"
+  File "ellipsoids.csv"
+  File "datums.csv"
 
   ; Create start menu entry and add links
   SetShellVarContext all
@@ -122,16 +139,15 @@ Section "GPXSee (required)" SEC_APP
 
 SectionEnd
 
-Section "QT libs" SEC_QT
+Section "QT framework" SEC_QT
+
+  SectionIn RO
 
   File "Qt5Core.dll"
   File "Qt5Gui.dll"
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
-  File "libGLESv2.dll"
-  File "libEGL.dll"
-  File "D3DCompiler_47.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
@@ -140,6 +156,8 @@ SectionEnd
 
 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"
@@ -155,10 +173,26 @@ Section "MSVC runtime" SEC_MSVC
   SetOutPath $TEMP
   File "VC_redist.x86.exe"
   ExecWait '"$TEMP/VC_redist.x86.exe" /install /quiet /norestart'
+  SetOutPath $INSTDIR
 
   done:
 SectionEnd
 
+Section "OpenSSL" SEC_OPENSSL
+
+  File "libeay32.dll"
+  File "ssleay32.dll"
+
+SectionEnd
+
+Section "ANGLE" SEC_ANGLE
+
+  File "libGLESv2.dll"
+  File "libEGL.dll"
+  File "D3DCompiler_47.dll"
+
+SectionEnd
+
 ;--------------------------------
 
 ; Uninstaller
@@ -201,15 +235,21 @@ SectionEnd
 
 ;Language strings
 LangString DESC_QT ${LANG_ENGLISH} \
-  "QT Library. Unselct only if you have QT already installed!"
+  "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. Unselct only if you have the runtime already installed!"
+  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+LangString DESC_OPENSSL ${LANG_ENGLISH} \
+  "OpenSSL library. Required for HTTPS to work."
+LangString DESC_ANGLE ${LANG_ENGLISH} \
+  "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
 LangString DESC_APP ${LANG_ENGLISH} \
   "GPXSee application"
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/gpxsee64.nsi

@@ -1,10 +1,11 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
+!include "WinVer.nsh"
 
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "3.4"
+!define VERSION "4.8"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -15,6 +16,14 @@ RequestExecutionLevel admin
 ; The default installation directory
 InstallDir "$PROGRAMFILES64\GPXSee"
 
+; Installer executable info
+VIProductVersion "${VERSION}.0.0"
+VIAddVersionKey "ProductVersion" ${VERSION}
+VIAddVersionKey "FileVersion" "${VERSION}.0.0"
+VIAddVersionKey "ProductName" "GPXSee"
+VIAddVersionKey "LegalCopyright" "GPXSee project"
+VIAddVersionKey "FileDescription" "GPXSee installer (x64)"
+
 ; Registry key to check for directory (so if you install again, it will 
 ; overwrite the old one automatically)
 InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
@@ -56,6 +65,11 @@ Var StartMenuFolder
 !insertmacro MUI_LANGUAGE "English"
 
 Function .onInit
+  ${IfNot} ${AtLeastWin7}
+    MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
+    Abort
+  ${EndIf}
+  
   ${If} ${RunningX64}
     SetRegView 64
   ${Else}  
@@ -65,7 +79,7 @@ Function .onInit
 FunctionEnd 
 
 ; The stuff to install
-Section "GPXSee (required)" SEC_APP
+Section "GPXSee" SEC_APP
 
   SectionIn RO
   
@@ -75,6 +89,8 @@ Section "GPXSee (required)" SEC_APP
   ; Put the files there
   File "gpxsee.exe"
   File "maps.txt"
+  File "ellipsoids.csv"
+  File "datums.csv"
   
   ; Create start menu entry and add links
   SetShellVarContext all
@@ -92,7 +108,7 @@ Section "GPXSee (required)" SEC_APP
   WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR"
 
   ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee"
+  WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee (x64)"
   WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tuma"
   WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}"
   WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
@@ -130,16 +146,15 @@ Section "GPXSee (required)" SEC_APP
 
 SectionEnd
 
-Section "QT libs" SEC_QT
+Section "QT framework" SEC_QT
+
+  SectionIn RO
 
   File "Qt5Core.dll"
   File "Qt5Gui.dll"
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
-  File "libGLESv2.dll"
-  File "libEGL.dll"
-  File "D3DCompiler_47.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
@@ -148,6 +163,8 @@ SectionEnd
 
 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
@@ -158,10 +175,26 @@ Section "MSVC runtime" SEC_MSVC
   SetOutPath $TEMP
   File "VC_redist.x64.exe"
   ExecWait '"$TEMP/VC_redist.x64.exe" /install /quiet /norestart'
+  SetOutPath $INSTDIR
 
   done:
 SectionEnd
 
+Section "OpenSSL" SEC_OPENSSL
+
+  File "libeay32.dll"
+  File "ssleay32.dll"
+
+SectionEnd
+
+Section "ANGLE" SEC_ANGLE
+
+  File "libGLESv2.dll"
+  File "libEGL.dll"
+  File "D3DCompiler_47.dll"
+
+SectionEnd
+
 ;--------------------------------
 
 ; Uninstaller
@@ -205,15 +238,21 @@ SectionEnd
 
 ;Language strings
 LangString DESC_QT ${LANG_ENGLISH} \
-  "QT Library. Unselct only if you have QT already installed!"
+  "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. Unselct only if you have the runtime already installed!"
+  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+LangString DESC_OPENSSL ${LANG_ENGLISH} \
+  "OpenSSL library. Required for HTTPS to work."
+LangString DESC_ANGLE ${LANG_ENGLISH} \
+  "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
 LangString DESC_APP ${LANG_ENGLISH} \
   "GPXSee application"
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/maps.txt

@@ -1,2 +1,4 @@
-Thunderforest	http://tile.thunderforest.com/outdoors/$z/$x/$y.png
+Open Topo Map	https://a.tile.opentopomap.org/$z/$x/$y.png
 Open Street Map	http://tile.openstreetmap.org/$z/$x/$y.png
+USGS Topo	https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png
+USGS Imagery	https://navigator.er.usgs.gov/tiles/aerial_Imagery.cgi/$z/$x/$y

src/albersequal.cpp

@@ -0,0 +1,229 @@
+/*
+ * Based on libgeotrans with the following Source Code Disclaimer:
+
+1. The GEOTRANS source code ("the software") is provided free of charge by
+the National Imagery and Mapping Agency (NIMA) of the United States
+Department of Defense. Although NIMA makes no copyright claim under Title 17
+U.S.C., NIMA claims copyrights in the source code under other legal regimes.
+NIMA hereby grants to each user of the software a license to use and
+distribute the software, and develop derivative works.
+
+2. Warranty Disclaimer: The software was developed to meet only the internal
+requirements of the U.S. National Imagery and Mapping Agency. The software
+is provided "as is," and no warranty, express or implied, including but not
+limited to the implied warranties of merchantability and fitness for
+particular purpose or arising by statute or otherwise in law or from a
+course of dealing or usage in trade, is made by NIMA as to the accuracy and
+functioning of the software.
+
+3. NIMA and its personnel are not required to provide technical support or
+general assistance with respect to the software.
+
+4. Neither NIMA nor its personnel will be liable for any claims, losses, or
+damages arising from or connected with the use of the software. The user
+agrees to hold harmless the United States National Imagery and Mapping
+Agency. The user's sole and exclusive remedy is to stop using the software.
+
+5. NIMA requests that products developed using the software credit the
+source of the software with the following statement, "The product was
+developed using GEOTRANS, a product of the National Imagery and Mapping
+Agency and U.S. Army Engineering Research and Development Center."
+
+6. For any products developed using the software, NIMA requires a disclaimer
+that use of the software does not indicate endorsement or approval of the
+product by the Secretary of Defense or the National Imagery and Mapping
+Agency. Pursuant to the United States Code, 10 U.S.C. Sec. 2797, the name of
+the National Imagery and Mapping Agency, the initials "NIMA", the seal of
+the National Imagery and Mapping Agency, or any colorable imitation thereof
+shall not be used to imply approval, endorsement, or authorization of a
+product without prior written permission from United States Secretary of
+Defense.
+
+*/
+
+#include "ellipsoid.h"
+#include "rd.h"
+#include "albersequal.h"
+
+
+#ifndef M_PI_2
+	#define M_PI_2 1.57079632679489661923
+#endif // M_PI_2
+
+#define ONE_MINUS_SQR(x) (1.0 - (x) * (x))
+#define ALBERS_Q(slat, one_minus_sqr_es_sin, es_sin) \
+	(_one_minus_es2 * ((slat) / (one_minus_sqr_es_sin) - \
+	(1 / (_two_es)) * log((1 - (es_sin)) / (1 + (es_sin)))))
+#define ALBERS_M(clat, one_minus_sqr_es_sin) \
+	((clat) / sqrt(one_minus_sqr_es_sin))
+
+
+AlbersEqual::AlbersEqual(const Ellipsoid &ellipsoid, double standardParallel1,
+  double standardParallel2, double latitudeOrigin, double longitudeOrigin,
+  double falseEasting, double falseNorthing)
+{
+	double sin_lat, sin_lat1, sin_lat2, cos_lat1, cos_lat2;
+	double m1, m2, sqr_m1, sqr_m2;
+	double q0, q1, q2;
+	double es_sin, es_sin1, es_sin2;
+	double one_minus_sqr_es_sin1, one_minus_sqr_es_sin2;
+	double nq0;
+	double sp1, sp2;
+
+
+	_e = ellipsoid;
+	_latitudeOrigin = deg2rad(latitudeOrigin);
+	_longitudeOrigin = deg2rad(longitudeOrigin);
+	_falseEasting = falseEasting;
+	_falseNorthing = falseNorthing;
+
+	sp1 = deg2rad(standardParallel1);
+	sp2 = deg2rad(standardParallel2);
+
+	_es2 = 2 * _e.flattening() - _e.flattening() * _e.flattening();
+	_es = sqrt(_es2);
+	_one_minus_es2 = 1 - _es2;
+	_two_es = 2 * _es;
+
+	sin_lat = sin(_latitudeOrigin);
+	es_sin = _es * sin_lat;
+	q0 = ALBERS_Q(sin_lat, ONE_MINUS_SQR(es_sin), es_sin);
+
+	sin_lat1 = sin(sp1);
+	cos_lat1 = cos(sp1);
+	es_sin1 = _es * sin_lat1;
+	one_minus_sqr_es_sin1 = ONE_MINUS_SQR(es_sin1);
+	m1 = ALBERS_M(cos_lat1, one_minus_sqr_es_sin1);
+	q1 = ALBERS_Q(sin_lat1, one_minus_sqr_es_sin1, es_sin1);
+
+	sqr_m1 = m1 * m1;
+	if (fabs(sp1 - sp2) > 1.0e-10) {
+		sin_lat2 = sin(sp2);
+		cos_lat2 = cos(sp2);
+		es_sin2 = _es * sin_lat2;
+		one_minus_sqr_es_sin2 = ONE_MINUS_SQR(es_sin2);
+		m2 = ALBERS_M(cos_lat2, one_minus_sqr_es_sin2);
+		q2 = ALBERS_Q(sin_lat2, one_minus_sqr_es_sin2, es_sin2);
+		sqr_m2 = m2 * m2;
+		_n = (sqr_m1 - sqr_m2) / (q2 - q1);
+	} else
+		_n = sin_lat1;
+
+	_C = sqr_m1 + _n * q1;
+	_a_over_n = _e.radius() / _n;
+	nq0 = _n * q0;
+	_rho0 = (_C < nq0) ? 0 : _a_over_n * sqrt(_C - nq0);
+}
+
+QPointF AlbersEqual::ll2xy(const Coordinates &c) const
+{
+	double dlam;
+	double sin_lat;
+	double es_sin;
+	double q;
+	double rho;
+	double theta;
+	double nq;
+
+
+	dlam = deg2rad(c.lon()) - _longitudeOrigin;
+	if (dlam > M_PI)
+		dlam -= 2.0 * M_PI;
+	if (dlam < -M_PI)
+		dlam += 2.0 * M_PI;
+
+	sin_lat = sin(deg2rad(c.lat()));
+	es_sin = _es * sin_lat;
+	q = ALBERS_Q(sin_lat, ONE_MINUS_SQR(es_sin), es_sin);
+	nq = _n * q;
+	rho = (_C < nq) ? 0 : _a_over_n * sqrt(_C - nq);
+	theta = _n * dlam;
+
+	return QPointF(rho * sin(theta) + _falseEasting,
+	  _rho0 - rho * cos(theta) + _falseNorthing);
+}
+
+Coordinates AlbersEqual::xy2ll(const QPointF &p) const
+{
+	double dy, dx;
+	double rho0_minus_dy;
+	double q, qc, q_over_2;
+	double rho, rho_n;
+	double phi, delta_phi = 1.0;
+	double sin_phi;
+	double es_sin, one_minus_sqr_es_sin;
+	double theta = 0.0;
+	int count = 30;
+	double tolerance = 4.85e-10;
+	double lat, lon;
+
+
+	dy = p.y() - _falseNorthing;
+	dx = p.x() - _falseEasting;
+
+	rho0_minus_dy = _rho0 - dy;
+	rho = sqrt(dx * dx + rho0_minus_dy * rho0_minus_dy);
+
+	if (_n < 0) {
+		rho *= -1.0;
+		dx *= -1.0;
+		rho0_minus_dy *= -1.0;
+	}
+
+	if (rho != 0.0)
+		theta = atan2(dx, rho0_minus_dy);
+	rho_n = rho * _n;
+	q = (_C - (rho_n * rho_n) / (_e.radius() * _e.radius())) / _n;
+	qc = 1 - ((_one_minus_es2) / (_two_es)) * log((1.0 - _es) / (1.0 + _es));
+	if (fabs(fabs(qc) - fabs(q)) > 1.0e-6) {
+		q_over_2 = q / 2.0;
+		if (q_over_2 > 1.0)
+			lat = M_PI_2;
+		else if (q_over_2 < -1.0)
+			lat = -M_PI_2;
+		else {
+			phi = asin(q_over_2);
+			if (_es < 1.0e-10)
+				lat = phi;
+			else  {
+				while ((fabs(delta_phi) > tolerance) && count) {
+					sin_phi = sin(phi);
+					es_sin = _es * sin_phi;
+					one_minus_sqr_es_sin = ONE_MINUS_SQR(es_sin);
+					delta_phi = (one_minus_sqr_es_sin * one_minus_sqr_es_sin)
+					  / (2.0 * cos(phi)) * (q / (_one_minus_es2) - sin_phi
+					  / one_minus_sqr_es_sin + (log((1.0 - es_sin)
+					  / (1.0 + es_sin)) / (_two_es)));
+					phi += delta_phi;
+					count --;
+				}
+
+				lat = phi;
+			}
+
+			if (lat > M_PI_2)
+				lat = M_PI_2;
+			else if (lat < -M_PI_2)
+				lat = -M_PI_2;
+		}
+	} else {
+		if (q >= 0.0)
+			lat = M_PI_2;
+		else
+			lat = -M_PI_2;
+	}
+
+	lon = _longitudeOrigin + theta / _n;
+
+	if (lon > M_PI)
+		lon -= M_PI * 2;
+	if (lon < -M_PI)
+		lon += M_PI * 2;
+
+	if (lon > M_PI)
+		lon = M_PI;
+	else if (lon < -M_PI)
+		lon = -M_PI;
+
+	return Coordinates(rad2deg(lon), rad2deg(lat));
+}

src/albersequal.h

@@ -0,0 +1,36 @@
+#ifndef ALBERSEQUAL_H
+#define ALBERSEQUAL_H
+
+#include "projection.h"
+
+class Ellipsoid;
+
+class AlbersEqual : public Projection
+{
+public:
+	AlbersEqual(const Ellipsoid &ellipsoid, double standardParallel1,
+	  double standardParallel2, double latitudeOrigin, double longitudeOrigin,
+	  double falseEasting, double falseNorthing);
+
+	virtual QPointF ll2xy(const Coordinates &c) const;
+	virtual Coordinates xy2ll(const QPointF &p) const;
+
+private:
+	Ellipsoid _e;
+
+	double _latitudeOrigin;
+	double _longitudeOrigin;
+	double _falseEasting;
+	double _falseNorthing;
+
+	double _rho0;
+	double _C;
+	double _n;
+	double _es;
+	double _es2;
+	double _a_over_n;
+	double _one_minus_es2;
+	double _two_es;
+};
+
+#endif // ALBERSEQUAL_H

src/app.cpp

@@ -3,41 +3,28 @@
 #include <QLocale>
 #include <QFileOpenEvent>
 #include <QNetworkProxyFactory>
-#include <QPixmapCache>
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-#include <QGLFormat>
-#else // QT 5
-#include <QSurfaceFormat>
-#endif // QT 5
+#include "opengl.h"
 #include "gui.h"
+#include "onlinemap.h"
+#include "downloader.h"
 #include "app.h"
 
 
 App::App(int &argc, char **argv) : QApplication(argc, argv),
   _argc(argc), _argv(argv)
 {
-	_translator = new QTranslator();
+	QTranslator *translator = new QTranslator(this);
 
 	QString locale = QLocale::system().name();
-	_translator->load(QString(":/lang/gpxsee_") + locale);
-	installTranslator(_translator);
+	translator->load(QString(":/lang/gpxsee_") + locale);
+	installTranslator(translator);
 #ifdef Q_OS_MAC
 	setAttribute(Qt::AA_DontShowIconsInMenus);
 #endif // Q_OS_MAC
 
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-	QGLFormat fmt;
-	fmt.setSamples(10);
-	QGLFormat::setDefaultFormat(fmt);
-#else
-	QSurfaceFormat fmt;
-	fmt.setSamples(4);
-	QSurfaceFormat::setDefaultFormat(fmt);
-#endif
-
-	QPixmapCache::setCacheLimit(65536);
+	OnlineMap::setDownloader(new Downloader(this));
+	OPENGL_SET_SAMPLES(4);
 
 	_gui = new GUI();
 }
@@ -45,7 +32,6 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),
 App::~App()
 {
 	delete _gui;
-	delete _translator;
 }
 
 void App::run()

src/app.h

@@ -4,7 +4,6 @@
 #include <QApplication>
 
 class GUI;
-class QTranslator;
 
 class App : QApplication
 {
@@ -22,7 +21,6 @@ private:
 	int &_argc;
 	char **_argv;
 	GUI *_gui;
-	QTranslator *_translator;
 };
 
 #endif // APP_H

src/atlas.cpp

@@ -0,0 +1,320 @@
+#include <QDir>
+#include <QtAlgorithms>
+#include <QPainter>
+#include "tar.h"
+#include "atlas.h"
+
+
+#define ZOOM_THRESHOLD 0.9
+
+#define TL(m) ((m)->xy2pp((m)->bounds().topLeft()))
+#define BR(m) ((m)->xy2pp((m)->bounds().bottomRight()))
+
+static bool resCmp(const OfflineMap *m1, const OfflineMap *m2)
+{
+	qreal r1, r2;
+
+	r1 = m1->resolution(m1->bounds().center());
+	r2 = m2->resolution(m2->bounds().center());
+
+	return r1 > r2;
+}
+
+static bool xCmp(const OfflineMap *m1, const OfflineMap *m2)
+{
+	return TL(m1).x() < TL(m2).x();
+}
+
+static bool yCmp(const OfflineMap *m1, const OfflineMap *m2)
+{
+	return TL(m1).y() > TL(m2).y();
+}
+
+bool Atlas::isAtlas(Tar &tar, const QString &path)
+{
+	QFileInfo fi(path);
+	QByteArray ba;
+	QString suffix = fi.suffix().toLower();
+
+	if (suffix == "tar") {
+		if (!tar.load(path)) {
+			_errorString = "Error reading tar file";
+			return false;
+		}
+		QString tbaFileName = fi.completeBaseName() + ".tba";
+		ba = tar.file(tbaFileName);
+	} else if (suffix == "tba") {
+		QFile tbaFile(path);
+		if (!tbaFile.open(QIODevice::ReadOnly)) {
+			_errorString = QString("Error opening tba file: %1")
+			  .arg(tbaFile.errorString());
+			return false;
+		}
+		ba = tbaFile.readAll();
+	}
+
+	if (ba.startsWith("Atlas 1.0"))
+		return true;
+	else {
+		_errorString = "Missing or invalid tba file";
+		return false;
+	}
+}
+
+void Atlas::computeZooms()
+{
+	qSort(_maps.begin(), _maps.end(), resCmp);
+
+	_zooms.append(QPair<int, int>(0, _maps.count() - 1));
+	for (int i = 1; i < _maps.count(); i++) {
+		qreal last = _maps.at(i-1)->resolution(_maps.at(i)->bounds().center());
+		qreal cur = _maps.at(i)->resolution(_maps.at(i)->bounds().center());
+		if (cur < last * ZOOM_THRESHOLD) {
+			_zooms.last().second = i-1;
+			_zooms.append(QPair<int, int>(i, _maps.count() - 1));
+		}
+	}
+}
+
+void Atlas::computeBounds()
+{
+	QList<QPointF> offsets;
+
+	for (int i = 0; i < _maps.count(); i++)
+		offsets.append(QPointF());
+
+	for (int z = 0; z < _zooms.count(); z++) {
+		qreal w = 0, h = 0;
+
+		QList<OfflineMap*> m;
+		for (int i = _zooms.at(z).first; i <= _zooms.at(z).second; i++)
+			m.append(_maps.at(i));
+
+		qSort(m.begin(), m.end(), xCmp);
+		offsets[_maps.indexOf(m.first())].setX(w);
+		for (int i = 1; i < m.size(); i++) {
+			w += round(m.at(i-1)->pp2xy(TL(m.at(i))).x());
+			offsets[_maps.indexOf(m.at(i))].setX(w);
+		}
+
+		qSort(m.begin(), m.end(), yCmp);
+		offsets[_maps.indexOf(m.first())].setY(h);
+		for (int i = 1; i < m.size(); i++) {
+			h += round(m.at(i-1)->pp2xy(TL(m.at(i))).y());
+			offsets[_maps.indexOf(m.at(i))].setY(h);
+		}
+	}
+
+	for (int i = 0; i < _maps.count(); i++)
+		_bounds.append(QPair<QRectF, QRectF>(QRectF(TL(_maps.at(i)),
+		  BR(_maps.at(i))), QRectF(offsets.at(i), _maps.at(i)->bounds().size())));
+}
+
+Atlas::Atlas(const QString &fileName, QObject *parent) : Map(parent)
+{
+	Tar tar;
+	QFileInfo fi(fileName);
+
+	_valid = false;
+	_zoom = 0;
+	_name = fi.dir().dirName();
+	_ci = -1; _cz = -1;
+
+	if (!isAtlas(tar, fileName))
+		return;
+
+	QDir dir(fi.absolutePath());
+	QFileInfoList layers = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+	for (int n = 0; n < layers.count(); n++) {
+		QDir zdir(layers.at(n).absoluteFilePath());
+		QFileInfoList maps = zdir.entryInfoList(QDir::Dirs
+		  | QDir::NoDotAndDotDot);
+		for (int i = 0; i < maps.count(); i++) {
+			QString mapFile = maps.at(i).absoluteFilePath() + "/"
+			  + maps.at(i).fileName() + ".map";
+
+			OfflineMap *map;
+			if (tar.isOpen())
+				map = new OfflineMap(mapFile, tar, this);
+			else
+				map = new OfflineMap(mapFile, this);
+
+			if (map->isValid())
+				_maps.append(map);
+			else {
+				_errorString = QString("Error loading map: %1: %2")
+				  .arg(mapFile, map->errorString());
+				return;
+			}
+		}
+	}
+	if (_maps.isEmpty()) {
+		_errorString = "No maps found in atlas";
+		return;
+	}
+
+	computeZooms();
+	computeBounds();
+
+	_valid = true;
+}
+
+Atlas::~Atlas()
+{
+	for (int i = 0; i < _maps.size(); i++)
+		delete _maps.at(i);
+}
+
+QRectF Atlas::bounds() const
+{
+	QSizeF s(0, 0);
+
+	for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
+		if (_bounds.at(i).second.right() > s.width())
+			s.setWidth(_bounds.at(i).second.right());
+		if (_bounds.at(i).second.bottom() > s.height())
+			s.setHeight(_bounds.at(i).second.bottom());
+	}
+
+	return QRectF(QPointF(0, 0), s);
+}
+
+qreal Atlas::resolution(const QPointF &p) const
+{
+	int idx = _zooms.at(_zoom).first;
+
+	for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
+		if (_bounds.at(i).second.contains(_maps.at(i)->xy2pp(p))) {
+			idx = i;
+			break;
+		}
+	}
+
+	return _maps.at(idx)->resolution(p);
+}
+
+qreal Atlas::zoom() const
+{
+	return _zoom;
+}
+
+qreal Atlas::zoomFit(const QSize &size, const QRectF &br)
+{
+	_zoom = 0;
+
+	if (br.isNull()) {
+		_zoom = _zooms.size() - 1;
+		return _zoom;
+	}
+
+	for (int z = 0; z < _zooms.count(); z++) {
+		for (int i = _zooms.at(z).first; i <= _zooms.at(z).second; i++) {
+			if (!_bounds.at(i).first.contains(_maps.at(i)->ll2pp(br.center())))
+				continue;
+
+			QRect sbr = QRectF(_maps.at(i)->ll2xy(br.topLeft()),
+			  _maps.at(i)->ll2xy(br.bottomRight())).toRect().normalized();
+
+			if (sbr.size().width() > size.width()
+			  || sbr.size().height() > size.height())
+				return _zoom;
+
+			_zoom = z;
+			break;
+		}
+	}
+
+	return _zoom;
+}
+
+qreal Atlas::zoomIn()
+{
+	_zoom = qMin(_zoom + 1, _zooms.size() - 1);
+	return _zoom;
+}
+
+qreal Atlas::zoomOut()
+{
+	_zoom = qMax(_zoom - 1, 0);
+	return _zoom;
+}
+
+QPointF Atlas::ll2xy(const Coordinates &c)
+{
+	QPointF pp;
+
+	if (_cz != _zoom) {
+		_ci = -1;
+		_cz = _zoom;
+	}
+
+	if (_ci >= 0)
+		pp = _maps.at(_ci)->ll2pp(c);
+	if (_ci < 0 || !_bounds.at(_ci).first.contains(pp)) {
+		_ci = _zooms.at(_zoom).first;
+		for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
+			pp = _maps.at(i)->ll2pp(c);
+			if (_bounds.at(i).first.contains(pp)) {
+				_ci = i;
+				break;
+			}
+		}
+	}
+
+	QPointF p = _maps.at(_ci)->pp2xy(pp);
+	return p + _bounds.at(_ci).second.topLeft();
+}
+
+Coordinates Atlas::xy2ll(const QPointF &p)
+{
+	int idx = _zooms.at(_zoom).first;
+
+	for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
+		if (_bounds.at(i).second.contains(_maps.at(i)->xy2pp(p))) {
+			idx = i;
+			break;
+		}
+	}
+
+	QPointF p2 = p - _bounds.at(idx).second.topLeft();
+	return _maps.at(idx)->xy2ll(p2);
+}
+
+void Atlas::draw(QPainter *painter, const QRectF &rect)
+{
+	// All in one map
+	for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
+		QRectF ir = rect.intersected(_bounds.at(i).second);
+		if (ir == rect) {
+			draw(painter, rect, i);
+			return;
+		}
+	}
+
+	// Multiple maps
+	painter->fillRect(rect, Qt::white);
+	for (int i = _zooms.at(_zoom).first; i <= _zooms.at(_zoom).second; i++) {
+		QRectF ir = rect.intersected(_bounds.at(i).second);
+		if (!ir.isNull())
+			draw(painter, ir, i);
+	}
+}
+
+void Atlas::draw(QPainter *painter, const QRectF &rect, int mapIndex)
+{
+	OfflineMap *map = _maps.at(mapIndex);
+	const QPointF offset = _bounds.at(mapIndex).second.topLeft();
+	QRectF pr = QRectF(rect.topLeft() - offset, rect.size());
+
+	map->load();
+
+	painter->translate(offset);
+	map->draw(painter, pr);
+	painter->translate(-offset);
+}
+
+void Atlas::unload()
+{
+	for (int i = 0; i < _maps.count(); i++)
+		_maps.at(i)->unload();
+}

src/atlas.h

@@ -0,0 +1,55 @@
+#ifndef ATLAS_H
+#define ATLAS_H
+
+#include <QFileInfoList>
+#include "map.h"
+#include "offlinemap.h"
+
+
+class Atlas : public Map
+{
+	Q_OBJECT
+
+public:
+	Atlas(const QString &fileName, QObject *parent = 0);
+	~Atlas();
+
+	const QString &name() const {return _name;}
+
+	QRectF bounds() const;
+	qreal resolution(const QPointF &p) const;
+
+	qreal zoom() const;
+	qreal zoomFit(const QSize &size, const QRectF &br);
+	qreal zoomIn();
+	qreal zoomOut();
+
+	QPointF ll2xy(const Coordinates &c);
+	Coordinates xy2ll(const QPointF &p);
+
+	void draw(QPainter *painter, const QRectF &rect);
+
+	void unload();
+
+	bool isValid() const {return _valid;}
+	const QString &errorString() const {return _errorString;}
+
+private:
+	void draw(QPainter *painter, const QRectF &rect, int mapIndex);
+	bool isAtlas(Tar &tar, const QString &path);
+	void computeZooms();
+	void computeBounds();
+
+	QString _name;
+	bool _valid;
+	QString _errorString;
+
+	QList<OfflineMap*> _maps;
+	QVector<QPair<int, int> > _zooms;
+	QVector<QPair<QRectF, QRectF> > _bounds;
+	int _zoom;
+
+	int _ci, _cz;
+};
+
+#endif // ATLAS_H

src/config.h

@@ -13,7 +13,10 @@
 #define FONT_SIZE       12
 #define SCREEN_DPI      96.0
 
+#define ELLIPSOID_FILE  QString("ellipsoids.csv")
+#define DATUM_FILE      QString("datums.csv")
 #define MAP_FILE        QString("maps.txt")
+#define MAP_DIR         QString("maps")
 #define POI_DIR         QString("POI")
 
 #if defined(Q_OS_WIN32)
@@ -28,8 +31,14 @@
 #define GLOBAL_DIR      QString("/usr/share/gpxsee")
 #endif
 
+#define USER_ELLIPSOID_FILE    USER_DIR + QString("/") + ELLIPSOID_FILE
+#define USER_DATUM_FILE        USER_DIR + QString("/") + DATUM_FILE
+#define USER_MAP_DIR           USER_DIR + QString("/") + MAP_DIR
 #define USER_MAP_FILE          USER_DIR + QString("/") + MAP_FILE
 #define USER_POI_DIR           USER_DIR + QString("/") + POI_DIR
+#define GLOBAL_ELLIPSOID_FILE  GLOBAL_DIR + QString("/") + ELLIPSOID_FILE
+#define GLOBAL_DATUM_FILE      GLOBAL_DIR + QString("/") + DATUM_FILE
+#define GLOBAL_MAP_DIR         GLOBAL_DIR + QString("/") + MAP_DIR
 #define GLOBAL_MAP_FILE        GLOBAL_DIR + QString("/") + MAP_FILE
 #define GLOBAL_POI_DIR         GLOBAL_DIR + QString("/") + POI_DIR
 #define TILES_DIR              USER_DIR + QString("/tiles")

src/coordinates.cpp

@@ -17,27 +17,12 @@ qreal Coordinates::distanceTo(const Coordinates &c) const
 	return (WGS84_RADIUS * (2.0 * atan2(sqrt(a), sqrt(1.0 - a))));
 }
 
-QPointF Coordinates::toMercator() const
-{
-	return QPointF(_lon, rad2deg(log(tan(M_PI/4.0 + deg2rad(_lat)/2.0))));
-}
-
-Coordinates Coordinates::fromMercator(const QPointF &m)
-{
-	return Coordinates(m.x(), rad2deg(2 * atan(exp(deg2rad(m.y()))) - M_PI/2));
-}
-
-bool operator==(const Coordinates &c1, const Coordinates &c2)
-{
-	return (c1.lat() == c2.lat() && c1.lon() == c2.lon());
-}
-
 QDebug operator<<(QDebug dbg, const Coordinates &coordinates)
 {
 	dbg.nospace() << "Coordinates(" << coordinates.lon() << ", "
 	  << coordinates.lat() << ")";
 
-	return dbg.maybeSpace();
+	return dbg.space();
 }
 
 QPair<Coordinates, Coordinates> Coordinates::boundingRect(qreal distance) const
@@ -64,6 +49,7 @@ QPair<Coordinates, Coordinates> Coordinates::boundingRect(qreal distance) const
 		maxLon = MAX_LON;
 	}
 
-	return QPair<Coordinates, Coordinates>(Coordinates(rad2deg(minLon),
-	  rad2deg(minLat)), Coordinates(rad2deg(maxLon), rad2deg(maxLat)));
+	return QPair<Coordinates, Coordinates>(Coordinates(rad2deg(qMin(minLon,
+	  maxLon)), rad2deg(qMin(minLat, maxLat))), Coordinates(rad2deg(qMax(minLon,
+	  maxLon)), rad2deg(qMax(minLat, maxLat))));
 }

src/coordinates.h

@@ -12,6 +12,9 @@ public:
 	Coordinates(const Coordinates &c) {_lon = c._lon; _lat = c._lat;}
 	Coordinates(qreal lon, qreal lat) {_lon = lon; _lat = lat;}
 
+	Coordinates(const QPointF &p) {_lon = p.x(), _lat = p.y();}
+	QPointF toPointF() const {return QPointF(_lon, _lat);}
+
 	qreal &rlon() {return _lon;}
 	qreal &rlat() {return _lat;}
 	void setLon(qreal lon) {_lon = lon;}
@@ -28,14 +31,14 @@ public:
 	qreal distanceTo(const Coordinates &c) const;
 	QPair<Coordinates, Coordinates> boundingRect(qreal distance) const;
 
-	QPointF toMercator() const;
-	static Coordinates fromMercator(const QPointF &m);
-
 private:
 	qreal _lat, _lon;
 };
 
-bool operator==(const Coordinates &c1, const Coordinates &c2);
+inline bool operator==(const Coordinates &c1, const Coordinates &c2)
+  {return (c1.lat() == c2.lat() && c1.lon() == c2.lon());}
+inline bool operator!=(const Coordinates &c1, const Coordinates &c2)
+  {return !(c1 == c2);}
 QDebug operator<<(QDebug dbg, const Coordinates &trackpoint);
 
 #endif // COORDINATES_H

src/data.cpp

@@ -82,9 +82,9 @@ bool Data::loadFile(const QString &fileName)
 			file.reset();
 		}
 
-		fprintf(stderr, "Error loading data file: %s:\n", qPrintable(fileName));
+		qWarning("Error loading data file: %s:\n", qPrintable(fileName));
 		for (it = _parsers.begin(); it != _parsers.end(); it++)
-			fprintf(stderr, "%s: line %d: %s\n", qPrintable(it.key()),
+			qWarning("%s: line %d: %s\n", qPrintable(it.key()),
 			  it.value()->errorLine(), qPrintable(it.value()->errorString()));
 
 		_errorLine = 0;

src/datum.cpp

@@ -0,0 +1,83 @@
+#include <QFile>
+#include "wgs84.h"
+#include "datum.h"
+
+
+static QMap<QString, Datum> WGS84()
+{
+	QMap<QString, Datum> map;
+	map.insert("WGS 84", Datum(Ellipsoid(WGS84_RADIUS, WGS84_FLATTENING),
+	  0, 0, 0));
+	return map;
+}
+
+QMap<QString, Datum> Datum::_datums = WGS84();
+QString Datum::_errorString;
+int Datum::_errorLine = 0;
+
+Datum Datum::datum(const QString &name)
+{
+	QMap<QString, Datum>::const_iterator it = _datums.find(name);
+
+	if (it == _datums.end())
+		return Datum();
+
+	return it.value();
+}
+
+bool Datum::loadList(const QString &path)
+{
+	QFile file(path);
+	bool res;
+
+	if (!file.open(QFile::ReadOnly)) {
+		_errorString = qPrintable(file.errorString());
+		return false;
+	}
+
+	_errorLine = 1;
+	_errorString.clear();
+
+	while (!file.atEnd()) {
+		QByteArray line = file.readLine();
+		QList<QByteArray> list = line.split(',');
+		if (list.size() != 6) {
+			_errorString = "Format error";
+			return false;
+		}
+
+		int eid = list[2].trimmed().toInt(&res);
+		if (!res) {
+			_errorString = "Invalid ellipsoid id";
+			return false;
+		}
+		double dx = list[3].trimmed().toDouble(&res);
+		if (!res) {
+			_errorString = "Invalid dx";
+			return false;
+		}
+		double dy = list[4].trimmed().toDouble(&res);
+		if (!res) {
+			_errorString = "Invalid dy";
+			return false;
+		}
+		double dz = list[5].trimmed().toDouble(&res);
+		if (!res) {
+			_errorString = "Invalid dz";
+			return false;
+		}
+
+		Ellipsoid e = Ellipsoid::ellipsoid(eid);
+		if (e.isNull()) {
+			_errorString = "Unknown ellipsoid ID";
+			return false;
+		}
+
+		Datum d(e, dx, dy, dz);
+		_datums.insert(list[0].trimmed(), d);
+
+		_errorLine++;
+	}
+
+	return true;
+}

src/datum.h

@@ -0,0 +1,38 @@
+#ifndef DATUM_H
+#define DATUM_H
+
+#include <QMap>
+#include "ellipsoid.h"
+
+class Datum
+{
+public:
+	Datum() : _ellipsoid(Ellipsoid()), _dx(0), _dy(0), _dz(0) {}
+	Datum(const Ellipsoid &ellipsoid, double dx, double dy, double dz)
+	  : _ellipsoid(ellipsoid), _dx(dx), _dy(dy), _dz(dz) {}
+
+	const Ellipsoid &ellipsoid() const {return _ellipsoid;}
+	double dx() const {return _dx;}
+	double dy() const {return _dy;}
+	double dz() const {return _dz;}
+
+	bool isNull() const {return _ellipsoid.isNull();}
+	bool isWGS84() const
+	  {return _ellipsoid.isWGS84() && _dx == 0 && _dy == 0 && _dz == 0;}
+
+	static bool loadList(const QString &path);
+	static const QString &errorString() {return _errorString;}
+	static int errorLine() {return _errorLine;}
+
+	static Datum datum(const QString &name);
+
+private:
+	Ellipsoid _ellipsoid;
+	double _dx, _dy, _dz;
+
+	static QMap<QString, Datum> _datums;
+	static QString _errorString;
+	static int _errorLine;
+};
+
+#endif // DATUM_H

src/downloader.cpp

@@ -1,5 +1,7 @@
 #include <QFile>
 #include <QFileInfo>
+#include <QNetworkRequest>
+#include <QNetworkReply>
 #include "config.h"
 #include "downloader.h"
 
@@ -17,25 +19,39 @@
 #define USER_AGENT \
 	APP_NAME "/" APP_VERSION " (" PLATFORM_STR "; Qt " QT_VERSION_STR ")"
 
-Downloader::Downloader()
+#define ATTR_REDIRECT QNetworkRequest::RedirectionTargetAttribute
+#define ATTR_FILE     QNetworkRequest::User
+#define ATTR_ORIGIN   (QNetworkRequest::Attribute)(QNetworkRequest::User + 1)
+#define ATTR_LEVEL    (QNetworkRequest::Attribute)(QNetworkRequest::User + 2)
+
+#define MAX_REDIRECT_LEVEL 5
+
+
+Downloader::Downloader(QObject *parent) : QObject(parent)
 {
 	connect(&_manager, SIGNAL(finished(QNetworkReply*)),
 			SLOT(downloadFinished(QNetworkReply*)));
 }
 
-bool Downloader::doDownload(const Download &dl)
+bool Downloader::doDownload(const Download &dl, const Redirect &redirect)
 {
 	QUrl url(dl.url());
 
 	if (_errorDownloads.contains(url))
 		return false;
+	if (_currentDownloads.contains(url))
+		return false;
 
 	QNetworkRequest request(url);
-	request.setAttribute(QNetworkRequest::User, QVariant(dl.file()));
+	request.setAttribute(ATTR_FILE, QVariant(dl.file()));
+	if (!redirect.isNull()) {
+		request.setAttribute(ATTR_ORIGIN, QVariant(redirect.origin()));
+		request.setAttribute(ATTR_LEVEL, QVariant(redirect.level()));
+	}
 	request.setRawHeader("User-Agent", USER_AGENT);
 	QNetworkReply *reply = _manager.get(request);
 
-	_currentDownloads.append(reply);
+	_currentDownloads.insert(url, reply);
 
 	return true;
 }
@@ -45,7 +61,7 @@ bool Downloader::saveToDisk(const QString &filename, QIODevice *data)
 	QFile file(filename);
 
 	if (!file.open(QIODevice::WriteOnly)) {
-		fprintf(stderr, "Error writing map tile: %s: %s\n",
+		qWarning("Error writing map tile: %s: %s\n",
 		  qPrintable(filename), qPrintable(file.errorString()));
 		return false;
 	}
@@ -58,26 +74,49 @@ bool Downloader::saveToDisk(const QString &filename, QIODevice *data)
 
 void Downloader::downloadFinished(QNetworkReply *reply)
 {
-	QUrl url = reply->url();
+	QUrl url = reply->request().url();
+
 	if (reply->error()) {
+		QUrl origin = reply->request().attribute(ATTR_ORIGIN).toUrl();
+		if (origin.isEmpty()) {
 			_errorDownloads.insert(url);
-		fprintf(stderr, "Error downloading map tile: %s: %s\n",
+			qWarning("Error downloading map tile: %s: %s\n",
 			  url.toEncoded().constData(), qPrintable(reply->errorString()));
 		} else {
-		QUrl redirect = reply->attribute(
-		  QNetworkRequest::RedirectionTargetAttribute).toUrl();
-		QString filename = reply->request().attribute(QNetworkRequest::User)
+			_errorDownloads.insert(origin);
+			qWarning("Error downloading map tile: %s -> %s: %s\n",
+			  origin.toEncoded().constData(), url.toEncoded().constData(),
+			  qPrintable(reply->errorString()));
+		}
+	} else {
+		QUrl location = reply->attribute(ATTR_REDIRECT).toUrl();
+		QString filename = reply->request().attribute(ATTR_FILE)
 		  .toString();
 
-		if (!redirect.isEmpty()) {
-			Download dl(redirect, filename);
-			doDownload(dl);
+		if (!location.isEmpty()) {
+			QUrl origin = reply->request().attribute(ATTR_ORIGIN).toUrl();
+			int level = reply->request().attribute(ATTR_LEVEL).toInt();
+
+			if (location == url) {
+				_errorDownloads.insert(url);
+				qWarning("Error downloading map tile: %s: "
+				  "redirect loop\n", url.toEncoded().constData());
+			} else if (level >= MAX_REDIRECT_LEVEL) {
+				_errorDownloads.insert(origin);
+				qWarning("Error downloading map tile: %s: "
+				  "redirect level limit reached\n",
+				  origin.toEncoded().constData());
+			} else {
+				Redirect redirect(origin.isEmpty() ? url : origin, level + 1);
+				Download dl(location, filename);
+				doDownload(dl, redirect);
+			}
 		} else
 			if (!saveToDisk(filename, reply))
 				_errorDownloads.insert(url);
 	}
 
-	_currentDownloads.removeAll(reply);
+	_currentDownloads.remove(url);
 	reply->deleteLater();
 
 	if (_currentDownloads.isEmpty())

src/downloader.h

@@ -2,13 +2,14 @@
 #define DOWNLOADER_H
 
 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
 #include <QUrl>
 #include <QList>
+#include <QMap>
 #include <QSet>
 
 
+class QNetworkReply;
+
 class Download
 {
 public:
@@ -28,8 +29,8 @@ class Downloader : public QObject
 	Q_OBJECT
 
 public:
-	static Downloader& instance()
-		{static Downloader i; return i;}
+	Downloader(QObject *parent = 0);
+
 	bool get(const QList<Download> &list);
 
 signals:
@@ -39,15 +40,28 @@ private slots:
 	void downloadFinished(QNetworkReply *reply);
 
 private:
-	Downloader();
-	Downloader(Downloader const&);
-	void operator=(Downloader const&);
+	class Redirect
+	{
+	public:
+		Redirect() : _level(0) {}
+		Redirect(const QUrl &origin, int level) :
+		  _origin(origin), _level(level) {}
 
-	bool doDownload(const Download &dl);
+		const QUrl &origin() const {return _origin;}
+		int level() const {return _level;}
+
+		bool isNull() const {return (_level == 0);}
+
+	private:
+		QUrl _origin;
+		int _level;
+	};
+
+	bool doDownload(const Download &dl, const Redirect &redirect = Redirect());
 	bool saveToDisk(const QString &filename, QIODevice *data);
 
 	QNetworkAccessManager _manager;
-	QList<QNetworkReply *> _currentDownloads;
+	QMap<QUrl, QNetworkReply *> _currentDownloads;
 	QSet<QUrl> _errorDownloads;
 };
 

src/ellipsoid.cpp

@@ -0,0 +1,62 @@
+#include <QFile>
+#include "ellipsoid.h"
+
+QMap<int, Ellipsoid> Ellipsoid::_ellipsoids;
+QString Ellipsoid::_errorString;
+int Ellipsoid::_errorLine = 0;
+
+Ellipsoid Ellipsoid::ellipsoid(int id)
+{
+	QMap<int, Ellipsoid>::const_iterator it = _ellipsoids.find(id);
+
+	if (it == _ellipsoids.end())
+		return Ellipsoid();
+
+	return it.value();
+}
+
+bool Ellipsoid::loadList(const QString &path)
+{
+	QFile file(path);
+	bool res;
+
+	if (!file.open(QFile::ReadOnly)) {
+		_errorString = qPrintable(file.errorString());
+		return false;
+	}
+
+	_errorLine = 1;
+	_errorString.clear();
+
+	while (!file.atEnd()) {
+		QByteArray line = file.readLine();
+		QList<QByteArray> list = line.split(',');
+		if (list.size() != 4) {
+			_errorString = "Format error";
+			return false;
+		}
+
+		int id = list[0].trimmed().toInt(&res);
+		if (!res) {
+			_errorString = "Invalid ellipsoid id";
+			return false;
+		}
+		double radius = list[2].trimmed().toDouble(&res);
+		if (!res) {
+			_errorString = "Invalid ellipsoid radius";
+			return false;
+		}
+		double flattening = list[3].trimmed().toDouble(&res);
+		if (!res) {
+			_errorString = "Invalid ellipsoid flattening";
+			return false;
+		}
+
+		Ellipsoid e(radius, 1.0/flattening);
+		_ellipsoids.insert(id, e);
+
+		_errorLine++;
+	}
+
+	return true;
+}

src/ellipsoid.h

@@ -0,0 +1,37 @@
+#ifndef ELLIPSOID_H
+#define ELLIPSOID_H
+
+#include <QString>
+#include <QMap>
+#include "wgs84.h"
+
+class Ellipsoid
+{
+public:
+	Ellipsoid() : _radius(-1.0), _flattening(-1.0) {}
+	Ellipsoid(double radius, double flattening)
+	  : _radius(radius), _flattening(flattening) {}
+
+	double radius() const {return _radius;}
+	double flattening() const {return _flattening;}
+
+	bool isNull() const {return _radius < 0 || _flattening < 0;}
+	bool isWGS84() const
+	  {return _radius == WGS84_RADIUS && _flattening == WGS84_FLATTENING;}
+
+	static bool loadList(const QString &path);
+	static const QString &errorString() {return _errorString;}
+	static int errorLine() {return _errorLine;}
+
+	static Ellipsoid ellipsoid(int id);
+
+private:
+	double _radius;
+	double _flattening;
+
+	static QMap<int, Ellipsoid> _ellipsoids;
+	static QString _errorString;
+	static int _errorLine;
+};
+
+#endif // ELLIPSOID_H

src/emptymap.cpp

@@ -0,0 +1,77 @@
+#include <QtGlobal>
+#include <QPainter>
+#include "misc.h"
+#include "rd.h"
+#include "wgs84.h"
+#include "coordinates.h"
+#include "mercator.h"
+#include "emptymap.h"
+
+
+#define SCALE_MIN 0.5
+#define SCALE_MAX 1.0E-6
+
+EmptyMap::EmptyMap(QObject *parent) : Map(parent)
+{
+	_scale = SCALE_MAX;
+}
+
+QRectF EmptyMap::bounds() const
+{
+	return scaled(QRectF(QPointF(-180, -180), QSizeF(360, 360)), 1.0/_scale);
+}
+
+qreal EmptyMap::zoomFit(const QSize &size, const QRectF &br)
+{
+	if (br.isNull())
+		_scale = SCALE_MAX;
+	else {
+		Coordinates topLeft(br.topLeft());
+		Coordinates bottomRight(br.bottomRight());
+		QRectF tbr(Mercator().ll2xy(topLeft), Mercator().ll2xy(bottomRight));
+
+		QPointF sc(tbr.width() / size.width(), tbr.height() / size.height());
+
+		_scale = qMax(sc.x(), sc.y());
+	}
+
+	_scale = qMax(_scale, SCALE_MAX);
+	_scale = qMin(_scale, SCALE_MIN);
+
+	return _scale;
+}
+
+qreal EmptyMap::resolution(const QPointF &p) const
+{
+	return (WGS84_RADIUS * 2 * M_PI * _scale / 360.0
+	  * cos(2.0 * atan(exp(deg2rad(-p.y() * _scale))) - M_PI/2));
+}
+
+qreal EmptyMap::zoomIn()
+{
+	_scale = qMax(_scale / 2.0, SCALE_MAX);
+	return _scale;
+}
+
+qreal EmptyMap::zoomOut()
+{
+	_scale = qMin(_scale * 2.0, SCALE_MIN);
+	return _scale;
+}
+
+void EmptyMap::draw(QPainter *painter, const QRectF &rect)
+{
+	painter->fillRect(rect, Qt::white);
+}
+
+QPointF EmptyMap::ll2xy(const Coordinates &c)
+{
+	QPointF m = Mercator().ll2xy(c);
+	return QPointF(m.x() / _scale, m.y() / -_scale);
+}
+
+Coordinates EmptyMap::xy2ll(const QPointF &p)
+{
+	QPointF m(p.x() * _scale, -p.y() * _scale);
+	return Mercator().xy2ll(m);
+}

src/emptymap.h

@@ -0,0 +1,33 @@
+#ifndef EMPTYMAP_H
+#define EMPTYMAP_H
+
+#include "map.h"
+
+class EmptyMap : public Map
+{
+	Q_OBJECT
+
+public:
+	EmptyMap(QObject *parent = 0);
+
+	const QString &name() const {return _name;}
+
+	QRectF bounds() const;
+	qreal resolution(const QPointF &p) const;
+
+	qreal zoom() const {return _scale;}
+	qreal zoomFit(const QSize &size, const QRectF &br);
+	qreal zoomIn();
+	qreal zoomOut();
+
+	QPointF ll2xy(const Coordinates &c);
+	Coordinates xy2ll(const QPointF &p);
+
+	void draw(QPainter *painter, const QRectF &rect);
+
+private:
+	QString _name;
+	qreal _scale;
+};
+
+#endif // EMPTYMAP_H

src/fitparser.cpp

@@ -36,8 +36,7 @@ void FITParser::clearDefinitions()
 void FITParser::warning(const char *text) const
 {
 	const QFile *file = static_cast<QFile *>(_device);
-	fprintf(stderr, "%s:%d: %s\n", qPrintable(file->fileName()),
-	  _len, text);
+	qWarning("%s:%d: %s\n", qPrintable(file->fileName()), _len, text);
 }
 
 bool FITParser::readData(char *data, size_t size)

src/graph.h

@@ -31,22 +31,6 @@ private:
 Q_DECLARE_TYPEINFO(GraphPoint, Q_PRIMITIVE_TYPE);
 QDebug operator<<(QDebug dbg, const GraphPoint &point);
 
-
-class Graph : public QVector<GraphPoint>
-{
-public:
-	Graph() : QVector<GraphPoint>() {_time = true;}
-	void append(const GraphPoint &p)
-	{
-		if (std::isnan(p.t()))
-			_time = false;
-		QVector<GraphPoint>::append(p);
-	}
-
-	bool hasTime() const {return _time;}
-
-private:
-	bool _time;
-};
+typedef QVector<GraphPoint> Graph;
 
 #endif // GRAPH_H

src/graphitem.cpp

@@ -14,6 +14,14 @@ GraphItem::GraphItem(const Graph &graph, QGraphicsItem *parent)
 	_graph = graph;
 	_sx = 1.0; _sy = 1.0;
 
+	_time = true;
+	for (int i = 0; i < _graph.size(); i++) {
+		if (std::isnan(_graph.at(i).t())) {
+			_time = false;
+			break;
+		}
+	}
+
 	setZValue(1.0);
 
 	updatePath();
@@ -124,7 +132,7 @@ qreal GraphItem::distanceAtTime(qreal time)
 void GraphItem::emitSliderPositionChanged(qreal pos)
 {
 	if (_type == Time) {
-		if (_graph.hasTime()) {
+		if (_time) {
 			if (pos >= _graph.first().t() && pos <= _graph.last().t())
 				emit sliderPositionChanged(distanceAtTime(pos));
 			else
@@ -163,7 +171,7 @@ void GraphItem::updatePath()
 {
 	_path = QPainterPath();
 
-	if (_type == Time && !_graph.hasTime())
+	if (_type == Time && !_time)
 		return;
 
 	_path.moveTo(_graph.first().x(_type) * _sx, -_graph.first().y() * _sy);
@@ -173,7 +181,7 @@ void GraphItem::updatePath()
 
 void GraphItem::updateBounds()
 {
-	if (_type == Time && !_graph.hasTime()) {
+	if (_type == Time && !_time) {
 		_bounds = QRectF();
 		return;
 	}

src/graphitem.h

@@ -50,6 +50,8 @@ private:
 	QPainterPath _path;
 	QRectF _bounds;
 	qreal _sx, _sy;
+
+	bool _time;
 };
 
 #endif // GRAPHITEM_H

src/graphtab.h

@@ -4,6 +4,7 @@
 #include <QList>
 #include "graphview.h"
 #include "units.h"
+#include "timetype.h"
 
 class Data;
 class PathItem;
@@ -18,10 +19,11 @@ public:
 
 	virtual QString label() const = 0;
 	virtual void loadData(const Data &data, const QList<PathItem *> &paths) = 0;
-	virtual void clear() = 0;
-	virtual void setUnits(enum Units units) = 0;
-	virtual void showTracks(bool show) = 0;
-	virtual void showRoutes(bool show) = 0;
+	virtual void clear() {}
+	virtual void setUnits(enum Units units) {Q_UNUSED(units)}
+	virtual void setTimeType(enum TimeType type) {Q_UNUSED(type)}
+	virtual void showTracks(bool show) {Q_UNUSED(show)}
+	virtual void showRoutes(bool show) {Q_UNUSED(show)}
 };
 
 #endif // GRAPHTAB_H

src/graphview.cpp

@@ -3,12 +3,7 @@
 #include <QMouseEvent>
 #include <QPaintEngine>
 #include <QPaintDevice>
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-#include <QGLWidget>
-#else // QT 5
-#include <QOpenGLWidget>
-#endif // QT 5
-#include <QSysInfo>
+#include "opengl.h"
 #include "config.h"
 #include "axisitem.h"
 #include "slideritem.h"
@@ -26,9 +21,10 @@
 GraphView::GraphView(QWidget *parent)
 	: QGraphicsView(parent)
 {
-	_scene = new QGraphicsScene();
+	_scene = new QGraphicsScene(this);
 	setScene(_scene);
 
+	setBackgroundBrush(QBrush(Qt::white));
 	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
 	setRenderHint(QPainter::Antialiasing, true);
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -462,15 +458,8 @@ void GraphView::setGraphWidth(int width)
 
 void GraphView::useOpenGL(bool use)
 {
-	if (use) {
-#ifdef Q_OS_WIN32
-		if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-#endif // Q_OS_WIN32
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-		setViewport(new QGLWidget);
-#else // QT 5
-		setViewport(new QOpenGLWidget);
-#endif // QT 5
-	} else
+	if (use)
+		setViewport(new OPENGL_WIDGET);
+	else
 		setViewport(new QWidget);
 }

src/gui.cpp

@@ -21,13 +21,17 @@
 #include <QLocale>
 #include <QMimeData>
 #include <QUrl>
+#include <QPixmapCache>
 #include "config.h"
 #include "icons.h"
 #include "keys.h"
 #include "settings.h"
 #include "data.h"
+#include "ellipsoid.h"
+#include "datum.h"
 #include "map.h"
 #include "maplist.h"
+#include "emptymap.h"
 #include "elevationgraph.h"
 #include "speedgraph.h"
 #include "heartrategraph.h"
@@ -43,8 +47,9 @@
 #include "gui.h"
 
 
-GUI::GUI(QWidget *parent) : QMainWindow(parent)
+GUI::GUI()
 {
+	loadDatums();
 	loadMaps();
 	loadPOIs();
 
@@ -78,6 +83,7 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	_trackDistance = 0;
 	_routeDistance = 0;
 	_time = 0;
+	_movingTime = 0;
 
 	_sliderPos = 0;
 
@@ -114,12 +120,94 @@ void GUI::createBrowser()
 	_browser->setFilter(filter);
 }
 
+void GUI::loadDatums()
+{
+	QString ef, df;
+	bool ok = false;
+
+	if (QFile::exists(USER_ELLIPSOID_FILE))
+		ef = USER_ELLIPSOID_FILE;
+	else if (QFile::exists(GLOBAL_ELLIPSOID_FILE))
+		ef = GLOBAL_ELLIPSOID_FILE;
+	else
+		qWarning("No ellipsoids file found.");
+
+	if (QFile::exists(USER_DATUM_FILE))
+		df = USER_DATUM_FILE;
+	else if (QFile::exists(GLOBAL_DATUM_FILE))
+		df = GLOBAL_DATUM_FILE;
+	else
+		qWarning("No datums file found.");
+
+	if (!ef.isNull() && !df.isNull()) {
+		if (!Ellipsoid::loadList(ef)) {
+			if (Ellipsoid::errorLine())
+				qWarning("%s: parse error on line %d: %s", qPrintable(ef),
+				  Ellipsoid::errorLine(), qPrintable(Ellipsoid::errorString()));
+			else
+				qWarning("%s: %s", qPrintable(ef), qPrintable(
+				  Ellipsoid::errorString()));
+		} else {
+			if (!Datum::loadList(df)) {
+				if (Datum::errorLine())
+					qWarning("%s: parse error on line %d: %s", qPrintable(ef),
+					  Datum::errorLine(), qPrintable(Datum::errorString()));
+				else
+					qWarning("%s: %s", qPrintable(ef), qPrintable(
+					  Datum::errorString()));
+			} else
+				ok = true;
+		}
+	}
+
+	if (!ok)
+		qWarning("Maps based on a datum different from WGS84 won't work.");
+}
+
 void GUI::loadMaps()
 {
+	_ml = new MapList(this);
+
+	QString offline, online;
+
 	if (QFile::exists(USER_MAP_FILE))
-		_maps = MapList::load(this, USER_MAP_FILE);
+		online = USER_MAP_FILE;
+	else if (QFile::exists(GLOBAL_MAP_FILE))
+		online = GLOBAL_MAP_FILE;
+
+	if (!online.isNull() && !_ml->loadList(online))
+		qWarning("%s: %s", qPrintable(online), qPrintable(_ml->errorString()));
+
+
+	if (QFile::exists(USER_MAP_DIR))
+		offline = USER_MAP_DIR;
+	else if (QFile::exists(GLOBAL_MAP_DIR))
+		offline = GLOBAL_MAP_DIR;
+
+	if (!offline.isNull()) {
+		QDir md(offline);
+		QFileInfoList ml = md.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+		QStringList filters;
+		filters << "*.map" << "*.tba" << "*.tar";
+
+		for (int i = 0; i < ml.size(); i++) {
+			QDir dir(ml.at(i).absoluteFilePath());
+			QFileInfoList fl = dir.entryInfoList(filters, QDir::Files);
+
+			if (fl.isEmpty())
+				qWarning("%s: no map/atlas file found",
+				  qPrintable(ml.at(i).absoluteFilePath()));
+			else if (fl.size() > 1)
+				qWarning("%s: ambiguous directory content",
+				  qPrintable(ml.at(i).absoluteFilePath()));
 			else
-		_maps = MapList::load(this, GLOBAL_MAP_FILE);
+				if (!_ml->loadMap(fl.first().absoluteFilePath()))
+					qWarning("%s: %s", qPrintable(fl.first().absoluteFilePath()),
+					  qPrintable(_ml->errorString()));
+		}
+	}
+
+	_map = _ml->maps().isEmpty() ? new EmptyMap(this) : _ml->maps().first();
 }
 
 void GUI::loadPOIs()
@@ -135,39 +223,47 @@ void GUI::loadPOIs()
 	else
 		list = globalDir.entryInfoList(QStringList(), QDir::Files);
 
-	for (int i = 0; i < list.size(); ++i)
-		_poi->loadFile(list.at(i).absoluteFilePath());
+	for (int i = 0; i < list.size(); ++i) {
+		if (!_poi->loadFile(list.at(i).absoluteFilePath())) {
+			qWarning("Error loading POI file: %s: %s\n",
+			  qPrintable(list.at(i).fileName()),
+			  qPrintable(_poi->errorString()));
+			if (_poi->errorLine())
+				qWarning("Line: %d\n", _poi->errorLine());
+		}
+	}
 }
 
 void GUI::createMapActions()
 {
-	QActionGroup *ag = new QActionGroup(this);
-	ag->setExclusive(true);
+	_mapsSignalMapper = new QSignalMapper(this);
+	_mapsActionGroup = new QActionGroup(this);
+	_mapsActionGroup->setExclusive(true);
 
-	QSignalMapper *sm = new QSignalMapper(this);
-
-	for (int i = 0; i < _maps.count(); i++) {
-		QAction *a = new QAction(_maps.at(i)->name(), this);
+	for (int i = 0; i < _ml->maps().count(); i++) {
+		QAction *a = new QAction(_ml->maps().at(i)->name(), this);
 		a->setCheckable(true);
-		a->setActionGroup(ag);
+		a->setActionGroup(_mapsActionGroup);
 
-		sm->setMapping(a, i);
-		connect(a, SIGNAL(triggered()), sm, SLOT(map()));
+		_mapsSignalMapper->setMapping(a, i);
+		connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
 
 		_mapActions.append(a);
 	}
 
-	connect(sm, SIGNAL(mapped(int)), this, SLOT(mapChanged(int)));
+	connect(_mapsSignalMapper, SIGNAL(mapped(int)), this,
+	  SLOT(mapChanged(int)));
 }
 
 void GUI::createPOIFilesActions()
 {
-	_poiFilesSM = new QSignalMapper(this);
+	_poiFilesSignalMapper = new QSignalMapper(this);
 
 	for (int i = 0; i < _poi->files().count(); i++)
 		createPOIFileAction(i);
 
-	connect(_poiFilesSM, SIGNAL(mapped(int)), this, SLOT(poiFileChecked(int)));
+	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
+	  SLOT(poiFileChecked(int)));
 }
 
 QAction *GUI::createPOIFileAction(int index)
@@ -176,8 +272,8 @@ QAction *GUI::createPOIFileAction(int index)
 	  this);
 	a->setCheckable(true);
 
-	_poiFilesSM->setMapping(a, index);
-	connect(a, SIGNAL(triggered()), _poiFilesSM, SLOT(map()));
+	_poiFilesSignalMapper->setMapping(a, index);
+	connect(a, SIGNAL(triggered()), _poiFilesSignalMapper, SLOT(map()));
 
 	_poiFilesActions.append(a);
 
@@ -213,7 +309,7 @@ void GUI::createActions()
 
 	// File actions
 	_openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
-	  tr("Open"), this);
+	  tr("Open..."), this);
 	_openFileAction->setShortcut(OPEN_SHORTCUT);
 	connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile()));
 	addAction(_openFileAction);
@@ -243,7 +339,7 @@ void GUI::createActions()
 
 	// POI actions
 	_openPOIAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
-	  tr("Load POI file"), this);
+	  tr("Load POI file..."), this);
 	connect(_openPOIAction, SIGNAL(triggered()), this, SLOT(openPOIFile()));
 	_closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
 	  tr("Close POI files"), this);
@@ -270,17 +366,16 @@ void GUI::createActions()
 	  this);
 	_showMapAction->setCheckable(true);
 	_showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
-	connect(_showMapAction, SIGNAL(triggered(bool)), this, SLOT(showMap(bool)));
+	connect(_showMapAction, SIGNAL(triggered(bool)), _pathView,
+	  SLOT(showMap(bool)));
 	addAction(_showMapAction);
+	_loadMapAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
+	  tr("Load map..."), this);
+	connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
 	_clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
 	connect(_clearMapCacheAction, SIGNAL(triggered()), this,
 	  SLOT(clearMapCache()));
-	if (_maps.empty()) {
-		_showMapAction->setEnabled(false);
-		_clearMapCacheAction->setEnabled(false);
-	} else {
 	createMapActions();
-
 	_nextMapAction = new QAction(tr("Next map"), this);
 	_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
 	connect(_nextMapAction, SIGNAL(triggered()), this, SLOT(nextMap()));
@@ -289,6 +384,9 @@ 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);
 	}
 
 	// Data actions
@@ -349,6 +447,18 @@ void GUI::createActions()
 	  SLOT(showToolbars(bool)));
 	ag = new QActionGroup(this);
 	ag->setExclusive(true);
+	_totalTimeAction = new QAction(tr("Total time"), this);
+	_totalTimeAction->setCheckable(true);
+	_totalTimeAction->setActionGroup(ag);
+	connect(_totalTimeAction, SIGNAL(triggered()), this,
+	  SLOT(setTotalTime()));
+	_movingTimeAction = new QAction(tr("Moving time"), this);
+	_movingTimeAction->setCheckable(true);
+	_movingTimeAction->setActionGroup(ag);
+	connect(_movingTimeAction, SIGNAL(triggered()), this,
+	  SLOT(setMovingTime()));
+	ag = new QActionGroup(this);
+	ag->setExclusive(true);
 	_metricUnitsAction = new QAction(tr("Metric"), this);
 	_metricUnitsAction->setCheckable(true);
 	_metricUnitsAction->setActionGroup(ag);
@@ -403,12 +513,13 @@ void GUI::createMenus()
 	fileMenu->addAction(_exitAction);
 #endif // Q_OS_MAC
 
-	QMenu *mapMenu = menuBar()->addMenu(tr("Map"));
-	mapMenu->addActions(_mapActions);
-	mapMenu->addSeparator();
-	mapMenu->addAction(_clearMapCacheAction);
-	mapMenu->addSeparator();
-	mapMenu->addAction(_showMapAction);
+	_mapMenu = menuBar()->addMenu(tr("Map"));
+	_mapMenu->addActions(_mapActions);
+	_mapsEnd = _mapMenu->addSeparator();
+	_mapMenu->addAction(_loadMapAction);
+	_mapMenu->addAction(_clearMapCacheAction);
+	_mapMenu->addSeparator();
+	_mapMenu->addAction(_showMapAction);
 
 	QMenu *graphMenu = menuBar()->addMenu(tr("Graph"));
 	graphMenu->addAction(_distanceGraphAction);
@@ -440,6 +551,9 @@ void GUI::createMenus()
 	dataMenu->addAction(_showWaypointsAction);
 
 	QMenu *settingsMenu = menuBar()->addMenu(tr("Settings"));
+	QMenu *timeMenu = settingsMenu->addMenu(tr("Time"));
+	timeMenu->addAction(_totalTimeAction);
+	timeMenu->addAction(_movingTimeAction);
 	QMenu *unitsMenu = settingsMenu->addMenu(tr("Units"));
 	unitsMenu->addAction(_metricUnitsAction);
 	unitsMenu->addAction(_imperialUnitsAction);
@@ -482,15 +596,13 @@ void GUI::createToolBars()
 
 void GUI::createPathView()
 {
-	_pathView = new PathView(this);
+	_pathView = new PathView(_map, _poi, this);
 	_pathView->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
 	  QSizePolicy::Expanding));
 	_pathView->setMinimumHeight(200);
 #ifdef Q_OS_WIN32
 	_pathView->setFrameShape(QFrame::NoFrame);
 #endif // Q_OS_WIN32
-
-	_pathView->setPOI(_poi);
 }
 
 void GUI::createGraphTabs()
@@ -537,15 +649,13 @@ void GUI::about()
 	QMessageBox msgBox(this);
 
 	msgBox.setWindowTitle(tr("About GPXSee"));
-	msgBox.setText(QString("<h2>") + QString(APP_NAME) + QString("</h2><p>")
-	  + QString("<p>") + tr("Version ") + APP_VERSION + QString(" (")
-	  + CPU_ARCH + QString(", Qt ") + QString(QT_VERSION_STR)
-	  + QString(")</p>"));
-	msgBox.setInformativeText(QString("<table width=\"300\"><tr><td>")
+	msgBox.setText("<h2>" + QString(APP_NAME) + "</h2><p><p>" + tr("Version ")
+	  + APP_VERSION + " (" + CPU_ARCH + ", Qt " + QT_VERSION_STR + ")</p>");
+	msgBox.setInformativeText("<table width=\"300\"><tr><td>"
 	  + tr("GPXSee is distributed under the terms of the GNU General Public "
 	  "License version 3. For more info about GPXSee visit the project "
-	  "homepage at ") + QString("<a href=\"" APP_HOMEPAGE "\">" APP_HOMEPAGE
-	  "</a>.</td></tr></table>"));
+	  "homepage at ") + "<a href=\"" + APP_HOMEPAGE + "\">" + APP_HOMEPAGE
+	  + "</a>.</td></tr></table>");
 
 	QIcon icon = msgBox.windowIcon();
 	QSize size = icon.actualSize(QSize(64, 64));
@@ -559,20 +669,26 @@ void GUI::keys()
 	QMessageBox msgBox(this);
 
 	msgBox.setWindowTitle(tr("Keyboard controls"));
-	msgBox.setText(QString("<h3>") + tr("Keyboard controls") + QString("</h3>"));
+	msgBox.setText("<h3>" + tr("Keyboard controls") + "</h3>");
 	msgBox.setInformativeText(
-	  QString("<div><table width=\"300\"><tr><td>") + tr("Next file")
-	  + QString("</td><td><i>SPACE</i></td></tr><tr><td>") + tr("Previous file")
-	  + QString("</td><td><i>BACKSPACE</i></td></tr><tr><td>")
-	  + tr("First file") + QString("</td><td><i>HOME</i></td></tr><tr><td>")
-	  + tr("Last file") + QString("</td><td><i>END</i></td></tr><tr><td>")
-	  + tr("Append modifier") + QString("</td><td><i>SHIFT</i></td></tr>"
-	  "<tr><td></td><td></td></tr><tr><td>")
-	  + tr("Next map") + QString("</td><td><i>")
-	  + _nextMapAction->shortcut().toString() + QString("</i></td></tr><tr><td>")
-	  + tr("Previous map") + QString("</td><td><i>")
-	  + _prevMapAction->shortcut().toString() + QString("</i></td></tr>"
-	  "</table></div>"));
+	  "<style>td {padding-right: 1.5em;}</style><div><table><tr><td>"
+	  + tr("Next file") + "</td><td><i>" + QKeySequence(NEXT_KEY).toString()
+	  + "</i></td></tr><tr><td>" + tr("Previous file")
+	  + "</td><td><i>" + QKeySequence(PREV_KEY).toString()
+	  + "</i></td></tr><tr><td>" + tr("First file") + "</td><td><i>"
+	  + QKeySequence(FIRST_KEY).toString() + "</i></td></tr><tr><td>"
+	  + tr("Last file") + "</td><td><i>" + QKeySequence(LAST_KEY).toString()
+	  + "</i></td></tr><tr><td>" + tr("Append file")
+	  + "</td><td><i>" + QKeySequence(MODIFIER).toString() + tr("Next/Previous")
+	  + "</i></td></tr><tr><td></td><td></td></tr><tr><td>" + tr("Next map")
+	  + "</td><td><i>" + NEXT_MAP_SHORTCUT.toString() + "</i></td></tr><tr><td>"
+	  + tr("Previous map") + "</td><td><i>" + PREV_MAP_SHORTCUT.toString()
+	  + "</i></td></tr><tr><td></td><td></td></tr><tr><td>" + tr("Zoom in")
+	  + "</td><td><i>" + QKeySequence(ZOOM_IN).toString()
+	  + "</i></td></tr><tr><td>" + tr("Zoom out") + "</td><td><i>"
+	  + QKeySequence(ZOOM_OUT).toString() + "</i></td></tr><tr><td>"
+	  + tr("Digital zoom") + "</td><td><i>" + QKeySequence(MODIFIER).toString()
+	  + tr("Zoom") + "</i></td></tr></table></div>");
 
 	msgBox.exec();
 }
@@ -582,23 +698,31 @@ void GUI::dataSources()
 	QMessageBox msgBox(this);
 
 	msgBox.setWindowTitle(tr("Data sources"));
-	msgBox.setText(QString("<h3>") + tr("Data sources") + QString("</h3>"));
+	msgBox.setText("<h3>" + tr("Data sources") + "</h3>");
 	msgBox.setInformativeText(
-	  QString("<h4>") + tr("Map sources") + QString("</h4><p>")
-	  + tr("Map (tiles) source URLs are read on program startup from the "
+	  "<h4>" + tr("Online maps") + "</h4><p>"
+	  + tr("Online map URLs are read on program startup from the "
 		"following file:")
-		+ QString("</p><p><code>") + USER_MAP_FILE + QString("</code></p><p>")
+	  + "</p><p><code>" + USER_MAP_FILE + "</code></p><p>"
 	  + tr("The file format is one map entry per line, consisting of the map "
 		"name and tiles URL delimited by a TAB character. The tile X and Y "
 		"coordinates are replaced with $x and $y in the URL and the zoom "
 		"level is replaced with $z. An example map file could look like:")
-		+ QString("</p><p><code>Map1	http://tile.server.com/map/$z/$x/$y.png"
-		  "<br/>Map2	http://mapserver.org/map/$z-$x-$y</code></p>")
+	  + "</p><p><code>Map1	http://tile.server.com/map/$z/$x/$y.png"
+		  "<br/>Map2	http://mapserver.org/map/$z-$x-$y</code></p>"
 
-	  + QString("<h4>") + tr("POIs") + QString("</h4><p>")
+	  + "<h4>" + tr("Offline maps") + "</h4><p>"
+	  + tr("Offline maps are loaded on program startup from the following "
+		"directory:")
+	  + "</p><p><code>" + USER_MAP_DIR + "</code></p><p>"
+	  + tr("The expected structure is one map/atlas in a separate subdirectory."
+		" Supported map formats are OziExplorer maps and TrekBuddy maps/atlases"
+		" (tared and non-tared).") + "</p>"
+
+	  + "<h4>" + tr("POIs") + "</h4><p>"
 	  + tr("To make GPXSee load a POI file automatically on startup, add "
 		"the file to the following directory:")
-		+ QString("</p><p><code>") + USER_POI_DIR + QString("</code></p>")
+		+ "</p><p><code>" + USER_POI_DIR + "</code></p>"
 	);
 
 	msgBox.exec();
@@ -654,6 +778,7 @@ bool GUI::loadFile(const QString &fileName)
 		for (int i = 0; i < data.tracks().count(); i++) {
 			_trackDistance += data.tracks().at(i)->distance();
 			_time += data.tracks().at(i)->time();
+			_movingTime += data.tracks().at(i)->movingTime();
 			const QDate &date = data.tracks().at(i)->date().date();
 			if (_dateRange.first.isNull() || _dateRange.first > date)
 				_dateRange.first = date;
@@ -668,6 +793,14 @@ bool GUI::loadFile(const QString &fileName)
 
 		_waypointCount += data.waypoints().count();
 
+		if (_pathName.isNull()) {
+			if (data.tracks().count() == 1 && !data.routes().count())
+				_pathName = data.tracks().first()->name();
+			else if (data.routes().count() == 1 && !data.tracks().count())
+				_pathName = data.routes().first()->name();
+		} else
+			_pathName = QString();
+
 		return true;
 	} else {
 		updateNavigationActions();
@@ -742,6 +875,7 @@ void GUI::printFile()
 void GUI::openOptions()
 {
 	Options options(_options);
+	bool reload = false;
 
 	OptionsDialog dialog(&options, this);
 	if (dialog.exec() != QDialog::Accepted)
@@ -771,6 +905,39 @@ void GUI::openOptions()
 			_tabs.at(i)->setRenderHint(QPainter::Antialiasing,
 			  options.graphAntiAliasing);
 
+	if (options.elevationFilter != _options.elevationFilter) {
+		Track::setElevationFilter(options.elevationFilter);
+		reload = true;
+	}
+	if (options.speedFilter != _options.speedFilter) {
+		Track::setSpeedFilter(options.speedFilter);
+		reload = true;
+	}
+	if (options.heartRateFilter != _options.heartRateFilter) {
+		Track::setHeartRateFilter(options.heartRateFilter);
+		reload = true;
+	}
+	if (options.cadenceFilter != _options.cadenceFilter) {
+		Track::setCadenceFilter(options.cadenceFilter);
+		reload = true;
+	}
+	if (options.powerFilter != _options.powerFilter) {
+		Track::setPowerFilter(options.powerFilter);
+		reload = true;
+	}
+	if (options.outlierEliminate != _options.outlierEliminate) {
+		Track::setOutlierElimination(options.outlierEliminate);
+		reload = true;
+	}
+	if (options.pauseSpeed != _options.pauseSpeed) {
+		Track::setPauseSpeed(options.pauseSpeed);
+		reload = true;
+	}
+	if (options.pauseInterval != _options.pauseInterval) {
+		Track::setPauseInterval(options.pauseInterval);
+		reload = true;
+	}
+
 	if (options.poiRadius != _options.poiRadius)
 		_poi->setRadius(options.poiRadius);
 
@@ -779,6 +946,11 @@ void GUI::openOptions()
 		for (int i = 0; i < _tabs.count(); i++)
 			_tabs.at(i)->useOpenGL(options.useOpenGL);
 	}
+	if (options.pixmapCache != _options.pixmapCache)
+		QPixmapCache::setCacheLimit(options.pixmapCache * 1024);
+
+	if (reload)
+		reloadFile();
 
 	_options = options;
 }
@@ -807,11 +979,23 @@ void GUI::plot(QPrinter *printer)
 	QPainter p(printer);
 	TrackInfo info;
 	qreal ih, gh, mh, ratio;
-	Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
 	qreal d = distance();
 	qreal t = time();
+	qreal tm = movingTime();
 
-	if (_dateRange.first.isValid()) {
+	if (!_pathName.isNull() && _options.printName)
+		info.insert(tr("Name"), _pathName);
+
+	if (_options.printItemCount) {
+		if (_trackCount > 1)
+			info.insert(tr("Tracks"), QString::number(_trackCount));
+		if (_routeCount > 1)
+			info.insert(tr("Routes"), QString::number(_routeCount));
+		if (_waypointCount > 2)
+			info.insert(tr("Waypoints"), QString::number(_waypointCount));
+	}
+
+	if (_dateRange.first.isValid() && _options.printDate) {
 		if (_dateRange.first == _dateRange.second) {
 			QString format = QLocale::system().dateFormat(QLocale::LongFormat);
 			info.insert(tr("Date"), _dateRange.first.toString(format));
@@ -823,17 +1007,12 @@ void GUI::plot(QPrinter *printer)
 		}
 	}
 
-	if (_trackCount > 1)
-		info.insert(tr("Tracks"), QString::number(_trackCount));
-	if (_routeCount > 1)
-		info.insert(tr("Routes"), QString::number(_routeCount));
-	if (_waypointCount > 2)
-		info.insert(tr("Waypoints"), QString::number(_waypointCount));
-
-	if (d > 0)
-		info.insert(tr("Distance"), Format::distance(d, units));
-	if (t > 0)
+	if (d > 0 && _options.printDistance)
+		info.insert(tr("Distance"), Format::distance(d, units()));
+	if (t > 0 && _options.printTime)
 		info.insert(tr("Time"), Format::timeSpan(t));
+	if (tm > 0 && _options.printMovingTime)
+		info.insert(tr("Moving time"), Format::timeSpan(tm));
 
 
 	ratio = p.paintEngine()->paintDevice()->logicalDpiX() / SCREEN_DPI;
@@ -845,7 +1024,7 @@ void GUI::plot(QPrinter *printer)
 		mh = ih / 2;
 		info.plot(&p, QRectF(0, 0, printer->width(), ih));
 	}
-	if (_graphTabWidget->isVisible()) {
+	if (_graphTabWidget->isVisible() && !_options.separateGraphPage) {
 		qreal r = (((qreal)(printer)->width()) / (qreal)(printer->height()));
 		gh = (printer->width() > printer->height())
 		  ? 0.15 * r * (printer->height() - ih - 2*mh)
@@ -857,6 +1036,27 @@ void GUI::plot(QPrinter *printer)
 		gh = 0;
 	_pathView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
 	  - (ih + 2*mh + gh)));
+
+	if (_graphTabWidget->isVisible() && _options.separateGraphPage) {
+		printer->newPage();
+
+		int cnt = 0;
+		for (int i = 0; i < _tabs.size(); i++)
+			if (_tabs.at(i)->count())
+				cnt++;
+
+		qreal sp = ratio * 20;
+		gh = qMin((printer->height() - ((cnt - 1) * sp))/(qreal)cnt,
+		  0.20 * printer->height());
+
+		qreal y = 0;
+		for (int i = 0; i < _tabs.size(); i++) {
+			if (_tabs.at(i)->count()) {
+				_tabs.at(i)->plot(&p,  QRectF(0, y, printer->width(), gh));
+				y += gh + sp;
+			}
+		}
+	}
 }
 
 void GUI::reloadFile()
@@ -867,7 +1067,9 @@ void GUI::reloadFile()
 	_trackDistance = 0;
 	_routeDistance = 0;
 	_time = 0;
+	_movingTime = 0;
 	_dateRange = DateRange(QDate(), QDate());
+	_pathName = QString();
 
 	for (int i = 0; i < _tabs.count(); i++)
 		_tabs.at(i)->clear();
@@ -900,7 +1102,9 @@ void GUI::closeFiles()
 	_trackDistance = 0;
 	_routeDistance = 0;
 	_time = 0;
+	_movingTime = 0;
 	_dateRange = DateRange(QDate(), QDate());
+	_pathName = QString();
 
 	_sliderPos = 0;
 
@@ -922,14 +1126,6 @@ void GUI::closeAll()
 	updatePathView();
 }
 
-void GUI::showMap(bool show)
-{
-	if (show)
-		_pathView->setMap(_currentMap);
-	else
-		_pathView->setMap(0);
-}
-
 void GUI::showGraphs(bool show)
 {
 	_graphTabWidget->setHidden(!show);
@@ -1005,66 +1201,99 @@ void GUI::showGraphGrids(bool show)
 		_tabs.at(i)->showGrid(show);
 }
 
+void GUI::loadMap()
+{
+	QString fileName = QFileDialog::getOpenFileName(this, tr("Open map file"),
+	  QString(), tr("Map files (*.map *.tba *.tar)"));
+
+	if (fileName.isEmpty())
+		return;
+
+	if (_ml->loadMap(fileName)) {
+		QAction *a = new QAction(_ml->maps().last()->name(), this);
+		a->setCheckable(true);
+		a->setActionGroup(_mapsActionGroup);
+		_mapsSignalMapper->setMapping(a, _ml->maps().size() - 1);
+		connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
+		_mapActions.append(a);
+		_mapMenu->insertAction(_mapsEnd, a);
+		_showMapAction->setEnabled(true);
+		_clearMapCacheAction->setEnabled(true);
+		a->activate(QAction::Trigger);
+	} else {
+		QString error = tr("Error loading map:") + "\n\n"
+		  + fileName + "\n\n" + _ml->errorString();
+		QMessageBox::critical(this, APP_NAME, error);
+	}
+}
+
 void GUI::clearMapCache()
 {
-	_currentMap->clearCache();
+	_map->clearCache();
 	_pathView->redraw();
 }
 
 void GUI::updateStatusBarInfo()
 {
 	if (_files.count() == 0)
-		_fileNameLabel->setText(tr("No GPX files loaded"));
+		_fileNameLabel->setText(tr("No files loaded"));
 	else if (_files.count() == 1)
 		_fileNameLabel->setText(_files.at(0));
 	else
 		_fileNameLabel->setText(tr("%n files", "", _files.count()));
 
-	qreal d = distance();
-	Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
-	if (d > 0)
-		_distanceLabel->setText(Format::distance(distance(), units));
+	if (distance() > 0)
+		_distanceLabel->setText(Format::distance(distance(), units()));
 	else
 		_distanceLabel->clear();
 
-	qreal t = time();
-	if (t > 0)
+	if (time() > 0) {
+		if (_movingTimeAction->isChecked()) {
+			_timeLabel->setText(Format::timeSpan(movingTime())
+			  + "<sub>M</sub>");
+			_timeLabel->setToolTip(Format::timeSpan(time()));
+		} else {
 			_timeLabel->setText(Format::timeSpan(time()));
-	else
+			_timeLabel->setToolTip(Format::timeSpan(movingTime())
+			  + "<sub>M</sub>");
+		}
+	} else {
 		_timeLabel->clear();
+		_timeLabel->setToolTip(QString());
+	}
 }
 
 void GUI::updateWindowTitle()
 {
 	if (_files.count() == 1)
-		setWindowTitle(QFileInfo(_files.at(0)).fileName()
-		  + QString(" - " APP_NAME));
+		setWindowTitle(QFileInfo(_files.at(0)).fileName() + " - " + APP_NAME);
 	else
 		setWindowTitle(APP_NAME);
 }
 
 void GUI::mapChanged(int index)
 {
-	_currentMap = _maps.at(index);
-
-	if (_showMapAction->isChecked())
-		_pathView->setMap(_currentMap);
+	_map = _ml->maps().at(index);
+	_pathView->setMap(_map);
 }
 
 void GUI::nextMap()
 {
-	if (_maps.count() < 2)
+	if (_ml->maps().count() < 2)
 		return;
-	int next = (_maps.indexOf(_currentMap) + 1) % _maps.count();
+
+	int next = (_ml->maps().indexOf(_map) + 1) % _ml->maps().count();
 	_mapActions.at(next)->setChecked(true);
 	mapChanged(next);
 }
 
 void GUI::prevMap()
 {
-	if (_maps.count() < 2)
+	if (_ml->maps().count() < 2)
 		return;
-	int prev = (_maps.indexOf(_currentMap) + _maps.count() - 1) % _maps.count();
+
+	int prev = (_ml->maps().indexOf(_map) + _ml->maps().count() - 1)
+	  % _ml->maps().count();
 	_mapActions.at(prev)->setChecked(true);
 	mapChanged(prev);
 }
@@ -1141,6 +1370,14 @@ void GUI::updatePathView()
 	  + _pathView->waypointCount()));
 }
 
+void GUI::setTimeType(TimeType type)
+{
+	for (int i = 0; i <_tabs.count(); i++)
+		_tabs.at(i)->setTimeType(type);
+
+	updateStatusBarInfo();
+}
+
 void GUI::setUnits(Units units)
 {
 	_export.units = units;
@@ -1224,6 +1461,7 @@ void GUI::keyPressEvent(QKeyEvent *event)
 			if (_fullscreenAction->isChecked()) {
 				_fullscreenAction->setChecked(false);
 				showFullscreen(false);
+				return;
 			}
 			break;
 	}
@@ -1232,7 +1470,10 @@ void GUI::keyPressEvent(QKeyEvent *event)
 		if (!(event->modifiers() & MODIFIER))
 			closeFiles();
 		openFile(file);
+		return;
 	}
+
+	QMainWindow::keyPressEvent(event);
 }
 
 void GUI::closeEvent(QCloseEvent *event)
@@ -1276,6 +1517,10 @@ void GUI::writeSettings()
 	settings.endGroup();
 
 	settings.beginGroup(SETTINGS_SETTINGS_GROUP);
+	if ((_movingTimeAction->isChecked() ? Moving : Total) !=
+	  TIME_TYPE_DEFAULT)
+		settings.setValue(TIME_TYPE_SETTING, _movingTimeAction->isChecked()
+	  ? Moving : Total);
 	if ((_imperialUnitsAction->isChecked() ? Imperial : Metric) !=
 	  UNITS_DEFAULT)
 		settings.setValue(UNITS_SETTING, _imperialUnitsAction->isChecked()
@@ -1286,8 +1531,7 @@ void GUI::writeSettings()
 	settings.endGroup();
 
 	settings.beginGroup(MAP_SETTINGS_GROUP);
-	if (_currentMap)
-		settings.setValue(CURRENT_MAP_SETTING, _currentMap->name());
+	settings.setValue(CURRENT_MAP_SETTING, _map->name());
 	if (_showMapAction->isChecked() != SHOW_MAP_DEFAULT)
 		settings.setValue(SHOW_MAP_SETTING, _showMapAction->isChecked());
 	settings.endGroup();
@@ -1374,10 +1618,43 @@ void GUI::writeSettings()
 		settings.setValue(PATH_AA_SETTING, _options.pathAntiAliasing);
 	if (_options.graphAntiAliasing != GRAPH_AA_DEFAULT)
 		settings.setValue(GRAPH_AA_SETTING, _options.graphAntiAliasing);
+	if (_options.elevationFilter != ELEVATION_FILTER_DEFAULT)
+		settings.setValue(ELEVATION_FILTER_SETTING, _options.elevationFilter);
+	if (_options.speedFilter != SPEED_FILTER_DEFAULT)
+		settings.setValue(SPEED_FILTER_SETTING, _options.speedFilter);
+	if (_options.heartRateFilter != HEARTRATE_FILTER_DEFAULT)
+		settings.setValue(HEARTRATE_FILTER_SETTING, _options.heartRateFilter);
+	if (_options.cadenceFilter != CADENCE_FILTER_DEFAULT)
+		settings.setValue(CADENCE_FILTER_SETTING, _options.cadenceFilter);
+	if (_options.powerFilter != POWER_FILTER_DEFAULT)
+		settings.setValue(POWER_FILTER_SETTING, _options.powerFilter);
+	if (_options.outlierEliminate != OUTLIER_ELIMINATE_DEFAULT)
+		settings.setValue(OUTLIER_ELIMINATE_SETTING, _options.outlierEliminate);
+	if (_options.pauseSpeed != PAUSE_SPEED_DEFAULT)
+		settings.setValue(PAUSE_SPEED_SETTING, _options.pauseSpeed);
+	if (_options.pauseInterval != PAUSE_INTERVAL_DEFAULT)
+		settings.setValue(PAUSE_INTERVAL_SETTING, _options.pauseInterval);
 	if (_options.poiRadius != POI_RADIUS_DEFAULT)
 		settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
 	if (_options.useOpenGL != USE_OPENGL_DEFAULT)
 		settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
+	if (_options.pixmapCache != PIXMAP_CACHE_DEFAULT)
+		settings.setValue(PIXMAP_CACHE_SETTING, _options.pixmapCache);
+	if (_options.printName != PRINT_NAME_DEFAULT)
+		settings.setValue(PRINT_NAME_SETTING, _options.printName);
+	if (_options.printDate != PRINT_DATE_DEFAULT)
+		settings.setValue(PRINT_DATE_SETTING, _options.printDate);
+	if (_options.printDistance != PRINT_DISTANCE_DEFAULT)
+		settings.setValue(PRINT_DISTANCE_SETTING, _options.printDistance);
+	if (_options.printTime != PRINT_TIME_DEFAULT)
+		settings.setValue(PRINT_TIME_SETTING, _options.printTime);
+	if (_options.printMovingTime != PRINT_MOVING_TIME_DEFAULT)
+		settings.setValue(PRINT_MOVING_TIME_SETTING, _options.printMovingTime);
+	if (_options.printItemCount != PRINT_ITEM_COUNT_DEFAULT)
+		settings.setValue(PRINT_ITEM_COUNT_SETTING, _options.printItemCount);
+	if (_options.separateGraphPage != SEPARATE_GRAPH_PAGE_DEFAULT)
+		settings.setValue(SEPARATE_GRAPH_PAGE_SETTING,
+		  _options.separateGraphPage);
 	settings.endGroup();
 }
 
@@ -1391,6 +1668,14 @@ void GUI::readSettings()
 	settings.endGroup();
 
 	settings.beginGroup(SETTINGS_SETTINGS_GROUP);
+	if (settings.value(TIME_TYPE_SETTING, TIME_TYPE_DEFAULT).toInt()
+	  == Moving) {
+		setTimeType(Moving);
+		_movingTimeAction->setChecked(true);
+	} else {
+		setTimeType(Total);
+		_totalTimeAction->setChecked(true);
+	}
 	if (settings.value(UNITS_SETTING, UNITS_DEFAULT).toInt() == Imperial) {
 		setUnits(Imperial);
 		_imperialUnitsAction->setChecked(true);
@@ -1407,14 +1692,12 @@ void GUI::readSettings()
 	settings.beginGroup(MAP_SETTINGS_GROUP);
 	if (settings.value(SHOW_MAP_SETTING, SHOW_MAP_DEFAULT).toBool())
 		_showMapAction->setChecked(true);
-	if (_maps.count()) {
+	if (_ml->maps().count()) {
 		int index = mapIndex(settings.value(CURRENT_MAP_SETTING).toString());
 		_mapActions.at(index)->setChecked(true);
-		_currentMap = _maps.at(index);
-		if (_showMapAction->isChecked())
-			_pathView->setMap(_currentMap);
-	} else
-		_currentMap = 0;
+		_map = _ml->maps().at(index);
+		_pathView->setMap(_map);
+	}
 	settings.endGroup();
 
 	settings.beginGroup(GRAPH_SETTINGS_GROUP);
@@ -1530,10 +1813,42 @@ void GUI::readSettings()
 	  GRAPH_WIDTH_DEFAULT).toInt();
 	_options.graphAntiAliasing = settings.value(GRAPH_AA_SETTING,
 	  GRAPH_AA_DEFAULT).toBool();
+	_options.elevationFilter = settings.value(ELEVATION_FILTER_SETTING,
+	  ELEVATION_FILTER_DEFAULT).toInt();
+	_options.speedFilter = settings.value(SPEED_FILTER_SETTING,
+	  SPEED_FILTER_DEFAULT).toInt();
+	_options.heartRateFilter = settings.value(HEARTRATE_FILTER_SETTING,
+	  HEARTRATE_FILTER_DEFAULT).toInt();
+	_options.cadenceFilter = settings.value(CADENCE_FILTER_SETTING,
+	  CADENCE_FILTER_DEFAULT).toInt();
+	_options.powerFilter = settings.value(POWER_FILTER_SETTING,
+	  POWER_FILTER_DEFAULT).toInt();
+	_options.outlierEliminate = settings.value(OUTLIER_ELIMINATE_SETTING,
+	  OUTLIER_ELIMINATE_DEFAULT).toBool();
+	_options.pauseSpeed = settings.value(PAUSE_SPEED_SETTING,
+	  PAUSE_SPEED_DEFAULT).toFloat();
+	_options.pauseInterval = settings.value(PAUSE_INTERVAL_SETTING,
+	  PAUSE_INTERVAL_DEFAULT).toInt();
 	_options.poiRadius = settings.value(POI_RADIUS_SETTING, POI_RADIUS_DEFAULT)
 	  .toInt();
 	_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
 	  .toBool();
+	_options.pixmapCache = settings.value(PIXMAP_CACHE_SETTING,
+	  PIXMAP_CACHE_DEFAULT).toInt();
+	_options.printName = settings.value(PRINT_NAME_SETTING, PRINT_NAME_DEFAULT)
+	  .toBool();
+	_options.printDate = settings.value(PRINT_DATE_SETTING, PRINT_DATE_DEFAULT)
+	  .toBool();
+	_options.printDistance = settings.value(PRINT_DISTANCE_SETTING,
+	  PRINT_DISTANCE_DEFAULT).toBool();
+	_options.printTime = settings.value(PRINT_TIME_SETTING, PRINT_TIME_DEFAULT)
+	  .toBool();
+	_options.printMovingTime = settings.value(PRINT_MOVING_TIME_SETTING,
+	  PRINT_MOVING_TIME_DEFAULT).toBool();
+	_options.printItemCount = settings.value(PRINT_ITEM_COUNT_SETTING,
+	  PRINT_ITEM_COUNT_DEFAULT).toBool();
+	_options.separateGraphPage = settings.value(SEPARATE_GRAPH_PAGE_SETTING,
+	  SEPARATE_GRAPH_PAGE_DEFAULT).toBool();
 
 	_pathView->setPalette(_options.palette);
 	_pathView->setTrackWidth(_options.trackWidth);
@@ -1553,20 +1868,36 @@ void GUI::readSettings()
 			_tabs.at(i)->useOpenGL(true);
 	}
 
+	Track::setElevationFilter(_options.elevationFilter);
+	Track::setSpeedFilter(_options.speedFilter);
+	Track::setHeartRateFilter(_options.heartRateFilter);
+	Track::setCadenceFilter(_options.cadenceFilter);
+	Track::setPowerFilter(_options.powerFilter);
+	Track::setOutlierElimination(_options.outlierEliminate);
+	Track::setPauseSpeed(_options.pauseSpeed);
+	Track::setPauseInterval(_options.pauseInterval);
+
 	_poi->setRadius(_options.poiRadius);
 
+	QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);
+
 	settings.endGroup();
 }
 
 int GUI::mapIndex(const QString &name)
 {
-	for (int i = 0; i < _maps.count(); i++)
-		if (_maps.at(i)->name() == name)
+	for (int i = 0; i < _ml->maps().count(); i++)
+		if (_ml->maps().at(i)->name() == name)
 			return i;
 
 	return 0;
 }
 
+Units GUI::units() const
+{
+	return _imperialUnitsAction->isChecked() ? Imperial : Metric;
+}
+
 qreal GUI::distance() const
 {
 	qreal dist = 0;
@@ -1583,3 +1914,8 @@ qreal GUI::time() const
 {
 	return (_showTracksAction->isChecked()) ? _time : 0;
 }
+
+qreal GUI::movingTime() const
+{
+	return (_showTracksAction->isChecked()) ? _movingTime : 0;
+}

src/gui.h

@@ -7,11 +7,13 @@
 #include <QDate>
 #include <QPrinter>
 #include "units.h"
+#include "timetype.h"
 #include "graph.h"
 #include "poi.h"
 #include "exportdialog.h"
 #include "optionsdialog.h"
 
+
 class QMenu;
 class QToolBar;
 class QTabWidget;
@@ -24,13 +26,14 @@ class FileBrowser;
 class GraphTab;
 class PathView;
 class Map;
+class MapList;
 
 class GUI : public QMainWindow
 {
 	Q_OBJECT
 
 public:
-	GUI(QWidget *parent = 0);
+	GUI();
 	~GUI();
 
 	bool openFile(const QString &fileName);
@@ -46,13 +49,13 @@ private slots:
 	void reloadFile();
 	void openPOIFile();
 	void closePOIFiles();
-	void showMap(bool show);
 	void showGraphs(bool show);
 	void showGraphGrids(bool show);
 	void showToolbars(bool show);
 	void showFullscreen(bool show);
 	void showTracks(bool show);
 	void showRoutes(bool show);
+	void loadMap();
 	void clearMapCache();
 	void nextMap();
 	void prevMap();
@@ -67,6 +70,8 @@ private slots:
 	void last();
 	void first();
 
+	void setTotalTime() {setTimeType(Total);}
+	void setMovingTime() {setTimeType(Moving);}
 	void setMetricUnits() {setUnits(Metric);}
 	void setImperialUnits() {setUnits(Imperial);}
 	void setDistanceGraph() {setGraphType(Distance);}
@@ -77,6 +82,7 @@ private slots:
 private:
 	typedef QPair<QDate, QDate> DateRange;
 
+	void loadDatums();
 	void loadMaps();
 	void loadPOIs();
 	void closeFiles();
@@ -102,11 +108,15 @@ private:
 	void updateGraphTabs();
 	void updatePathView();
 
+	TimeType timeType() const;
+	Units units() const;
+	void setTimeType(TimeType type);
 	void setUnits(Units units);
 	void setGraphType(GraphType type);
 
 	qreal distance() const;
 	qreal time() const;
+	qreal movingTime() const;
 	int mapIndex(const QString &name);
 	void readSettings();
 	void writeSettings();
@@ -122,9 +132,11 @@ private:
 	QToolBar *_showToolBar;
 	QToolBar *_navigationToolBar;
 	QMenu *_poiFilesMenu;
+	QMenu *_mapMenu;
 
 	QActionGroup *_fileActionGroup;
 	QActionGroup *_navigationActionGroup;
+	QActionGroup *_mapsActionGroup;
 	QAction *_exitAction;
 	QAction *_keysAction;
 	QAction *_dataSourcesAction;
@@ -142,6 +154,7 @@ private:
 	QAction *_showPOILabelsAction;
 	QAction *_showMapAction;
 	QAction *_fullscreenAction;
+	QAction *_loadMapAction;
 	QAction *_clearMapCacheAction;
 	QAction *_showGraphsAction;
 	QAction *_showGraphGridAction;
@@ -154,6 +167,8 @@ private:
 	QAction *_firstAction;
 	QAction *_metricUnitsAction;
 	QAction *_imperialUnitsAction;
+	QAction *_totalTimeAction;
+	QAction *_movingTimeAction;
 	QAction *_nextMapAction;
 	QAction *_prevMapAction;
 	QAction *_showTracksAction;
@@ -162,10 +177,12 @@ private:
 	QAction *_showWaypointLabelsAction;
 	QAction *_showRouteWaypointsAction;
 	QAction *_openOptionsAction;
+	QAction *_mapsEnd;
 	QList<QAction*> _mapActions;
 	QList<QAction*> _poiFilesActions;
 
-	QSignalMapper *_poiFilesSM;
+	QSignalMapper *_poiFilesSignalMapper;
+	QSignalMapper *_mapsSignalMapper;
 
 	QLabel *_fileNameLabel;
 	QLabel *_distanceLabel;
@@ -176,19 +193,21 @@ private:
 	QList<GraphTab*> _tabs;
 
 	POI *_poi;
-	QList<Map*> _maps;
+	MapList *_ml;
 
 	FileBrowser *_browser;
 	QList<QString> _files;
-	Map *_currentMap;
 
+	Map *_map;
 	int _trackCount;
 	int _routeCount;
 	int _waypointCount;
 	qreal _trackDistance;
 	qreal _routeDistance;
 	qreal _time;
+	qreal _movingTime;
 	DateRange _dateRange;
+	QString _pathName;
 
 	qreal _sliderPos;
 

src/heartrategraph.h

@@ -13,9 +13,7 @@ public:
 	QString label() const {return tr("Heart rate");}
 	void loadData(const Data &data, const QList<PathItem *> &paths);
 	void clear();
-	void setUnits(enum Units) {}
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;

src/icons.h

@@ -10,7 +10,7 @@
 #define CLOSE_FILE_ICON   ":/icons/dialog-close.png"
 #define SHOW_POI_ICON     ":/icons/flag.png"
 #define SHOW_MAP_ICON     ":/icons/applications-internet.png"
-#define SHOW_GRAPHS_ICON ":/icons/office-chart-line-stacked.png"
+#define SHOW_GRAPHS_ICON  ":/icons/office-chart-line.png"
 #define QUIT_ICON         ":/icons/application-exit.png"
 #define RELOAD_FILE_ICON  ":/icons/view-refresh.png"
 #define NEXT_FILE_ICON    ":/icons/arrow-right.png"
@@ -23,5 +23,7 @@
 #define APPEARANCE_ICON   ":/icons/preferences-desktop-display.png"
 #define POI_ICON          ":/icons/flag_48.png"
 #define SYSTEM_ICON       ":/icons/system-run.png"
+#define PRINT_EXPORT_ICON ":/icons/document-print-preview.png"
+#define DATA_ICON         ":/icons/view-filter.png"
 
 #endif /* ICONS_H */

src/infoitem.cpp

@@ -78,6 +78,7 @@ void InfoItem::insert(const QString &key, const QString &value)
 		_list[i] = kv;
 
 	updateBoundingRect();
+	update();
 }
 
 void InfoItem::clear()

src/keys.h

@@ -10,18 +10,22 @@
 #define LAST_KEY                Qt::Key_End
 #define MODIFIER                Qt::ShiftModifier
 
-#define QUIT_SHORTCUT           QKeySequence::Quit
-#define OPEN_SHORTCUT           QKeySequence::Open
-#define CLOSE_SHORTCUT          QKeySequence::Close
-#define RELOAD_SHORTCUT         QKeySequence::Refresh
+#define ZOOM_IN                 QKeySequence::ZoomIn
+#define ZOOM_OUT                QKeySequence::ZoomOut
+
+#define QUIT_SHORTCUT           QKeySequence(QKeySequence::Quit)
+#define OPEN_SHORTCUT           QKeySequence(QKeySequence::Open)
+#define CLOSE_SHORTCUT          QKeySequence(QKeySequence::Close)
+#define RELOAD_SHORTCUT         QKeySequence(QKeySequence::Refresh)
 #define EXPORT_SHORTCUT         QKeySequence(Qt::CTRL + Qt::Key_E)
 #define SHOW_POI_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_P)
 #define SHOW_MAP_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_M)
-#define NEXT_MAP_SHORTCUT       QKeySequence::Forward
-#define PREV_MAP_SHORTCUT       QKeySequence::Back
+#define NEXT_MAP_SHORTCUT       QKeySequence(QKeySequence::Forward)
+#define PREV_MAP_SHORTCUT       QKeySequence(QKeySequence::Back)
 #define SHOW_GRAPHS_SHORTCUT    QKeySequence(Qt::CTRL + Qt::Key_G)
 #define DISTANCE_GRAPH_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_D)
 #define TIME_GRAPH_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_T)
+
 #ifdef Q_OS_MAC
 #define FULLSCREEN_SHORTCUT     QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F)
 #else // Q_OS_MAC

src/lambertconic.cpp

@@ -0,0 +1,81 @@
+#include <cmath>
+#include "rd.h"
+#include "lambertconic.h"
+
+#ifndef M_PI_2
+	#define M_PI_2 1.57079632679489661923
+#endif // M_PI_2
+#ifndef M_PI_4
+	#define M_PI_4 0.78539816339744830962
+#endif // M_PI_4
+
+static double q(const Ellipsoid &el, double b)
+{
+	double e = sqrt(el.flattening() * (2. - el.flattening()));
+	double esb = e * sin(b);
+	return log(tan(M_PI_4 + b / 2.) * pow((1. - esb) / (1. + esb), e / 2.));
+}
+
+static double iq(const Ellipsoid &el, double q)
+{
+	double e = sqrt(el.flattening() * (2. - el.flattening()));
+	double b0 = 0.;
+	double b = 2. * atan(exp(q)) - M_PI_2;
+
+	do {
+		b0 = b;
+		double esb = e * sin(b);
+		b = 2. * atan(exp(q) * pow((1. - esb) / (1. + esb), -e / 2.)) - M_PI_2;
+	} while (fabs(b - b0) > 1e-10);
+
+	return b;
+}
+
+static double nradius(const Ellipsoid &el, double phi)
+{
+	double sin_phi = sin(phi);
+	return (el.radius() / sqrt(1. - (el.flattening() * (2. - el.flattening()))
+	  * sin_phi * sin_phi));
+}
+
+LambertConic::LambertConic(const Ellipsoid &ellipsoid, double standardParallel1,
+  double standardParallel2, double latitudeOrigin, double longitudeOrigin,
+  double scale, double falseEasting, double falseNorthing) : _e(ellipsoid)
+{
+	_cm = longitudeOrigin;
+	_fe = falseEasting;
+	_fn = falseNorthing;
+
+	double sp1 = deg2rad(standardParallel1);
+	double sp2 = deg2rad(standardParallel2);
+
+	double N1 = nradius(_e, sp1);
+	double N2 = nradius(_e, sp2);
+
+	_q0 = q(_e, deg2rad(latitudeOrigin));
+	double q1 = q(_e, sp1);
+	double q2 = q(_e, sp2);
+
+	_n = log((N1 * cos(sp1)) / (N2 * cos(sp2))) / (q2 - q1);
+	double R1 = N1 * cos(sp1) / _n;
+	_R0 = scale * R1 * exp(_n * (q1 - _q0));
+}
+
+QPointF LambertConic::ll2xy(const Coordinates &c) const
+{
+	double dl = _n * (deg2rad(c.lon()) - deg2rad(_cm));
+	double R = _R0 * exp(_n * (_q0 - q(_e, deg2rad(c.lat()))));
+
+	return QPointF(_fe + R * sin(dl), _fn + _R0 - R * cos(dl));
+}
+
+Coordinates LambertConic::xy2ll(const QPointF &p) const
+{
+	double dl = atan((p.x() - _fe) / (_fn + _R0 - p.y()));
+	double dx = p.x() - _fe;
+	double dy = p.y() - _fn - _R0;
+	double R = sqrt(dx * dx + dy * dy);
+	double q = _q0 - log(R / _R0) / _n;
+
+	return Coordinates(rad2deg(deg2rad(_cm) + dl / _n), rad2deg(iq(_e, q)));
+}

src/lambertconic.h

@@ -0,0 +1,29 @@
+#ifndef LAMBERTCONIC_H
+#define LAMBERTCONIC_H
+
+#include "ellipsoid.h"
+#include "projection.h"
+
+class LambertConic : public Projection
+{
+public:
+	LambertConic(const Ellipsoid &ellipsoid, double standardParallel1,
+	  double standardParallel2, double latitudeOrigin, double longitudeOrigin,
+	  double scale, double falseEasting, double falseNorthing);
+
+	virtual QPointF ll2xy(const Coordinates &c) const;
+	virtual Coordinates xy2ll(const QPointF &p) const;
+
+private:
+	Ellipsoid _e;
+
+	double _cm;
+	double _fe;
+	double _fn;
+
+	double _q0;
+	double _R0;
+	double _n;
+};
+
+#endif // LAMBERTCONIC_H

src/latlon.h

@@ -0,0 +1,15 @@
+#ifndef LATLON_H
+#define LATLON_H
+
+#include "projection.h"
+
+class LatLon : public Projection
+{
+public:
+	virtual QPointF ll2xy(const Coordinates &c) const
+	  {return c.toPointF();}
+	virtual Coordinates xy2ll(const QPointF &p) const
+	  {return Coordinates(p);}
+};
+
+#endif // LATLON_H

src/map.cpp

@@ -1,134 +0,0 @@
-#include <QFileInfo>
-#include <QDir>
-#include "downloader.h"
-#include "config.h"
-#include "map.h"
-
-
-Map::Map(QObject *parent, const QString &name, const QString &url)
-  : QObject(parent)
-{
-	_name = name;
-	_url = url;
-
-	connect(&Downloader::instance(), SIGNAL(finished()), this,
-	  SLOT(emitLoaded()));
-
-	QString path = TILES_DIR + QString("/") + _name;
-	if (!QDir().mkpath(path))
-		fprintf(stderr, "Error creating tiles dir: %s\n", qPrintable(path));
-}
-
-void Map::emitLoaded()
-{
-	emit loaded();
-}
-
-void Map::loadTiles(QList<Tile> &list, bool block)
-{
-	if (block)
-		loadTilesSync(list);
-	else
-		loadTilesAsync(list);
-}
-
-void Map::loadTilesAsync(QList<Tile> &list)
-{
-	QList<Download> dl;
-
-	for (int i = 0; i < list.size(); i++) {
-		Tile &t = list[i];
-		QString file = tileFile(t);
-		QFileInfo fi(file);
-
-		if (!fi.exists()) {
-			fillTile(t);
-			dl.append(Download(tileUrl(t), file));
-		} else
-			loadTileFile(t, file);
-	}
-
-	if (!dl.empty())
-		Downloader::instance().get(dl);
-}
-
-void Map::loadTilesSync(QList<Tile> &list)
-{
-	QList<Download> dl;
-
-	for (int i = 0; i < list.size(); i++) {
-		Tile &t = list[i];
-		QString file = tileFile(t);
-		QFileInfo fi(file);
-
-		if (!fi.exists())
-			dl.append(Download(tileUrl(t), file));
-		else
-			loadTileFile(t, file);
-	}
-
-	if (dl.empty())
-		return;
-
-	QEventLoop wait;
-	connect(&Downloader::instance(), SIGNAL(finished()), &wait, SLOT(quit()));
-	if (Downloader::instance().get(dl))
-		wait.exec();
-
-	for (int i = 0; i < list.size(); i++) {
-		Tile &t = list[i];
-
-		if (t.pixmap().isNull()) {
-			QString file = tileFile(t);
-			QFileInfo fi(file);
-
-			if (!(fi.exists() && loadTileFile(t, file)))
-				fillTile(t);
-		}
-	}
-}
-
-void Map::fillTile(Tile &tile)
-{
-	tile.pixmap() = QPixmap(Tile::size(), Tile::size());
-	tile.pixmap().fill();
-}
-
-bool Map::loadTileFile(Tile &tile, const QString &file)
-{
-	if (!tile.pixmap().load(file)) {
-		fprintf(stderr, "%s: error loading tile file\n", qPrintable(file));
-		return false;
-	}
-
-	return true;
-}
-
-QString Map::tileUrl(const Tile &tile)
-{
-	QString url(_url);
-
-	url.replace("$z", QString::number(tile.zoom()));
-	url.replace("$x", QString::number(tile.xy().x()));
-	url.replace("$y", QString::number(tile.xy().y()));
-
-	return url;
-}
-
-QString Map::tileFile(const Tile &tile)
-{
-	QString file = TILES_DIR + QString("/%1/%2-%3-%4").arg(_name)
-	  .arg(tile.zoom()).arg(tile.xy().x()).arg(tile.xy().y());
-
-	return file;
-}
-
-void Map::clearCache()
-{
-	QString path = TILES_DIR + QString("/") + _name;
-	QDir dir = QDir(path);
-	QStringList list = dir.entryList();
-
-	for (int i = 0; i < list.count(); i++)
-		dir.remove(list.at(i));
-}

src/map.h

@@ -1,37 +1,42 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "tile.h"
+#include <QObject>
+#include <QString>
+#include <QRectF>
+
+class QPainter;
+class Coordinates;
 
 class Map : public QObject
 {
 	Q_OBJECT
 
 public:
-	Map(QObject *parent = 0, const QString &name = QString(),
-	  const QString &url = QString());
+	Map(QObject *parent = 0) : QObject(parent) {}
 
-	const QString &name() const {return _name;}
-	void loadTiles(QList<Tile> &list, bool block);
-	void clearCache();
+	virtual const QString &name() const = 0;
+
+	virtual QRectF bounds() const = 0;
+	virtual qreal resolution(const QPointF &p) const = 0;
+
+	virtual qreal zoom() const = 0;
+	virtual qreal zoomFit(const QSize &size, const QRectF &br) = 0;
+	virtual qreal zoomIn() = 0;
+	virtual qreal zoomOut() = 0;
+
+	virtual QPointF ll2xy(const Coordinates &c) = 0;
+	virtual Coordinates xy2ll(const QPointF &p) = 0;
+
+	virtual void draw(QPainter *painter, const QRectF &rect) = 0;
+
+	virtual void setBlockingMode(bool block) {Q_UNUSED(block);}
+	virtual void clearCache() {}
+	virtual void load() {}
+	virtual void unload() {}
 
 signals:
 	void loaded();
-
-private slots:
-	void emitLoaded();
-
-private:
-	QString tileUrl(const Tile &tile);
-	QString tileFile(const Tile &tile);
-	bool loadTileFile(Tile &tile, const QString &file);
-	void fillTile(Tile &tile);
-
-	void loadTilesAsync(QList<Tile> &list);
-	void loadTilesSync(QList<Tile> &list);
-
-	QString _name;
-	QString _url;
 };
 
 #endif // MAP_H

src/maplist.cpp

@@ -1,41 +1,100 @@
-#include <QFile>
 #include <QFileInfo>
-#include "map.h"
+#include <QDir>
+#include "atlas.h"
+#include "offlinemap.h"
+#include "onlinemap.h"
 #include "maplist.h"
 
 
-QList<Map*> MapList::load(QObject *parent, const QString &fileName)
+bool MapList::loadListEntry(const QByteArray &line)
 {
-	QList<Map*> mapList;
-	QFileInfo fi(fileName);
+	QList<QByteArray> list = line.split('\t');
+	if (list.size() != 2)
+		return false;
 
-	if (!fi.exists())
-		return mapList;
+	QByteArray ba1 = list[0].trimmed();
+	QByteArray ba2 = list[1].trimmed();
+	if (ba1.isEmpty() || ba2.isEmpty())
+		return false;
 
-	QFile file(fileName);
+	_maps.append(new OnlineMap(QString::fromUtf8(ba1.data(), ba1.size()),
+	  QString::fromLatin1(ba2.data(), ba2.size()), this));
+
+	return true;
+}
+
+bool MapList::loadList(const QString &path)
+{
+	QFile file(path);
 
 	if (!file.open(QFile::ReadOnly | QFile::Text)) {
-		fprintf(stderr, "Error opening map list file: %s: %s\n",
-		  qPrintable(fileName), qPrintable(file.errorString()));
-		return mapList;
+		_errorString = file.errorString();
+		return false;
 	}
 
 	int ln = 0;
 	while (!file.atEnd()) {
 		ln++;
 		QByteArray line = file.readLine();
-		QList<QByteArray> list = line.split('\t');
-		if (list.size() != 2) {
-			fprintf(stderr, "Invalid map list entry on line %d\n", ln);
-			continue;
+
+		if (!loadListEntry(line)) {
+			_errorString = QString("Invalid map list entry on line %1.")
+			  .arg(QString::number(ln));
+			return false;
+		}
 	}
 
-		QByteArray ba1 = list[0].trimmed();
-		QByteArray ba2 = list[1].trimmed();
-
-		mapList.append(new Map(parent, QString::fromUtf8(ba1.data(), ba1.size()),
-		  QString::fromLatin1(ba2.data(), ba2.size())));
+	return true;
 }
 
-	return mapList;
+bool MapList::loadMap(const QString &path)
+{
+	QFileInfo fi(path);
+	QString suffix = fi.suffix().toLower();
+
+	if (suffix == "map") {
+		OfflineMap *om = new OfflineMap(path, this);
+		if (om->isValid()) {
+			_maps.append(om);
+			return true;
+		} else {
+			_errorString = om->errorString();
+			delete om;
+			return false;
+		}
+	} else if (suffix == "tba") {
+		Atlas *atlas = new Atlas(path, this);
+		if (atlas->isValid()) {
+			_maps.append(atlas);
+			return true;
+		} else {
+			_errorString = atlas->errorString();
+			delete atlas;
+			return false;
+		}
+	} else if (suffix == "tar") {
+		Atlas *atlas = new Atlas(path, this);
+		if (atlas->isValid()) {
+			_maps.append(atlas);
+			return true;
+		} else {
+			_errorString = atlas->errorString();
+			delete atlas;
+			OfflineMap *om = new OfflineMap(path, this);
+			if (om->isValid()) {
+				_maps.append(om);
+				return true;
+			} else {
+				qWarning("%s: %s", qPrintable(path), qPrintable(_errorString));
+				qWarning("%s: %s", qPrintable(path),
+				  qPrintable(om->errorString()));
+				_errorString = "Not a map/atlas file";
+				delete om;
+				return false;
+			}
+		}
+	} else {
+		_errorString = "Not a map/atlas file";
+		return false;
+	}
 }

src/maplist.h

@@ -1,17 +1,28 @@
 #ifndef MAPLIST_H
 #define MAPLIST_H
 
-#include <QList>
-#include <QString>
 #include <QObject>
+#include <QString>
+#include "map.h"
 
-class Map;
-
-class MapList
+class MapList : public QObject
 {
+	Q_OBJECT
+
 public:
-	static QList<Map*> load(QObject *parent = 0,
-	  const QString &fileName = QString());
+	MapList(QObject *parent = 0) : QObject(parent) {}
+
+	bool loadMap(const QString &path);
+	bool loadList(const QString &path);
+
+	QList<Map*> &maps() {return _maps;}
+	const QString &errorString() const {return _errorString;}
+
+private:
+	bool loadListEntry(const QByteArray &line);
+
+	QList<Map*> _maps;
+	QString _errorString;
 };
 
 #endif // MAPLIST_H

src/matrix.cpp

@@ -0,0 +1,117 @@
+#include "matrix.h"
+
+
+#define abs(x) ((x)<0 ? -(x) : (x))
+
+Matrix::~Matrix()
+{
+	if (isNull())
+		return;
+
+	delete[] _m;
+}
+
+Matrix::Matrix(size_t h, size_t w)
+{
+	_h = h; _w = w;
+
+	if (isNull())
+		_m = 0;
+	else
+		_m = new double[_h * _w];
+}
+
+Matrix::Matrix(const Matrix& M)
+{
+	_h = M._h; _w = M._w;
+
+	if (isNull())
+		_m = 0;
+	else
+		_m = new double[_h * _w];
+
+	for (size_t i = 0; i < _h; i++)
+		for (size_t j = 0; j < _w; j++)
+			m(i,j) = M.m(i,j);
+}
+
+Matrix &Matrix::operator=(const Matrix &M)
+{
+	if (_h != M._h || _w != M._w) {
+		if (!isNull())
+			delete[] _m;
+
+		_h = M._h; _w = M._w;
+		if (isNull())
+			_m = 0;
+		else
+			_m = new double[_h * _w];
+	}
+
+	for (size_t i = 0; i < _h; i++)
+		for (size_t j = 0; j < _w; j++)
+			m(i,j) = M.m(i,j);
+
+	return *this;
+}
+
+bool Matrix::eliminate(double epsilon)
+{
+	size_t i, j, k, maxrow;
+	double temp;
+
+
+	for (i = 0; i < _h; i++) {
+		maxrow = i;
+		for (j = i+1; j < _h; j++)
+			if (abs(m(j, i)) > abs(m(maxrow, i)))
+				maxrow = j;
+		for (j = 0; j < _w; j++) {
+			temp = m(i, j);
+			m(i, j) = m(maxrow, j);
+			m(maxrow, j) = temp;
+		}
+		if (abs(m(i, i)) <= epsilon)
+			return false;
+		for (j = i+1; j<_h; j++) {
+			temp = m(j, i) / m(i, i);
+			for (k = i; k < _w; k++)
+				m(j, k) -= m(i, k) * temp;
+		}
+	}
+	for (i = _h-1; i < i+1; i--) {
+		temp  = m(i, i);
+		for (j = 0; j < i; j++)
+			for (k = _w-1; k >= i; k--)
+				m(j, k) -=  m(i, k) * m(j, i) / temp;
+		m(i, i) /= temp;
+		for (j = _h; j < _w; j++)
+			m(i, j) /= temp;
+	}
+
+	return true;
+}
+
+Matrix Matrix::augemented(const Matrix &M) const
+{
+	if (_h != M._h)
+		return Matrix();
+
+	Matrix A(_h, _w + M._w);
+
+	for (size_t i = 0; i < _h; i++)
+		for (size_t j = 0; j < _w; j++)
+			A.m(i, j) = m(i, j);
+
+	for (size_t i = 0; i < _h; i++)
+		for (size_t j = _w; j < A._w; j++)
+			A.m(i, j) = M.m(i, j-_w);
+
+	return A;
+}
+
+void Matrix::zeroize()
+{
+	for (size_t i = 0; i < _h * _w; i++)
+		_m[i] = 0;
+}

src/matrix.h

@@ -0,0 +1,33 @@
+#ifndef MATRIX_H
+#define MATRIX_H
+
+#include <cstddef>
+#include <cfloat>
+
+class Matrix {
+public:
+	Matrix() {_h = 0; _w = 0; _m = 0;}
+	Matrix(size_t h, size_t w);
+	Matrix(const Matrix& M);
+	~Matrix();
+
+	Matrix &operator=(const Matrix &M);
+
+	size_t h() const {return _h;}
+	size_t w() const {return _w;}
+	double &m(size_t i, size_t j) {return _m[_w * i + j];}
+	double const &m(size_t i, size_t j) const {return _m[_w * i + j];}
+
+	bool isNull() const {return (_h == 0 || _w == 0);}
+
+	void zeroize();
+	bool eliminate(double epsilon = DBL_EPSILON);
+	Matrix augemented(const Matrix &M) const;
+
+private:
+	double *_m;
+	size_t _h;
+	size_t _w;
+};
+
+#endif // MATRIX_H

src/mercator.cpp

@@ -0,0 +1,13 @@
+#include <cmath>
+#include "rd.h"
+#include "mercator.h"
+
+QPointF Mercator::ll2xy(const Coordinates &c) const
+{
+	return QPointF(c.lon(), rad2deg(log(tan(M_PI/4.0 + deg2rad(c.lat())/2.0))));
+}
+
+Coordinates Mercator::xy2ll(const QPointF &p) const
+{
+	return Coordinates(p.x(), rad2deg(2 * atan(exp(deg2rad(p.y()))) - M_PI/2));
+}

src/mercator.h

@@ -0,0 +1,13 @@
+#ifndef MERCATOR_H
+#define MERCATOR_H
+
+#include "projection.h"
+
+class Mercator : public Projection
+{
+public:
+	virtual QPointF ll2xy(const Coordinates &c) const;
+	virtual Coordinates xy2ll(const QPointF &p) const;
+};
+
+#endif // MERCATOR_H

src/misc.cpp

@@ -48,3 +48,9 @@ int str2int(const char *str, int len)
 
 	return res;
 }
+
+QRectF scaled(const QRectF &rect, qreal factor)
+{
+	return QRectF(QPointF(rect.left() * factor, rect.top() * factor),
+	  QSizeF(rect.width() * factor, rect.height() * factor));
+}

src/misc.h

@@ -1,7 +1,13 @@
 #ifndef MISC_H
 #define MISC_H
 
+#include <QRectF>
+
+#define ARRAY_SIZE(array) \
+  (sizeof(array) / sizeof((array)[0]))
+
 double niceNum(double x, int round);
 int str2int(const char *str, int len);
+QRectF scaled(const QRectF &rect, qreal factor);
 
 #endif // MISC_H

src/nmeaparser.cpp

@@ -313,7 +313,7 @@ bool NMEAParser::readGGA(const char *line, int len)
 						return false;
 					break;
 				case 3:
-					if (!readNS(vp, lp - vp, lon))
+					if (!readNS(vp, lp - vp, lat))
 						return false;
 					break;
 				case 4:

src/oddspinbox.cpp

@@ -0,0 +1,20 @@
+#include "oddspinbox.h"
+
+OddSpinBox::OddSpinBox(QWidget *parent) : QSpinBox(parent)
+{
+	setSingleStep(2);
+	setMinimum(1);
+}
+
+QValidator::State OddSpinBox::validate(QString &text, int &pos) const
+{
+	Q_UNUSED(pos);
+	bool ok;
+	int val;
+
+	val = text.toInt(&ok);
+	if (!ok || val < 0 || val % 2 == 0)
+		return QValidator::Invalid;
+
+	return QValidator::Acceptable;
+}

src/oddspinbox.h

@@ -0,0 +1,15 @@
+#ifndef ODDSPINBOX_H
+#define ODDSPINBOX_H
+
+#include <QSpinBox>
+
+class OddSpinBox : public QSpinBox
+{
+public:
+	OddSpinBox(QWidget *parent = 0);
+
+protected:
+	QValidator::State validate(QString &text, int &pos) const;
+};
+
+#endif // ODDSPINBOX_H

src/offlinemap.cpp

@@ -0,0 +1,677 @@
+#include <QtGlobal>
+#include <QPainter>
+#include <QFileInfo>
+#include <QMap>
+#include <QDir>
+#include <QBuffer>
+#include <QImage>
+#include <QImageReader>
+#include <QPixmapCache>
+#include "misc.h"
+#include "rd.h"
+#include "wgs84.h"
+#include "coordinates.h"
+#include "matrix.h"
+#include "datum.h"
+#include "latlon.h"
+#include "mercator.h"
+#include "transversemercator.h"
+#include "utm.h"
+#include "lambertconic.h"
+#include "albersequal.h"
+#include "ozf.h"
+#include "offlinemap.h"
+
+
+// Abridged Molodensky transformation
+static Coordinates toWGS84(Coordinates c, const Datum &datum)
+{
+	double rlat = deg2rad(c.lat());
+	double rlon = deg2rad(c.lon());
+
+	double slat = sin(rlat);
+	double clat = cos(rlat);
+	double slon = sin(rlon);
+	double clon = cos(rlon);
+	double ssqlat = slat * slat;
+
+	double from_f = datum.ellipsoid().flattening();
+	double df = WGS84_FLATTENING - from_f;
+	double from_a = datum.ellipsoid().radius();
+	double da = WGS84_RADIUS - from_a;
+	double from_esq = datum.ellipsoid().flattening()
+	  * (2.0 - datum.ellipsoid().flattening());
+	double adb = 1.0 / (1.0 - from_f);
+	double rn = from_a / sqrt(1 - from_esq * ssqlat);
+	double rm = from_a * (1 - from_esq) / pow((1 - from_esq * ssqlat), 1.5);
+	double from_h = 0.0;
+
+	double dlat = (-datum.dx() * slat * clon - datum.dy() * slat * slon
+	  + datum.dz() * clat + da * rn * from_esq * slat * clat / from_a + df
+	  * (rm * adb + rn / adb) * slat * clat) / (rm + from_h);
+	double dlon = (-datum.dx() * slon + datum.dy() * clon) / ((rn + from_h)
+	  * clat);
+
+	return Coordinates(c.lon() + rad2deg(dlon), c.lat() + rad2deg(dlat));
+}
+
+
+int OfflineMap::parse(QIODevice &device, QList<ReferencePoint> &points,
+  QString &projection, ProjectionSetup &setup, QString &datum)
+{
+	bool res;
+	int ln = 1;
+
+	while (!device.atEnd()) {
+		QByteArray line = device.readLine();
+
+		if (ln == 1) {
+			if (!line.trimmed().startsWith("OziExplorer Map Data File"))
+				return ln;
+		} else if (ln == 2)
+			_name = line.trimmed();
+		else if (ln == 3)
+			_imgPath = line.trimmed();
+		else if (ln == 5)
+			datum = line.split(',').at(0).trimmed();
+		else {
+			QList<QByteArray> list = line.split(',');
+			QString key(list.at(0).trimmed());
+			bool ll = true; bool pp = true;
+
+			if (key.startsWith("Point") && list.count() == 17
+			  && !list.at(2).trimmed().isEmpty()) {
+				int x = list.at(2).trimmed().toInt(&res);
+				if (!res)
+					return ln;
+				int y = list.at(3).trimmed().toInt(&res);
+				if (!res)
+					return ln;
+
+				int latd = list.at(6).trimmed().toInt(&res);
+				if (!res)
+					ll = false;
+				qreal latm = list.at(7).trimmed().toFloat(&res);
+				if (!res)
+					ll = false;
+				int lond = list.at(9).trimmed().toInt(&res);
+				if (!res)
+					ll = false;
+				qreal lonm = list.at(10).trimmed().toFloat(&res);
+				if (!res)
+					ll = false;
+				if (ll && list.at(8).trimmed() == "S") {
+					latd = -latd;
+					latm = -latm;
+				}
+				if (ll && list.at(11).trimmed() == "W") {
+					lond = -lond;
+					lonm = -lonm;
+				}
+
+				setup.zone = list.at(13).trimmed().toInt(&res);
+				if (!res)
+					setup.zone = 0;
+				qreal ppx = list.at(14).trimmed().toFloat(&res);
+				if (!res)
+					pp = false;
+				qreal ppy = list.at(15).trimmed().toFloat(&res);
+				if (!res)
+					pp = false;
+				if (list.at(16).trimmed() == "S")
+					setup.zone = -setup.zone;
+
+				ReferencePoint p;
+				p.xy = QPoint(x, y);
+				if (ll) {
+					p.ll = Coordinates(lond + lonm/60.0, latd + latm/60.0);
+					if (p.ll.isValid())
+						points.append(p);
+					else
+						return ln;
+				} else if (pp) {
+					p.pp = QPointF(ppx, ppy);
+					points.append(p);
+				} else
+					return ln;
+			} else if (key == "IWH") {
+				int w = list.at(2).trimmed().toInt(&res);
+				if (!res)
+					return ln;
+				int h = list.at(3).trimmed().toInt(&res);
+				if (!res)
+					return ln;
+				_size = QSize(w, h);
+			} else if (key == "Map Projection") {
+				projection = list.at(1);
+			} else if (key == "Projection Setup") {
+				if (list.count() < 8)
+					return ln;
+				setup.latitudeOrigin = list.at(1).trimmed().toFloat(&res);
+				if (!res)
+					setup.latitudeOrigin = 0;
+				setup.longitudeOrigin = list.at(2).trimmed().toFloat(&res);
+				if (!res)
+					setup.longitudeOrigin = 0;
+				setup.scale = list.at(3).trimmed().toFloat(&res);
+				if (!res)
+					setup.scale = 1.0;
+				setup.falseEasting = list.at(4).trimmed().toFloat(&res);
+				if (!res)
+					setup.falseEasting = 0;
+				setup.falseNorthing = list.at(5).trimmed().toFloat(&res);
+				if (!res)
+					setup.falseNorthing = 0;
+				setup.standardParallel1 = list.at(6).trimmed().toFloat(&res);
+				if (!res)
+					setup.standardParallel1 = 0;
+				setup.standardParallel2 = list.at(7).trimmed().toFloat(&res);
+				if (!res)
+					setup.standardParallel2 = 0;
+			}
+		}
+
+		ln++;
+	}
+
+	return 0;
+}
+
+bool OfflineMap::parseMapFile(QIODevice &device, QList<ReferencePoint> &points,
+  QString &projection, ProjectionSetup &setup, QString &datum)
+{
+	int el;
+
+	if (!device.open(QIODevice::ReadOnly)) {
+		_errorString = QString("Error opening map file: %1")
+		  .arg(device.errorString());
+		return false;
+	}
+
+	if ((el = parse(device, points, projection, setup, datum))) {
+		_errorString = QString("Map file parse error on line %1").arg(el);
+		return false;
+	}
+
+	return true;
+}
+
+bool OfflineMap::createProjection(const QString &datum,
+  const QString &projection, const ProjectionSetup &setup,
+  QList<ReferencePoint> &points)
+{
+	if (points.count() < 2) {
+		_errorString = "Insufficient number of reference points";
+		return false;
+	}
+
+	Datum d = Datum::datum(datum);
+	if (d.isNull()) {
+		_errorString = QString("%1: Unknown datum").arg(datum);
+		return false;
+	}
+
+	if (setup.latitudeOrigin < -90.0 || setup.latitudeOrigin > 90.0
+	  || setup.longitudeOrigin < -180.0 || setup.longitudeOrigin > 180.0
+	  || setup.standardParallel1 < -90 || setup.standardParallel1 > 90
+	  || setup.standardParallel2 < -90 || setup.standardParallel2 > 90) {
+		_errorString = "Invalid projection setup";
+		return false;
+	}
+
+	if (projection == "Mercator")
+		_projection = new Mercator();
+	else if (projection == "Transverse Mercator")
+		_projection = new TransverseMercator(d.ellipsoid(),
+		  setup.latitudeOrigin, setup.longitudeOrigin, setup.scale,
+		  setup.falseEasting, setup.falseNorthing);
+	else if (projection == "Latitude/Longitude")
+		_projection = new LatLon();
+	else if (projection == "Lambert Conformal Conic")
+		_projection = new LambertConic(d.ellipsoid(),
+		  setup.standardParallel1, setup.standardParallel2,
+		  setup.latitudeOrigin, setup.longitudeOrigin, setup.scale,
+		  setup.falseEasting, setup.falseNorthing);
+	else if (projection == "Albers Equal Area")
+		_projection = new AlbersEqual(d.ellipsoid(), setup.standardParallel1,
+		  setup.standardParallel2, setup.latitudeOrigin, setup.longitudeOrigin,
+		  setup.falseEasting, setup.falseNorthing);
+	else if (projection == "(UTM) Universal Transverse Mercator") {
+		if (setup.zone)
+			_projection = new UTM(d.ellipsoid(), setup.zone);
+		else if (!points.first().ll.isNull())
+			_projection = new UTM(d.ellipsoid(), points.first().ll);
+		else {
+			_errorString = "Can not determine UTM zone";
+			return false;
+		}
+	} else if (projection == "(NZTM2) New Zealand TM 2000")
+		_projection = new TransverseMercator(d.ellipsoid(), 0, 173.0, 0.9996,
+		  1600000, 10000000);
+	else if (projection == "(BNG) British National Grid")
+		_projection = new TransverseMercator(d.ellipsoid(), 49, -2, 0.999601,
+		  400000, -100000);
+	else if (projection == "(IG) Irish Grid")
+		_projection = new TransverseMercator(d.ellipsoid(), 53.5, -8, 1.000035,
+		  200000, 250000);
+	else if (projection == "(SG) Swedish Grid")
+		_projection = new TransverseMercator(d.ellipsoid(), 0, 15.808278, 1,
+		  1500000, 0);
+	else {
+		_errorString = QString("%1: Unknown map projection").arg(projection);
+		return false;
+	}
+
+	for (int i = 0; i < points.size(); i++) {
+		if (points.at(i).ll.isNull()) {
+			if (d.isWGS84())
+				points[i].ll = _projection->xy2ll(points.at(i).pp);
+			else
+				points[i].ll = toWGS84(_projection->xy2ll(points.at(i).pp), d);
+		} else {
+			if (!d.isWGS84())
+				points[i].ll = toWGS84(points[i].ll, d);
+		}
+	}
+
+	return true;
+}
+
+bool OfflineMap::computeTransformation(const QList<ReferencePoint> &points)
+{
+	Q_ASSERT(points.size() >= 2);
+
+	Matrix c(3, 2);
+	c.zeroize();
+	for (size_t j = 0; j < c.w(); j++) {
+		for (size_t k = 0; k < c.h(); k++) {
+			for (int i = 0; i < points.size(); i++) {
+				double f[3], t[2];
+				QPointF p = _projection->ll2xy(points.at(i).ll);
+
+				f[0] = p.x();
+				f[1] = p.y();
+				f[2] = 1.0;
+				t[0] = points.at(i).xy.x();
+				t[1] = points.at(i).xy.y();
+				c.m(k,j) += f[k] * t[j];
+			}
+		}
+	}
+
+	Matrix Q(3, 3);
+	Q.zeroize();
+	for (int qi = 0; qi < points.size(); qi++) {
+		double v[3];
+		QPointF p = _projection->ll2xy(points.at(qi).ll);
+
+		v[0] = p.x();
+		v[1] = p.y();
+		v[2] = 1.0;
+		for (size_t i = 0; i < Q.h(); i++)
+			for (size_t j = 0; j < Q.w(); j++)
+				Q.m(i,j) += v[i] * v[j];
+	}
+
+	Matrix M = Q.augemented(c);
+	if (!M.eliminate()) {
+		_errorString = "Singular transformation matrix";
+		return false;
+	}
+
+	_transform = QTransform(M.m(0,3), M.m(0,4), M.m(1,3), M.m(1,4), M.m(2,3),
+	  M.m(2,4));
+	_inverted = _transform.inverted();
+
+	return true;
+}
+
+bool OfflineMap::computeResolution(QList<ReferencePoint> &points)
+{
+	Q_ASSERT(points.count() >= 2);
+
+	int maxLon = 0, minLon = 0, maxLat = 0, minLat = 0;
+	qreal dLon, pLon, dLat, pLat;
+
+	for (int i = 1; i < points.size(); i++) {
+		if (points.at(i).ll.lon() < points.at(minLon).ll.lon())
+			minLon = i;
+		if (points.at(i).ll.lon() > points.at(maxLon).ll.lon())
+			maxLon = i;
+		if (points.at(i).ll.lat() < points.at(minLat).ll.lon())
+			minLat = i;
+		if (points.at(i).ll.lat() > points.at(maxLat).ll.lon())
+			maxLat = i;
+	}
+
+	dLon = points.at(minLon).ll.distanceTo(points.at(maxLon).ll);
+	pLon = QLineF(points.at(minLon).xy, points.at(maxLon).xy).length();
+	dLat = points.at(minLat).ll.distanceTo(points.at(maxLat).ll);
+	pLat = QLineF(points.at(minLat).xy, points.at(maxLat).xy).length();
+
+	_resolution = (dLon/pLon + dLat/pLat) / 2.0;
+
+	return true;
+}
+
+bool OfflineMap::getImageInfo(const QString &path)
+{
+	QFileInfo ii(_imgPath);
+
+	if (ii.isRelative())
+		ii.setFile(path + "/" + _imgPath);
+
+	if (!ii.exists()) {
+		int last = _imgPath.lastIndexOf('\\');
+		if (last >= 0 && last < _imgPath.length() - 1) {
+			QStringRef fn(&_imgPath, last + 1, _imgPath.length() - last - 1);
+			ii.setFile(path + "/" + fn.toString());
+		}
+	}
+
+	if (ii.exists())
+		_imgPath = ii.absoluteFilePath();
+	else {
+		_errorString = QString("%1: No such image file").arg(_imgPath);
+		return false;
+	}
+
+	QString suffix = ii.suffix().toLower();
+	if (suffix == "ozf4" || suffix == "ozfx4") {
+		_errorString = QString("%1: OZF4 image files not supported")
+		  .arg(QFileInfo(_imgPath).fileName());
+		return false;
+	} else if (suffix == "ozf2" || suffix == "ozfx2" || suffix == "ozf3"
+	  || suffix == "ozfx3") {
+		_ozf.load(_imgPath);
+		_size = _ozf.size();
+	} else {
+		QImageReader img(_imgPath);
+		_size = img.size();
+	}
+	if (!_size.isValid()) {
+		_errorString = QString("%1: Error reading map image")
+		  .arg(QFileInfo(_imgPath).fileName());
+		return false;
+	}
+
+	return true;
+}
+
+bool OfflineMap::getTileInfo(const QStringList &tiles, const QString &path)
+{
+	QRegExp rx("_[0-9]+_[0-9]+\\.");
+	for (int i = 0; i < tiles.size(); i++) {
+		if (tiles.at(i).contains(rx)) {
+			_tileName = QString(tiles.at(i)).replace(rx, "_%1_%2.");
+
+			if (path.isNull()) {
+				QByteArray ba = _tar.file(tiles.at(i));
+				QBuffer buffer(&ba);
+				_tileSize = QImageReader(&buffer).size();
+			} else {
+				_tileName = path + "/" + _tileName;
+				_tileSize = QImageReader(path + "/" + tiles.at(i)).size();
+			}
+			if (!_tileSize.isValid()) {
+				_errorString = QString("Error retrieving tile size: "
+				  "%1: Invalid image").arg(QFileInfo(tiles.at(i)).fileName());
+				return false;
+			}
+
+			return true;
+		}
+	}
+
+	_errorString = "Invalid/missing tile set";
+	return false;
+}
+
+bool OfflineMap::totalSizeSet()
+{
+	if (!_size.isValid()) {
+		_errorString = "Missing total image size (IWH)";
+		return false;
+	} else
+		return true;
+}
+
+OfflineMap::OfflineMap(const QString &fileName, QObject *parent)
+  : Map(parent)
+{
+	QList<ReferencePoint> points;
+	QString proj, datum;
+	ProjectionSetup setup;
+	QFileInfo fi(fileName);
+	QString suffix = fi.suffix().toLower();
+
+
+	_valid = false;
+	_img = 0;
+	_projection = 0;
+	_resolution = 0;
+
+	if (suffix == "tar") {
+		if (!_tar.load(fileName)) {
+			_errorString = "Error reading tar file";
+			return;
+		}
+
+		QString mapFileName = fi.completeBaseName() + ".map";
+		QByteArray ba = _tar.file(mapFileName);
+		if (ba.isNull()) {
+			_errorString = "Map file not found";
+			return;
+		}
+		QBuffer mapFile(&ba);
+		if (!parseMapFile(mapFile, points, proj, setup, datum))
+			return;
+	} else if (suffix =="map") {
+		QFile mapFile(fileName);
+		if (!parseMapFile(mapFile, points, proj, setup, datum))
+			return;
+	} else {
+		_errorString = "Not a map file";
+		return;
+	}
+
+	if (!createProjection(datum, proj, setup, points))
+		return;
+	if (!computeTransformation(points))
+		return;
+	computeResolution(points);
+
+	if (_tar.isOpen()) {
+		if (!totalSizeSet())
+			return;
+		if (!getTileInfo(_tar.files()))
+			return;
+		_imgPath = QString();
+	} else {
+		QDir set(fi.absolutePath() + "/" + "set");
+		if (set.exists()) {
+			if (!totalSizeSet())
+				return;
+			if (!getTileInfo(set.entryList(), set.absolutePath()))
+				return;
+			_imgPath = QString();
+		} else {
+			if (!getImageInfo(fi.absolutePath()))
+				return;
+		}
+	}
+
+	_valid = true;
+}
+
+OfflineMap::OfflineMap(const QString &fileName, Tar &tar, QObject *parent)
+  : Map(parent)
+{
+	QList<ReferencePoint> points;
+	QString proj, datum;
+	ProjectionSetup setup;
+	QFileInfo fi(fileName);
+
+	_valid = false;
+	_img = 0;
+	_projection = 0;
+
+	QFileInfo map(fi.absolutePath());
+	QFileInfo layer(map.absolutePath());
+	QString mapFile = layer.fileName() + "/" + map.fileName() + "/"
+	  + fi.fileName();
+	QByteArray ba = tar.file(mapFile);
+	if (ba.isNull()) {
+		_errorString = "Map file not found";
+		return;
+	}
+	QBuffer buffer(&ba);
+
+	if (!parseMapFile(buffer, points, proj, setup, datum))
+		return;
+	if (!createProjection(datum, proj, setup, points))
+		return;
+	if (!totalSizeSet())
+		return;
+	if (!computeTransformation(points))
+		return;
+	computeResolution(points);
+
+
+	_tarPath = fi.absolutePath() + "/" + fi.completeBaseName() + ".tar";
+	_imgPath = QString();
+	_valid = true;
+}
+
+OfflineMap::~OfflineMap()
+{
+	if (_img)
+		delete _img;
+	if (_projection)
+		delete _projection;
+}
+
+void OfflineMap::load()
+{
+	if (!_tarPath.isNull() && !_tileSize.isValid()) {
+		if (!_tar.load(_tarPath)) {
+			qWarning("%s: error loading tar file", qPrintable(_tarPath));
+			return;
+		}
+		if (!getTileInfo(_tar.files()))
+			qWarning("%s: %s", qPrintable(_tarPath), qPrintable(_errorString));
+		return;
+	}
+
+	if (!_img && !_imgPath.isNull() && !_ozf.isOpen()) {
+		_img = new QImage(_imgPath);
+		if (_img->isNull())
+			qWarning("%s: error loading map image", qPrintable(_imgPath));
+	}
+}
+
+void OfflineMap::unload()
+{
+	if (_img) {
+		delete _img;
+		_img = 0;
+	}
+}
+
+void OfflineMap::drawTiled(QPainter *painter, const QRectF &rect)
+{
+	QPoint tl = QPoint((int)floor(rect.left() / (qreal)_tileSize.width())
+	  * _tileSize.width(), (int)floor(rect.top() / _tileSize.height())
+	  * _tileSize.height());
+
+	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	for (int i = 0; i < ceil(s.width() / _tileSize.width()); i++) {
+		for (int j = 0; j < ceil(s.height() / _tileSize.height()); j++) {
+			int x = tl.x() + i * _tileSize.width();
+			int y = tl.y() + j * _tileSize.height();
+
+			if (!QRectF(QPointF(x, y), _ozf.tileSize()).intersects(bounds())) {
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
+				continue;
+			}
+
+			QString tileName(_tileName.arg(QString::number(x),
+			  QString::number(y)));
+			QPixmap pixmap;
+
+			if (_tar.isOpen()) {
+				QString key = _tar.fileName() + "/" + tileName;
+				if (!QPixmapCache::find(key, &pixmap)) {
+					QByteArray ba = _tar.file(tileName);
+					pixmap = QPixmap::fromImage(QImage::fromData(ba));
+					if (!pixmap.isNull())
+						QPixmapCache::insert(key, pixmap);
+				}
+			} else
+				pixmap = QPixmap(tileName);
+
+			if (pixmap.isNull()) {
+				qWarning("%s: error loading tile image", qPrintable(
+				  _tileName.arg(QString::number(x), QString::number(y))));
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
+			} else
+				painter->drawPixmap(QPoint(x, y), pixmap);
+		}
+	}
+}
+
+void OfflineMap::drawOZF(QPainter *painter, const QRectF &rect)
+{
+	QPoint tl = QPoint((int)floor(rect.left() / _ozf.tileSize().width())
+	  * _ozf.tileSize().width(), (int)floor(rect.top()
+	  / _ozf.tileSize().height()) * _ozf.tileSize().height());
+
+	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	for (int i = 0; i < ceil(s.width() / _ozf.tileSize().width()); i++) {
+		for (int j = 0; j < ceil(s.height() / _ozf.tileSize().height()); j++) {
+			int x = tl.x() + i * _ozf.tileSize().width();
+			int y = tl.y() + j * _ozf.tileSize().height();
+
+			if (!QRectF(QPointF(x, y), _ozf.tileSize()).intersects(bounds())) {
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
+				continue;
+			}
+
+			QPixmap pixmap;
+			QString key = _ozf.fileName() + "/" + QString::number(x)
+			  + "_" + QString::number(y);
+			if (!QPixmapCache::find(key, &pixmap)) {
+				pixmap = _ozf.tile(x, y);
+				if (!pixmap.isNull())
+					QPixmapCache::insert(key, pixmap);
+			}
+
+			if (pixmap.isNull()) {
+				qWarning("%s: error loading tile image", qPrintable(key));
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
+			} else
+				painter->drawPixmap(QPoint(x, y), pixmap);
+		}
+	}
+}
+
+void OfflineMap::drawImage(QPainter *painter, const QRectF &rect)
+{
+	if (!_img || _img->isNull())
+		painter->fillRect(rect, Qt::white);
+	else {
+		QPoint p = rect.topLeft().toPoint();
+		QImage crop = _img->copy(QRect(p, rect.size().toSize()));
+		painter->drawImage(rect.topLeft(), crop);
+	}
+}
+
+void OfflineMap::draw(QPainter *painter, const QRectF &rect)
+{
+	if (_ozf.isOpen())
+		drawOZF(painter, rect);
+	else if (_tileSize.isValid())
+		drawTiled(painter, rect);
+	else
+		drawImage(painter, rect);
+}

src/offlinemap.h

@@ -0,0 +1,106 @@
+#ifndef OFFLINEMAP_H
+#define OFFLINEMAP_H
+
+#include <QTransform>
+#include "map.h"
+#include "tar.h"
+#include "ozf.h"
+#include "coordinates.h"
+#include "projection.h"
+
+
+class QIODevice;
+class QImage;
+
+class OfflineMap : public Map
+{
+	Q_OBJECT
+
+public:
+	OfflineMap(const QString &fileName, QObject *parent = 0);
+	OfflineMap(const QString &fileName, Tar &tar, QObject *parent = 0);
+	~OfflineMap();
+
+	const QString &name() const {return _name;}
+
+	QRectF bounds() const {return QRectF(QPointF(0, 0), _size);}
+	qreal resolution(const QPointF &) const {return _resolution;}
+
+	qreal zoom() const {return 1.0;}
+	qreal zoomFit(const QSize &, const QRectF &) {return 1.0;}
+	qreal zoomIn() {return 1.0;}
+	qreal zoomOut() {return 1.0;}
+
+	QPointF ll2xy(const Coordinates &c)
+	  {return _transform.map(_projection->ll2xy(c));}
+	Coordinates xy2ll(const QPointF &p)
+	  {return _projection->xy2ll(_inverted.map(p));}
+
+	void draw(QPainter *painter, const QRectF &rect);
+
+	void load();
+	void unload();
+
+	bool isValid() const {return _valid;}
+	const QString &errorString() const {return _errorString;}
+
+	QPointF ll2pp(const Coordinates &c) const
+	  {return _projection->ll2xy(c);}
+	QPointF xy2pp(const QPointF &p) const
+	  {return _inverted.map(p);}
+	QPointF pp2xy(const QPointF &p) const
+	  {return _transform.map(p);}
+
+private:
+	typedef struct {
+		QPoint xy;
+		Coordinates ll;
+		QPointF pp;
+	} ReferencePoint;
+
+	typedef struct {
+		double latitudeOrigin;
+		double longitudeOrigin;
+		double scale;
+		double falseEasting;
+		double falseNorthing;
+		double standardParallel1;
+		double standardParallel2;
+		int zone;
+	} ProjectionSetup;
+
+	int parse(QIODevice &device, QList<ReferencePoint> &points,
+	  QString &projection, ProjectionSetup &setup, QString &datum);
+	bool parseMapFile(QIODevice &device, QList<ReferencePoint> &points,
+	  QString &projection, ProjectionSetup &setup, QString &datum);
+	bool totalSizeSet();
+	bool createProjection(const QString &datum, const QString &projection,
+	  const ProjectionSetup &setup, QList<ReferencePoint> &points);
+	bool computeTransformation(const QList<ReferencePoint> &points);
+	bool computeResolution(QList<ReferencePoint> &points);
+	bool getTileInfo(const QStringList &tiles, const QString &path = QString());
+	bool getImageInfo(const QString &path);
+
+	void drawTiled(QPainter *painter, const QRectF &rect);
+	void drawOZF(QPainter *painter, const QRectF &rect);
+	void drawImage(QPainter *painter, const QRectF &rect);
+
+	QString _name;
+	bool _valid;
+	QString _errorString;
+
+	QSize _size;
+	Projection *_projection;
+	QTransform _transform, _inverted;
+	qreal _resolution;
+
+	OZF _ozf;
+	Tar _tar;
+	QString _tarPath;
+	QImage *_img;
+	QString _imgPath;
+	QSize _tileSize;
+	QString _tileName;
+};
+
+#endif // OFFLINEMAP_H

src/onlinemap.cpp

@@ -0,0 +1,245 @@
+#include <QFileInfo>
+#include <QDir>
+#include <QPainter>
+#include "downloader.h"
+#include "config.h"
+#include "rd.h"
+#include "wgs84.h"
+#include "misc.h"
+#include "coordinates.h"
+#include "mercator.h"
+#include "onlinemap.h"
+
+
+#define ZOOM_MAX      18
+#define ZOOM_MIN      3
+#define TILE_SIZE     256
+
+static QPoint mercator2tile(const QPointF &m, int z)
+{
+	QPoint tile;
+
+	tile.setX((int)(floor((m.x() + 180.0) / 360.0 * (1<<z))));
+	tile.setY((int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * (1<<z))));
+
+	return tile;
+}
+
+static int scale2zoom(qreal scale)
+{
+	int zoom = (int)log2(360.0/(scale * (qreal)TILE_SIZE));
+
+	if (zoom < ZOOM_MIN)
+		return ZOOM_MIN;
+	if (zoom > ZOOM_MAX)
+		return ZOOM_MAX;
+
+	return zoom;
+}
+
+
+Downloader *OnlineMap::downloader;
+
+OnlineMap::OnlineMap(const QString &name, const QString &url, QObject *parent)
+  : Map(parent)
+{
+	_name = name;
+	_url = url;
+	_block = false;
+	_scale = ((360.0/(qreal)(1<<ZOOM_MAX))/(qreal)TILE_SIZE);
+
+	connect(downloader, SIGNAL(finished()), this, SLOT(emitLoaded()));
+
+	QString path = TILES_DIR + QString("/") + name;
+	if (!QDir().mkpath(path))
+		qWarning("Error creating tiles dir: %s\n", qPrintable(path));
+}
+
+void OnlineMap::emitLoaded()
+{
+	emit loaded();
+}
+
+void OnlineMap::loadTilesAsync(QList<Tile> &list)
+{
+	QList<Download> dl;
+
+	for (int i = 0; i < list.size(); i++) {
+		Tile &t = list[i];
+		QString file = tileFile(t);
+		QFileInfo fi(file);
+
+		if (!fi.exists()) {
+			fillTile(t);
+			dl.append(Download(tileUrl(t), file));
+		} else
+			loadTileFile(t, file);
+	}
+
+	if (!dl.empty())
+		downloader->get(dl);
+}
+
+void OnlineMap::loadTilesSync(QList<Tile> &list)
+{
+	QList<Download> dl;
+
+	for (int i = 0; i < list.size(); i++) {
+		Tile &t = list[i];
+		QString file = tileFile(t);
+		QFileInfo fi(file);
+
+		if (!fi.exists())
+			dl.append(Download(tileUrl(t), file));
+		else
+			loadTileFile(t, file);
+	}
+
+	if (dl.empty())
+		return;
+
+	QEventLoop wait;
+	connect(downloader, SIGNAL(finished()), &wait, SLOT(quit()));
+	if (downloader->get(dl))
+		wait.exec();
+
+	for (int i = 0; i < list.size(); i++) {
+		Tile &t = list[i];
+
+		if (t.pixmap().isNull()) {
+			QString file = tileFile(t);
+			QFileInfo fi(file);
+
+			if (!(fi.exists() && loadTileFile(t, file)))
+				fillTile(t);
+		}
+	}
+}
+
+void OnlineMap::fillTile(Tile &tile)
+{
+	tile.pixmap() = QPixmap(TILE_SIZE, TILE_SIZE);
+	tile.pixmap().fill();
+}
+
+bool OnlineMap::loadTileFile(Tile &tile, const QString &file)
+{
+	if (!tile.pixmap().load(file)) {
+		qWarning("%s: error loading tile file\n", qPrintable(file));
+		return false;
+	}
+
+	return true;
+}
+
+QString OnlineMap::tileUrl(const Tile &tile)
+{
+	QString url(_url);
+
+	url.replace("$z", QString::number(tile.zoom()));
+	url.replace("$x", QString::number(tile.xy().x()));
+	url.replace("$y", QString::number(tile.xy().y()));
+
+	return url;
+}
+
+QString OnlineMap::tileFile(const Tile &tile)
+{
+	QString file = TILES_DIR + QString("/%1/%2-%3-%4").arg(name())
+	  .arg(tile.zoom()).arg(tile.xy().x()).arg(tile.xy().y());
+
+	return file;
+}
+
+void OnlineMap::clearCache()
+{
+	QString path = TILES_DIR + QString("/") + name();
+	QDir dir = QDir(path);
+	QStringList list = dir.entryList();
+
+	for (int i = 0; i < list.count(); i++)
+		dir.remove(list.at(i));
+}
+
+QRectF OnlineMap::bounds() const
+{
+	return scaled(QRectF(QPointF(-180, -180), QSizeF(360, 360)), 1.0/_scale);
+}
+
+qreal OnlineMap::zoomFit(const QSize &size, const QRectF &br)
+{
+	if (br.isNull())
+		_scale = ((360.0/(qreal)(1<<ZOOM_MAX))/(qreal)TILE_SIZE);
+	else {
+		Coordinates topLeft(br.topLeft());
+		Coordinates bottomRight(br.bottomRight());
+		QRectF tbr(Mercator().ll2xy(topLeft), Mercator().ll2xy(bottomRight));
+
+		QPointF sc(tbr.width() / size.width(), tbr.height() / size.height());
+
+		_scale = ((360.0/(qreal)(1<<scale2zoom(qMax(sc.x(), sc.y()))))
+		  / (qreal)TILE_SIZE);
+	}
+
+	return _scale;
+}
+
+qreal OnlineMap::resolution(const QPointF &p) const
+{
+	return (WGS84_RADIUS * 2 * M_PI * _scale / 360.0
+	  * cos(2.0 * atan(exp(deg2rad(-p.y() * _scale))) - M_PI/2));
+}
+
+qreal OnlineMap::zoomIn()
+{
+	int zoom = qMin(scale2zoom(_scale) + 1, ZOOM_MAX);
+	_scale = ((360.0/(qreal)(1<<zoom))/(qreal)TILE_SIZE);
+	return _scale;
+}
+
+qreal OnlineMap::zoomOut()
+{
+	int zoom = qMax(scale2zoom(_scale) - 1, ZOOM_MIN);
+	_scale = ((360.0/(qreal)(1<<zoom))/(qreal)TILE_SIZE);
+	return _scale;
+}
+
+void OnlineMap::draw(QPainter *painter, const QRectF &rect)
+{
+	int zoom = scale2zoom(_scale);
+
+	QPoint tile = mercator2tile(QPointF(rect.topLeft().x() * _scale,
+	  -rect.topLeft().y() * _scale), zoom);
+	QPoint tl = QPoint((int)floor(rect.left() / (qreal)TILE_SIZE)
+	  * TILE_SIZE, (int)floor(rect.top() / TILE_SIZE) * TILE_SIZE);
+
+	QList<Tile> tiles;
+	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	for (int i = 0; i < ceil(s.width() / TILE_SIZE); i++)
+		for (int j = 0; j < ceil(s.height() / TILE_SIZE); j++)
+			tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), zoom));
+
+	if (_block)
+		loadTilesSync(tiles);
+	else
+		loadTilesAsync(tiles);
+
+	for (int i = 0; i < tiles.count(); i++) {
+		Tile &t = tiles[i];
+		QPoint tp(tl.x() + (t.xy().x() - tile.x()) * TILE_SIZE,
+		  tl.y() + (t.xy().y() - tile.y()) * TILE_SIZE);
+		painter->drawPixmap(tp, t.pixmap());
+	}
+}
+
+QPointF OnlineMap::ll2xy(const Coordinates &c)
+{
+	QPointF m = Mercator().ll2xy(c);
+	return QPointF(m.x() / _scale, m.y() / -_scale);
+}
+
+Coordinates OnlineMap::xy2ll(const QPointF &p)
+{
+	QPointF m(p.x() * _scale, -p.y() * _scale);
+	return Mercator().xy2ll(m);
+}

src/onlinemap.h

@@ -0,0 +1,56 @@
+#ifndef ONLINEMAP_H
+#define ONLINEMAP_H
+
+#include "map.h"
+#include "tile.h"
+
+class Downloader;
+
+class OnlineMap : public Map
+{
+	Q_OBJECT
+
+public:
+	OnlineMap(const QString &name, const QString &url, QObject *parent = 0);
+
+	const QString &name() const {return _name;}
+
+	QRectF bounds() const;
+	qreal resolution(const QPointF &p) const;
+
+	qreal zoom() const {return _scale;}
+	qreal zoomFit(const QSize &size, const QRectF &br);
+	qreal zoomIn();
+	qreal zoomOut();
+
+	QPointF ll2xy(const Coordinates &c);
+	Coordinates xy2ll(const QPointF &p);
+
+	void draw(QPainter *painter, const QRectF &rect);
+
+	void setBlockingMode(bool block) {_block = block;}
+	void clearCache();
+
+	static void setDownloader(Downloader *downloader)
+	  {OnlineMap::downloader = downloader;}
+
+private slots:
+	void emitLoaded();
+
+private:
+	QString tileUrl(const Tile &tile);
+	QString tileFile(const Tile &tile);
+	bool loadTileFile(Tile &tile, const QString &file);
+	void fillTile(Tile &tile);
+	void loadTilesAsync(QList<Tile> &list);
+	void loadTilesSync(QList<Tile> &list);
+
+	qreal _scale;
+	QString _name;
+	QString _url;
+	bool _block;
+
+	static Downloader *downloader;
+};
+
+#endif // ONLINEMAP_H

src/opengl.h

@@ -0,0 +1,26 @@
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
+#include <QGLWidget>
+#include <QGLFormat>
+#else
+#include <QOpenGLWidget>
+#include <QSurfaceFormat>
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
+#define OPENGL_WIDGET QGLWidget
+#else
+#define OPENGL_WIDGET QOpenGLWidget
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
+#define OPENGL_SET_SAMPLES(samples) \
+	{QGLFormat fmt; \
+	fmt.setSamples(samples); \
+	QGLFormat::setDefaultFormat(fmt);}
+#else
+#define OPENGL_SET_SAMPLES(samples) \
+	{QSurfaceFormat fmt; \
+	fmt.setSamples(samples);\
+	QSurfaceFormat::setDefaultFormat(fmt);}
+#endif

src/optionsdialog.cpp

@@ -9,11 +9,13 @@
 #include <QGroupBox>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QLabel>
 #include <QSysInfo>
 #include "config.h"
 #include "icons.h"
 #include "colorbox.h"
 #include "stylecombobox.h"
+#include "oddspinbox.h"
 #include "optionsdialog.h"
 
 #define MENU_MARGIN 20
@@ -83,11 +85,12 @@ QWidget *OptionsDialog::createAppearancePage()
 	pathTabLayout->addWidget(l1);
 	pathTabLayout->addLayout(routeLayout);
 	pathTabLayout->addWidget(l2);
-#else
+#else // Q_OS_MAC
 	pathTabLayout->addWidget(trackBox);
 	pathTabLayout->addWidget(routeBox);
-#endif
+#endif // Q_OS_MAC
 	pathTabLayout->addLayout(pathAALayout);
+	pathTabLayout->addStretch();
 	pathTab->setLayout(pathTabLayout);
 
 	_graphWidth = new QSpinBox();
@@ -117,6 +120,98 @@ QWidget *OptionsDialog::createAppearancePage()
 	return appearancePage;
 }
 
+QWidget *OptionsDialog::createDataPage()
+{
+	QString filterToolTip = tr("Moving average window size");
+
+	_elevationFilter = new OddSpinBox();
+	_elevationFilter->setValue(_options->elevationFilter);
+	_elevationFilter->setToolTip(filterToolTip);
+	_speedFilter = new OddSpinBox();
+	_speedFilter->setValue(_options->speedFilter);
+	_speedFilter->setToolTip(filterToolTip);
+	_heartRateFilter = new OddSpinBox();
+	_heartRateFilter->setValue(_options->heartRateFilter);
+	_heartRateFilter->setToolTip(filterToolTip);
+	_cadenceFilter = new OddSpinBox();
+	_cadenceFilter->setValue(_options->cadenceFilter);
+	_cadenceFilter->setToolTip(filterToolTip);
+	_powerFilter = new OddSpinBox();
+	_powerFilter->setValue(_options->powerFilter);
+	_powerFilter->setToolTip(filterToolTip);
+
+	QFormLayout *smoothLayout = new QFormLayout();
+	smoothLayout->addRow(tr("Elevation:"), _elevationFilter);
+	smoothLayout->addRow(tr("Speed:"), _speedFilter);
+	smoothLayout->addRow(tr("Heart rate:"), _heartRateFilter);
+	smoothLayout->addRow(tr("Cadence:"), _cadenceFilter);
+	smoothLayout->addRow(tr("Power:"), _powerFilter);
+#ifndef Q_OS_MAC
+	QGroupBox *smoothBox = new QGroupBox(tr("Smoothing"));
+	smoothBox->setLayout(smoothLayout);
+#endif // Q_OS_MAC
+
+	_outlierEliminate = new QCheckBox(tr("Eliminate GPS outliers"));
+	_outlierEliminate->setChecked(_options->outlierEliminate);
+
+	QFormLayout *outlierLayout = new QFormLayout();
+	outlierLayout->addWidget(_outlierEliminate);
+#ifndef Q_OS_MAC
+	QGroupBox *outlierBox = new QGroupBox(tr("Outlier elimination"));
+	outlierBox->setLayout(outlierLayout);
+#endif // Q_OS_MAC
+
+	QWidget *filterTab = new QWidget();
+	QVBoxLayout *filterTabLayout = new QVBoxLayout();
+#ifdef Q_OS_MAC
+	QLabel *label = new QLabel(tr("Smoothing:"));
+	QFrame *line = new QFrame();
+	line->setFrameShape(QFrame::HLine);
+	line->setFrameShadow(QFrame::Sunken);
+
+	filterTabLayout->addWidget(label);
+	filterTabLayout->addLayout(smoothLayout);
+	filterTabLayout->addWidget(line);
+	filterTabLayout->addLayout(outlierLayout);
+#else // Q_OS_MAC
+	filterTabLayout->addWidget(smoothBox);
+	filterTabLayout->addWidget(outlierBox);
+#endif // Q_OS_MAC
+	filterTabLayout->addStretch();
+	filterTab->setLayout(filterTabLayout);
+
+
+	_pauseSpeed = new QDoubleSpinBox();
+	_pauseSpeed->setDecimals(1);
+	_pauseSpeed->setSingleStep(0.1);
+	_pauseSpeed->setMinimum(0.1);
+	if (_options->units == Imperial) {
+		_pauseSpeed->setValue(_options->pauseSpeed * MS2MIH);
+		_pauseSpeed->setSuffix(UNIT_SPACE + tr("mi/h"));
+	} else {
+		_pauseSpeed->setValue(_options->pauseSpeed * MS2KMH);
+		_pauseSpeed->setSuffix(UNIT_SPACE + tr("km/h"));
+	}
+	_pauseInterval = new QSpinBox();
+	_pauseInterval->setMinimum(1);
+	_pauseInterval->setSuffix(UNIT_SPACE + tr("s"));
+	_pauseInterval->setValue(_options->pauseInterval);
+
+	QFormLayout *pauseLayout = new QFormLayout();
+	pauseLayout->addRow(tr("Minimal speed:"), _pauseSpeed);
+	pauseLayout->addRow(tr("Minimal duration:"), _pauseInterval);
+
+	QWidget *pauseTab = new QWidget();
+	pauseTab->setLayout(pauseLayout);
+
+
+	QTabWidget *filterPage = new QTabWidget();
+	filterPage->addTab(filterTab, tr("Filtering"));
+	filterPage->addTab(pauseTab, tr("Pause detection"));
+
+	return filterPage;
+}
+
 QWidget *OptionsDialog::createPOIPage()
 {
 	_poiRadius = new QDoubleSpinBox();
@@ -142,26 +237,78 @@ QWidget *OptionsDialog::createPOIPage()
 	return poiPage;
 }
 
+QWidget *OptionsDialog::createExportPage()
+{
+	_name = new QCheckBox(tr("Name"));
+	_name->setChecked(_options->printName);
+	_date = new QCheckBox(tr("Date"));
+	_date->setChecked(_options->printDate);
+	_distance = new QCheckBox(tr("Distance"));
+	_distance->setChecked(_options->printDistance);
+	_time = new QCheckBox(tr("Time"));
+	_time->setChecked(_options->printTime);
+	_movingTime = new QCheckBox(tr("Moving time"));
+	_movingTime->setChecked(_options->printMovingTime);
+	_itemCount = new QCheckBox(tr("Item count (>1)"));
+	_itemCount->setChecked(_options->printItemCount);
+
+	QFormLayout *headerTabLayout = new QFormLayout();
+	headerTabLayout->addWidget(_name);
+	headerTabLayout->addWidget(_date);
+	headerTabLayout->addWidget(_distance);
+	headerTabLayout->addWidget(_time);
+	headerTabLayout->addWidget(_movingTime);
+	headerTabLayout->addItem(new QSpacerItem(10, 10));
+	headerTabLayout->addWidget(_itemCount);
+	QWidget *headerTab = new QWidget();
+	headerTab->setLayout(headerTabLayout);
+
+
+	_separateGraphPage = new QCheckBox(tr("Separate graph page"));
+	_separateGraphPage->setChecked(_options->separateGraphPage);
+
+	QFormLayout *graphTabLayout = new QFormLayout();
+	graphTabLayout->addWidget(_separateGraphPage);
+	QWidget *graphTab = new QWidget();
+	graphTab->setLayout(graphTabLayout);
+
+
+	QTabWidget *exportPage = new QTabWidget();
+	exportPage->addTab(headerTab, tr("Header"));
+	exportPage->addTab(graphTab, tr("Graphs"));
+
+	return exportPage;
+}
+
 QWidget *OptionsDialog::createSystemPage()
 {
 	_useOpenGL = new QCheckBox(tr("Use OpenGL"));
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
 #ifdef Q_OS_WIN32
 	if (QSysInfo::WindowsVersion < QSysInfo::WV_VISTA) {
-#endif // Q_OS_WIN32
 		_useOpenGL->setChecked(false);
 		_useOpenGL->setEnabled(false);
-#ifdef Q_OS_WIN32
 	} else
 #endif // Q_OS_WIN32
-#endif // Q_OS_WIN32 || Q_OS_MAC
 	_useOpenGL->setChecked(_options->useOpenGL);
 
-	QFormLayout *systemLayout = new QFormLayout();
-	systemLayout->addWidget(_useOpenGL);
+	_pixmapCache = new QSpinBox();
+	_pixmapCache->setMinimum(16);
+	_pixmapCache->setMaximum(1024);
+	_pixmapCache->setSuffix(UNIT_SPACE + tr("MB"));
+	_pixmapCache->setValue(_options->pixmapCache);
+
+	QFormLayout *cacheLayout = new QFormLayout();
+	cacheLayout->addRow(tr("Image cache size:"), _pixmapCache);
+
+	QFormLayout *openGLLayout = new QFormLayout();
+	openGLLayout->addWidget(_useOpenGL);
 
 	QWidget *systemTab = new QWidget();
-	systemTab->setLayout(systemLayout);
+	QVBoxLayout *systemTabLayout = new QVBoxLayout();
+	systemTabLayout->addLayout(cacheLayout);
+	systemTabLayout->addLayout(openGLLayout);
+	systemTabLayout->addStretch();
+	systemTab->setLayout(systemTabLayout);
 
 	QTabWidget *systemPage = new QTabWidget();
 	systemPage->addTab(systemTab, tr("System"));
@@ -174,14 +321,19 @@ OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
 {
 	QStackedWidget *pages = new QStackedWidget();
 	pages->addWidget(createAppearancePage());
+	pages->addWidget(createDataPage());
 	pages->addWidget(createPOIPage());
+	pages->addWidget(createExportPage());
 	pages->addWidget(createSystemPage());
 
 	QListWidget *menu = new QListWidget();
 	menu->setIconSize(QSize(MENU_ICON_SIZE, MENU_ICON_SIZE));
 	new QListWidgetItem(QIcon(QPixmap(APPEARANCE_ICON)), tr("Appearance"),
 	  menu);
+	new QListWidgetItem(QIcon(QPixmap(DATA_ICON)), tr("Data"), menu);
 	new QListWidgetItem(QIcon(QPixmap(POI_ICON)), tr("POI"), menu);
+	new QListWidgetItem(QIcon(QPixmap(PRINT_EXPORT_ICON)), tr("Print & Export"),
+	  menu);
 	new QListWidgetItem(QIcon(QPixmap(SYSTEM_ICON)), tr("System"), menu);
 
 	QHBoxLayout *contentLayout = new QHBoxLayout();
@@ -227,12 +379,29 @@ void OptionsDialog::accept()
 	_options->graphWidth = _graphWidth->value();
 	_options->graphAntiAliasing = _graphAA->isChecked();
 
-	if (_options->units == Imperial)
-		_options->poiRadius = _poiRadius->value() * MIINM;
-	else
-		_options->poiRadius = _poiRadius->value() * KMINM;
+	_options->elevationFilter = _elevationFilter->value();
+	_options->speedFilter = _speedFilter->value();
+	_options->heartRateFilter = _heartRateFilter->value();
+	_options->cadenceFilter = _cadenceFilter->value();
+	_options->powerFilter = _powerFilter->value();
+	_options->outlierEliminate = _outlierEliminate->isChecked();
+	_options->pauseSpeed = (_options->units == Imperial)
+		? _pauseSpeed->value() / MS2MIH : _pauseSpeed->value() / MS2KMH;
+	_options->pauseInterval = _pauseInterval->value();
+
+	_options->poiRadius = (_options->units == Imperial)
+		? _poiRadius->value() * MIINM :  _poiRadius->value() * KMINM;
 
 	_options->useOpenGL = _useOpenGL->isChecked();
+	_options->pixmapCache = _pixmapCache->value();
+
+	_options->printName = _name->isChecked();
+	_options->printDate = _date->isChecked();
+	_options->printDistance = _distance->isChecked();
+	_options->printTime = _time->isChecked();
+	_options->printMovingTime = _movingTime->isChecked();
+	_options->printItemCount = _itemCount->isChecked();
+	_options->separateGraphPage = _separateGraphPage->isChecked();
 
 	QDialog::accept();
 }

src/optionsdialog.h

@@ -7,6 +7,7 @@
 
 class ColorBox;
 class StyleComboBox;
+class OddSpinBox;
 class QSpinBox;
 class QDoubleSpinBox;
 class QComboBox;
@@ -22,10 +23,28 @@ struct Options {
 	int graphWidth;
 	bool pathAntiAliasing;
 	bool graphAntiAliasing;
+	// Data
+	int elevationFilter;
+	int speedFilter;
+	int heartRateFilter;
+	int cadenceFilter;
+	int powerFilter;
+	bool outlierEliminate;
+	qreal pauseSpeed;
+	int pauseInterval;
 	// POI
 	int poiRadius;
 	// System
 	bool useOpenGL;
+	int pixmapCache;
+	// Print/Export
+	bool printName;
+	bool printDate;
+	bool printDistance;
+	bool printTime;
+	bool printMovingTime;
+	bool printItemCount;
+	bool separateGraphPage;
 
 	Units units;
 };
@@ -42,11 +61,14 @@ public slots:
 
 private:
 	QWidget *createAppearancePage();
+	QWidget *createDataPage();
 	QWidget *createPOIPage();
 	QWidget *createSystemPage();
+	QWidget *createExportPage();
 
 	Options *_options;
 
+	// Appearance
 	ColorBox *_baseColor;
 	QDoubleSpinBox *_colorOffset;
 	QSpinBox *_trackWidth;
@@ -56,8 +78,28 @@ private:
 	QCheckBox *_pathAA;
 	QSpinBox *_graphWidth;
 	QCheckBox *_graphAA;
+	// Data
+	OddSpinBox *_elevationFilter;
+	OddSpinBox *_speedFilter;
+	OddSpinBox *_heartRateFilter;
+	OddSpinBox *_cadenceFilter;
+	OddSpinBox *_powerFilter;
+	QCheckBox *_outlierEliminate;
+	QDoubleSpinBox *_pauseSpeed;
+	QSpinBox *_pauseInterval;
+	// POI
 	QDoubleSpinBox *_poiRadius;
+	// System
+	QSpinBox *_pixmapCache;
 	QCheckBox *_useOpenGL;
+	// Print/Export
+	QCheckBox *_name;
+	QCheckBox *_date;
+	QCheckBox *_distance;
+	QCheckBox *_time;
+	QCheckBox *_movingTime;
+	QCheckBox *_itemCount;
+	QCheckBox *_separateGraphPage;
 };
 
 #endif // OPTIONSDIALOG_H

src/ozf.cpp

@@ -0,0 +1,234 @@
+#include <QtEndian>
+#include <QFile>
+#include "ozf.h"
+
+
+#define OZF2_MAGIC  0x7778
+#define OZF3_MAGIC  0x7780
+#define SEPARATOR   0x77777777
+
+static const quint8 XKEY[] =
+{
+	0x2D, 0x4A, 0x43, 0xF1, 0x27, 0x9B, 0x69, 0x4F,
+	0x36, 0x52, 0x87, 0xEC, 0x5F, 0x42, 0x53, 0x22,
+	0x9E, 0x8B, 0x2D, 0x83, 0x3D, 0xD2, 0x84, 0xBA,
+	0xD8, 0x5B
+};
+
+static void decrypt(void *data, size_t size, quint8 init)
+{
+	for (size_t i = 0; i < size; i++)
+		reinterpret_cast<quint8*>(data)[i] ^= XKEY[i % sizeof(XKEY)] + init;
+}
+
+template<class T> bool OZF::readValue(T &val)
+{
+	T data;
+
+	if (_file.read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
+		return false;
+
+	if (_decrypt)
+		decrypt(&data, sizeof(T), _key);
+
+	if (sizeof(T) > 1)
+		val = qFromLittleEndian(data);
+	else
+		val = data;
+
+	return true;
+}
+
+bool OZF::read(void *data, size_t size)
+{
+	if (_file.read((char*)data, size) < (qint64)size)
+		return false;
+
+	if (_decrypt)
+		decrypt(data, size, _key);
+
+	return true;
+}
+
+bool OZF::readKey()
+{
+	quint8 randomNumber, initial;
+	quint32 keyblock;
+
+
+	if (!_file.seek(14))
+		return false;
+	if (!readValue(randomNumber))
+		return false;
+
+	if (!_file.seek(162))
+		return false;
+	if (!readValue(initial))
+		return false;
+
+	_decrypt = true; _key = initial;
+	if (!_file.seek(15 + randomNumber))
+		return false;
+	if (!readValue(keyblock))
+		return false;
+
+	switch (keyblock & 0xFF) {
+		case 0xf1:
+			initial += 0x8a;
+			break;
+		case 0x18:
+		case 0x54:
+			initial += 0xa0;
+			break;
+		case 0x56:
+			initial += 0xb9;
+			break;
+		case 0x43:
+			initial += 0x6a;
+			break;
+		case 0x83:
+			initial += 0xa4;
+			break;
+		case 0xc5:
+			initial += 0x7e;
+			break;
+		case 0x38:
+			initial += 0xc1;
+			break;
+		default:
+			break;
+	}
+
+	_key = initial;
+
+	return true;
+}
+
+bool OZF::readHeaders()
+{
+	quint16 magic;
+	quint32 separator;
+
+	if (!readValue(magic))
+		return false;
+
+	if (magic == OZF2_MAGIC) {
+		if (!_file.seek(_file.pos() + 52))
+			return false;
+		if (!readValue(separator) || separator != SEPARATOR)
+			return false;
+	} else if (magic == OZF3_MAGIC) {
+		if (!readKey())
+			return false;
+	} else
+		return false;
+
+	return true;
+}
+
+bool OZF::readTileTable()
+{
+	quint32 offset, bgr0, w, h;
+	quint16 x, y;
+
+
+	if (!_file.seek(_file.size() - 4))
+		return false;
+	// table offset
+	if (!readValue(offset))
+		return false;
+	if (!_file.seek(offset))
+		return false;
+	// tiles offset (zoom level 0)
+	if (!readValue(offset))
+		return false;
+	if (!_file.seek(offset))
+		return false;
+
+	if (!readValue(w))
+		return false;
+	if (!readValue(h))
+		return false;
+	if (!readValue(x))
+		return false;
+	if (!readValue(y))
+		return false;
+
+	_size = QSize(w, h);
+	_dim = QSize(x, y);
+
+	_palette = QVector<quint32>(256);
+	if (!read(&(_palette[0]), sizeof(quint32) * 256))
+		return false;
+	for (int i = 0; i < _palette.size(); i++) {
+		bgr0 = qFromLittleEndian(_palette.at(i));
+
+		quint32 b = (bgr0 & 0x000000FF);
+		quint32 g = (bgr0 & 0x0000FF00) >> 8;
+		quint32 r = (bgr0 & 0x00FF0000) >> 16;
+
+		_palette[i] = 0xFF000000 | r << 16 | g << 8 | b;
+	}
+
+	_tiles = QVector<quint32>(_dim.width() * _dim.height() + 1);
+	for (int i = 0; i < _tiles.size(); i++)
+		if (!readValue(_tiles[i]))
+			return false;
+
+	return true;
+}
+
+bool OZF::load(const QString &path)
+{
+	if (_file.isOpen())
+		_file.close();
+
+	_file.setFileName(path);
+	if (!_file.open(QIODevice::ReadOnly))
+		return false;
+
+	if (!readHeaders()) {
+		qWarning("%s: not a OZF2/OZF3 file", qPrintable(_file.fileName()));
+		_file.close();
+		return false;
+	}
+
+	if (!readTileTable()) {
+		qWarning("%s: file format error", qPrintable(_file.fileName()));
+		_file.close();
+		_size = QSize();
+		return false;
+	}
+
+	return true;
+}
+
+QPixmap OZF::tile(int x, int y)
+{
+	Q_ASSERT(_file.isOpen());
+
+	int i = (y/tileSize().height()) * _dim.width() + (x/tileSize().width());
+	if (i >= _tiles.size() - 1 || i < 0)
+		return QPixmap();
+
+	int size = _tiles.at(i+1) - _tiles.at(i);
+	if (!_file.seek(_tiles.at(i)))
+		return QPixmap();
+
+	QByteArray ba = _file.read(size);
+	if (ba.size() != size)
+		return QPixmap();
+	if (_decrypt)
+		decrypt(ba.data(), qMin(16, ba.size()), _key);
+	quint32 bes = qToBigEndian(tileSize().width() * tileSize().height());
+	ba.prepend(QByteArray((char*)&bes, sizeof(bes)));
+	QByteArray uba = qUncompress(ba);
+	if (uba.size() != tileSize().width() * tileSize().height())
+		return QPixmap();
+
+	QImage img((const uchar*)uba.constData(), tileSize().width(),
+	  tileSize().height(), QImage::Format_Indexed8);
+	img.setColorTable(_palette);
+
+	return QPixmap::fromImage(img.mirrored());
+}

src/ozf.h

@@ -0,0 +1,43 @@
+#ifndef OZF_H
+#define OZF_H
+
+#include <QString>
+#include <QSize>
+#include <QColor>
+#include <QVector>
+#include <QFile>
+#include <QPixmap>
+
+class OZF
+{
+public:
+	OZF() : _decrypt(false), _key(0) {}
+
+	bool load(const QString &path);
+
+	QString fileName() const {return _file.fileName();}
+	bool isOpen() const {return _file.isOpen();}
+
+	QSize size() const {return _size;}
+	QSize tileSize() const {return QSize(64, 64);}
+	QPixmap tile(int x, int y);
+
+private:
+	template<class T> bool readValue(T &val);
+	bool read(void *data, size_t size);
+	bool readKey();
+	bool readHeaders();
+	bool readTileTable();
+
+	bool _decrypt;
+	quint8 _key;
+
+	QSize _size;
+	QSize _dim;
+	QVector<QRgb> _palette;
+	QVector<quint32> _tiles;
+
+	QFile _file;
+};
+
+#endif // OZF_H

src/path.cpp

@@ -1,5 +1,29 @@
 #include "path.h"
 
+QRectF Path::boundingRect() const
+{
+	if (size() < 2)
+		return QRectF();
+
+	QPointF topLeft(at(0).coordinates().lon(), at(0).coordinates().lat());
+	QPointF bottomRight(topLeft);
+
+	for (int i = 1; i < size(); i++) {
+		qreal x = at(i).coordinates().lon();
+		qreal y = at(i).coordinates().lat();
+
+		if (x < topLeft.x())
+			topLeft.setX(x);
+		if (y < topLeft.y())
+			topLeft.setY(y);
+		if (x > bottomRight.x())
+			bottomRight.setX(x);
+		if (y > bottomRight.y())
+			bottomRight.setY(y);
+	}
+	return QRectF(topLeft, bottomRight);
+}
+
 QDebug operator<<(QDebug dbg, const PathPoint &point)
 {
 	dbg.nospace() << "PathPoint(" << point.distance() << ", "

src/path.h

@@ -2,6 +2,7 @@
 #define PATH_H
 
 #include <QVector>
+#include <QRectF>
 #include "coordinates.h"
 
 class PathPoint
@@ -23,6 +24,11 @@ private:
 Q_DECLARE_TYPEINFO(PathPoint, Q_PRIMITIVE_TYPE);
 QDebug operator<<(QDebug dbg, const PathPoint &point);
 
-typedef QVector<PathPoint> Path;
+
+class Path : public QVector<PathPoint>
+{
+public:
+	QRectF boundingRect() const;
+};
 
 #endif // PATH_H

src/pathitem.cpp

@@ -3,29 +3,49 @@
 #include <QCursor>
 #include <QPainter>
 #include "tooltip.h"
+#include "map.h"
+#include "misc.h"
 #include "pathitem.h"
 
 
+PathItem::PathItem(const Path &path, Map *map, QGraphicsItem *parent)
+  : QGraphicsObject(parent)
+{
+	Q_ASSERT(path.count() >= 2);
+
+	_path = path;
+	_map = map;
+	_digitalZoom = 0;
+
+	_width = 3;
+	QBrush brush(Qt::SolidPattern);
+	_pen = QPen(brush, _width);
+
+	updatePainterPath(map);
+	updateShape();
+
+	_marker = new MarkerItem(this);
+	_marker->setPos(position(_path.at(0).distance()));
+	_markerDistance = _path.at(0).distance();
+
+	setCursor(Qt::ArrowCursor);
+	setAcceptHoverEvents(true);
+}
+
 void PathItem::updateShape()
 {
 	QPainterPathStroker s;
-	s.setWidth((_width + 1) * 1.0/scale());
-	_shape = s.createStroke(_path);
+	s.setWidth((_width + 1) * pow(2, -_digitalZoom));
+	_shape = s.createStroke(_painterPath);
 }
 
-PathItem::PathItem(QGraphicsItem *parent) : QGraphicsObject(parent)
+void PathItem::updatePainterPath(Map *map)
 {
-	_width = 3;
+	_painterPath = QPainterPath();
 
-	QBrush brush(Qt::SolidPattern);
-	_pen = QPen(brush, _width);
-
-	_units = Metric;
-
-	_marker = new MarkerItem(this);
-
-	setCursor(Qt::ArrowCursor);
-	setAcceptHoverEvents(true);
+	_painterPath.moveTo(map->ll2xy(_path.first().coordinates()));
+	for (int i = 1; i < _path.size(); i++)
+		_painterPath.lineTo(map->ll2xy(_path.at(i).coordinates()));
 }
 
 void PathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@@ -35,7 +55,7 @@ void PathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	Q_UNUSED(widget);
 
 	painter->setPen(_pen);
-	painter->drawPath(_path);
+	painter->drawPath(_painterPath);
 
 /*
 	QPen p = QPen(QBrush(Qt::red), 0);
@@ -44,15 +64,15 @@ void PathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 */
 }
 
-void PathItem::setScale(qreal scale)
+void PathItem::setMap(Map *map)
 {
+	_map = map;
 	prepareGeometryChange();
 
-	_pen.setWidthF(_width * 1.0/scale);
-	QGraphicsItem::setScale(scale);
-	_marker->setScale(1.0/scale);
-
+	updatePainterPath(map);
 	updateShape();
+
+	_marker->setPos(position(_markerDistance));
 }
 
 void PathItem::setColor(const QColor &color)
@@ -61,12 +81,12 @@ void PathItem::setColor(const QColor &color)
 	update();
 }
 
-void PathItem::setWidth(int width)
+void PathItem::setWidth(qreal width)
 {
 	prepareGeometryChange();
 
 	_width = width;
-	_pen.setWidthF(_width * 1.0/scale());
+	_pen.setWidthF(_width * pow(2, -_digitalZoom));
 
 	updateShape();
 }
@@ -77,41 +97,47 @@ void PathItem::setStyle(Qt::PenStyle style)
 	update();
 }
 
-void PathItem::setUnits(enum Units units)
+void PathItem::setDigitalZoom(int zoom)
 {
-	_units = units;
+	prepareGeometryChange();
+
+	_digitalZoom = zoom;
+	_pen.setWidthF(_width * pow(2, -_digitalZoom));
+	_marker->setScale(pow(2, -_digitalZoom));
+
+	updateShape();
 }
 
 QPointF PathItem::position(qreal x) const
 {
 	int low = 0;
-	int high = _distance.count() - 1;
+	int high = _path.count() - 1;
 	int mid = 0;
 
-
-	Q_ASSERT(_distance.count() == _path.elementCount());
 	Q_ASSERT(high > low);
-	Q_ASSERT(x >= _distance.at(low) && x <= _distance.at(high));
+	Q_ASSERT(x >= _path.at(low).distance() && x <= _path.at(high).distance());
 
 	while (low <= high) {
 		mid = low + ((high - low) / 2);
-		qreal val = _distance.at(mid);
+		qreal val = _path.at(mid).distance();
 		if (val > x)
 			high = mid - 1;
 		else if (val < x)
 			low = mid + 1;
 		else
-			return _path.elementAt(mid);
+			return _map->ll2xy(_path.at(mid).coordinates());
 	}
 
 	QLineF l;
 	qreal p1, p2;
-	if (_distance.at(mid) < x) {
-		l = QLineF(_path.elementAt(mid), _path.elementAt(mid+1));
-		p1 = _distance.at(mid); p2 = _distance.at(mid+1);
+	if (_path.at(mid).distance() < x) {
+		l = QLineF(_map->ll2xy(_path.at(mid).coordinates()),
+		  _map->ll2xy(_path.at(mid+1).coordinates()));
+		p1 = _path.at(mid).distance(); p2 = _path.at(mid+1).distance();
 	} else {
-		l = QLineF(_path.elementAt(mid-1), _path.elementAt(mid));
-		p1 = _distance.at(mid-1); p2 = _distance.at(mid);
+		l = QLineF(_map->ll2xy(_path.at(mid-1).coordinates()),
+		  _map->ll2xy(_path.at(mid).coordinates()));
+		p1 = _path.at(mid-1).distance(); p2 = _path.at(mid).distance();
 	}
 
 	return l.pointAt((x - p1) / (p2 - p1));
@@ -119,9 +145,11 @@ QPointF PathItem::position(qreal x) const
 
 void PathItem::moveMarker(qreal distance)
 {
-	if (distance >= _distance.first() && distance <= _distance.last()) {
+	if (distance >= _path.first().distance()
+	  && distance <= _path.last().distance()) {
 		_marker->setVisible(true);
 		_marker->setPos(position(distance));
+		_markerDistance = distance;
 	} else
 		_marker->setVisible(false);
 }
@@ -130,7 +158,7 @@ void PathItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF((_width + 1) * 1.0/scale());
+	_pen.setWidthF((_width + 1) * pow(2, -_digitalZoom));
 	setZValue(zValue() + 1.0);
 	update();
 
@@ -141,7 +169,7 @@ void PathItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);
 
-	_pen.setWidthF(_width * 1.0/scale());
+	_pen.setWidthF(_width * pow(2, -_digitalZoom));
 	setZValue(zValue() - 1.0);
 	update();
 

src/pathitem.h

@@ -4,28 +4,31 @@
 #include <QGraphicsObject>
 #include <QPen>
 #include "markeritem.h"
-#include "units.h"
+#include "path.h"
 
 
+class Map;
+
 class PathItem : public QGraphicsObject
 {
 	Q_OBJECT
 
 public:
-	PathItem(QGraphicsItem *parent = 0);
+	PathItem(const Path &path, Map *map, QGraphicsItem *parent = 0);
 
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-	const QPainterPath &path() const {return _path;}
-	void showMarker(bool show) {_marker->setVisible(show);}
-	void setScale(qreal scale);
-	void setUnits(enum Units units);
+	const Path &path() const {return _path;}
+
+	void setMap(Map *map);
+
 	void setColor(const QColor &color);
-	void setWidth(int width);
+	void setWidth(qreal width);
 	void setStyle(Qt::PenStyle style);
+	void setDigitalZoom(int zoom);
 
 public slots:
 	void moveMarker(qreal distance);
@@ -34,22 +37,25 @@ signals:
 	void selected(bool);
 
 protected:
-	void updateShape();
-
-	QVector<qreal> _distance;
-	QPainterPath _path;
+	Path _path;
 	MarkerItem *_marker;
-	Units _units;
 
 private:
 	QPointF position(qreal distance) const;
+	void updatePainterPath(Map *map);
+	void updateShape();
 
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
 
-	int _width;
+	Map *_map;
+	qreal _markerDistance;
+	int _digitalZoom;
+
+	qreal _width;
 	QPen _pen;
 	QPainterPath _shape;
+	QPainterPath _painterPath;
 };
 
 #endif // PATHITEM_H

src/pathview.cpp

@@ -1,72 +1,26 @@
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QWheelEvent>
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-#include <QGLWidget>
-#else // QT 5
-#include <QOpenGLWidget>
-#endif // QT 5
-#include <QSysInfo>
-#include "rd.h"
+#include <QApplication>
+#include <QPixmapCache>
+#include "opengl.h"
+#include "misc.h"
 #include "poi.h"
 #include "data.h"
 #include "map.h"
+#include "emptymap.h"
 #include "trackitem.h"
 #include "routeitem.h"
 #include "waypointitem.h"
 #include "scaleitem.h"
+#include "keys.h"
 #include "pathview.h"
 
-
-#define ZOOM_MAX      18
-#define ZOOM_MIN      3
+#define MAX_ZOOM      1
+#define MIN_ZOOM      -3
 #define MARGIN        10.0
 #define SCALE_OFFSET  7
 
-static QPoint mercator2tile(const QPointF &m, int z)
-{
-	QPoint tile;
-
-	tile.setX((int)(floor((m.x() + 180.0) / 360.0 * pow(2.0, z))));
-	tile.setY((int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * pow(2.0, z))));
-
-	return tile;
-}
-
-static QPointF tile2mercator(const QPoint &tile, int z)
-{
-	Coordinates m;
-
-	m.setLon(tile.x() / pow(2.0, z) * 360.0 - 180);
-	qreal n = M_PI - 2.0 * M_PI * tile.y() / pow(2.0, z);
-	m.setLat(rad2deg(atan(0.5 * (exp(n) - exp(-n)))));
-
-	return m.toMercator();
-}
-
-static int scale2zoom(qreal scale)
-{
-	int zoom = (int)log2(360.0/(scale * (qreal)Tile::size()));
-
-	if (zoom < ZOOM_MIN)
-		return ZOOM_MIN;
-	if (zoom > ZOOM_MAX)
-		return ZOOM_MAX;
-
-	return zoom;
-}
-
-qreal mapScale(int zoom)
-{
-	return ((360.0/(qreal)(1<<zoom))/(qreal)Tile::size());
-}
-
-static QRectF qrectf(const QPointF &p1, const QPointF &p2)
-{
-	return QRectF(QPointF(qMin(p1.x(), p2.x()), qMin(p1.y(), p2.y())),
-	  QPointF(qMax(p1.x(), p2.x()), qMax(p1.y(), p2.y())));
-}
-
 static void unite(QRectF &rect, const QPointF &p)
 {
 	if (p.x() < rect.left())
@@ -79,16 +33,12 @@ static void unite(QRectF &rect, const QPointF &p)
 		rect.setTop(p.y());
 }
 
-static QRectF scaled(const QRectF &rect, qreal factor)
-{
-	return QRectF(QPointF(rect.left() * factor, rect.top() * factor),
-	  QSizeF(rect.width() * factor, rect.height() * factor));
-}
-
-
-PathView::PathView(QWidget *parent)
+PathView::PathView(Map *map, POI *poi, QWidget *parent)
 	: QGraphicsView(parent)
 {
+	Q_ASSERT(map != 0);
+	Q_ASSERT(poi != 0);
+
 	_scene = new QGraphicsScene(this);
 	setScene(_scene);
 	setCacheMode(QGraphicsView::CacheBackground);
@@ -102,12 +52,14 @@ PathView::PathView(QWidget *parent)
 	_mapScale = new ScaleItem();
 	_mapScale->setZValue(2.0);
 
-	_zoom = ZOOM_MAX;
-	_map = 0;
-	_poi = 0;
+	_map = map;
+	_poi = poi;
+	connect(_map, SIGNAL(loaded()), this, SLOT(redraw()));
+	connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
 
 	_units = Metric;
 
+	_showMap = true;
 	_showTracks = true;
 	_showRoutes = true;
 	_showWaypoints = true;
@@ -122,6 +74,10 @@ PathView::PathView(QWidget *parent)
 	_routeStyle = Qt::DashLine;
 
 	_plot = false;
+	_digitalZoom = 0;
+
+	_scene->setSceneRect(_map->bounds());
+	_res = _map->resolution(_scene->sceneRect().center());
 }
 
 PathView::~PathView()
@@ -137,19 +93,18 @@ PathItem *PathView::addTrack(const Track &track)
 		return 0;
 	}
 
-	TrackItem *ti = new TrackItem(track);
+	TrackItem *ti = new TrackItem(track, _map);
 	_tracks.append(ti);
 	_tr |= ti->path().boundingRect();
-	_zoom = scale2zoom(contentsScale());
-	ti->setScale(1.0/mapScale(_zoom));
 	ti->setColor(_palette.nextColor());
 	ti->setWidth(_trackWidth);
 	ti->setStyle(_trackStyle);
+	ti->setUnits(_units);
 	ti->setVisible(_showTracks);
+	ti->setDigitalZoom(_digitalZoom);
 	_scene->addItem(ti);
 
-	if (_poi)
-		addPOI(_poi->points(ti));
+	addPOI(_poi->points(ti->path()));
 
 	return ti;
 }
@@ -161,61 +116,48 @@ PathItem *PathView::addRoute(const Route &route)
 		return 0;
 	}
 
-	RouteItem *ri = new RouteItem(route);
+	RouteItem *ri = new RouteItem(route, _map);
 	_routes.append(ri);
 	_rr |= ri->path().boundingRect();
-	_zoom = scale2zoom(contentsScale());
-	ri->setScale(1.0/mapScale(_zoom));
 	ri->setColor(_palette.nextColor());
 	ri->setWidth(_routeWidth);
 	ri->setStyle(_routeStyle);
+	ri->setUnits(_units);
 	ri->setVisible(_showRoutes);
 	ri->showWaypoints(_showRouteWaypoints);
 	ri->showWaypointLabels(_showWaypointLabels);
+	ri->setDigitalZoom(_digitalZoom);
 	_scene->addItem(ri);
 
-	if (_poi)
-		addPOI(_poi->points(ri));
+	addPOI(_poi->points(ri->path()));
 
 	return ri;
 }
 
 void PathView::addWaypoints(const QList<Waypoint> &waypoints)
 {
-	qreal scale = mapScale(_zoom);
-
 	for (int i = 0; i < waypoints.count(); i++) {
 		const Waypoint &w = waypoints.at(i);
 
-		WaypointItem *wi = new WaypointItem(w);
-		wi->setScale(1.0/scale);
+		WaypointItem *wi = new WaypointItem(w, _map);
+		_waypoints.append(wi);
+		Coordinates c = wi->waypoint().coordinates();
+		updateWaypointsBoundingRect(QPointF(c.lon(), c.lat()));
 		wi->setZValue(1);
 		wi->showLabel(_showWaypointLabels);
+		wi->setUnits(_units);
 		wi->setVisible(_showWaypoints);
+		wi->setDigitalZoom(_digitalZoom);
 		_scene->addItem(wi);
-
-		if (_wr.isNull()) {
-			if (_wp.isNull())
-				_wp = wi->coordinates();
-			else
-				_wr = qrectf(_wp, wi->coordinates());
-		} else
-			unite(_wr, wi->coordinates());
-
-		_waypoints.append(wi);
 	}
 
-	if (_poi)
 	addPOI(_poi->points(waypoints));
-
-	_zoom = scale2zoom(contentsScale());
 }
 
 QList<PathItem *> PathView::loadData(const Data &data)
 {
 	QList<PathItem *> paths;
-	int zoom = _zoom;
-
+	qreal scale = _map->zoom();
 
 	for (int i = 0; i < data.tracks().count(); i++)
 		paths.append(addTrack(*(data.tracks().at(i))));
@@ -226,47 +168,54 @@ QList<PathItem *> PathView::loadData(const Data &data)
 	if (_tracks.empty() && _routes.empty() && _waypoints.empty())
 		return paths;
 
-	if ((_tracks.size() + _routes.size() > 1 && _zoom < zoom)
-	  || (_waypoints.size() && _zoom < zoom))
-		rescale(_zoom);
+	if (mapScale() != scale)
+		rescale();
 	else
 		updatePOIVisibility();
 
-	QRectF sr = contentsSceneRect();
-	_scene->setSceneRect(sr);
-	centerOn(sr.center());
+	QPointF center = contentCenter();
+	centerOn(center);
 
-	_mapScale->setZoom(_zoom, -(sr.center().ry() * mapScale(_zoom)));
+	_res = _map->resolution(center);
+	_mapScale->setResolution(_res);
 	if (_mapScale->scene() != _scene)
 		_scene->addItem(_mapScale);
 
 	return paths;
 }
 
-qreal PathView::contentsScale() const
+void PathView::updateWaypointsBoundingRect(const QPointF &wp)
 {
-	QRectF br = _tr | _rr | _wr;
-
-	if (br.isNull())
-		return mapScale(ZOOM_MAX);
-
-	QPointF sc(br.width() / (viewport()->width() - MARGIN/2),
-	  br.height() / (viewport()->height() - MARGIN/2));
-
-	return qMax(sc.x(), sc.y());
+	if (_wr.isNull()) {
+		if (_wp.isNull())
+			_wp = wp;
+		else {
+			_wr = QRectF(_wp, wp).normalized();
+			_wp = QPointF();
+		}
+	} else
+		unite(_wr, wp);
 }
 
-QRectF PathView::contentsSceneRect() const
+qreal PathView::mapScale() const
 {
-	qreal scale = mapScale(_zoom);
-	QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
+	QRectF br = _tr | _rr | _wr;
+	if (!br.isNull() && !_wp.isNull())
+		unite(br, _wp);
+
+	return _map->zoomFit(viewport()->size() - QSize(MARGIN/2, MARGIN/2), br);
+}
+
+QPointF PathView::contentCenter() const
+{
+	QRectF br = _tr | _rr | _wr;
+	if (!br.isNull() && !_wp.isNull())
+		unite(br, _wp);
 
 	if (br.isNull())
-		return QRectF(QPointF(_wp.x() / scale - Tile::size()/2,
-		  _wp.y() /scale - Tile::size()/2), QSizeF(Tile::size(), Tile::size()));
+		return _map->ll2xy(_wp);
 	else
-		return br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
-		  Tile::size());
+		return _map->ll2xy(br.center());
 }
 
 void PathView::updatePOIVisibility()
@@ -290,23 +239,21 @@ void PathView::updatePOIVisibility()
 	}
 }
 
-void PathView::rescale(int zoom)
+void PathView::rescale()
 {
-	_zoom = zoom;
-	qreal scale = mapScale(zoom);
+	_scene->setSceneRect(_map->bounds());
+	resetCachedContent();
 
 	for (int i = 0; i < _tracks.size(); i++)
-		_tracks.at(i)->setScale(1.0/scale);
-
+		_tracks.at(i)->setMap(_map);
 	for (int i = 0; i < _routes.size(); i++)
-		_routes.at(i)->setScale(1.0/scale);
-
+		_routes.at(i)->setMap(_map);
 	for (int i = 0; i < _waypoints.size(); i++)
-		_waypoints.at(i)->setScale(1.0/scale);
+		_waypoints.at(i)->setMap(_map);
 
 	QHash<Waypoint, WaypointItem*>::const_iterator it;
 	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
-		it.value()->setScale(1.0/scale);
+		it.value()->setMap(_map);
 
 	updatePOIVisibility();
 }
@@ -322,16 +269,49 @@ void PathView::setPalette(const Palette &palette)
 		_routes.at(i)->setColor(_palette.nextColor());
 }
 
+void PathView::setMap(Map *map)
+{
+	_map->unload();
+	disconnect(_map, SIGNAL(loaded()), this, SLOT(redraw()));
+
+	_map = map;
+	_map->load();
+	connect(_map, SIGNAL(loaded()), this, SLOT(redraw()));
+
+	resetDigitalZoom();
+
+	mapScale();
+	_scene->setSceneRect(_map->bounds());
+
+	for (int i = 0; i < _tracks.size(); i++)
+		_tracks.at(i)->setMap(map);
+	for (int i = 0; i < _routes.size(); i++)
+		_routes.at(i)->setMap(map);
+	for (int i = 0; i < _waypoints.size(); i++)
+		_waypoints.at(i)->setMap(map);
+
+	QHash<Waypoint, WaypointItem*>::const_iterator it;
+	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+		it.value()->setMap(_map);
+	updatePOIVisibility();
+
+	QPointF center = contentCenter();
+	centerOn(center);
+
+	_res = _map->resolution(center);
+	_mapScale->setResolution(_res);
+
+	resetCachedContent();
+	QPixmapCache::clear();
+}
+
 void PathView::setPOI(POI *poi)
 {
-	if (_poi)
 	disconnect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
+	connect(poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
 
 	_poi = poi;
 
-	if (_poi)
-		connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
-
 	updatePOI();
 }
 
@@ -345,13 +325,10 @@ void PathView::updatePOI()
 	}
 	_pois.clear();
 
-	if (!_poi)
-		return;
-
 	for (int i = 0; i < _tracks.size(); i++)
-		addPOI(_poi->points(_tracks.at(i)));
+		addPOI(_poi->points(_tracks.at(i)->path()));
 	for (int i = 0; i < _routes.size(); i++)
-		addPOI(_poi->points(_routes.at(i)));
+		addPOI(_poi->points(_routes.at(i)->path()));
 	addPOI(_poi->points(_waypoints));
 
 	updatePOIVisibility();
@@ -359,38 +336,23 @@ void PathView::updatePOI()
 
 void PathView::addPOI(const QVector<Waypoint> &waypoints)
 {
-	qreal scale = mapScale(_zoom);
-
 	for (int i = 0; i < waypoints.size(); i++) {
 		const Waypoint &w = waypoints.at(i);
 
 		if (_pois.contains(w))
 			continue;
 
-		WaypointItem *pi = new WaypointItem(w);
-		pi->setScale(1.0/scale);
+		WaypointItem *pi = new WaypointItem(w, _map);
 		pi->setZValue(1);
 		pi->showLabel(_showPOILabels);
 		pi->setVisible(_showPOI);
+		pi->setDigitalZoom(_digitalZoom);
 		_scene->addItem(pi);
 
 		_pois.insert(w, pi);
 	}
 }
 
-void PathView::setMap(Map *map)
-{
-	if (_map)
-		disconnect(_map, SIGNAL(loaded()), this, SLOT(redraw()));
-
-	_map = map;
-
-	if (_map)
-		connect(_map, SIGNAL(loaded()), this, SLOT(redraw()));
-
-	resetCachedContent();
-}
-
 void PathView::setUnits(enum Units units)
 {
 	_units = units;
@@ -414,49 +376,88 @@ void PathView::redraw()
 	resetCachedContent();
 }
 
-void PathView::rescale()
+void PathView::resetDigitalZoom()
 {
-	int zoom = scale2zoom(contentsScale());
+	QHash<Waypoint, WaypointItem*>::const_iterator it;
 
-	if (zoom != _zoom) {
-		rescale(zoom);
-		_mapScale->setZoom(zoom);
-	}
+	_digitalZoom = 0;
+	resetTransform();
+
+	for (int i = 0; i < _tracks.size(); i++)
+		_tracks.at(i)->setDigitalZoom(0);
+	for (int i = 0; i < _routes.size(); i++)
+		_routes.at(i)->setDigitalZoom(0);
+	for (int i = 0; i < _waypoints.size(); i++)
+		_waypoints.at(i)->setDigitalZoom(0);
+	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+		it.value()->setDigitalZoom(0);
+
+	_mapScale->setDigitalZoom(0);
 }
 
-void PathView::zoom(int z, const QPoint &pos)
+void PathView::digitalZoom(int zoom)
 {
-	if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
+	QHash<Waypoint, WaypointItem*>::const_iterator it;
+
+	_digitalZoom += zoom;
+	scale(pow(2, zoom), pow(2, zoom));
+
+	for (int i = 0; i < _tracks.size(); i++)
+		_tracks.at(i)->setDigitalZoom(_digitalZoom);
+	for (int i = 0; i < _routes.size(); i++)
+		_routes.at(i)->setDigitalZoom(_digitalZoom);
+	for (int i = 0; i < _waypoints.size(); i++)
+		_waypoints.at(i)->setDigitalZoom(_digitalZoom);
+	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+		it.value()->setDigitalZoom(_digitalZoom);
+
+	_mapScale->setDigitalZoom(_digitalZoom);
+}
+
+void PathView::zoom(int zoom, const QPoint &pos, const Coordinates &c)
+{
+	bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier;
+
+	if (_digitalZoom) {
+		if (((_digitalZoom > 0 && zoom > 0) && (!shift || _digitalZoom
+		  >= MAX_ZOOM)) || ((_digitalZoom < 0 && zoom < 0) && (!shift
+		  || _digitalZoom <= MIN_ZOOM)))
 			return;
 
+		digitalZoom(zoom);
+	} else {
+		qreal os, ns;
+		os = _map->zoom();
+		ns = (zoom > 0) ? _map->zoomIn() : _map->zoomOut();
+
+		if (ns != os) {
 			QPoint offset = pos - viewport()->rect().center();
-	QPointF spos = mapToScene(pos);
 
-	qreal os = mapScale(_zoom);
-	_zoom = z;
+			rescale();
 
-	rescale(_zoom);
+			QPointF center = _map->ll2xy(c) - offset;
+			centerOn(center);
 
-	QRectF sr = contentsSceneRect();
-	_scene->setSceneRect(sr);
-
-	if (sr.width() < viewport()->size().width()
-	  && sr.height() < viewport()->size().height())
-		centerOn(sr.center());
-	else
-		centerOn((spos * (os/mapScale(_zoom))) - offset);
-
-	_mapScale->setZoom(_zoom);
-
-	resetCachedContent();
+			_res = _map->resolution(center);
+			_mapScale->setResolution(_res);
+		} else {
+			if (shift)
+				digitalZoom(zoom);
+		}
+	}
 }
 
 void PathView::wheelEvent(QWheelEvent *event)
 {
-	int z = (event->delta() > 0) ?
-		qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN);
+	static int deg = 0;
 
-	zoom(z, event->pos());
+	deg += event->delta() / 8;
+	if (qAbs(deg) < 15)
+		return;
+	deg = 0;
+
+	Coordinates c = _map->xy2ll(mapToScene(event->pos()));
+	zoom((event->delta() > 0) ? 1 : -1, event->pos(), c);
 }
 
 void PathView::mouseDoubleClickEvent(QMouseEvent *event)
@@ -464,25 +465,30 @@ void PathView::mouseDoubleClickEvent(QMouseEvent *event)
 	if (event->button() != Qt::LeftButton && event->button() != Qt::RightButton)
 		return;
 
-	int z = (event->button() == Qt::LeftButton) ?
-		qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN);
-
-	zoom(z, event->pos());
+	Coordinates c = _map->xy2ll(mapToScene(event->pos()));
+	zoom((event->button() == Qt::LeftButton) ? 1 : -1, event->pos(), c);
 }
 
 void PathView::keyPressEvent(QKeyEvent *event)
 {
-	int z = -1;
+	int z;
 
-	if (event->matches(QKeySequence::ZoomIn))
-		z = qMin(_zoom + 1, ZOOM_MAX);
-	if (event->matches(QKeySequence::ZoomOut))
-		z = qMax(_zoom - 1, ZOOM_MIN);
+	QPoint pos = QRect(QPoint(), viewport()->size()).center();
+	Coordinates c = _map->xy2ll(mapToScene(pos));
 
-	if (z >= 0)
-		zoom(z, QRect(QPoint(), size()).center());
-	else
-		QWidget::keyPressEvent(event);
+	if (event->matches(ZOOM_IN))
+		z = 1;
+	else if (event->matches(ZOOM_OUT))
+		z = -1;
+	else if (_digitalZoom && event->key() == Qt::Key_Escape) {
+		resetDigitalZoom();
+		return;
+	} else {
+		QGraphicsView::keyPressEvent(event);
+		return;
+	}
+
+	zoom(z, pos, c);
 }
 
 void PathView::plot(QPainter *painter, const QRectF &target)
@@ -505,6 +511,7 @@ void PathView::plot(QPainter *painter, const QRectF &target)
 
 	setUpdatesEnabled(false);
 	_plot = true;
+	_map->setBlockingMode(true);
 
 	QPointF pos = _mapScale->pos();
 	_mapScale->setPos(mapToScene(QPoint(adj.bottomRight() + QPoint(
@@ -515,6 +522,7 @@ void PathView::plot(QPainter *painter, const QRectF &target)
 
 	_mapScale->setPos(pos);
 
+	_map->setBlockingMode(false);
 	_plot = false;
 	setUpdatesEnabled(true);
 }
@@ -531,11 +539,12 @@ void PathView::clear()
 	_scene->clear();
 	_palette.reset();
 
-	_zoom = ZOOM_MAX;
 	_tr = QRectF(); _rr = QRectF(); _wr = QRectF();
 	_wp = QPointF();
 
-	_scene->setSceneRect(QRectF());
+	resetDigitalZoom();
+	resetCachedContent();
+	QPixmapCache::clear();
 }
 
 void PathView::showTracks(bool show)
@@ -581,6 +590,12 @@ void PathView::showRouteWaypoints(bool show)
 		_routes.at(i)->showWaypoints(show);
 }
 
+void PathView::showMap(bool show)
+{
+	_showMap = show;
+	resetCachedContent();
+}
+
 void PathView::showPOI(bool show)
 {
 	_showPOI = show;
@@ -644,59 +659,25 @@ void PathView::setRouteStyle(Qt::PenStyle style)
 
 void PathView::drawBackground(QPainter *painter, const QRectF &rect)
 {
-	if ((_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
-	  || !_map) {
+	if (_showMap)
+		_map->draw(painter, rect);
+	else
 		painter->fillRect(rect, Qt::white);
-		return;
-	}
-
-	qreal scale = mapScale(_zoom);
-	QRectF rr(rect.topLeft() * scale, rect.size());
-	QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()),
-	  _zoom);
-	QPointF tm = tile2mercator(tile, _zoom);
-	QPoint tl = mapToScene(mapFromScene(QPointF(tm.x() / scale,
-	  -tm.y() / scale))).toPoint();
-
-	QList<Tile> tiles;
-	for (int i = 0; i <= rr.size().width() / Tile::size() + 1; i++) {
-		for (int j = 0; j <= rr.size().height() / Tile::size() + 1; j++) {
-			tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom));
-		}
-	}
-
-	_map->loadTiles(tiles, _plot);
-
-	for (int i = 0; i < tiles.count(); i++) {
-		Tile &t = tiles[i];
-		QPoint tp(tl.x() + (t.xy().x() - tile.x()) * Tile::size(),
-		  tl.y() + (t.xy().y() - tile.y()) * Tile::size());
-		painter->drawPixmap(tp, t.pixmap());
-	}
 }
 
 void PathView::resizeEvent(QResizeEvent *event)
 {
-	if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
-		return;
-
+	qreal scale = _map->zoom();
+	if (mapScale() != scale)
 		rescale();
 
-	QRectF sr = contentsSceneRect();
+	QPointF center = contentCenter();
+	centerOn(center);
 
-	if (sr.width() < event->size().width()) {
-		qreal diff = event->size().width() - sr.width();
-		sr.adjust(-diff/2, 0, diff/2, 0);
-	}
-	if (sr.height() < event->size().height()) {
-		qreal diff = event->size().height() - sr.height();
-		sr.adjust(0, -diff/2, 0, diff/2);
-	}
+	_res = _map->resolution(center);
+	_mapScale->setResolution(_res);
 
-	_scene->setSceneRect(sr);
-	centerOn(sr.center());
-
-	resetCachedContent();
+	QGraphicsView::resizeEvent(event);
 }
 
 void PathView::paintEvent(QPaintEvent *event)
@@ -710,17 +691,23 @@ void PathView::paintEvent(QPaintEvent *event)
 	QGraphicsView::paintEvent(event);
 }
 
+void PathView::scrollContentsBy(int dx, int dy)
+{
+	QGraphicsView::scrollContentsBy(dx, dy);
+
+	QPointF center = mapToScene(viewport()->rect().center());
+	qreal res = _map->resolution(center);
+
+	if (qMax(res, _res) / qMin(res, _res) > 1.1) {
+		_mapScale->setResolution(res);
+		_res = res;
+	}
+}
+
 void PathView::useOpenGL(bool use)
 {
-	if (use) {
-#ifdef Q_OS_WIN32
-		if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-#endif // Q_OS_WIN32
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-		setViewport(new QGLWidget);
-#else // QT 5
-		setViewport(new QOpenGLWidget);
-#endif // QT 5
-	} else
+	if (use)
+		setViewport(new OPENGL_WIDGET);
+	else
 		setViewport(new QWidget);
 }

src/pathview.h

@@ -25,7 +25,7 @@ class PathView : public QGraphicsView
 	Q_OBJECT
 
 public:
-	PathView(QWidget *parent = 0);
+	PathView(Map *map, POI *poi, QWidget *parent = 0);
 	~PathView();
 
 	QList<PathItem*> loadData(const Data &data);
@@ -48,6 +48,7 @@ public:
 public slots:
 	void redraw();
 
+	void showMap(bool show);
 	void showPOI(bool show);
 	void setPOIOverlap(bool overlap);
 	void showWaypointLabels(bool show);
@@ -72,12 +73,14 @@ private:
 	void loadPOI();
 	void clearPOI();
 
-	qreal contentsScale() const;
-	QRectF contentsSceneRect() const;
-	void rescale(int zoom);
+	qreal mapScale() const;
+	QPointF contentCenter() const;
 	void rescale();
-	void zoom(int z, const QPoint &pos);
+	void zoom(int zoom, const QPoint &pos, const Coordinates &c);
+	void digitalZoom(int zoom);
+	void resetDigitalZoom();
 	void updatePOIVisibility();
+	void updateWaypointsBoundingRect(const QPointF &wp);
 
 	void mouseDoubleClickEvent(QMouseEvent *event);
 	void wheelEvent(QWheelEvent *event);
@@ -85,6 +88,7 @@ private:
 	void drawBackground(QPainter *painter, const QRectF &rect);
 	void resizeEvent(QResizeEvent *event);
 	void paintEvent(QPaintEvent *event);
+	void scrollContentsBy(int dx, int dy);
 
 	QGraphicsScene *_scene;
 	ScaleItem *_mapScale;
@@ -93,15 +97,16 @@ private:
 	QList<WaypointItem*> _waypoints;
 	QHash<Waypoint, WaypointItem*> _pois;
 
-	int _zoom;
 	QRectF _tr, _rr, _wr;
 	QPointF _wp;
+	qreal _res;
 
 	Map *_map;
 	POI *_poi;
 	Palette _palette;
 	Units _units;
 
+	bool _showMap;
 	bool _showTracks;
 	bool _showRoutes;
 	bool _showWaypoints;
@@ -115,6 +120,7 @@ private:
 	Qt::PenStyle _trackStyle;
 	Qt::PenStyle _routeStyle;
 
+	int _digitalZoom;
 	bool _plot;
 };
 

src/poi.cpp

@@ -58,18 +58,15 @@ static bool cb(size_t data, void* context)
 	return true;
 }
 
-QVector<Waypoint> POI::points(const PathItem *path) const
+QVector<Waypoint> POI::points(const Path &path) const
 {
 	QVector<Waypoint> ret;
 	QSet<int> set;
 	qreal min[2], max[2];
-	const QPainterPath &pp = path->path();
 
-	for (int i = 0; i < pp.elementCount(); i++) {
-		const QPainterPath::Element &pe = pp.elementAt(i);
-		Coordinates p = Coordinates::fromMercator(QPointF(pe.x, -pe.y));
-
-		QPair<Coordinates, Coordinates> br = p.boundingRect(_radius);
+	for (int i = 0; i < path.count(); i++) {
+		const Coordinates &c = path.at(i).coordinates();
+		QPair<Coordinates, Coordinates> br = c.boundingRect(_radius);
 		min[0] = br.first.lon();
 		min[1] = br.first.lat();
 		max[0] = br.second.lon();

src/poi.h

@@ -7,8 +7,8 @@
 #include <QStringList>
 #include "waypoint.h"
 #include "rtree.h"
+#include "path.h"
 
-class PathItem;
 class WaypointItem;
 
 class POI : public QObject
@@ -25,7 +25,7 @@ public:
 	unsigned radius() const {return _radius;}
 	void setRadius(unsigned radius);
 
-	QVector<Waypoint> points(const PathItem *path) const;
+	QVector<Waypoint> points(const Path &path) const;
 	QVector<Waypoint> points(const QList<WaypointItem*> &list) const;
 	QVector<Waypoint> points(const QList<Waypoint> &list) const;
 

src/powergraph.h

@@ -13,9 +13,7 @@ public:
 	QString label() const {return tr("Power");}
 	void loadData(const Data &data, const QList<PathItem *> &paths);
 	void clear();
-	void setUnits(enum Units) {}
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;

src/projection.h

@@ -0,0 +1,15 @@
+#ifndef PROJECTION_H
+#define PROJECTION_H
+
+#include <QPointF>
+#include "coordinates.h"
+
+class Projection {
+public:
+	virtual ~Projection() {}
+
+	virtual QPointF ll2xy(const Coordinates &c) const = 0;
+	virtual Coordinates xy2ll(const QPointF &p) const = 0;
+};
+
+#endif // PROJECTION_H

src/route.cpp

@@ -11,6 +11,16 @@ Route::Route(const RouteData &data) : _data(data)
 	}
 }
 
+Path Route::path() const
+{
+	Path ret;
+
+	for (int i = 0; i < _data.size(); i++)
+		ret.append(PathPoint(_data.at(i).coordinates(), _distance.at(i)));
+
+	return ret;
+}
+
 Graph Route::elevation() const
 {
 	Graph graph;

src/route.h

@@ -11,13 +11,17 @@ class Route
 public:
 	Route(const RouteData &data);
 
-	const RouteData &routeData() const {return _data;}
-	const QVector<qreal> &distanceData() const {return _distance;}
+	Path path() const;
+
+	const QVector<Waypoint> &waypoints() const {return _data;}
 
 	Graph elevation() const;
 
 	qreal distance() const;
 
+	const QString &name() const {return _data.name();}
+	const QString &description() const {return _data.description();}
+
 	bool isNull() const {return (_data.count() < 2);}
 
 private:

src/routeitem.cpp

@@ -1,73 +1,55 @@
-#include <QApplication>
 #include <QPainter>
 #include "format.h"
 #include "waypoint.h"
 #include "waypointitem.h"
 #include "tooltip.h"
+#include "map.h"
 #include "routeitem.h"
 
 
-QString RouteItem::toolTip()
+QString RouteItem::toolTip(Units units)
 {
 	ToolTip tt;
 
 	if (!_name.isEmpty())
-		tt.insert(qApp->translate("RouteItem", "Name"), _name);
+		tt.insert(tr("Name"), _name);
 	if (!_desc.isEmpty())
-		tt.insert(qApp->translate("RouteItem", "Description"), _desc);
-	tt.insert(qApp->translate("RouteItem", "Distance"),
-	  Format::distance(_distance.last(), _units));
+		tt.insert(tr("Description"), _desc);
+	tt.insert(tr("Distance"), Format::distance(_path.last().distance(), units));
 
 	return tt.toString();
 }
 
-RouteItem::RouteItem(const Route &route, QGraphicsItem *parent)
-  : PathItem(parent)
+RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
+  : PathItem(route.path(), map, parent)
 {
-	const RouteData &r = route.routeData();
-	const QVector<qreal> &d = route.distanceData();
-	QPointF p;
+	const QVector<Waypoint> &waypoints = route.waypoints();
 
+	for (int i = 0; i < waypoints.size(); i++)
+		new WaypointItem(waypoints.at(i), map, this);
 
-	Q_ASSERT(r.count() >= 2);
-	Q_ASSERT(r.size() == d.size());
+	_name = route.name();
+	_desc = route.description();
 
-	_name = r.name();
-	_desc = r.description();
-
-	new WaypointItem(r.first(), this);
-	p = r.first().coordinates().toMercator();
-	_path.moveTo(QPointF(p.x(), -p.y()));
-	_distance.append(d.first());
-	for (int i = 1; i < r.size(); i++) {
-		if (r.at(i).coordinates() == r.at(i-1).coordinates())
-			continue;
-		p = r.at(i).coordinates().toMercator();
-		_path.lineTo(QPointF(p.x(), -p.y()));
-		_distance.append(d.at(i));
-		new WaypointItem(r.at(i), this);
+	setToolTip(toolTip(Metric));
 }
 
-	updateShape();
-
-	_marker->setPos(_path.elementAt(0));
-
-	setToolTip(toolTip());
-}
-
-void RouteItem::setScale(qreal scale)
+void RouteItem::setMap(Map *map)
 {
 	QList<QGraphicsItem *> childs =	childItems();
-	for (int i = 0; i < childs.count(); i++)
-		childs.at(i)->setScale(1.0/scale);
+	for (int i = 0; i < childs.count(); i++) {
+		if (childs.at(i) != _marker) {
+			WaypointItem *wi = static_cast<WaypointItem*>(childs.at(i));
+			wi->setMap(map);
+		}
+	}
 
-	PathItem::setScale(scale);
+	PathItem::setMap(map);
 }
 
 void RouteItem::setUnits(enum Units units)
 {
-	PathItem::setUnits(units);
-	setToolTip(toolTip());
+	setToolTip(toolTip(units));
 }
 
 void RouteItem::showWaypoints(bool show)

src/routeitem.h

@@ -3,23 +3,26 @@
 
 #include "pathitem.h"
 #include "route.h"
+#include "units.h"
 
+class Map;
 
 class RouteItem : public PathItem
 {
 	Q_OBJECT
 
 public:
-	RouteItem(const Route &route, QGraphicsItem *parent = 0);
+	RouteItem(const Route &route, Map *map, QGraphicsItem *parent = 0);
 
-	void setUnits(enum Units units);
-	void setScale(qreal scale);
+	//void setScale(qreal scale);
+	void setMap(Map *map);
 
+	void setUnits(Units units);
 	void showWaypoints(bool show);
 	void showWaypointLabels(bool show);
 
 private:
-	QString toolTip();
+	QString toolTip(Units units);
 
 	QString _name;
 	QString _desc;

src/scaleitem.cpp

@@ -1,8 +1,6 @@
+#include <cmath>
 #include <QPainter>
 #include "config.h"
-#include "rd.h"
-#include "wgs84.h"
-#include "tile.h"
 #include "misc.h"
 #include "scaleitem.h"
 
@@ -13,17 +11,12 @@
 #define SEGMENTS       3
 #define PADDING        4
 
-static qreal zoom2resolution(int zoom, qreal y)
-{
-	return (WGS84_RADIUS * 2 * M_PI / Tile::size()
-	  * cos(2 * atan(exp(deg2rad(y))) - M_PI/2)) / pow(2.0, zoom);
-}
 
 ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent)
 {
 	_units = Metric;
-	_zoom = 0;
-	_lat = 0;
+	_res = 1.0;
+	_digitalZoom = 0;
 
 #ifndef Q_OS_MAC
 	setCacheMode(QGraphicsItem::DeviceCoordinateCache);
@@ -96,7 +89,7 @@ QString ScaleItem::units() const
 
 void ScaleItem::computeScale()
 {
-	qreal res = zoom2resolution(_zoom, _lat);
+	qreal res = _res * pow(2, -_digitalZoom);
 
 	if (_units == Imperial) {
 		_length = niceNum((res * M2FT * SCALE_WIDTH) / SEGMENTS, 1);
@@ -121,20 +114,10 @@ void ScaleItem::computeScale()
 	}
 }
 
-void ScaleItem::setZoom(int z, qreal lat)
+void ScaleItem::setResolution(qreal res)
 {
 	prepareGeometryChange();
-	_zoom = z;
-	_lat = lat;
-	computeScale();
-	updateBoundingRect();
-	update();
-}
-
-void ScaleItem::setZoom(int z)
-{
-	prepareGeometryChange();
-	_zoom = z;
+	_res = res;
 	computeScale();
 	updateBoundingRect();
 	update();
@@ -148,3 +131,14 @@ void ScaleItem::setUnits(enum Units units)
 	updateBoundingRect();
 	update();
 }
+
+void ScaleItem::setDigitalZoom(int zoom)
+{
+	prepareGeometryChange();
+	_digitalZoom = zoom;
+	computeScale();
+	updateBoundingRect();
+	update();
+
+	setScale(pow(2, -_digitalZoom));
+}

src/scaleitem.h

@@ -13,22 +13,23 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-	void setZoom(int z);
-	void setZoom(int z, qreal lat);
+	void setResolution(qreal res);
 	void setUnits(enum Units units);
+	void setDigitalZoom(int zoom);
 
 private:
 	void updateBoundingRect();
 	void computeScale();
 	QString units() const;
 
-	int _zoom;
-	qreal _lat;
+	qreal _res;
 	qreal _width;
 	qreal _length;
 	Units _units;
 	bool _scale;
 
+	int _digitalZoom;
+
 	QRectF _boundingRect;
 };
 

src/settings.h

@@ -11,6 +11,8 @@
 #define WINDOW_POS_DEFAULT                QPoint(10, 10)
 
 #define SETTINGS_SETTINGS_GROUP           "Settings"
+#define TIME_TYPE_SETTING                 "timeType"
+#define TIME_TYPE_DEFAULT                 Total
 #define UNITS_SETTING                     "units"
 #define UNITS_DEFAULT                     (IMPERIAL_UNITS() ? Imperial : Metric)
 #define SHOW_TOOLBARS_SETTING             "toolbar"
@@ -88,9 +90,41 @@
 #define PATH_AA_DEFAULT                   true
 #define GRAPH_AA_SETTING                  "graphAntiAliasing"
 #define GRAPH_AA_DEFAULT                  false
+#define ELEVATION_FILTER_SETTING          "elevationFilter"
+#define ELEVATION_FILTER_DEFAULT          3
+#define SPEED_FILTER_SETTING              "speedFilter"
+#define SPEED_FILTER_DEFAULT              5
+#define HEARTRATE_FILTER_SETTING          "heartrateFilter"
+#define HEARTRATE_FILTER_DEFAULT          3
+#define CADENCE_FILTER_SETTING            "cadenceFilter"
+#define CADENCE_FILTER_DEFAULT            3
+#define POWER_FILTER_SETTING              "powerFilter"
+#define POWER_FILTER_DEFAULT              3
+#define OUTLIER_ELIMINATE_SETTING         "outlierEliminate"
+#define OUTLIER_ELIMINATE_DEFAULT         true
+#define PAUSE_SPEED_SETTING               "pauseSpeed"
+#define PAUSE_SPEED_DEFAULT               0.5 /* m/s */
+#define PAUSE_INTERVAL_SETTING            "pauseInterval"
+#define PAUSE_INTERVAL_DEFAULT            10 /* s */
 #define POI_RADIUS_SETTING                "poiRadius"
-#define POI_RADIUS_DEFAULT                (IMPERIAL_UNITS() ? MIINM : KMINM)
+#define POI_RADIUS_DEFAULT                (int)(IMPERIAL_UNITS() ? MIINM : KMINM)
 #define USE_OPENGL_SETTING                "useOpenGL"
 #define USE_OPENGL_DEFAULT                false
+#define PIXMAP_CACHE_SETTING              "pixmapCache"
+#define PIXMAP_CACHE_DEFAULT              64 /* MB */
+#define PRINT_NAME_SETTING                "printName"
+#define PRINT_NAME_DEFAULT                true
+#define PRINT_DATE_SETTING                "printDate"
+#define PRINT_DATE_DEFAULT                true
+#define PRINT_DISTANCE_SETTING            "printDistance"
+#define PRINT_DISTANCE_DEFAULT            true
+#define PRINT_TIME_SETTING                "printTime"
+#define PRINT_TIME_DEFAULT                true
+#define PRINT_MOVING_TIME_SETTING         "printMovingTime"
+#define PRINT_MOVING_TIME_DEFAULT         false
+#define PRINT_ITEM_COUNT_SETTING          "printItemCount"
+#define PRINT_ITEM_COUNT_DEFAULT          true
+#define SEPARATE_GRAPH_PAGE_SETTING       "separateGraphPage"
+#define SEPARATE_GRAPH_PAGE_DEFAULT       false
 
 #endif // SETTINGS_H

src/speedgraph.cpp

@@ -6,6 +6,7 @@
 SpeedGraph::SpeedGraph(QWidget *parent) : GraphTab(parent)
 {
 	_units = Metric;
+	_timeType = Total;
 	_showTracks = true;
 
 	setYUnits();
@@ -36,6 +37,8 @@ void SpeedGraph::loadData(const Data &data, const QList<PathItem *> &paths)
 
 		_avg.append(QPointF(data.tracks().at(i)->distance(),
 		  data.tracks().at(i)->distance() / data.tracks().at(i)->time()));
+		_avgM.append(QPointF(data.tracks().at(i)->distance(),
+		  data.tracks().at(i)->distance() / data.tracks().at(i)->movingTime()));
 
 		GraphView::loadGraph(graph, paths.at(i));
 	}
@@ -52,8 +55,9 @@ qreal SpeedGraph::avg() const
 {
 	qreal sum = 0, w = 0;
 	QList<QPointF>::const_iterator it;
+	const QList<QPointF> &list = (_timeType == Moving) ? _avgM : _avg;
 
-	for (it = _avg.begin(); it != _avg.end(); it++) {
+	for (it = list.begin(); it != list.end(); it++) {
 		sum += it->y() * it->x();
 		w += it->x();
 	}
@@ -64,6 +68,7 @@ qreal SpeedGraph::avg() const
 void SpeedGraph::clear()
 {
 	_avg.clear();
+	_avgM.clear();
 
 	GraphView::clear();
 }
@@ -90,6 +95,14 @@ void SpeedGraph::setUnits(enum Units units)
 	redraw();
 }
 
+void SpeedGraph::setTimeType(enum TimeType type)
+{
+	_timeType = type;
+
+	setInfo();
+	redraw();
+}
+
 void SpeedGraph::showTracks(bool show)
 {
 	_showTracks = show;

src/speedgraph.h

@@ -15,8 +15,8 @@ public:
 	void loadData(const Data &data, const QList<PathItem *> &paths);
 	void clear();
 	void setUnits(enum Units units);
+	void setTimeType(enum TimeType type);
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;
@@ -25,8 +25,10 @@ private:
 	void setInfo();
 
 	QList<QPointF> _avg;
+	QList<QPointF> _avgM;
 
 	enum Units _units;
+	enum TimeType _timeType;
 	bool _showTracks;
 };
 

src/tar.cpp

@@ -0,0 +1,89 @@
+#include <cctype>
+#include <QFile>
+#include "tar.h"
+
+
+#define BLOCKSIZE 512
+
+#define BLOCKCOUNT(size) \
+	((size)/BLOCKSIZE + ((size) % BLOCKSIZE > 0 ? 1 : 0))
+
+struct Header
+{
+	char name[100];               /*   0 */
+	char mode[8];                 /* 100 */
+	char uid[8];                  /* 108 */
+	char gid[8];                  /* 116 */
+	char size[12];                /* 124 */
+	char mtime[12];               /* 136 */
+	char chksum[8];               /* 148 */
+	char typeflag;                /* 156 */
+	char linkname[100];           /* 157 */
+	char magic[6];                /* 257 */
+	char version[2];              /* 263 */
+	char uname[32];               /* 265 */
+	char gname[32];               /* 297 */
+	char devmajor[8];             /* 329 */
+	char devminor[8];             /* 337 */
+	char prefix[155];             /* 345 */
+	                              /* 500 */
+};
+
+static quint64 number(const char* data, size_t size)
+{
+	const char *sp;
+	quint64 val = 0;
+
+	for (sp = data; sp < data + size; sp++)
+		if (isdigit(*sp))
+			break;
+	for (; sp < data + size && isdigit(*sp); sp++)
+		val = val * 8 + *sp - '0';
+
+	return val;
+}
+
+bool Tar::load(const QString &path)
+{
+	char buffer[BLOCKSIZE];
+	struct Header *hdr = (struct Header*)&buffer;
+	quint64 size;
+	qint64 ret;
+
+	if (_file.isOpen())
+		_file.close();
+	_index.clear();
+
+	_file.setFileName(path);
+	if (!_file.open(QIODevice::ReadOnly))
+		return false;
+
+	while ((ret = _file.read(buffer, BLOCKSIZE)) > 0) {
+		if (ret < BLOCKSIZE) {
+			_file.close();
+			return false;
+		}
+		size = number(hdr->size, sizeof(hdr->size));
+		if (size)
+			_index.insert(hdr->name, Info(size, _file.pos()));
+		if (!_file.seek(_file.pos() + BLOCKCOUNT(size) * BLOCKSIZE)) {
+			_file.close();
+			return false;
+		}
+	}
+
+	return true;
+}
+
+QByteArray Tar::file(const QString &name)
+{
+	QMap<QString, Tar::Info>::const_iterator it = _index.find(name);
+	if (it == _index.end())
+		return QByteArray();
+
+	Q_ASSERT(_file.isOpen());
+	if (_file.seek(it.value().offset()))
+		return _file.read(it.value().size());
+	else
+		return QByteArray();
+}

src/tar.h

@@ -0,0 +1,36 @@
+#ifndef TAR_H
+#define TAR_H
+
+#include <QStringList>
+#include <QMap>
+#include <QFile>
+
+class Tar
+{
+public:
+	bool load(const QString &path);
+
+	QStringList files() const {return _index.keys();}
+	QByteArray file(const QString &name);
+
+	QString fileName() const {return _file.fileName();}
+	bool isOpen() const {return _file.isOpen();}
+
+private:
+	class Info
+	{
+	public:
+		Info(quint64 size, quint64 offset) : _size(size),  _offset(offset) {}
+		quint64 size() const {return _size;}
+		quint64 offset() const {return _offset;}
+
+	private:
+		quint64 _size;
+		quint64 _offset;
+	};
+
+	QFile _file;
+	QMap<QString, Info> _index;
+};
+
+#endif // TAR_H

src/tcxparser.cpp

@@ -4,7 +4,7 @@
 void TCXParser::warning(const char *text) const
 {
 	const QFile *file = static_cast<QFile *>(_reader.device());
-	fprintf(stderr, "%s:%lld: %s\n", qPrintable(file->fileName()),
+	qWarning("%s:%lld: %s\n", qPrintable(file->fileName()),
 	  _reader.lineNumber(), text);
 }
 

src/temperaturegraph.h

@@ -15,7 +15,6 @@ public:
 	void clear();
 	void setUnits(enum Units units);
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}
 
 private:
 	qreal avg() const;

src/tile.h

@@ -14,8 +14,6 @@ public:
 	const QPoint& xy() const {return _xy;}
 	QPixmap& pixmap() {return _pixmap;}
 
-	static int size() {return 256;}
-
 private:
 	int _zoom;
 	QPoint _xy;

src/timetype.h

@@ -0,0 +1,9 @@
+#ifndef TIMETYPE_H
+#define TIMETYPE_H
+
+enum TimeType {
+	Total,
+	Moving
+};
+
+#endif // TIMETYPE_H

src/track.cpp

@@ -1,13 +1,17 @@
 #include "track.h"
 
+#define OUTLIER_WINDOW 21
 
-#define WINDOW_OE 31
+int Track::_elevationWindow = 3;
+int Track::_speedWindow = 5;
+int Track::_heartRateWindow = 3;
+int Track::_cadenceWindow = 3;
+int Track::_powerWindow = 3;
 
-#define WINDOW_EF 3
-#define WINDOW_SF 7
-#define WINDOW_HF 3
-#define WINDOW_CF 3
-#define WINDOW_PF 3
+qreal Track::_pauseSpeed = 0.5;
+int Track::_pauseInterval = 10;
+
+bool Track::_outlierEliminate = true;
 
 
 static qreal median(QVector<qreal> v)
@@ -43,30 +47,33 @@ static QSet<int> eliminate(const QVector<qreal> &v, int window)
 	return rm;
 }
 
-static Graph filter(const Graph &v, int window)
+static Graph filter(const Graph &g, int window)
 {
-	qreal acc = 0;
-	Graph ret;
+	if (g.size() < window)
+		return Graph();
+	if (window < 2)
+		return Graph(g);
 
-	if (v.size() < window)
-		return ret;
+	qreal acc = 0;
+	Graph ret(g.size());
 
 	for (int i = 0; i < window; i++)
-		acc += v.at(i).y();
+		acc += g.at(i).y();
 	for (int i = 0; i <= window/2; i++)
-		ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
+		ret[i] = GraphPoint(g.at(i).s(), g.at(i).t(), acc/window);
 
-	for (int i = window/2 + 1; i < v.size() - window/2; i++) {
-		acc += v.at(i + window/2).y() - v.at(i - (window/2 + 1)).y();
-		ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
+	for (int i = window/2 + 1; i < g.size() - window/2; i++) {
+		acc += g.at(i + window/2).y() - g.at(i - (window/2 + 1)).y();
+		ret[i] = GraphPoint(g.at(i).s(), g.at(i).t(), acc/window);
 	}
 
-	for (int i = v.size() - window/2; i < v.size(); i++)
-		ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
+	for (int i = g.size() - window/2; i < g.size(); i++)
+		ret[i] = GraphPoint(g.at(i).s(), g.at(i).t(), acc/window);
 
 	return ret;
 }
 
+
 Track::Track(const TrackData &data) : _data(data)
 {
 	qreal dt, ds, total;
@@ -98,12 +105,28 @@ Track::Track(const TrackData &data) : _data(data)
 		}
 	}
 
-	_outliers = eliminate(_speed, WINDOW_OE);
+	_pause = 0;
+	for (int i = 1; i < data.count(); i++) {
+		if (_time.at(i) > _time.at(i-1) + _pauseInterval
+		  && _speed.at(i) < _pauseSpeed) {
+			_pause += _time.at(i) - _time.at(i-1);
+			_stop.insert(i-1);
+			_stop.insert(i);
+		}
+	}
+
+	if (_outlierEliminate)
+		_outliers = eliminate(_speed, OUTLIER_WINDOW);
+
+	QSet<int>::const_iterator it;
+	for (it = _stop.constBegin(); it != _stop.constEnd(); ++it)
+		_outliers.remove(*it);
 
 	total = 0;
 	for (int i = 0; i < _data.size(); i++) {
 		if (_outliers.contains(i))
 			continue;
+		if (!discardStopPoint(i))
 			total += _distance.at(i);
 		_distance[i] = total;
 	}
@@ -113,27 +136,26 @@ Graph Track::elevation() const
 {
 	Graph raw;
 
-	if (!_data.size())
-		return raw;
-
 	for (int i = 0; i < _data.size(); i++)
 		if (_data.at(i).hasElevation() && !_outliers.contains(i))
 			raw.append(GraphPoint(_distance.at(i), _time.at(i),
 			  _data.at(i).elevation()));
 
-	return filter(raw, WINDOW_EF);
+	return filter(raw, _elevationWindow);
 }
 
 Graph Track::speed() const
 {
-	Graph raw;
+	Graph raw, filtered;
 	qreal v;
-
-	if (!_data.size())
-		return raw;
+	QSet<int> stop;
 
 	for (int i = 0; i < _data.size(); i++) {
-		if (_data.at(i).hasSpeed() && !_outliers.contains(i))
+		if (_stop.contains(i) && (!std::isnan(_speed.at(i))
+		  || _data.at(i).hasSpeed())) {
+			v = 0;
+			stop.insert(raw.size());
+		} else if (_data.at(i).hasSpeed() && !_outliers.contains(i))
 			v = _data.at(i).speed();
 		else if (!std::isnan(_speed.at(i)) && !_outliers.contains(i))
 			v = _speed.at(i);
@@ -143,22 +165,25 @@ Graph Track::speed() const
 		raw.append(GraphPoint(_distance.at(i), _time.at(i), v));
 	}
 
-	return filter(raw, WINDOW_SF);
+	filtered = filter(raw, _speedWindow);
+
+	QSet<int>::const_iterator it;
+	for (it = stop.constBegin(); it != stop.constEnd(); ++it)
+		filtered[*it].setY(0);
+
+	return filtered;
 }
 
 Graph Track::heartRate() const
 {
 	Graph raw;
 
-	if (!_data.size())
-		return raw;
-
 	for (int i = 0; i < _data.count(); i++)
 		if (_data.at(i).hasHeartRate() && !_outliers.contains(i))
 			raw.append(GraphPoint(_distance.at(i), _time.at(i),
 			  _data.at(i).heartRate()));
 
-	return filter(raw, WINDOW_HF);
+	return filter(raw, _heartRateWindow);
 }
 
 Graph Track::temperature() const
@@ -175,26 +200,56 @@ Graph Track::temperature() const
 
 Graph Track::cadence() const
 {
-	Graph raw;
+	Graph raw, filtered;
+	QSet<int> stop;
+	qreal c;
 
-	for (int i = 0; i < _data.size(); i++)
-		if (_data.at(i).hasCadence() && !_outliers.contains(i))
-			raw.append(GraphPoint(_distance.at(i), _time.at(i),
-			  _data.at(i).cadence()));
+	for (int i = 0; i < _data.size(); i++) {
+		if (_data.at(i).hasCadence() && _stop.contains(i)) {
+			c = 0;
+			stop.insert(raw.size());
+		} else if (_data.at(i).hasCadence() && !_outliers.contains(i))
+			c = _data.at(i).cadence();
+		else
+			continue;
 
-	return filter(raw, WINDOW_CF);
+		raw.append(GraphPoint(_distance.at(i), _time.at(i), c));
+	}
+
+	filtered = filter(raw, _cadenceWindow);
+
+	QSet<int>::const_iterator it;
+	for (it = stop.constBegin(); it != stop.constEnd(); ++it)
+		filtered[*it].setY(0);
+
+	return filtered;
 }
 
 Graph Track::power() const
 {
-	Graph raw;
+	Graph raw, filtered;
+	QSet<int> stop;
+	qreal p;
 
-	for (int i = 0; i < _data.size(); i++)
-		if (_data.at(i).hasPower() && !_outliers.contains(i))
-			raw.append(GraphPoint(_distance.at(i), _time.at(i),
-			  _data.at(i).power()));
+	for (int i = 0; i < _data.size(); i++) {
+		if (_data.at(i).hasPower() && _stop.contains(i)) {
+			p = 0;
+			stop.insert(raw.size());
+		} else if (_data.at(i).hasPower() && !_outliers.contains(i))
+			p = _data.at(i).power();
+		else
+			continue;
 
-	return filter(raw, WINDOW_PF);
+		raw.append(GraphPoint(_distance.at(i), _time.at(i), p));
+	}
+
+	filtered = filter(raw, _powerWindow);
+
+	QSet<int>::const_iterator it;
+	for (it = stop.constBegin(); it != stop.constEnd(); ++it)
+		filtered[*it].setY(0);
+
+	return filtered;
 }
 
 qreal Track::distance() const
@@ -208,6 +263,11 @@ qreal Track::time() const
 	  (_data.first().timestamp().msecsTo(_data.last().timestamp()) / 1000.0);
 }
 
+qreal Track::movingTime() const
+{
+	return (time() - _pause);
+}
+
 QDateTime Track::date() const
 {
 	return (_data.size()) ? _data.first().timestamp() : QDateTime();
@@ -218,8 +278,14 @@ Path Track::path() const
 	Path ret;
 
 	for (int i = 0; i < _data.size(); i++)
-		if (!_outliers.contains(i))
+		if (!_outliers.contains(i) && !discardStopPoint(i))
 			ret.append(PathPoint(_data.at(i).coordinates(), _distance.at(i)));
 
 	return ret;
 }
+
+bool Track::discardStopPoint(int i) const
+{
+	return (_stop.contains(i) && i > 0 && _stop.contains(i-1)
+	  && i < _data.size() - 1 && _stop.contains(i+1));
+}

src/track.h

@@ -15,6 +15,7 @@ public:
 	Track(const TrackData &data);
 
 	Path path() const;
+
 	Graph elevation() const;
 	Graph speed() const;
 	Graph heartRate() const;
@@ -24,6 +25,7 @@ public:
 
 	qreal distance() const;
 	qreal time() const;
+	qreal movingTime() const;
 	QDateTime date() const;
 
 	const QString &name() const {return _data.name();}
@@ -31,7 +33,19 @@ public:
 
 	bool isNull() const {return (_data.size() < 2);}
 
+	static void setElevationFilter(int window) {_elevationWindow = window;}
+	static void setSpeedFilter(int window) {_speedWindow = window;}
+	static void setHeartRateFilter(int window) {_heartRateWindow = window;}
+	static void setCadenceFilter(int window) {_cadenceWindow = window;}
+	static void setPowerFilter(int window) {_powerWindow = window;}
+	static void setPauseSpeed(qreal speed) {_pauseSpeed = speed;}
+	static void setPauseInterval(int interval) {_pauseInterval = interval;}
+	static void setOutlierElimination(bool eliminate)
+	  {_outlierEliminate = eliminate;}
+
 private:
+	bool discardStopPoint(int i) const;
+
 	const TrackData &_data;
 
 	QVector<qreal> _distance;
@@ -39,6 +53,20 @@ private:
 	QVector<qreal> _speed;
 
 	QSet<int> _outliers;
+	QSet<int> _stop;
+
+	qreal _pause;
+
+	static bool _outlierEliminate;
+
+	static int _elevationWindow;
+	static int _speedWindow;
+	static int _heartRateWindow;
+	static int _cadenceWindow;
+	static int _powerWindow;
+
+	static qreal _pauseSpeed;
+	static int _pauseInterval;
 };
 
 #endif // TRACK_H