Version++

Fixes #104

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.16.{build}
+version: 5.9.{build}
 configuration: Release
 platform: Any CPU
 environment:
@@ -34,11 +34,11 @@ build_script:
 
     copy pkg\%NSI% installer
 
-    copy pkg\datums.csv installer
+    xcopy pkg\csv installer\csv /i
 
-    copy pkg\ellipsoids.csv installer
+    xcopy pkg\maps installer\maps /i
 
-    copy pkg\maps.txt installer
+    xcopy lang\*.qm installer\translations\ /sy
 
     copy licence.txt installer
 
@@ -49,4 +49,4 @@ build_script:
 
     makensis.exe installer\%NSI%
 artifacts:
-- path: installer\GPXSee-*.exe
+- path: installer\GPXSee-*.exe

.gitignore

@@ -0,0 +1,13 @@
+# C++ objects and libs
+*.o
+
+# Qt-es
+/.qmake.stash
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+Makefile*
+*.qm
+
+# Binary
+GPXSee

.travis.yml

@@ -1,9 +1,18 @@
 language: c++
 
+os:
+  - linux
+  - osx
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
+
 install:
-  - sudo apt-get install libqt4-dev
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev; fi
 
 script:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
   - lrelease gpxsee.pro
   - qmake gpxsee.pro
   - make

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+Only localization contributions are accepted at the moment, code pull requests will be rejected.
+
+The rationale is, that I want leave the possibility to distribute GPXsee builds in the OS X/Windows
+stores under a non-GPL licence open. In the future, code pull requests under a QT-like contribution
+agreement [1] will be possible.
+
+[1] https://d21tv0wm5mksdn.cloudfront.net/wp-content/uploads/2015/03/Qt-ContributionLicenseAgreement_v1_2_FINAL.pdf

README.md

@@ -1,17 +1,17 @@
 # GPXSee
 GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
-KML, FIT, IGC and NMEA files.
+KML, FIT, IGC, NMEA and OziExplorer files.
 
 ## Features
-* User-definable online maps.
-* Offline maps (OziExplorer maps and TrekBuddy maps/atlases).
+* User-definable online maps (OSM/Google tiles, WMTS, WMS).
+* Offline maps (OziExplorer maps, TrekBuddy maps/atlases, GeoTIFF images).
 * Elevation, speed, heart rate, cadence, power and temperature graphs.
 * Support for multiple tracks in one view.
 * Support for POI files.
 * Print/export to PDF.
 * Full-screen mode.
 * Native GUI for Windows, Mac OS X and Linux.
-* Opens GPX, TCX, FIT, KML, IGC, NMEA and Garmin CSV files.
+* Opens GPX, TCX, FIT, KML, IGC, NMEA, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.
 
 ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
 

gpxsee.pro

@@ -1,5 +1,5 @@
 TARGET = GPXSee
-VERSION = 4.16
+VERSION = 5.9
 QT += core \
     gui \
     network
@@ -7,197 +7,253 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
 lessThan(QT_VERSION, 5.4): QT += opengl
 macx: QT += opengl
+INCLUDEPATH += ./src
 HEADERS += src/config.h \
-    src/icons.h \
-    src/gui.h \
-    src/poi.h \
-    src/rtree.h \
-    src/axisitem.h \
-    src/keys.h \
-    src/slideritem.h \
-    src/markeritem.h \
-    src/infoitem.h \
-    src/elevationgraph.h \
-    src/speedgraph.h \
-    src/sliderinfoitem.h \
-    src/filebrowser.h \
-    src/map.h \
-    src/onlinemap.h \
-    src/downloader.h \
-    src/units.h \
-    src/scaleitem.h \
-    src/waypoint.h \
-    src/track.h \
-    src/graphview.h \
-    src/trackpoint.h \
-    src/waypointitem.h \
-    src/palette.h \
-    src/heartrategraph.h \
-    src/range.h \
-    src/cpuarch.h \
-    src/settings.h \
-    src/app.h \
-    src/trackinfo.h \
-    src/exportdialog.h \
-    src/fileselectwidget.h \
-    src/margins.h \
-    src/temperaturegraph.h \
-    src/graphtab.h \
-    src/misc.h \
-    src/trackitem.h \
-    src/tooltip.h \
-    src/route.h \
-    src/routeitem.h \
-    src/graphitem.h \
-    src/graph.h \
-    src/pathitem.h \
-    src/pathview.h \
-    src/griditem.h \
-    src/data.h \
-    src/gpxparser.h \
-    src/tcxparser.h \
-    src/parser.h \
-    src/csvparser.h \
-    src/coordinates.h \
-    src/tile.h \
-    src/rd.h \
-    src/wgs84.h \
-    src/kmlparser.h \
-    src/trackdata.h \
-    src/routedata.h \
-    src/fitparser.h \
-    src/format.h \
-    src/path.h \
-    src/assert.h \
-    src/cadencegraph.h \
-    src/powergraph.h \
-    src/igcparser.h \
-    src/nmeaparser.h \
-    src/optionsdialog.h \
-    src/colorbox.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 \
-    src/rectc.h \
-    src/searchpointer.h \
-    src/percentslider.h \
-    src/elevationgraphitem.h \
-    src/speedgraphitem.h \
-    src/heartrategraphitem.h \
-    src/temperaturegraphitem.h \
-    src/cadencegraphitem.h \
-    src/powergraphitem.h
+    src/common/staticassert.h \
+    src/common/coordinates.h \
+    src/common/range.h \
+    src/common/rectc.h \
+    src/common/wgs84.h \
+    src/common/str2int.h \
+    src/GUI/app.h \
+    src/GUI/icons.h \
+    src/GUI/gui.h \
+    src/GUI/axisitem.h \
+    src/GUI/keys.h \
+    src/GUI/slideritem.h \
+    src/GUI/markeritem.h \
+    src/GUI/infoitem.h \
+    src/GUI/elevationgraph.h \
+    src/GUI/speedgraph.h \
+    src/GUI/sliderinfoitem.h \
+    src/GUI/filebrowser.h \
+    src/GUI/units.h \
+    src/GUI/scaleitem.h \
+    src/GUI/graphview.h \
+    src/GUI/waypointitem.h \
+    src/GUI/palette.h \
+    src/GUI/heartrategraph.h \
+    src/GUI/trackinfo.h \
+    src/GUI/exportdialog.h \
+    src/GUI/fileselectwidget.h \
+    src/GUI/margins.h \
+    src/GUI/temperaturegraph.h \
+    src/GUI/graphtab.h \
+    src/GUI/trackitem.h \
+    src/GUI/tooltip.h \
+    src/GUI/routeitem.h \
+    src/GUI/graphitem.h \
+    src/GUI/pathitem.h \
+    src/GUI/griditem.h \
+    src/GUI/format.h \
+    src/GUI/cadencegraph.h \
+    src/GUI/powergraph.h \
+    src/GUI/optionsdialog.h \
+    src/GUI/colorbox.h \
+    src/GUI/stylecombobox.h \
+    src/GUI/opengl.h \
+    src/GUI/timetype.h \
+    src/GUI/percentslider.h \
+    src/GUI/elevationgraphitem.h \
+    src/GUI/speedgraphitem.h \
+    src/GUI/heartrategraphitem.h \
+    src/GUI/temperaturegraphitem.h \
+    src/GUI/cadencegraphitem.h \
+    src/GUI/powergraphitem.h \
+    src/GUI/oddspinbox.h \
+    src/GUI/settings.h \
+    src/GUI/nicenum.h \
+    src/GUI/cpuarch.h \
+    src/GUI/searchpointer.h \
+    src/GUI/mapview.h \
+    src/map/projection.h \
+    src/map/ellipsoid.h \
+    src/map/datum.h \
+    src/map/mercator.h \
+    src/map/transversemercator.h \
+    src/map/latlon.h \
+    src/map/utm.h \
+    src/map/lambertconic.h \
+    src/map/lambertazimuthal.h \
+    src/map/albersequal.h \
+    src/map/map.h \
+    src/map/maplist.h \
+    src/map/onlinemap.h \
+    src/map/downloader.h \
+    src/map/tile.h \
+    src/map/emptymap.h \
+    src/map/offlinemap.h \
+    src/map/tar.h \
+    src/map/ozf.h \
+    src/map/atlas.h \
+    src/map/matrix.h \
+    src/map/geotiff.h \
+    src/map/pcs.h \
+    src/map/transform.h \
+    src/map/mapfile.h \
+    src/map/tifffile.h \
+    src/map/gcs.h \
+    src/map/angularunits.h \
+    src/map/primemeridian.h \
+    src/map/linearunits.h \
+    src/map/ct.h \
+    src/map/mapsource.h \
+    src/map/tileloader.h \
+    src/map/wmtsmap.h \
+    src/map/wmts.h \
+    src/map/wmsmap.h \
+    src/map/wms.h \
+    src/map/crs.h \
+    src/map/coordinatesystem.h \
+    src/map/pointd.h \
+    src/data/graph.h \
+    src/data/poi.h \
+    src/data/waypoint.h \
+    src/data/track.h \
+    src/data/route.h \
+    src/data/trackpoint.h \
+    src/data/data.h \
+    src/data/parser.h \
+    src/data/trackdata.h \
+    src/data/routedata.h \
+    src/data/path.h \
+    src/data/rtree.h \
+    src/data/gpxparser.h \
+    src/data/tcxparser.h \
+    src/data/csvparser.h \
+    src/data/kmlparser.h \
+    src/data/fitparser.h \
+    src/data/igcparser.h \
+    src/data/nmeaparser.h \
+    src/data/oziparsers.h
 SOURCES += src/main.cpp \
-    src/gui.cpp \
-    src/poi.cpp \
-    src/axisitem.cpp \
-    src/slideritem.cpp \
-    src/markeritem.cpp \
-    src/infoitem.cpp \
-    src/elevationgraph.cpp \
-    src/speedgraph.cpp \
-    src/sliderinfoitem.cpp \
-    src/filebrowser.cpp \
-    src/onlinemap.cpp \
-    src/downloader.cpp \
-    src/scaleitem.cpp \
-    src/track.cpp \
-    src/graphview.cpp \
-    src/waypointitem.cpp \
-    src/palette.cpp \
-    src/heartrategraph.cpp \
-    src/range.cpp \
-    src/app.cpp \
-    src/trackinfo.cpp \
-    src/exportdialog.cpp \
-    src/fileselectwidget.cpp \
-    src/temperaturegraph.cpp \
-    src/trackpoint.cpp \
-    src/misc.cpp \
-    src/waypoint.cpp \
-    src/trackitem.cpp \
-    src/tooltip.cpp \
-    src/route.cpp \
-    src/routeitem.cpp \
-    src/graphitem.cpp \
-    src/pathitem.cpp \
-    src/pathview.cpp \
-    src/griditem.cpp \
-    src/data.cpp \
-    src/gpxparser.cpp \
-    src/tcxparser.cpp \
-    src/csvparser.cpp \
-    src/coordinates.cpp \
-    src/kmlparser.cpp \
-    src/fitparser.cpp \
-    src/format.cpp \
-    src/graph.cpp \
-    src/cadencegraph.cpp \
-    src/powergraph.cpp \
-    src/igcparser.cpp \
-    src/path.cpp \
-    src/nmeaparser.cpp \
-    src/optionsdialog.cpp \
-    src/colorbox.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 \
-    src/rectc.cpp \
-    src/percentslider.cpp \
-    src/elevationgraphitem.cpp \
-    src/speedgraphitem.cpp \
-    src/heartrategraphitem.cpp \
-    src/temperaturegraphitem.cpp \
-    src/cadencegraphitem.cpp \
-    src/powergraphitem.cpp
+    src/common/coordinates.cpp \
+    src/common/rectc.cpp \
+    src/common/range.cpp \
+    src/common/str2int.cpp \
+    src/GUI/app.cpp \
+    src/GUI/gui.cpp \
+    src/GUI/axisitem.cpp \
+    src/GUI/slideritem.cpp \
+    src/GUI/markeritem.cpp \
+    src/GUI/infoitem.cpp \
+    src/GUI/elevationgraph.cpp \
+    src/GUI/speedgraph.cpp \
+    src/GUI/sliderinfoitem.cpp \
+    src/GUI/filebrowser.cpp \
+    src/GUI/scaleitem.cpp \
+    src/GUI/graphview.cpp \
+    src/GUI/waypointitem.cpp \
+    src/GUI/palette.cpp \
+    src/GUI/heartrategraph.cpp \
+    src/GUI/trackinfo.cpp \
+    src/GUI/exportdialog.cpp \
+    src/GUI/fileselectwidget.cpp \
+    src/GUI/temperaturegraph.cpp \
+    src/GUI/trackitem.cpp \
+    src/GUI/tooltip.cpp \
+    src/GUI/routeitem.cpp \
+    src/GUI/graphitem.cpp \
+    src/GUI/pathitem.cpp \
+    src/GUI/griditem.cpp \
+    src/GUI/format.cpp \
+    src/GUI/cadencegraph.cpp \
+    src/GUI/powergraph.cpp \
+    src/GUI/optionsdialog.cpp \
+    src/GUI/colorbox.cpp \
+    src/GUI/stylecombobox.cpp \
+    src/GUI/oddspinbox.cpp \
+    src/GUI/percentslider.cpp \
+    src/GUI/elevationgraphitem.cpp \
+    src/GUI/speedgraphitem.cpp \
+    src/GUI/heartrategraphitem.cpp \
+    src/GUI/temperaturegraphitem.cpp \
+    src/GUI/cadencegraphitem.cpp \
+    src/GUI/powergraphitem.cpp \
+    src/GUI/nicenum.cpp \
+    src/GUI/mapview.cpp \
+    src/map/maplist.cpp \
+    src/map/onlinemap.cpp \
+    src/map/downloader.cpp \
+    src/map/emptymap.cpp \
+    src/map/offlinemap.cpp \
+    src/map/tar.cpp \
+    src/map/atlas.cpp \
+    src/map/ozf.cpp \
+    src/map/matrix.cpp \
+    src/map/ellipsoid.cpp \
+    src/map/datum.cpp \
+    src/map/mercator.cpp \
+    src/map/transversemercator.cpp \
+    src/map/utm.cpp \
+    src/map/lambertconic.cpp \
+    src/map/albersequal.cpp \
+    src/map/lambertazimuthal.cpp \
+    src/map/geotiff.cpp \
+    src/map/pcs.cpp \
+    src/map/transform.cpp \
+    src/map/mapfile.cpp \
+    src/map/tifffile.cpp \
+    src/map/projection.cpp \
+    src/map/gcs.cpp \
+    src/map/angularunits.cpp \
+    src/map/primemeridian.cpp \
+    src/map/linearunits.cpp \
+    src/map/mapsource.cpp \
+    src/map/tileloader.cpp \
+    src/map/wmtsmap.cpp \
+    src/map/wmts.cpp \
+    src/map/wmsmap.cpp \
+    src/map/wms.cpp \
+    src/map/crs.cpp \
+    src/map/coordinatesystem.cpp \
+    src/data/data.cpp \
+    src/data/poi.cpp \
+    src/data/track.cpp \
+    src/data/route.cpp \
+    src/data/path.cpp \
+    src/data/gpxparser.cpp \
+    src/data/tcxparser.cpp \
+    src/data/csvparser.cpp \
+    src/data/kmlparser.cpp \
+    src/data/fitparser.cpp \
+    src/data/igcparser.cpp \
+    src/data/nmeaparser.cpp \
+    src/data/oziparsers.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts \
     lang/gpxsee_sv.ts \
-    lang/gpxsee_de.ts
+    lang/gpxsee_de.ts \
+    lang/gpxsee_ru.ts \
+    lang/gpxsee_fi.ts \
+    lang/gpxsee_fr.ts \
+    lang/gpxsee_pl.ts
 macx {
     ICON = icons/gpxsee.icns
-    QMAKE_INFO_PLIST = Info.plist
-    APP_RESOURCES.files = icons/gpx.icns \
+    QMAKE_INFO_PLIST = pkg/Info.plist
+    LOCALE.path = Contents/Resources/translations
+    LOCALE.files = lang/gpxsee_cs.qm \
+        lang/gpxsee_de.qm \
+        lang/gpxsee_fi.qm \
+        lang/gpxsee_fr.qm \
+        lang/gpxsee_ru.qm \
+        lang/gpxsee_sv.qm \
+        lang/gpxsee_pl.qm
+    CSV.path = Contents/Resources
+    CSV.files = pkg/csv
+    MAPS.path = Contents/Resources
+    MAPS.files = pkg/maps
+    ICONS.path = Contents/Resources/icons
+    ICONS.files = icons/gpx.icns \
         icons/tcx.icns \
         icons/kml.icns \
         icons/fit.icns \
         icons/igc.icns \
         icons/nmea.icns \
-        pkg/maps.txt \
-        pkg/ellipsoids.csv \
-        pkg/datums.csv
-    APP_RESOURCES.path = Contents/Resources
-    QMAKE_BUNDLE_DATA += APP_RESOURCES
+        icons/plt.icns \
+        icons/rte.icns \
+        icons/wpt.icns
+    QMAKE_BUNDLE_DATA += LOCALE MAPS ICONS CSV
 }
 win32 {
     RC_ICONS = icons/gpxsee.ico \
@@ -206,6 +262,9 @@ win32 {
         icons/kml.ico \
         icons/fit.ico \
         icons/igc.ico \
-        icons/nmea.ico
+        icons/nmea.ico \
+        icons/plt.ico \
+        icons/rte.ico \
+        icons/wpt.ico
 }
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

gpxsee.qrc

@@ -20,8 +20,5 @@
         <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>

icons/fit.svg

@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg3390"
-   height="185"
-   width="185"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="fit.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="815"
-     id="namedview3427"
-     showgrid="false"
-     inkscape:zoom="3.1351351"
-     inkscape:cx="92.5"
-     inkscape:cy="92.5"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3390" />
-  <metadata
-     id="metadata3404">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3402" />
-  <path
-     style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867"
-     id="path3392"
-     d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
-  <rect
-     y="124.9782"
-     x="16.573463"
-     height="49.84631"
-     width="120.3215"
-     id="rect3426"
-     style="fill:#006600;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <g
-     id="g3828"
-     transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
-    <g
-       id="g3715">
-      <circle
-         style="fill:#000000"
-         cx="113"
-         cy="90.875"
-         id="ellipse3717"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round"
-         cx="113"
-         cy="90.875"
-         id="ellipse3719"
-         r="7.0209999" />
-    </g>
-    <polyline
-       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4"
-       points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
-       id="polyline3721" />
-    <g
-       id="g3723">
-      <circle
-         style="fill:#000000"
-         cx="73.5"
-         cy="125.854"
-         id="ellipse3725"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="73.5"
-         cy="125.854"
-         id="ellipse3727"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3729">
-      <circle
-         style="fill:#000000"
-         cx="136.5"
-         cy="172.375"
-         id="ellipse3731"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="136.5"
-         cy="172.375"
-         id="ellipse3733"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3735">
-      <circle
-         style="fill:#000000"
-         cx="60.700001"
-         cy="186.39999"
-         id="ellipse3737"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="60.700001"
-         cy="186.39999"
-         id="ellipse3739"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3741">
-      <circle
-         style="fill:#000000"
-         cx="154.5"
-         cy="154.354"
-         id="ellipse3743"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="154.5"
-         cy="154.354"
-         id="ellipse3745"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3747">
-      <circle
-         style="fill:#000000"
-         cx="96"
-         cy="151.875"
-         id="ellipse3749"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="96"
-         cy="151.875"
-         id="ellipse3751"
-         r="7.0209999" />
-    </g>
-  </g>
-  <text
-     transform="scale(0.9437456,1.0596076)"
-     id="text3921"
-     y="155.86783"
-     x="44.388157"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     xml:space="preserve"
-     sodipodi:linespacing="100%"><tspan
-       sodipodi:role="line"
-       id="tspan3429"
-       x="44.388157"
-       y="155.86783">FIT</tspan></text>
-</svg>

icons/gpx.svg

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="svg3390"
-   height="185"
-   width="185">
-  <metadata
-     id="metadata3404">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3402" />
-  <path
-     style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867"
-     id="path3392"
-     d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
-  <rect
-     y="124.9782"
-     x="16.573463"
-     height="49.84631"
-     width="120.3215"
-     id="rect3426"
-     style="fill:#003399;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <g
-     id="g3828"
-     transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
-    <g
-       id="g3715">
-      <circle
-         style="fill:#000000"
-         cx="113"
-         cy="90.875"
-         id="ellipse3717"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round"
-         cx="113"
-         cy="90.875"
-         id="ellipse3719"
-         r="7.0209999" />
-    </g>
-    <polyline
-       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4"
-       points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
-       id="polyline3721" />
-    <g
-       id="g3723">
-      <circle
-         style="fill:#000000"
-         cx="73.5"
-         cy="125.854"
-         id="ellipse3725"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="73.5"
-         cy="125.854"
-         id="ellipse3727"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3729">
-      <circle
-         style="fill:#000000"
-         cx="136.5"
-         cy="172.375"
-         id="ellipse3731"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="136.5"
-         cy="172.375"
-         id="ellipse3733"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3735">
-      <circle
-         style="fill:#000000"
-         cx="60.700001"
-         cy="186.39999"
-         id="ellipse3737"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="60.700001"
-         cy="186.39999"
-         id="ellipse3739"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3741">
-      <circle
-         style="fill:#000000"
-         cx="154.5"
-         cy="154.354"
-         id="ellipse3743"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="154.5"
-         cy="154.354"
-         id="ellipse3745"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3747">
-      <circle
-         style="fill:#000000"
-         cx="96"
-         cy="151.875"
-         id="ellipse3749"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="96"
-         cy="151.875"
-         id="ellipse3751"
-         r="7.0209999" />
-    </g>
-  </g>
-  <text
-     transform="scale(0.9437456,1.0596076)"
-     id="text3921"
-     y="155.86783"
-     x="31.672857"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       y="155.86783"
-       x="31.672857"
-       id="tspan3923"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">GPX</tspan></text>
-</svg>

icons/igc.svg

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="185"
-   height="185"
-   id="svg3390"
-   version="1.1">
-  <metadata
-     id="metadata3404">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3402" />
-  <path
-     d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0"
-     id="path3392"
-     style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" />
-  <rect
-     style="fill:#ff3300;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect3426"
-     width="120.3215"
-     height="49.84631"
-     x="16.573463"
-     y="124.9782" />
-  <g
-     transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)"
-     id="g3828">
-    <g
-       id="g3715">
-      <circle
-         r="7.0209999"
-         id="ellipse3717"
-         cy="90.875"
-         cx="113"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3719"
-         cy="90.875"
-         cx="113"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round" />
-    </g>
-    <polyline
-       id="polyline3721"
-       points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
-       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" />
-    <g
-       id="g3723">
-      <circle
-         r="7.0209999"
-         id="ellipse3725"
-         cy="125.854"
-         cx="73.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3727"
-         cy="125.854"
-         cx="73.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3729">
-      <circle
-         r="7.0209999"
-         id="ellipse3731"
-         cy="172.375"
-         cx="136.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3733"
-         cy="172.375"
-         cx="136.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3735">
-      <circle
-         r="7.0209999"
-         id="ellipse3737"
-         cy="186.39999"
-         cx="60.700001"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3739"
-         cy="186.39999"
-         cx="60.700001"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3741">
-      <circle
-         r="7.0209999"
-         id="ellipse3743"
-         cy="154.354"
-         cx="154.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3745"
-         cy="154.354"
-         cx="154.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3747">
-      <circle
-         r="7.0209999"
-         id="ellipse3749"
-         cy="151.875"
-         cx="96"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3751"
-         cy="151.875"
-         cx="96"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="40.149723"
-     y="155.86783"
-     id="text3921"
-     transform="scale(0.9437456,1.0596076)"><tspan
-       y="155.86783"
-       x="40.149723"
-       id="tspan3448">IGC</tspan></text>
-</svg>

icons/kml.svg

@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="185"
-   height="185"
-   id="svg3390"
-   version="1.1">
-  <metadata
-     id="metadata3404">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3402" />
-  <path
-     d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0"
-     id="path3392"
-     style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" />
-  <rect
-     style="fill:#990000;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect3426"
-     width="120.3215"
-     height="49.84631"
-     x="16.573463"
-     y="124.9782" />
-  <g
-     transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)"
-     id="g3828">
-    <g
-       id="g3715">
-      <circle
-         r="7.0209999"
-         id="ellipse3717"
-         cy="90.875"
-         cx="113"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3719"
-         cy="90.875"
-         cx="113"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round" />
-    </g>
-    <polyline
-       id="polyline3721"
-       points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
-       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" />
-    <g
-       id="g3723">
-      <circle
-         r="7.0209999"
-         id="ellipse3725"
-         cy="125.854"
-         cx="73.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3727"
-         cy="125.854"
-         cx="73.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3729">
-      <circle
-         r="7.0209999"
-         id="ellipse3731"
-         cy="172.375"
-         cx="136.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3733"
-         cy="172.375"
-         cx="136.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3735">
-      <circle
-         r="7.0209999"
-         id="ellipse3737"
-         cy="186.39999"
-         cx="60.700001"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3739"
-         cy="186.39999"
-         cx="60.700001"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3741">
-      <circle
-         r="7.0209999"
-         id="ellipse3743"
-         cy="154.354"
-         cx="154.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3745"
-         cy="154.354"
-         cx="154.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3747">
-      <circle
-         r="7.0209999"
-         id="ellipse3749"
-         cy="151.875"
-         cx="96"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3751"
-         cy="151.875"
-         cx="96"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
-     x="31.672857"
-     y="155.86783"
-     id="text3921"
-     transform="scale(0.9437456,1.0596076)"><tspan
-       id="tspan3429">KML</tspan></text>
-</svg>

icons/nmea.svg

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="svg3390"
-   height="185"
-   width="185">
-  <metadata
-     id="metadata3404">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3402" />
-  <path
-     style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867"
-     id="path3392"
-     d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
-  <rect
-     y="124.9782"
-     x="16.573463"
-     height="49.84631"
-     width="131.6837"
-     id="rect3426"
-     style="fill:#0083d7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <g
-     id="g3828"
-     transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
-    <g
-       id="g3715">
-      <circle
-         style="fill:#000000"
-         cx="113"
-         cy="90.875"
-         id="ellipse3717"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round"
-         cx="113"
-         cy="90.875"
-         id="ellipse3719"
-         r="7.0209999" />
-    </g>
-    <polyline
-       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4"
-       points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
-       id="polyline3721" />
-    <g
-       id="g3723">
-      <circle
-         style="fill:#000000"
-         cx="73.5"
-         cy="125.854"
-         id="ellipse3725"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="73.5"
-         cy="125.854"
-         id="ellipse3727"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3729">
-      <circle
-         style="fill:#000000"
-         cx="136.5"
-         cy="172.375"
-         id="ellipse3731"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="136.5"
-         cy="172.375"
-         id="ellipse3733"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3735">
-      <circle
-         style="fill:#000000"
-         cx="60.700001"
-         cy="186.39999"
-         id="ellipse3737"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="60.700001"
-         cy="186.39999"
-         id="ellipse3739"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3741">
-      <circle
-         style="fill:#000000"
-         cx="154.5"
-         cy="154.354"
-         id="ellipse3743"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="154.5"
-         cy="154.354"
-         id="ellipse3745"
-         r="7.0209999" />
-    </g>
-    <g
-       id="g3747">
-      <circle
-         style="fill:#000000"
-         cx="96"
-         cy="151.875"
-         id="ellipse3749"
-         r="7.0209999" />
-      <circle
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
-         cx="96"
-         cy="151.875"
-         id="ellipse3751"
-         r="7.0209999" />
-    </g>
-  </g>
-  <text
-     transform="scale(0.9437456,1.0596076)"
-     id="text3921"
-     y="155.86783"
-     x="21.076782"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     xml:space="preserve"><tspan
-       y="155.86783"
-       x="21.076782"
-       id="tspan3429">NMEA</tspan></text>
-</svg>

icons/scripts/icns.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
+  plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
+
+for e in $EXTENSIONS; do
+	IFS=":"; set $e
+
+	EXT=`echo $1 | tr /a-z/ /A-Z/`
+	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
+
+	ICONSET=$1.iconset
+	mkdir $ICONSET
+
+	convert -density 400 -background none -resize '16x16' "$1.svg" "$ICONSET/icon_16x16.png"
+	convert -density 400 -background none -resize '32x32' "$1.svg" "$ICONSET/icon_16x16@2x.png"
+	cp "$ICONSET/icon_16x16@2x.png" "$ICONSET/icon_32x32.png"
+	convert -density 400 -background none -resize '64x64' "$1.svg" "$ICONSET/icon_32x32@2x.png"
+	convert -density 400 -background none -resize '128x128' "$1.svg" "$ICONSET/icon_128x128.png"
+	convert -density 400 -background none -resize '256x256' "$1.svg" "$ICONSET/icon_128x128@2x.png"
+	cp "$ICONSET/icon_128x128@2x.png" "$ICONSET/icon_256x256.png"
+	convert -density 400 -background none -resize '512x512' "$1.svg" "$ICONSET/icon_256x256@2x.png"
+	cp "$ICONSET/icon_256x256@2x.png" "$ICONSET/icon_512x512.png"
+	convert -density 400 -background none -resize '1024x1024' "$1.svg" "$ICONSET/icon_512x512@2x.png"
+
+	iconutil -c icns -o $1.icns "$ICONSET"
+	rm -R "$ICONSET" $1.svg
+done

icons/scripts/ico.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
+  plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
+
+for e in $EXTENSIONS; do
+	IFS=":"; set $e
+
+	EXT=`echo $1 | tr /a-z/ /A-Z/`
+	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
+	convert -density 400 $1.svg -define icon:auto-resize $1.ico
+	rm $1.svg
+done

icons/scripts/icon-template.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" height="185" width="185">
+  <path id="envelope" style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
+  <g id="logo" transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
+    <polyline style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "/>
+    <circle style="fill:#000000" cx="113" cy="90.875" r="8"/>
+    <circle style="fill:#000000" cx="73.5" cy="125.854" r="8"/>
+    <circle style="fill:#000000" cx="136.5" cy="172.375" r="8"/>
+    <circle style="fill:#000000" cx="60.700001" cy="186.39999" r="8"/>
+    <circle style="fill:#000000" cx="154.5" cy="154.354" r="8"/>
+    <circle style="fill:#000000" cx="96" cy="151.875" r="8"/>
+  </g>
+  <g transform="translate(16.573463,124.9782)">
+    <rect y="0" x="0" id="textrect" height="50" width="120" style="fill:$COLOR;fill-opacity:1;stroke:none;"/>
+    <text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:sans-serif;font-weight:bold;">$EXTENSION</text>
+  </g>
+</svg>

icons/tcx.svg

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="185"
-   height="185"
-   id="svg3390"
-   version="1.1">
-  <metadata
-     id="metadata3404">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3402" />
-  <path
-     d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0"
-     id="path3392"
-     style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867" />
-  <rect
-     style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect3426"
-     width="120.3215"
-     height="49.84631"
-     x="16.573463"
-     y="124.9782" />
-  <g
-     transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)"
-     id="g3828">
-    <g
-       id="g3715">
-      <circle
-         r="7.0209999"
-         id="ellipse3717"
-         cy="90.875"
-         cx="113"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3719"
-         cy="90.875"
-         cx="113"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round" />
-    </g>
-    <polyline
-       id="polyline3721"
-       points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
-       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4" />
-    <g
-       id="g3723">
-      <circle
-         r="7.0209999"
-         id="ellipse3725"
-         cy="125.854"
-         cx="73.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3727"
-         cy="125.854"
-         cx="73.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3729">
-      <circle
-         r="7.0209999"
-         id="ellipse3731"
-         cy="172.375"
-         cx="136.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3733"
-         cy="172.375"
-         cx="136.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3735">
-      <circle
-         r="7.0209999"
-         id="ellipse3737"
-         cy="186.39999"
-         cx="60.700001"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3739"
-         cy="186.39999"
-         cx="60.700001"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3741">
-      <circle
-         r="7.0209999"
-         id="ellipse3743"
-         cy="154.354"
-         cx="154.5"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3745"
-         cy="154.354"
-         cx="154.5"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-    <g
-       id="g3747">
-      <circle
-         r="7.0209999"
-         id="ellipse3749"
-         cy="151.875"
-         cx="96"
-         style="fill:#000000" />
-      <circle
-         r="7.0209999"
-         id="ellipse3751"
-         cy="151.875"
-         cx="96"
-         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2" />
-    </g>
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     x="35.911289"
-     y="155.86783"
-     id="text3921"
-     transform="scale(0.9437456,1.0596076)"><tspan
-       y="155.86783"
-       x="35.911289"
-       id="tspan3429">TCX</tspan></text>
-</svg>

pkg/Info.plist

@@ -29,7 +29,7 @@
 				<string>application/gpx+xml</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>gpx.icns</string>
+			<string>icons/gpx.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>GPS Exchange Format</string>
 			<key>CFBundleTypeRole</key>
@@ -45,7 +45,7 @@
 				<string>application/tcx+xml</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>tcx.icns</string>
+			<string>icons/tcx.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>Training Center XML</string>
 			<key>CFBundleTypeRole</key>
@@ -61,7 +61,7 @@
 				<string>application/vnd.google-earth.kml+xml</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>kml.icns</string>
+			<string>icons/kml.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>Keyhole Markup Language</string>
 			<key>CFBundleTypeRole</key>
@@ -77,7 +77,7 @@
 				<string>application/vnd.ant.fit</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>fit.icns</string>
+			<string>icons/fit.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>Flexible and Interoperable Data Transfer</string>
 			<key>CFBundleTypeRole</key>
@@ -93,7 +93,7 @@
 				<string>application/vnd.fai.igc</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>igc.icns</string>
+			<string>icons/igc.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>Flight Recorder Data Format</string>
 			<key>CFBundleTypeRole</key>
@@ -109,12 +109,60 @@
 				<string>application/vnd.nmea.nmea</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>nmea.icns</string>
+			<string>icons/nmea.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>NMEA 0183 data</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>plt</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.oziexplorer.plt</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/plt.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>OziExplorer Track Point File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>rte</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.oziexplorer.rte</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/rte.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>OziExplorer Route File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>wpt</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.oziexplorer.wpt</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/wpt.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>OziExplorer Waypoint File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -245,6 +293,69 @@
 				<string>application/vnd.nmea.nmea</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.oziexplorer3.plt</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.oziexplorer3.com/eng/help/fileformats.html</string>
+			<key>UTTypeDescription</key>
+			<string>OziExplorer Track Point File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>plt</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.oziexplorer.plt</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.oziexplorer3.plt</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.oziexplorer3.com/eng/help/fileformats.html</string>
+			<key>UTTypeDescription</key>
+			<string>OziExplorer Route File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>rte</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.oziexplorer.rte</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.oziexplorer3.plt</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.oziexplorer3.com/eng/help/fileformats.html</string>
+			<key>UTTypeDescription</key>
+			<string>OziExplorer Waypoint File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>wpt</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.oziexplorer.wpt</string>
+			</dict>
+		</dict>
 	</array>
 
 </dict>

pkg/appdata.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+	<id>gpxsee.desktop</id>
+	<metadata_license>MIT</metadata_license>
+	<project_license>GPL-3.0</project_license>
+
+	<name>GPXSee</name>
+	<summary>GPS log file viewer and analyzer</summary>
+	<description>
+		<p>GPXSee is a GPS log file viewer and analyzer that supports GPX, TCX,
+		KML, FIT, IGC, NMEA and OziExplorer files.</p>
+
+		<p>Features:</p>
+		<ul>
+			<li>User-definable online maps (OSM/Google tiles, WMTS, WMS).</li>
+			<li>Offline maps (OziExplorer maps, TrekBuddy maps/atlases, GeoTIFF
+				images).</li>
+			<li>Elevation, speed, heart rate, cadence, power and temperature
+				graphs.</li>
+			<li>Support for multiple tracks in one view.</li>
+			<li>Support for POI files.</li>
+			<li>Print/export to PDF.</li>
+			<li>Full-screen mode.</li>
+			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, OziExplorer (PLT, WPT, RTE)
+				and Garmin CSV files.</li>
+		</ul>
+	</description>
+
+	<screenshots>
+		<screenshot type="default">
+			<image>http://www.gpxsee.org/gallery/lin1.png</image>
+		</screenshot>
+		<screenshot>
+			<image>http://www.gpxsee.org/gallery/lin2.png</image>
+		</screenshot>
+	</screenshots>
+
+	<categories>
+		<category>Graphics</category>
+		<category>Viewer</category>
+	</categories>
+
+	<url type="homepage">http://www.gpxsee.org</url>
+
+	<launchable type="desktop-id">gpxsee.desktop</launchable>
+
+	<provides>
+		<binary>gpxsee</binary>
+	</provides>
+
+	<mimetypes>
+		<mimetype>application/gpx+xml</mimetype>
+		<mimetype>application/tcx+xml</mimetype>
+		<mimetype>application/vnd.ant.fit</mimetype>
+		<mimetype>application/vnd.google-earth.kml+xml</mimetype>
+		<mimetype>application/vnd.fai.igc</mimetype>
+		<mimetype>application/vnd.nmea.nmea</mimetype>
+		<mimetype>application/vnd.oziexplorer.plt</mimetype>
+		<mimetype>application/vnd.oziexplorer.rte</mimetype>
+		<mimetype>application/vnd.oziexplorer.wpt</mimetype>
+	</mimetypes>
+</component>

pkg/csv/ellipsoids.csv

@@ -0,0 +1,19 @@
+Airy 1830,7001,6377563.396,299.3249646
+Modified Airy,7002,6377340.189,299.3249646
+Australian National,7003,6378160.0,298.25
+Bessel 1841,7004,6377397.155,299.1528128
+Bessel 1841 (Norway),7005,6377492.0176,299.1528
+Clarke 1866,7008,6378206.4,294.9786982
+Clarke 1880 (Palestine),7010,6378300.789,293.466
+Clarke 1880 (IGN),7011,6378249.2,293.466021
+Clarke 1880,7012,6378249.145,293.465
+Everest 1830 (1937 Adjustment),7015,6377276.345,300.8017
+Everest 1830 Modified,7018,6377304.063,300.8017
+GRS 80,7019,6378137.0,298.257222101
+Helmert 1906,7020,6378200.0,298.3
+International 1924,7022,6378388.0,297.0
+Krassovsky 1940,7024,6378245.0,298.3
+South American 1969,7036,6378160.0,298.25
+WGS 72,7043,6378135.0,298.26
+Bessel 1841 (Namibia),7046,6377483.865,299.1528128
+Hough 1960,7053,6378270.0,297.0

pkg/csv/gcs.csv

@@ -0,0 +1,123 @@
+Adindan,4201,6201,9122,7012,8901,9603,-162,-12,206
+Afgooye,4205,6205,9122,7024,8901,9603,-43,-163,45
+Ain el Abd 1970,4204,6204,9122,7022,8901,9603,-150,-251,-2
+Anna 1 Astro 1965,4708,6708,9122,7003,8901,9603,-491,-22,435
+Arc 1950,4209,6209,9122,7012,8901,9603,-143,-90,-294
+Arc 1960,4210,6210,9122,7012,8901,9603,-160,-8,-300
+Ascension Island 1958,4712,6712,9122,7022,8901,9603,-207,107,52
+Astro B4 Sorol Atoll,4707,6707,9122,7022,8901,9603,114,-116,-333
+Astro Beacon 1945,4709,6709,9122,7022,8901,9603,145,75,-272
+Astro DOS 71/4,4710,6710,9122,7022,8901,9603,-320,550,-494
+Astronomic Stn 1952,4711,6711,9122,7022,8901,9603,124,-234,-25
+Australian Geodetic 1966,4202,6202,9122,7003,8901,9603,-133,-48,148
+Australian Geodetic 1984,4203,6203,9122,7003,8901,9603,-134,-48,149
+Australian Geocentric 1994 (GDA94),4283,6283,9122,7019,8901,9603,0,0,0
+Austrian,4312,6312,9122,7004,8901,9603,594,84,471
+Bellevue (IGN),4714,6714,9122,7022,8901,9603,-127,-769,472
+Bermuda 1957,4216,6216,9122,7008,8901,9603,-73,213,296
+Bogota Observatory,4218,6218,9122,7022,8901,9603,307,304,-318
+Campo Inchauspe,4221,6221,9122,7022,8901,9603,-148,136,90
+Canton Astro 1966,4716,6716,9122,7022,8901,9603,298,-304,-375
+Cape,4222,6222,9122,7012,8901,9603,-136,-108,-292
+Cape Canaveral,4717,6717,9122,7008,8901,9603,-2,150,181
+Carthage,4223,6223,9122,7012,8901,9603,-263,6,431
+CH-1903,4149,6149,9122,7004,8901,9603,674.374,15.056,405.343
+Chatham 1971,4672,6672,9122,7022,8901,9603,175,-38,113
+Chua Astro,4224,6224,9122,7022,8901,9603,-134,229,-29
+Corrego Alegre,4225,6225,9122,7022,8901,9603,-206,172,-6
+Djakarta (Batavia),4211,6211,9122,7004,8901,9603,-377,681,-50
+DOS 1968,,,9122,7022,8901,9603,230,-199,-752
+Easter Island 1967,4719,6719,9122,7022,8901,9603,211,147,111
+Egypt,4199,6199,9122,7022,8901,9603,-130,-117,-151
+ETRS 89,4258,6258,9122,7019,8901,9603,0,0,0
+European 1950,4230,6230,9122,7022,8901,9603,-87,-98,-121
+European 1950 (Mean France),,,9122,7022,8901,9603,-87,-96,-120
+European 1950 (Spain and Portugal),,,9122,7022,8901,9603,-84,-107,-120
+European 1979,4668,6668,9122,7022,8901,9603,-86,-98,-119
+Finland Hayford,4123,6123,9122,7022,8901,9603,-78,-231,-97
+Gandajika Base,4233,6233,9122,7022,8901,9603,-133,-321,50
+Geodetic Datum 1949,4272,6272,9122,7022,8901,9603,84,-22,209
+GGRS 87,4121,6121,9122,7019,8901,9603,-199.87,74.79,246.62
+Guam 1963,4675,6675,9122,7008,8901,9603,-100,-248,259
+GUX 1 Astro,4718,6718,9122,7022,8901,9603,252,-209,-751
+Hartebeeshoek94,4148,6148,9122,7030,8901,9603,0,0,0
+Hermannskogel,3906,1031,9122,7004,8901,9603,653,-212,449
+Hjorsey 1955,4658,6658,9122,7022,8901,9603,-73,46,-86
+Hong Kong 1963,4739,6739,9122,7022,8901,9603,-156,-271,-189
+Hu-Tzu-Shan,4236,6236,9122,7022,8901,9603,-634,-549,-201
+Indian Bangladesh,4682,6682,9122,7015,8901,9603,289,734,257
+Indian Thailand,4240,6240,9122,7015,8901,9603,214,836,303
+Israeli,4281,6281,9122,7010,8901,9603,-235,-85,264
+Ireland 1965,4299,6299,9122,7002,8901,9603,506,-122,611
+ISTS 073 Astro 1969,4724,6724,9122,7022,8901,9603,208,-435,-229
+Johnston Island,4725,6725,9122,7022,8901,9603,191,-77,-204
+Kandawala,4244,6244,9122,7015,8901,9603,-97,787,86
+Kerguelen Island,4698,6698,9122,7022,8901,9603,145,-187,103
+Kertau 1948,4245,6245,9122,7018,8901,9603,-11,851,5
+L.C. 5 Astro,4726,6726,9122,7008,8901,9603,42,124,147
+Liberia 1964,4251,6251,9122,7012,8901,9603,-90,40,88
+Luzon Mindanao,,,9122,7008,8901,9603,-133,-79,-72
+Luzon Philippines,4253,6253,9122,7008,8901,9603,-133,-77,-51
+Mahe 1971,4256,6256,9122,7012,8901,9603,41,-220,-134
+Marco Astro,4616,6616,9122,7022,8901,9603,-289,-124,60
+Massawa,4262,6262,9122,7004,8901,9603,639,405,60
+Merchich,4261,6261,9122,7012,8901,9603,31,146,47
+Midway Astro 1961,4727,6727,9122,7022,8901,9603,912,-58,1227
+Minna,4263,6263,9122,7012,8901,9603,-92,-93,122
+NAD27 Alaska,,,9122,7008,8901,9603,-5,135,172
+NAD27 Bahamas,,,9122,7008,8901,9603,-4,154,178
+NAD27 Canada,,,9122,7008,8901,9603,-10,158,187
+NAD27 Canal Zone,,,9122,7008,8901,9603,0,125,201
+NAD27 Caribbean,,,9122,7008,8901,9603,-3,142,183
+NAD27 Central,,,9122,7008,8901,9603,0,125,194
+NAD27 CONUS,4267,6267,9122,7008,8901,9603,-8,160,176
+NAD27 Cuba,,,9122,7008,8901,9603,-9,152,178
+NAD27 Greenland,,,9122,7008,8901,9603,11,114,195
+NAD27 Mexico,,,9122,7008,8901,9603,-12,130,190
+NAD27 San Salvador,,,9122,7008,8901,9603,1,140,165
+NAD83,4269,6269,9122,7019,8901,9603,0,0,0
+Nahrwn Masirah Ilnd,,,9122,7012,8901,9603,-247,-148,369
+Nahrwn Saudi Arbia,,,9122,7012,8901,9603,-231,-196,482
+Nahrwn United Arab,4270,6270,9122,7012,8901,9603,-249,-156,381
+Naparima BWI,4271,6271,9122,7022,8901,9603,-2,374,172
+NGO1948,4273,6273,9122,7005,8901,9603,315,-217,528
+NTF France,4275,6275,9122,7011,8901,9603,-168,-60,320
+Norsk,4817,6817,9122,7005,8913,9603,278,93,474
+NZGD1949,4272,6272,9122,7022,8901,9603,84,-22,209
+NZGD2000,4167,6167,9122,7030,8901,9603,0,0,0
+Observatorio 1966,4182,6182,9122,7022,8901,9603,-425,-169,81
+Old Egyptian,4229,6229,9122,7020,8901,9603,-130,110,-13
+Old Hawaiian,4135,6135,9122,7008,8901,9603,61,-285,-181
+Oman,4232,6232,9122,7012,8901,9603,-346,-1,224
+Ord Srvy Grt Britn,4277,6277,9122,7001,8901,9603,375,-111,431
+Pico De Las Nieves,4728,6728,9122,7022,8901,9603,-307,-92,127
+Pitcairn Astro 1967,4729,6729,9122,7022,8901,9603,185,165,42
+Potsdam Rauenberg DHDN,4314,6314,9122,7004,8901,9603,606,23,413
+Prov So Amrican 1956,4248,6248,9122,7022,8901,9603,-288,175,-376
+Prov So Chilean 1963,4254,6254,9122,7022,8901,9603,16,196,93
+Puerto Rico,4139,6139,9122,7008,8901,9603,11,72,-101
+Pulkovo 1942 (1),4284,6284,9122,7024,8901,9603,28,-130,-95
+Pulkovo 1942 (2),,,9122,7024,8901,9603,28,-130,-95
+Qatar National,4285,6285,9122,7022,8901,9603,-128,-283,22
+Qornoq,4287,6287,9108,7022,8901,9603,164,138,-189
+Reunion,4626,6626,9122,7022,8901,9603,94,-948,-1262
+Rijksdriehoeksmeting,4289,6289,9122,7004,8901,9603,593,26,478
+Rome 1940,4806,6806,9122,7022,8906,9603,-225,-65,9
+RT 90,4124,6124,9122,7004,8901,9603,498,-36,568
+S42,4179,6179,9122,7024,8901,9603,28,-121,-77
+S42 (83),4178,6178,9122,7024,8901,9603,26,-121,-78
+Santo (DOS),4730,6730,9122,7022,8901,9603,170,42,84
+Sao Braz,4184,6184,9122,7022,8901,9603,-203,141,53
+Sapper Hill 1943,4292,6292,9122,7022,8901,9603,-355,16,74
+Schwarzeck,4293,6293,9122,7046,8901,9603,616,97,-251
+South American 1969,4291,6291,9108,7036,8901,9603,-57,1,-41
+Southeast Base,4615,6615,9122,7022,8901,9603,-499,-249,314
+Southwest Base,4183,6183,9122,7022,8901,9603,-104,167,-38
+Timbalai 1948,4298,6298,9122,7015,8901,9603,-689,691,-46
+Tokyo,4301,6301,9122,7004,8901,9603,-128,481,664
+Tristan Astro 1968,4734,6734,9122,7022,8901,9603,-632,438,-609
+Viti Levu 1916,4731,6731,9122,7012,8901,9603,51,391,-36
+Wake-Eniwetok 1960,4732,6732,9122,7053,8901,9603,101,52,-39
+WGS 72,4322,6322,9122,7043,8901,9603,0,0,5
+Yacare,4309,6309,9122,7022,8901,9603,-155,171,37
+Zanderij,4311,6311,9122,7022,8901,9603,-265,120,-358

pkg/datums.csv

@@ -1,123 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=GPXSee
+Comment=GPS log file viewer and analyzer
+Comment[cz]=Prohlížeč a analyzátor GPS logů
+Comment[fi]=Ohjelma GPS-lokien katseluun ja analysointiin
+Comment[ru]=Программа для просмотра и анализа GPS логов
+Comment[sv]=GPS-loggfilsläsare och analysator
+Exec=gpxsee %F
+Icon=gpxsee
+Terminal=false
+Type=Application
+Categories=Graphics;Viewer;Maps;Qt;
+MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;

pkg/gpxsee.nsi

@@ -5,14 +5,14 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "4.16"
+!define VERSION "5.9"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
 ; Compression method
 SetCompressor /SOLID lzma
 
-; Required execution level 
+; Required execution level
 RequestExecutionLevel admin
 
 ; The default installation directory
@@ -26,7 +26,7 @@ VIAddVersionKey "ProductName" "GPXSee"
 VIAddVersionKey "LegalCopyright" "GPXSee project"
 VIAddVersionKey "FileDescription" "GPXSee installer"
 
-; Registry key to check for directory (so if you install again, it will 
+; Registry key to check for directory (so if you install again, it will
 ; overwrite the old one automatically)
 InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 
@@ -39,11 +39,14 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 !define REGFIT "GPXSee.fit"
 !define REGIGC "GPXSee.igc"
 !define REGNMEA "GPXSee.nmea"
+!define REGPLT "GPXSee.plt"
+!define REGRTE "GPXSee.rte"
+!define REGWPT "GPXSee.wpt"
 
 ; Start menu page configuration
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee" 
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee" 
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee"
 
 Var StartMenuFolder
 
@@ -77,26 +80,25 @@ FunctionEnd
 Section "GPXSee" SEC_APP
 
   SectionIn RO
-  
-  ; Set output path to the installation directory.
+
+  ; Set output path to the installation directory
   SetOutPath $INSTDIR
-  
+
   ; Put the files there
   File "gpxsee.exe"
-  File "maps.txt"
-  File "ellipsoids.csv"
-  File "datums.csv"
+  File /r "maps"
+  File /r "csv"
 
   ; Create start menu entry and add links
   SetShellVarContext all
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application  
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
   !insertmacro MUI_STARTMENU_WRITE_END
 
   ; Create the uninstaller
-  WriteUninstaller "$INSTDIR\uninstall.exe" 
+  WriteUninstaller "$INSTDIR\uninstall.exe"
 
   ; Write the installation path into the registry
   DetailPrint "Registering application..."
@@ -114,28 +116,40 @@ Section "GPXSee" SEC_APP
   DetailPrint "Associating file types..."
   WriteRegStr HKCR ".gpx" "" "${REGGPX}"
   WriteRegStr HKCR "${REGGPX}" ""  "GPS Exchange Format"
-  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
+  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
   WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".tcx" "" "${REGTCX}"
   WriteRegStr HKCR "${REGTCX}" ""  "Training Center XML"
-  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
+  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
   WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".kml" "" "${REGKML}"
   WriteRegStr HKCR "${REGKML}" ""  "Keyhole Markup Language"
-  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
+  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
   WriteRegStr HKCR "${REGKML}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".fit" "" "${REGFIT}"
   WriteRegStr HKCR "${REGFIT}" ""  "Flexible and Interoperable Data Transfer"
-  WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
+  WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
   WriteRegStr HKCR "${REGFIT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".igc" "" "${REGIGC}"
   WriteRegStr HKCR "${REGIGC}" ""  "Flight Recorder Data Format"
-  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
+  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
   WriteRegStr HKCR "${REGIGC}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".nmea" "" "${REGNMEA}"
   WriteRegStr HKCR "${REGNMEA}" ""  "NMEA 0183 data"
-  WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
+  WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7"
   WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  WriteRegStr HKCR ".plt" "" "${REGPLT}"
+  WriteRegStr HKCR "${REGPLT}" ""  "OziExplorer Track Point File"
+  WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8"
+  WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  WriteRegStr HKCR ".rte" "" "${REGRTE}"
+  WriteRegStr HKCR "${REGRTE}" ""  "OziExplorer Route File"
+  WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9"
+  WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  WriteRegStr HKCR ".wpt" "" "${REGWPT}"
+  WriteRegStr HKCR "${REGWPT}" ""  "OziExplorer Waypoint File"
+  WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
+  WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
 
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
@@ -153,7 +167,7 @@ Section "QT framework" SEC_QT
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
- 
+
 SectionEnd
 
 Section "MSVC runtime" SEC_MSVC
@@ -195,12 +209,49 @@ Section "ANGLE" SEC_ANGLE
 
 SectionEnd
 
+SectionGroup "Localization" SEC_LOCALIZATION
+  Section "Czech"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_cs.qm translations\gpxsee_cs.qm
+    File /oname=translations\qt_cs.qm translations\qt_cs.qm
+  SectionEnd
+  Section "Finnish"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_fi.qm translations\gpxsee_fi.qm
+    File /oname=translations\qt_fi.qm translations\qt_fi.qm
+  SectionEnd
+  Section "French"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_fr.qm translations\gpxsee_fr.qm
+    File /oname=translations\qt_fr.qm translations\qt_fr.qm
+  SectionEnd
+  Section "German"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
+    File /oname=translations\qt_de.qm translations\qt_de.qm
+  SectionEnd
+  Section "Polish"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_pl.qm translations\gpxsee_pl.qm
+    File /oname=translations\qt_pl.qm translations\qt_pl.qm
+  SectionEnd
+  Section "Russian"
+    CreateDirectory "$INSTDIR\translations" 
+    File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
+    File /oname=translations\qt_ru.qm translations\qt_ru.qm
+  SectionEnd
+  Section "Swedish"
+    CreateDirectory "$INSTDIR\translations" 
+    File /oname=translations\gpxsee_sv.qm translations\gpxsee_sv.qm
+  SectionEnd
+SectionGroupEnd
+
 ;--------------------------------
 
 ; Uninstaller
 
 Section "Uninstall"
-  
+
   ; Remove registry keys
   DeleteRegKey HKLM "${REGENTRY}"
   DeleteRegKey HKLM SOFTWARE\GPXSee
@@ -227,7 +278,13 @@ Section "Uninstall"
   DeleteRegKey HKCR ".igc"
   DeleteRegKey HKCR "${REGNMEA}"
   DeleteRegKey HKCR ".nmea"
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'  
+  DeleteRegKey HKCR "${REGPLT}"
+  DeleteRegKey HKCR ".plt"
+  DeleteRegKey HKCR "${REGRTE}"
+  DeleteRegKey HKCR ".rte"
+  DeleteRegKey HKCR "${REGWPT}"
+  DeleteRegKey HKCR ".wpt"
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
 
@@ -246,6 +303,8 @@ LangString DESC_ANGLE ${LANG_ENGLISH} \
   "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
 LangString DESC_APP ${LANG_ENGLISH} \
   "GPXSee application"
+LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
+  "Localization"
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -254,4 +313,5 @@ LangString DESC_APP ${LANG_ENGLISH} \
   !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_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/gpxsee.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+
+	<mime-type type="application/gpx+xml">
+		<comment>GPS Exchange Format</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.gpx"/>
+	</mime-type>
+
+	<mime-type type="application/tcx+xml">
+		<comment>Training Center XML</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.tcx"/>
+	</mime-type>
+
+	<mime-type type="application/kml+xml">
+		<comment>Keyhole Markup Language</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.kml"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.ant.fit">
+		<comment>Flexible and Interoperable Data Transfer</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application-octet-stream"/>
+		<glob pattern="*.fit"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.fai.igc">
+		<comment>Flight Recorder Data Format</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.igc"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.nmea.nmea">
+		<comment>NMEA 0183 data</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.nmea"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.oziexplorer.plt">
+		<comment>OziExplorer Track Point File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.plt"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.oziexplorer.rte">
+		<comment>OziExplorer Route File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.rte"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.oziexplorer.wpt">
+		<comment>OziExplorer Waypoint File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<glob pattern="*.wpt"/>
+	</mime-type>
+</mime-info>

pkg/gpxsee64.nsi

@@ -5,14 +5,14 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "4.16"
+!define VERSION "5.9"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
 ; Compression method
 SetCompressor /SOLID lzma
 
-; Required execution level 
+; Required execution level
 RequestExecutionLevel admin
 
 ; The default installation directory
@@ -26,7 +26,7 @@ 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 
+; Registry key to check for directory (so if you install again, it will
 ; overwrite the old one automatically)
 InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 
@@ -39,11 +39,14 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 !define REGFIT "GPXSee.fit"
 !define REGIGC "GPXSee.igc"
 !define REGNMEA "GPXSee.nmea"
+!define REGPLT "GPXSee.plt"
+!define REGRTE "GPXSee.rte"
+!define REGWPT "GPXSee.wpt"
 
 ; Start menu page configuration
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee" 
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee" 
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee"
 
 Var StartMenuFolder
 
@@ -71,32 +74,31 @@ Function .onInit
     MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
     Abort
   ${EndIf}
-  
+
   ${If} ${RunningX64}
     SetRegView 64
-  ${Else}  
-    MessageBox MB_OK "The 64b version of GPXSee can not be run on 32b systems."  
-    Abort  
+  ${Else}
+    MessageBox MB_OK "The 64b version of GPXSee can not be run on 32b systems."
+    Abort
   ${EndIf}
-FunctionEnd 
+FunctionEnd
 
 ; The stuff to install
 Section "GPXSee" SEC_APP
 
   SectionIn RO
-  
-  ; Set output path to the installation directory.
+
+  ; Set output path to the installation directory
   SetOutPath $INSTDIR
-  
+
   ; Put the files there
   File "gpxsee.exe"
-  File "maps.txt"
-  File "ellipsoids.csv"
-  File "datums.csv"
-  
+  File /r "maps"
+  File /r "csv"
+
   ; Create start menu entry and add links
   SetShellVarContext all
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application  
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
@@ -104,7 +106,7 @@ Section "GPXSee" SEC_APP
 
   ; Create the uninstaller
   WriteUninstaller "$INSTDIR\uninstall.exe"
-  
+
   ; Write the installation path into the registry
   DetailPrint "Registering application..."
   WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR"
@@ -121,29 +123,41 @@ Section "GPXSee" SEC_APP
   DetailPrint "Associating file types..."
   WriteRegStr HKCR ".gpx" "" "${REGGPX}"
   WriteRegStr HKCR "${REGGPX}" ""  "GPS Exchange Format"
-  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
+  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
   WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".tcx" "" "${REGTCX}"
   WriteRegStr HKCR "${REGTCX}" ""  "Training Center XML"
-  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
+  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
   WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".kml" "" "${REGKML}"
   WriteRegStr HKCR "${REGKML}" ""  "Keyhole Markup Language"
-  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
+  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
   WriteRegStr HKCR "${REGKML}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".fit" "" "${REGFIT}"
   WriteRegStr HKCR "${REGFIT}" ""  "Flexible and Interoperable Data Transfer"
-  WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
+  WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
   WriteRegStr HKCR "${REGFIT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".igc" "" "${REGIGC}"
   WriteRegStr HKCR "${REGIGC}" ""  "Flight Recorder Data Format"
-  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
+  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
   WriteRegStr HKCR "${REGIGC}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".nmea" "" "${REGNMEA}"
   WriteRegStr HKCR "${REGNMEA}" ""  "NMEA 0183 data"
-  WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
+  WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7"
   WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  
+  WriteRegStr HKCR ".plt" "" "${REGPLT}"
+  WriteRegStr HKCR "${REGPLT}" ""  "OziExplorer Track Point File"
+  WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8"
+  WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  WriteRegStr HKCR ".rte" "" "${REGRTE}"
+  WriteRegStr HKCR "${REGRTE}" ""  "OziExplorer Route File"
+  WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9"
+  WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  WriteRegStr HKCR ".wpt" "" "${REGWPT}"
+  WriteRegStr HKCR "${REGWPT}" ""  "OziExplorer Waypoint File"
+  WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
+  WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -160,7 +174,7 @@ Section "QT framework" SEC_QT
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
- 
+
 SectionEnd
 
 Section "MSVC runtime" SEC_MSVC
@@ -197,12 +211,49 @@ Section "ANGLE" SEC_ANGLE
 
 SectionEnd
 
+SectionGroup "Localization" SEC_LOCALIZATION
+  Section "Czech"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_cs.qm translations\gpxsee_cs.qm
+    File /oname=translations\qt_cs.qm translations\qt_cs.qm
+  SectionEnd
+  Section "Finnish"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_fi.qm translations\gpxsee_fi.qm
+    File /oname=translations\qt_fi.qm translations\qt_fi.qm
+  SectionEnd
+  Section "French"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_fr.qm translations\gpxsee_fr.qm
+    File /oname=translations\qt_fr.qm translations\qt_fr.qm
+  SectionEnd
+  Section "German"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
+    File /oname=translations\qt_de.qm translations\qt_de.qm
+  SectionEnd
+  Section "Polish"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_pl.qm translations\gpxsee_pl.qm
+    File /oname=translations\qt_pl.qm translations\qt_pl.qm
+  SectionEnd
+  Section "Russian"
+    CreateDirectory "$INSTDIR\translations" 
+    File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
+    File /oname=translations\qt_ru.qm translations\qt_ru.qm
+  SectionEnd
+  Section "Swedish"
+    CreateDirectory "$INSTDIR\translations" 
+    File /oname=translations\gpxsee_sv.qm translations\gpxsee_sv.qm
+  SectionEnd
+SectionGroupEnd
+
 ;--------------------------------
 
 ; Uninstaller
 
 Section "Uninstall"
-  
+
   ; Remove registry keys
   SetRegView 64
   DeleteRegKey HKLM "${REGENTRY}"
@@ -216,7 +267,7 @@ Section "Uninstall"
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
   Delete "$SMPROGRAMS\$StartMenuFolder\*.*"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
-  
+
   ; Remove File associations
   DeleteRegKey HKCR "${REGGPX}"
   DeleteRegKey HKCR ".gpx"
@@ -230,6 +281,12 @@ Section "Uninstall"
   DeleteRegKey HKCR ".igc"
   DeleteRegKey HKCR "${REGNMEA}"
   DeleteRegKey HKCR ".nmea"
+  DeleteRegKey HKCR "${REGPLT}"
+  DeleteRegKey HKCR ".plt"
+  DeleteRegKey HKCR "${REGRTE}"
+  DeleteRegKey HKCR ".rte"
+  DeleteRegKey HKCR "${REGWPT}"
+  DeleteRegKey HKCR ".wpt"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -249,6 +306,8 @@ LangString DESC_ANGLE ${LANG_ENGLISH} \
   "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
 LangString DESC_APP ${LANG_ENGLISH} \
   "GPXSee application"
+LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
+  "Localization"
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -257,4 +316,5 @@ LangString DESC_APP ${LANG_ENGLISH} \
   !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_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/maps.txt

@@ -1,5 +0,0 @@
-Open Topo Map	https://a.tile.opentopomap.org/$z/$x/$y.png	17
-4UMaps	http://4umaps.eu/$z/$x/$y.png	15
-Open Street Map	http://tile.openstreetmap.org/$z/$x/$y.png	19
-USGS Topo	https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png	15
-USGS Imagery	https://navigator.er.usgs.gov/tiles/aerial_Imagery.cgi/$z/$x/$y	15

pkg/maps/4UMaps.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1">
+	<name>4UMaps</name>
+	<url>http://4umaps.eu/$z/$x/$y.png</url>
+	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
+	<zoom min="2" max="15"/>
+	<bounds bottom="-65"/>
+</map>

pkg/maps/OpenStreetMap.xml

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

pkg/maps/OpenTopoMap.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1">
+	<name>Open Topo Map</name>
+	<url>https://a.tile.opentopomap.org/$z/$x/$y.png</url>
+	<copyright>Map data: © OpenStreetMap contributors (ODbL), SRTM | Rendering: © OpenTopoMap (CC-BY-SA)</copyright>
+	<zoom max="17"/>
+</map>

pkg/maps/USGS-imagery.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1">
+	<name>USGS Imagery</name>
+	<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
+	<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
+	<zoom min="2" max="15"/>
+	<bounds bottom="0" top="74"/>
+</map>

pkg/maps/USGS-topo.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1">
+	<name>USGS Topo</name>
+	<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
+	<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
+	<zoom min="2" max="15"/>
+</map>

src/GUI/app.cpp

@@ -0,0 +1,116 @@
+#include <QtGlobal>
+#include <QTranslator>
+#include <QLocale>
+#include <QFileOpenEvent>
+#include <QNetworkProxyFactory>
+#include <QLibraryInfo>
+#include "map/wmts.h"
+#include "map/wms.h"
+#include "map/tileloader.h"
+#include "map/downloader.h"
+#include "map/ellipsoid.h"
+#include "map/gcs.h"
+#include "map/pcs.h"
+#include "opengl.h"
+#include "gui.h"
+#include "config.h"
+#include "app.h"
+
+
+App::App(int &argc, char **argv) : QApplication(argc, argv),
+  _argc(argc), _argv(argv)
+{
+	QTranslator *gpxsee = new QTranslator(this);
+	gpxsee->load(QLocale::system(), "gpxsee", "_", TRANSLATIONS_DIR);
+	installTranslator(gpxsee);
+
+	QTranslator *qt = new QTranslator(this);
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+	qt->load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR);
+#else // Q_OS_WIN32 || Q_OS_MAC
+	qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
+	  QLibraryInfo::TranslationsPath));
+#endif // Q_OS_WIN32 || Q_OS_MAC
+	installTranslator(qt);
+
+#ifdef Q_OS_MAC
+	setAttribute(Qt::AA_DontShowIconsInMenus);
+#endif // Q_OS_MAC
+
+	QNetworkProxyFactory::setUseSystemConfiguration(true);
+	Downloader *dl = new Downloader(this);
+	TileLoader::setDownloader(dl);
+	WMTS::setDownloader(dl);
+	WMS::setDownloader(dl);
+	OPENGL_SET_SAMPLES(4);
+	loadDatums();
+	loadPCSs();
+
+	_gui = new GUI();
+}
+
+App::~App()
+{
+	delete _gui;
+}
+
+void App::run()
+{
+	_gui->show();
+
+	for (int i = 1; i < _argc; i++)
+		_gui->openFile(QString::fromLocal8Bit(_argv[i]));
+
+	exec();
+}
+
+bool App::event(QEvent *event)
+{
+	if (event->type() == QEvent::FileOpen) {
+		QFileOpenEvent *e = static_cast<QFileOpenEvent *>(event);
+		return _gui->openFile(e->file());
+	}
+
+	return QApplication::event(event);
+}
+
+void App::loadDatums()
+{
+	QString ef, df;
+
+	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_GCS_FILE))
+		df = USER_GCS_FILE;
+	else if (QFile::exists(GLOBAL_GCS_FILE))
+		df = GLOBAL_GCS_FILE;
+	else
+		qWarning("No datums file found.");
+
+	if (!ef.isNull() && !df.isNull()) {
+		Ellipsoid::loadList(ef);
+		GCS::loadList(df);
+	} else
+		qWarning("Maps based on a datum different from WGS84 won't work.");
+}
+
+void App::loadPCSs()
+{
+	QString file;
+
+	if (QFile::exists(USER_PCS_FILE))
+		file = USER_PCS_FILE;
+	else if (QFile::exists(GLOBAL_PCS_FILE))
+		file = GLOBAL_PCS_FILE;
+	else {
+		qWarning("No PCS file found.");
+		return;
+	}
+
+	PCS::loadList(file);
+}

src/GUI/app.h

@@ -18,6 +18,9 @@ protected:
 	bool event(QEvent *event);
 
 private:
+	void loadDatums();
+	void loadPCSs();
+
 	int &_argc;
 	char **_argv;
 	GUI *_gui;

src/GUI/axisitem.cpp

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

src/GUI/axisitem.h

@@ -2,7 +2,7 @@
 #define AXISITEM_H
 
 #include <QGraphicsItem>
-#include "range.h"
+#include "common/range.h"
 
 class AxisItem : public QGraphicsItem
 {

src/GUI/cadencegraph.cpp

@@ -1,4 +1,4 @@
-#include "data.h"
+#include "data/data.h"
 #include "cadencegraphitem.h"
 #include "cadencegraph.h"
 

src/GUI/elevationgraph.cpp

@@ -1,6 +1,6 @@
 #include <cmath>
+#include "data/data.h"
 #include "config.h"
-#include "data.h"
 #include "tooltip.h"
 #include "elevationgraphitem.h"
 #include "elevationgraph.h"

src/GUI/exportdialog.cpp

@@ -62,12 +62,17 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	_bottomMargin = new QDoubleSpinBox();
 	_leftMargin = new QDoubleSpinBox();
 	_rightMargin = new QDoubleSpinBox();
-	QString us = (_export->units == Imperial) ? tr("in") : tr("mm");
+	QString us = (_export->units == Metric) ? tr("mm") : tr("in");
 	_topMargin->setSuffix(UNIT_SPACE + us);
 	_bottomMargin->setSuffix(UNIT_SPACE + us);
 	_leftMargin->setSuffix(UNIT_SPACE + us);
 	_rightMargin->setSuffix(UNIT_SPACE + us);
-	if (_export->units == Imperial) {
+	if (_export->units == Metric) {
+		_topMargin->setValue(_export->margins.top());
+		_bottomMargin->setValue(_export->margins.bottom());
+		_leftMargin->setValue(_export->margins.left());
+		_rightMargin->setValue(_export->margins.right());
+	} else {
 		_topMargin->setValue(_export->margins.top() * MM2IN);
 		_bottomMargin->setValue(_export->margins.bottom() * MM2IN);
 		_leftMargin->setValue(_export->margins.left() * MM2IN);
@@ -76,11 +81,6 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 		_bottomMargin->setSingleStep(0.1);
 		_leftMargin->setSingleStep(0.1);
 		_rightMargin->setSingleStep(0.1);
-	} else {
-		_topMargin->setValue(_export->margins.top());
-		_bottomMargin->setValue(_export->margins.bottom());
-		_leftMargin->setValue(_export->margins.left());
-		_rightMargin->setValue(_export->margins.right());
 	}
 
 	QGridLayout *marginsLayout = new QGridLayout();

src/GUI/format.cpp

@@ -0,0 +1,101 @@
+#include <QApplication>
+#include "common/coordinates.h"
+#include "format.h"
+
+
+static QString deg2DMS(double val)
+{
+	int deg = val;
+	double r1 = val - deg;
+
+	int min = r1 * 60.0;
+	double r2 = r1 - (min / 60.0);
+
+	double sec = r2 * 3600.0;
+
+	return QString("%1°%2'%3\"").arg(deg).arg(min, 2, 10, QChar('0'))
+	  .arg(sec, 4, 'f', 1, QChar('0'));
+}
+
+static QString deg2DMM(double val)
+{
+	int deg = val;
+	double r1 = val - deg;
+
+	double min = r1 * 60.0;
+
+	return QString("%1°%2'").arg(deg).arg(min, 6, 'f', 3, QChar('0'));
+}
+
+
+QString Format::timeSpan(qreal time, bool full)
+{
+	unsigned h, m, s;
+
+	h = time / 3600;
+	m = (time - (h * 3600)) / 60;
+	s = time - (h * 3600) - (m * 60);
+
+	if (full || h)
+		return QString("%1:%2:%3").arg(h, 2, 10, QChar('0'))
+		  .arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0'));
+	else
+		return QString("%1:%2").arg(m, 2, 10, QChar('0'))
+		  .arg(s, 2, 10, QChar('0'));
+}
+
+QString Format::distance(qreal value, Units units)
+{
+	if (units == Imperial) {
+		if (value < MIINM)
+			return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+			  + qApp->translate("Format", "ft");
+		else
+			return QString::number(value * M2MI, 'f', 1) + UNIT_SPACE
+			  + qApp->translate("Format", "mi");
+	} else if (units == Nautical) {
+		if (value < NMIINM)
+			return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+			  + qApp->translate("Format", "ft");
+		else
+			return QString::number(value * M2NMI, 'f', 1) + UNIT_SPACE
+			  + qApp->translate("Format", "nmi");
+	} else {
+		if (value < KMINM)
+			return QString::number(value, 'f', 0) + UNIT_SPACE
+			  + qApp->translate("Format", "m");
+		else
+			return QString::number(value * M2KM, 'f', 1) + UNIT_SPACE
+			  + qApp->translate("Format", "km");
+	}
+}
+
+QString Format::elevation(qreal value, Units units)
+{
+	if (units == Metric)
+		return QString::number(qRound(value)) + UNIT_SPACE
+		  + qApp->translate("Format", "m");
+	else
+		return QString::number(qRound(value * M2FT)) + UNIT_SPACE
+		  + qApp->translate("Format", "ft");
+}
+
+QString Format::coordinates(const Coordinates &value, CoordinatesFormat type)
+{
+	QChar yH = (value.lat() < 0) ? 'S' : 'N';
+	QChar xH = (value.lon() < 0) ? 'W' : 'E';
+
+	switch (type) {
+		case DegreesMinutes:
+			return deg2DMM(qAbs(value.lat())) + yH + "," + QChar(0x00A0)
+			  + deg2DMM(qAbs(value.lon())) + xH;
+			break;
+		case DMS:
+			return deg2DMS(qAbs(value.lat())) + yH + "," + QChar(0x00A0)
+			  + deg2DMS(qAbs(value.lon())) + xH;
+			break;
+		default:
+			return QString::number(qAbs(value.lat()), 'f', 5) + yH + ","
+			  + QChar(0x00A0) + QString::number(qAbs(value.lon()), 'f', 5) + xH;
+	}
+}

src/GUI/format.h

@@ -6,12 +6,18 @@
 
 class Coordinates;
 
+enum CoordinatesFormat {
+	DecimalDegrees,
+	DegreesMinutes,
+	DMS
+};
+
 namespace Format
 {
 	QString timeSpan(qreal time, bool full = true);
 	QString distance(qreal value, Units units);
 	QString elevation(qreal value, Units units);
-	QString coordinates(const Coordinates &value);
+	QString coordinates(const Coordinates &value, CoordinatesFormat type);
 }
 
 #endif // FORMAT_H

src/GUI/graphitem.h

@@ -3,8 +3,8 @@
 
 #include <QGraphicsObject>
 #include <QPen>
+#include "data/graph.h"
 #include "units.h"
-#include "graph.h"
 
 class GraphItem : public QGraphicsObject
 {
@@ -12,6 +12,7 @@ class GraphItem : public QGraphicsObject
 
 public:
 	GraphItem(const Graph &graph, GraphType type, QGraphicsItem *parent = 0);
+	virtual ~GraphItem() {}
 
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}

src/GUI/graphtab.h

@@ -16,6 +16,7 @@ class GraphTab : public GraphView
 public:
 	GraphTab(QWidget *parent = 0) : GraphView(parent)
 	  {setFrameShape(QFrame::NoFrame);}
+	virtual ~GraphTab() {}
 
 	virtual QString label() const = 0;
 	virtual void loadData(const Data &data, const QList<PathItem *> &paths) = 0;

src/GUI/graphview.cpp

@@ -3,6 +3,7 @@
 #include <QMouseEvent>
 #include <QPaintEngine>
 #include <QPaintDevice>
+#include "data/graph.h"
 #include "opengl.h"
 #include "config.h"
 #include "axisitem.h"
@@ -10,7 +11,6 @@
 #include "sliderinfoitem.h"
 #include "infoitem.h"
 #include "griditem.h"
-#include "graph.h"
 #include "graphitem.h"
 #include "pathitem.h"
 #include "format.h"
@@ -81,12 +81,12 @@ GraphView::~GraphView()
 
 void GraphView::createXLabel()
 {
-	_xAxis->setLabel(QString("%1 [%2]").arg(_xLabel).arg(_xUnits));
+	_xAxis->setLabel(QString("%1 [%2]").arg(_xLabel, _xUnits));
 }
 
 void GraphView::createYLabel()
 {
-	_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel).arg(_yUnits));
+	_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel, _yUnits));
 }
 
 void GraphView::setYLabel(const QString &label)
@@ -104,15 +104,7 @@ void GraphView::setYUnits(const QString &units)
 void GraphView::setXUnits()
 {
 	if (_graphType == Distance) {
-		if (_units == Metric) {
-			if (bounds().width() < KMINM) {
-				_xUnits = tr("m");
-				_xScale = 1;
-			} else {
-				_xUnits = tr("km");
-				_xScale = M2KM;
-			}
-		} else {
+		if (_units == Imperial) {
 			if (bounds().width() < MIINM) {
 				_xUnits = tr("ft");
 				_xScale = M2FT;
@@ -120,6 +112,22 @@ void GraphView::setXUnits()
 				_xUnits = tr("mi");
 				_xScale = M2MI;
 			}
+		} else if (_units == Nautical) {
+			if (bounds().width() < NMIINM) {
+				_xUnits = tr("ft");
+				_xScale = M2FT;
+			} else {
+				_xUnits = tr("nmi");
+				_xScale = M2NMI;
+			}
+		} else {
+			if (bounds().width() < KMINM) {
+				_xUnits = tr("m");
+				_xScale = 1;
+			} else {
+				_xUnits = tr("km");
+				_xScale = M2KM;
+			}
 		}
 	} else {
 		    if (bounds().width() < MININS) {
@@ -181,9 +189,12 @@ void GraphView::showSliderInfo(bool show)
 
 void GraphView::addGraph(GraphItem *graph, PathItem *path, int id)
 {
+	QColor color(_palette.nextColor());
+	color.setAlpha(255);
+
 	graph->setUnits(_units);
 	graph->setId(id);
-	graph->setColor(_palette.nextColor());
+	graph->setColor(color);
 	graph->setWidth(_width);
 
 	connect(this, SIGNAL(sliderPositionChanged(qreal)), graph,
@@ -458,8 +469,11 @@ void GraphView::setPalette(const Palette &palette)
 	_palette = palette;
 	_palette.reset();
 
-	for (int i = 0; i < _graphs.count(); i++)
-		_graphs.at(i)->setColor(_palette.nextColor());
+	for (int i = 0; i < _graphs.count(); i++) {
+		QColor color(_palette.nextColor());
+		color.setAlpha(255);
+		_graphs.at(i)->setColor(color);
+	}
 }
 
 void GraphView::setGraphWidth(int width)
@@ -484,3 +498,9 @@ void GraphView::useAntiAliasing(bool use)
 {
 	setRenderHint(QPainter::Antialiasing, use);
 }
+
+void GraphView::setSliderColor(const QColor &color)
+{
+	_slider->setColor(color);
+	_sliderInfo->setColor(color);
+}

src/GUI/graphview.h

@@ -4,7 +4,7 @@
 #include <QGraphicsView>
 #include <QList>
 #include <QSet>
-#include "graph.h"
+#include "data/graph.h"
 #include "palette.h"
 #include "units.h"
 
@@ -38,6 +38,7 @@ public:
 	void useAntiAliasing(bool use);
 
 	void setSliderPosition(qreal pos);
+	void setSliderColor(const QColor &color);
 
 signals:
 	void sliderPositionChanged(qreal);

src/GUI/gui.cpp

@@ -22,38 +22,33 @@
 #include <QMimeData>
 #include <QUrl>
 #include <QPixmapCache>
+#include "data/data.h"
+#include "map/maplist.h"
+#include "map/emptymap.h"
 #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"
 #include "temperaturegraph.h"
 #include "cadencegraph.h"
 #include "powergraph.h"
-#include "pathview.h"
+#include "mapview.h"
 #include "trackinfo.h"
 #include "filebrowser.h"
 #include "cpuarch.h"
 #include "graphtab.h"
-#include "format.h"
 #include "gui.h"
 
 
 GUI::GUI()
 {
-	loadDatums();
 	loadMaps();
 	loadPOIs();
 
-	createPathView();
+	createMapView();
 	createGraphTabs();
 	createStatusBar();
 	createActions();
@@ -65,7 +60,7 @@ GUI::GUI()
 	QSplitter *splitter = new QSplitter();
 	splitter->setOrientation(Qt::Vertical);
 	splitter->setChildrenCollapsible(false);
-	splitter->addWidget(_pathView);
+	splitter->addWidget(_mapView);
 	splitter->addWidget(_graphTabWidget);
 	splitter->setContentsMargins(0, 0, 0, 0);
 	splitter->setStretchFactor(0, 255);
@@ -87,11 +82,15 @@ GUI::GUI()
 
 	_sliderPos = 0;
 
-	updateGraphTabs();
-	updatePathView();
-	updateStatusBarInfo();
+	_dataDir = QDir::homePath();
+	_mapDir = QDir::homePath();
+	_poiDir = QDir::homePath();
 
 	readSettings();
+
+	updateGraphTabs();
+	updateMapView();
+	updateStatusBarInfo();
 }
 
 GUI::~GUI()
@@ -102,116 +101,34 @@ GUI::~GUI()
 	}
 }
 
-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))
-		online = USER_MAP_FILE;
-	else if (QFile::exists(GLOBAL_MAP_FILE))
-		online = GLOBAL_MAP_FILE;
-
-	if (!online.isNull() && !_ml->loadFile(online))
-		qWarning("%s: %s", qPrintable(online), qPrintable(_ml->errorString()));
-
+	QString dir;
 
 	if (QFile::exists(USER_MAP_DIR))
-		offline = USER_MAP_DIR;
+		dir = USER_MAP_DIR;
 	else if (QFile::exists(GLOBAL_MAP_DIR))
-		offline = GLOBAL_MAP_DIR;
+		dir = GLOBAL_MAP_DIR;
 
-	if (!offline.isNull()) {
-		QDir md(offline);
-		QFileInfoList ml = md.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
-
-		for (int i = 0; i < ml.size(); i++) {
-			QDir dir(ml.at(i).absoluteFilePath());
-			QFileInfoList fl = dir.entryInfoList(MapList::filter(), 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
-				if (!_ml->loadFile(fl.first().absoluteFilePath()))
-					qWarning("%s: %s", qPrintable(fl.first().absoluteFilePath()),
-					  qPrintable(_ml->errorString()));
-		}
-	}
+	if (!dir.isNull() && !_ml->loadDir(dir))
+		qWarning("%s", qPrintable(_ml->errorString()));
 
 	_map = new EmptyMap(this);
 }
 
 void GUI::loadPOIs()
 {
-	QFileInfoList list;
-	QDir userDir(USER_POI_DIR);
-	QDir globalDir(GLOBAL_POI_DIR);
-
 	_poi = new POI(this);
+	QString dir;
 
-	if (userDir.exists())
-		list = userDir.entryInfoList(QStringList(), QDir::Files);
-	else
-		list = globalDir.entryInfoList(QStringList(), QDir::Files);
+	if (QFile::exists(USER_POI_DIR))
+		dir = USER_POI_DIR;
+	else if (QFile::exists(GLOBAL_POI_DIR))
+		dir = GLOBAL_POI_DIR;
 
-	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());
-		}
-	}
+	if (!dir.isNull() && !_poi->loadDir(dir))
+		qWarning("%s", qPrintable(_poi->errorString()));
 }
 
 void GUI::createBrowser()
@@ -286,8 +203,8 @@ void GUI::createActions()
 	addAction(_exitAction);
 
 	// Help & About
-	_dataSourcesAction = new QAction(tr("Data sources"), this);
-	connect(_dataSourcesAction, SIGNAL(triggered()), this, SLOT(dataSources()));
+	_pathsAction = new QAction(tr("Paths"), this);
+	connect(_pathsAction, SIGNAL(triggered()), this, SLOT(paths()));
 	_keysAction = new QAction(tr("Keyboard controls"), this);
 	connect(_keysAction, SIGNAL(triggered()), this, SLOT(keys()));
 	_aboutAction = new QAction(QIcon(QPixmap(APP_ICON)),
@@ -334,17 +251,17 @@ void GUI::createActions()
 	connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles()));
 	_overlapPOIAction = new QAction(tr("Overlap POIs"), this);
 	_overlapPOIAction->setCheckable(true);
-	connect(_overlapPOIAction, SIGNAL(triggered(bool)), _pathView,
+	connect(_overlapPOIAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(setPOIOverlap(bool)));
 	_showPOILabelsAction = new QAction(tr("Show POI labels"), this);
 	_showPOILabelsAction->setCheckable(true);
-	connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _pathView,
+	connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(showPOILabels(bool)));
 	_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
 	  tr("Show POIs"), this);
 	_showPOIAction->setCheckable(true);
 	_showPOIAction->setShortcut(SHOW_POI_SHORTCUT);
-	connect(_showPOIAction, SIGNAL(triggered(bool)), _pathView,
+	connect(_showPOIAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(showPOI(bool)));
 	addAction(_showPOIAction);
 	createPOIFilesActions();
@@ -354,14 +271,14 @@ void GUI::createActions()
 	  this);
 	_showMapAction->setCheckable(true);
 	_showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
-	connect(_showMapAction, SIGNAL(triggered(bool)), _pathView,
+	connect(_showMapAction, SIGNAL(triggered(bool)), _mapView,
 	  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()), _pathView,
+	connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView,
 	  SLOT(clearMapCache()));
 	createMapActions();
 	_nextMapAction = new QAction(tr("Next map"), this);
@@ -388,15 +305,15 @@ void GUI::createActions()
 	  SLOT(showRoutes(bool)));
 	_showWaypointsAction = new QAction(tr("Show waypoints"), this);
 	_showWaypointsAction->setCheckable(true);
-	connect(_showWaypointsAction, SIGNAL(triggered(bool)), _pathView,
+	connect(_showWaypointsAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(showWaypoints(bool)));
 	_showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this);
 	_showWaypointLabelsAction->setCheckable(true);
-	connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _pathView,
+	connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(showWaypointLabels(bool)));
 	_showRouteWaypointsAction = new QAction(tr("Route waypoints"), this);
 	_showRouteWaypointsAction->setCheckable(true);
-	connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _pathView,
+	connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(showRouteWaypoints(bool)));
 
 	// Graph actions
@@ -459,6 +376,28 @@ void GUI::createActions()
 	_imperialUnitsAction->setActionGroup(ag);
 	connect(_imperialUnitsAction, SIGNAL(triggered()), this,
 	  SLOT(setImperialUnits()));
+	_nauticalUnitsAction = new QAction(tr("Nautical"), this);
+	_nauticalUnitsAction->setCheckable(true);
+	_nauticalUnitsAction->setActionGroup(ag);
+	connect(_nauticalUnitsAction, SIGNAL(triggered()), this,
+	  SLOT(setNauticalUnits()));
+	ag = new QActionGroup(this);
+	ag->setExclusive(true);
+	_decimalDegreesAction = new QAction(tr("Decimal degrees (DD)"), this);
+	_decimalDegreesAction->setCheckable(true);
+	_decimalDegreesAction->setActionGroup(ag);
+	connect(_decimalDegreesAction, SIGNAL(triggered()), this,
+	  SLOT(setDecimalDegrees()));
+	_degreesMinutesAction = new QAction(tr("Degrees and decimal minutes (DMM)"),
+	  this);
+	_degreesMinutesAction->setCheckable(true);
+	_degreesMinutesAction->setActionGroup(ag);
+	connect(_degreesMinutesAction, SIGNAL(triggered()), this,
+	  SLOT(setDegreesMinutes()));
+	_DMSAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
+	_DMSAction->setCheckable(true);
+	_DMSAction->setActionGroup(ag);
+	connect(_DMSAction, SIGNAL(triggered()), this, SLOT(setDMS()));
 	_fullscreenAction = new QAction(QIcon(QPixmap(FULLSCREEN_ICON)),
 	  tr("Fullscreen mode"), this);
 	_fullscreenAction->setCheckable(true);
@@ -490,7 +429,7 @@ void GUI::createActions()
 
 void GUI::createMenus()
 {
-	QMenu *fileMenu = menuBar()->addMenu(tr("File"));
+	QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
 	fileMenu->addAction(_openFileAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(_printFileAction);
@@ -504,7 +443,7 @@ void GUI::createMenus()
 	fileMenu->addAction(_exitAction);
 #endif // Q_OS_MAC
 
-	_mapMenu = menuBar()->addMenu(tr("Map"));
+	_mapMenu = menuBar()->addMenu(tr("&Map"));
 	_mapMenu->addActions(_mapActions);
 	_mapsEnd = _mapMenu->addSeparator();
 	_mapMenu->addAction(_loadMapAction);
@@ -512,7 +451,7 @@ void GUI::createMenus()
 	_mapMenu->addSeparator();
 	_mapMenu->addAction(_showMapAction);
 
-	QMenu *graphMenu = menuBar()->addMenu(tr("Graph"));
+	QMenu *graphMenu = menuBar()->addMenu(tr("&Graph"));
 	graphMenu->addAction(_distanceGraphAction);
 	graphMenu->addAction(_timeGraphAction);
 	graphMenu->addSeparator();
@@ -521,7 +460,7 @@ void GUI::createMenus()
 	graphMenu->addSeparator();
 	graphMenu->addAction(_showGraphsAction);
 
-	QMenu *poiMenu = menuBar()->addMenu(tr("POI"));
+	QMenu *poiMenu = menuBar()->addMenu(tr("&POI"));
 	_poiFilesMenu = poiMenu->addMenu(tr("POI files"));
 	_poiFilesMenu->addActions(_poiFilesActions);
 	poiMenu->addSeparator();
@@ -533,7 +472,7 @@ void GUI::createMenus()
 	poiMenu->addSeparator();
 	poiMenu->addAction(_showPOIAction);
 
-	QMenu *dataMenu = menuBar()->addMenu(tr("Data"));
+	QMenu *dataMenu = menuBar()->addMenu(tr("&Data"));
 	QMenu *displayMenu = dataMenu->addMenu(tr("Display"));
 	displayMenu->addAction(_showWaypointLabelsAction);
 	displayMenu->addAction(_showRouteWaypointsAction);
@@ -542,21 +481,26 @@ void GUI::createMenus()
 	dataMenu->addAction(_showRoutesAction);
 	dataMenu->addAction(_showWaypointsAction);
 
-	QMenu *settingsMenu = menuBar()->addMenu(tr("Settings"));
+	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);
+	unitsMenu->addAction(_nauticalUnitsAction);
+	QMenu *coordinatesMenu = settingsMenu->addMenu(tr("Coordinates format"));
+	coordinatesMenu->addAction(_decimalDegreesAction);
+	coordinatesMenu->addAction(_degreesMinutesAction);
+	coordinatesMenu->addAction(_DMSAction);
 	settingsMenu->addSeparator();
 	settingsMenu->addAction(_showToolbarsAction);
 	settingsMenu->addAction(_fullscreenAction);
 	settingsMenu->addSeparator();
 	settingsMenu->addAction(_openOptionsAction);
 
-	QMenu *helpMenu = menuBar()->addMenu(tr("Help"));
-	helpMenu->addAction(_dataSourcesAction);
+	QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+	helpMenu->addAction(_pathsAction);
 	helpMenu->addAction(_keysAction);
 	helpMenu->addSeparator();
 	helpMenu->addAction(_aboutAction);
@@ -586,14 +530,14 @@ void GUI::createToolBars()
 	_navigationToolBar->addAction(_lastAction);
 }
 
-void GUI::createPathView()
+void GUI::createMapView()
 {
-	_pathView = new PathView(_map, _poi, this);
-	_pathView->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
+	_mapView = new MapView(_map, _poi, this);
+	_mapView->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,
 	  QSizePolicy::Expanding));
-	_pathView->setMinimumHeight(200);
+	_mapView->setMinimumHeight(200);
 #ifdef Q_OS_WIN32
-	_pathView->setFrameShape(QFrame::NoFrame);
+	_mapView->setFrameShape(QFrame::NoFrame);
 #endif // Q_OS_WIN32
 }
 
@@ -692,37 +636,26 @@ void GUI::keys()
 	msgBox.exec();
 }
 
-void GUI::dataSources()
+void GUI::paths()
 {
 	QMessageBox msgBox(this);
 
-	msgBox.setWindowTitle(tr("Data sources"));
-	msgBox.setText("<h3>" + tr("Data sources") + "</h3>");
+	msgBox.setWindowTitle(tr("Paths"));
+	msgBox.setText("<h3>" + tr("Paths") + "</h3>");
 	msgBox.setInformativeText(
-	  "<h4>" + tr("Online maps") + "</h4><p>"
-	  + tr("Online map URLs are read on program startup from the "
-		"following file:")
-	  + "</p><p><code>" + USER_MAP_FILE + "</code></p><p>"
-	  + tr("The file format is one map entry per line, consisting of the map "
-		"name, tiles URL and an optional maximal zoom level 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:")
-	  + "</p><p><code>Map1	http://tile.server.com/map/$z/$x/$y.png	15"
-		  "<br/>Map2	http://mapserver.org/map/$z-$x-$y</code></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:")
-		+ "</p><p><code>" + USER_POI_DIR + "</code></p>"
+	  "<style>td {white-space: pre; padding-right: 1em;}</style>"
+	  "<div><table><tr><td>" + tr("Map directory:") + "</td><td><code>"
+	  + QDir::cleanPath(GLOBAL_MAP_DIR) + "</code></td></tr><tr><td>"
+	  + tr("POI directory:") + "</td><td><code>"
+	  + QDir::cleanPath(GLOBAL_POI_DIR) + "</code></td></tr><tr><td>"
+	  + tr("GCS file:") + "</td><td><code>" + QDir::cleanPath(GLOBAL_GCS_FILE)
+	  + "</code></td></tr><tr><td>" + tr("PCS file:") + "</td><td><code>"
+	  + QDir::cleanPath(GLOBAL_PCS_FILE) + "</code></td></tr><tr><td>"
+	  + tr("Ellipsoids file:") + "</td><td><code>"
+	  + QDir::cleanPath(GLOBAL_ELLIPSOID_FILE) + "</code></td></tr>"
+	  + "<tr><td></td><td></td></tr></table></div><div><table><tr><td>"
+	  + tr("User override directory:") + "</td><td><code>"
+	  + QDir::cleanPath(USER_DIR) + "</td></tr></table></div>"
 	);
 
 	msgBox.exec();
@@ -731,17 +664,17 @@ void GUI::dataSources()
 void GUI::openFile()
 {
 	QStringList files = QFileDialog::getOpenFileNames(this, tr("Open file"),
-	  QString(), Data::formats());
+	  _dataDir, Data::formats());
 	QStringList list = files;
 
 	for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
 		openFile(*it);
+	if (!list.isEmpty())
+		_dataDir = QFileInfo(list.first()).path();
 }
 
 bool GUI::openFile(const QString &fileName)
 {
-	bool ret = true;
-
 	if (fileName.isEmpty() || _files.contains(fileName))
 		return false;
 
@@ -755,14 +688,15 @@ bool GUI::openFile(const QString &fileName)
 		updateStatusBarInfo();
 		updateWindowTitle();
 		updateGraphTabs();
-		updatePathView();
+		updateMapView();
+
+		return true;
 	} else {
 		if (_files.isEmpty())
 			_fileActionGroup->setEnabled(false);
-		ret = false;
-	}
 
-	return ret;
+		return false;
+	}
 }
 
 bool GUI::loadFile(const QString &fileName)
@@ -771,7 +705,7 @@ bool GUI::loadFile(const QString &fileName)
 	QList<PathItem*> paths;
 
 	if (data.loadFile(fileName)) {
-		paths = _pathView->loadData(data);
+		paths = _mapView->loadData(data);
 		for (int i = 0; i < _tabs.count(); i++)
 			_tabs.at(i)->loadData(data, paths);
 
@@ -807,7 +741,7 @@ bool GUI::loadFile(const QString &fileName)
 		updateStatusBarInfo();
 		updateWindowTitle();
 		updateGraphTabs();
-		updatePathView();
+		updateMapView();
 
 		QString error = tr("Error loading data file:") + "\n\n"
 		  + fileName + "\n\n" + data.errorString();
@@ -821,11 +755,13 @@ bool GUI::loadFile(const QString &fileName)
 void GUI::openPOIFile()
 {
 	QStringList files = QFileDialog::getOpenFileNames(this, tr("Open POI file"),
-	  QString(), Data::formats());
+	  _poiDir, Data::formats());
 	QStringList list = files;
 
 	for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
 		openPOIFile(*it);
+	if (!list.isEmpty())
+		_poiDir = QFileInfo(list.first()).path();
 }
 
 bool GUI::openPOIFile(const QString &fileName)
@@ -842,7 +778,7 @@ bool GUI::openPOIFile(const QString &fileName)
 
 		return false;
 	} else {
-		_pathView->showPOI(true);
+		_mapView->showPOI(true);
 		_showPOIAction->setChecked(true);
 		QAction *action = createPOIFileAction(_poi->files().indexOf(fileName));
 		action->setChecked(true);
@@ -867,7 +803,7 @@ void GUI::openOptions()
 {
 #define SET_VIEW_OPTION(option, action) \
 	if (options.option != _options.option) \
-		_pathView->action(options.option)
+		_mapView->action(options.option)
 #define SET_TAB_OPTION(option, action) \
 	if (options.option != _options.option) \
 		for (int i = 0; i < _tabs.count(); i++) \
@@ -898,11 +834,13 @@ void GUI::openOptions()
 	SET_VIEW_OPTION(poiColor, setPOIColor);
 	SET_VIEW_OPTION(pathAntiAliasing, useAntiAliasing);
 	SET_VIEW_OPTION(useOpenGL, useOpenGL);
+	SET_VIEW_OPTION(sliderColor, setMarkerColor);
 
 	SET_TAB_OPTION(palette, setPalette);
 	SET_TAB_OPTION(graphWidth, setGraphWidth);
 	SET_TAB_OPTION(graphAntiAliasing, useAntiAliasing);
 	SET_TAB_OPTION(useOpenGL, useOpenGL);
+	SET_TAB_OPTION(sliderColor, setSliderColor);
 
 	SET_TRACK_OPTION(elevationFilter, setElevationFilter);
 	SET_TRACK_OPTION(speedFilter, setSpeedFilter);
@@ -922,6 +860,8 @@ void GUI::openOptions()
 		reloadFile();
 
 	_options = options;
+
+	updateMapView();
 }
 
 void GUI::printFile()
@@ -966,11 +906,11 @@ void GUI::plot(QPrinter *printer)
 		info.insert(tr("Name"), _pathName);
 
 	if (_options.printItemCount) {
-		if (_trackCount > 1)
+		if (_showTracksAction->isChecked() && _trackCount > 1)
 			info.insert(tr("Tracks"), QString::number(_trackCount));
-		if (_routeCount > 1)
+		if (_showRoutesAction->isChecked() && _routeCount > 1)
 			info.insert(tr("Routes"), QString::number(_routeCount));
-		if (_waypointCount > 2)
+		if (_showWaypointsAction->isChecked() && _waypointCount > 2)
 			info.insert(tr("Waypoints"), QString::number(_waypointCount));
 	}
 
@@ -1014,7 +954,7 @@ void GUI::plot(QPrinter *printer)
 		  ratio);
 	} else
 		gh = 0;
-	_pathView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
+	_mapView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
 	  - (ih + 2*mh + gh)), ratio, _options.hiresPrint);
 
 	if (_graphTabWidget->isVisible() && _options.separateGraphPage) {
@@ -1054,7 +994,7 @@ void GUI::reloadFile()
 
 	for (int i = 0; i < _tabs.count(); i++)
 		_tabs.at(i)->clear();
-	_pathView->clear();
+	_mapView->clear();
 
 	_sliderPos = 0;
 
@@ -1068,7 +1008,7 @@ void GUI::reloadFile()
 	updateStatusBarInfo();
 	updateWindowTitle();
 	updateGraphTabs();
-	updatePathView();
+	updateMapView();
 	if (_files.isEmpty())
 		_fileActionGroup->setEnabled(false);
 	else
@@ -1091,7 +1031,7 @@ void GUI::closeFiles()
 
 	for (int i = 0; i < _tabs.count(); i++)
 		_tabs.at(i)->clear();
-	_pathView->clear();
+	_mapView->clear();
 
 	_files.clear();
 }
@@ -1104,7 +1044,7 @@ void GUI::closeAll()
 	updateStatusBarInfo();
 	updateWindowTitle();
 	updateGraphTabs();
-	updatePathView();
+	updateMapView();
 }
 
 void GUI::showGraphs(bool show)
@@ -1131,7 +1071,7 @@ void GUI::showToolbars(bool show)
 void GUI::showFullscreen(bool show)
 {
 	if (show) {
-		_frameStyle = _pathView->frameStyle();
+		_frameStyle = _mapView->frameStyle();
 		_showGraphs = _showGraphsAction->isChecked();
 
 		statusBar()->hide();
@@ -1139,7 +1079,7 @@ void GUI::showFullscreen(bool show)
 		showToolbars(false);
 		showGraphs(false);
 		_showGraphsAction->setChecked(false);
-		_pathView->setFrameStyle(QFrame::NoFrame);
+		_mapView->setFrameStyle(QFrame::NoFrame);
 
 		showFullScreen();
 	} else {
@@ -1150,7 +1090,7 @@ void GUI::showFullscreen(bool show)
 		_showGraphsAction->setChecked(_showGraphs);
 		if (_showGraphsAction->isEnabled())
 			showGraphs(_showGraphs);
-		_pathView->setFrameStyle(_frameStyle);
+		_mapView->setFrameStyle(_frameStyle);
 
 		showNormal();
 	}
@@ -1158,22 +1098,24 @@ void GUI::showFullscreen(bool show)
 
 void GUI::showTracks(bool show)
 {
-	_pathView->showTracks(show);
+	_mapView->showTracks(show);
 
 	for (int i = 0; i < _tabs.size(); i++)
 		_tabs.at(i)->showTracks(show);
 
 	updateStatusBarInfo();
+	updateGraphTabs();
 }
 
 void GUI::showRoutes(bool show)
 {
-	_pathView->showRoutes(show);
+	_mapView->showRoutes(show);
 
 	for (int i = 0; i < _tabs.size(); i++)
 		_tabs.at(i)->showRoutes(show);
 
 	updateStatusBarInfo();
+	updateGraphTabs();
 }
 
 void GUI::showGraphGrids(bool show)
@@ -1190,30 +1132,40 @@ void GUI::showGraphSliderInfo(bool show)
 
 void GUI::loadMap()
 {
-	QString fileName = QFileDialog::getOpenFileName(this, tr("Open map file"),
-	  QString(), MapList::formats());
+	QStringList files = QFileDialog::getOpenFileNames(this, tr("Open map file"),
+	  _mapDir, MapList::formats());
+	QStringList list = files;
 
+	for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
+		loadMap(*it);
+	if (!list.isEmpty())
+		_mapDir = QFileInfo(list.first()).path();
+}
+
+bool GUI::loadMap(const QString &fileName)
+{
 	if (fileName.isEmpty())
-		return;
+		return false;
 
-	int count = _ml->maps().count();
 	if (_ml->loadFile(fileName)) {
-		for (int i = count; i < _ml->maps().count(); i++) {
-			QAction *a = new QAction(_ml->maps().at(i)->name(), this);
-			a->setCheckable(true);
-			a->setActionGroup(_mapsActionGroup);
-			_mapsSignalMapper->setMapping(a, i);
-			connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
-			_mapActions.append(a);
-			_mapMenu->insertAction(_mapsEnd, a);
-		}
+		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);
-		_mapActions.last()->activate(QAction::Trigger);
+		_mapActions.last()->trigger();
+
+		return true;
 	} else {
 		QString error = tr("Error loading map:") + "\n\n"
 		  + fileName + "\n\n" + _ml->errorString();
 		QMessageBox::critical(this, APP_NAME, error);
+
+		return false;
 	}
 }
 
@@ -1258,7 +1210,7 @@ void GUI::updateWindowTitle()
 void GUI::mapChanged(int index)
 {
 	_map = _ml->maps().at(index);
-	_pathView->setMap(_map);
+	_mapView->setMap(_map);
 }
 
 void GUI::nextMap()
@@ -1338,7 +1290,9 @@ void GUI::updateGraphTabs()
 			_graphTabWidget->insertTab(i, tab, _tabs.at(i)->label());
 	}
 
-	if (_graphTabWidget->count()) {
+	if (_graphTabWidget->count() &&
+	  ((_showTracksAction->isChecked() && _trackCount)
+	  || (_showRoutesAction->isChecked() && _routeCount))) {
 		if (_showGraphsAction->isChecked())
 			_graphTabWidget->setHidden(false);
 		_showGraphsAction->setEnabled(true);
@@ -1348,10 +1302,12 @@ void GUI::updateGraphTabs()
 	}
 }
 
-void GUI::updatePathView()
+void GUI::updateMapView()
 {
-	_pathView->setHidden(!(_pathView->trackCount() + _pathView->routeCount()
-	  + _pathView->waypointCount()));
+	if (_options.alwaysShowMap)
+		_mapView->setHidden(false);
+	else
+		_mapView->setHidden(!(_trackCount + _routeCount + _waypointCount));
 }
 
 void GUI::setTimeType(TimeType type)
@@ -1367,12 +1323,17 @@ void GUI::setUnits(Units units)
 	_export.units = units;
 	_options.units = units;
 
-	_pathView->setUnits(units);
+	_mapView->setUnits(units);
 	for (int i = 0; i <_tabs.count(); i++)
 		_tabs.at(i)->setUnits(units);
 	updateStatusBarInfo();
 }
 
+void GUI::setCoordinatesFormat(CoordinatesFormat format)
+{
+	_mapView->setCoordinatesFormat(format);
+}
+
 void GUI::setGraphType(GraphType type)
 {
 	_sliderPos = 0;
@@ -1443,15 +1404,15 @@ void GUI::keyPressEvent(QKeyEvent *event)
 
 		case TOGGLE_GRAPH_TYPE_KEY:
 			if (_timeGraphAction->isChecked())
-				_distanceGraphAction->activate(QAction::Trigger);
+				_distanceGraphAction->trigger();
 			else
-				_timeGraphAction->activate(QAction::Trigger);
+				_timeGraphAction->trigger();
 			break;
 		case TOGGLE_TIME_TYPE_KEY:
 			if (_movingTimeAction->isChecked())
-				_totalTimeAction->activate(QAction::Trigger);
+				_totalTimeAction->trigger();
 			else
-				_movingTimeAction->activate(QAction::Trigger);
+				_movingTimeAction->trigger();
 			break;
 
 		case Qt::Key_Escape:
@@ -1517,11 +1478,15 @@ void GUI::writeSettings()
 	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()
-	  ? Imperial : Metric);
+		  ? Moving : Total);
+	Units units = _imperialUnitsAction->isChecked() ? Imperial
+	  : _nauticalUnitsAction->isChecked() ? Nautical : Metric;
+	if (units != UNITS_DEFAULT)
+		settings.setValue(UNITS_SETTING, units);
+	CoordinatesFormat format = _DMSAction->isChecked() ? DMS
+	  : _degreesMinutesAction->isChecked() ? DegreesMinutes : DecimalDegrees;
+	if (format != COORDINATES_DEFAULT)
+		settings.setValue(COORDINATES_SETTING, format);
 	if (_showToolbarsAction->isChecked() != SHOW_TOOLBARS_DEFAULT)
 		settings.setValue(SHOW_TOOLBARS_SETTING,
 		  _showToolbarsAction->isChecked());
@@ -1672,11 +1637,16 @@ void GUI::writeSettings()
 	if (_options.separateGraphPage != SEPARATE_GRAPH_PAGE_DEFAULT)
 		settings.setValue(SEPARATE_GRAPH_PAGE_SETTING,
 		  _options.separateGraphPage);
+	if (_options.sliderColor != SLIDER_COLOR_DEFAULT)
+		settings.setValue(SLIDER_COLOR_SETTING, _options.sliderColor);
+	if (_options.alwaysShowMap != ALWAYS_SHOW_MAP_DEFAULT)
+		settings.setValue(ALWAYS_SHOW_MAP_SETTING, _options.alwaysShowMap);
 	settings.endGroup();
 }
 
 void GUI::readSettings()
 {
+	int value;
 	QSettings settings(APP_NAME, APP_NAME);
 
 	settings.beginGroup(WINDOW_SETTINGS_GROUP);
@@ -1686,20 +1656,27 @@ void GUI::readSettings()
 
 	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);
-	} else {
-		setUnits(Metric);
-		_metricUnitsAction->setChecked(true);
-	}
+	  == Moving)
+		_movingTimeAction->trigger();
+	else
+		_totalTimeAction->trigger();
+
+	value = settings.value(UNITS_SETTING, UNITS_DEFAULT).toInt();
+	if (value == Imperial)
+		_imperialUnitsAction->trigger();
+	else if (value == Nautical)
+		_nauticalUnitsAction->trigger();
+	else
+		_metricUnitsAction->trigger();
+
+	value = settings.value(COORDINATES_SETTING, COORDINATES_DEFAULT).toInt();
+	if (value == DMS)
+		_DMSAction->trigger();
+	else if (value == DegreesMinutes)
+		_degreesMinutesAction->trigger();
+	else
+		_decimalDegreesAction->trigger();
+
 	if (!settings.value(SHOW_TOOLBARS_SETTING, SHOW_TOOLBARS_DEFAULT).toBool())
 		showToolbars(false);
 	else
@@ -1709,6 +1686,8 @@ void GUI::readSettings()
 	settings.beginGroup(MAP_SETTINGS_GROUP);
 	if (settings.value(SHOW_MAP_SETTING, SHOW_MAP_DEFAULT).toBool())
 		_showMapAction->setChecked(true);
+	else
+		_mapView->showMap(false);
 	if (_ml->maps().count()) {
 		int index = mapIndex(settings.value(CURRENT_MAP_SETTING).toString());
 		_mapActions.at(index)->trigger();
@@ -1740,17 +1719,17 @@ void GUI::readSettings()
 
 	settings.beginGroup(POI_SETTINGS_GROUP);
 	if (!settings.value(OVERLAP_POI_SETTING, OVERLAP_POI_DEFAULT).toBool())
-		_pathView->setPOIOverlap(false);
+		_mapView->setPOIOverlap(false);
 	else
 		_overlapPOIAction->setChecked(true);
 	if (!settings.value(LABELS_POI_SETTING, LABELS_POI_DEFAULT).toBool())
-		_pathView->showPOILabels(false);
+		_mapView->showPOILabels(false);
 	else
 		_showPOILabelsAction->setChecked(true);
 	if (settings.value(SHOW_POI_SETTING, SHOW_POI_DEFAULT).toBool())
 		_showPOIAction->setChecked(true);
 	else
-		_pathView->showPOI(false);
+		_mapView->showPOI(false);
 	for (int i = 0; i < _poiFilesActions.count(); i++)
 		_poiFilesActions.at(i)->setChecked(true);
 	int size = settings.beginReadArray(DISABLED_POI_FILE_SETTINGS_PREFIX);
@@ -1768,30 +1747,30 @@ void GUI::readSettings()
 
 	settings.beginGroup(DATA_SETTINGS_GROUP);
 	if (!settings.value(SHOW_TRACKS_SETTING, SHOW_TRACKS_DEFAULT).toBool()) {
-		_pathView->showTracks(false);
+		_mapView->showTracks(false);
 		for (int i = 0; i < _tabs.count(); i++)
 			_tabs.at(i)->showTracks(false);
 	} else
 		_showTracksAction->setChecked(true);
 	if (!settings.value(SHOW_ROUTES_SETTING, SHOW_ROUTES_DEFAULT).toBool()) {
-		_pathView->showRoutes(false);
+		_mapView->showRoutes(false);
 		for (int i = 0; i < _tabs.count(); i++)
 			_tabs.at(i)->showRoutes(false);
 	} else
 		_showRoutesAction->setChecked(true);
 	if (!settings.value(SHOW_WAYPOINTS_SETTING, SHOW_WAYPOINTS_DEFAULT)
 	  .toBool())
-		_pathView->showWaypoints(false);
+		_mapView->showWaypoints(false);
 	else
 		_showWaypointsAction->setChecked(true);
 	if (!settings.value(SHOW_WAYPOINT_LABELS_SETTING,
 	  SHOW_WAYPOINT_LABELS_DEFAULT).toBool())
-		_pathView->showWaypointLabels(false);
+		_mapView->showWaypointLabels(false);
 	else
 		_showWaypointLabelsAction->setChecked(true);
 	if (!settings.value(SHOW_ROUTE_WAYPOINTS_SETTING,
 	  SHOW_ROUTE_WAYPOINTS_SETTING).toBool())
-		_pathView->showRouteWaypoints(false);
+		_mapView->showRouteWaypoints(false);
 	else
 		_showRouteWaypointsAction->setChecked(true);
 	settings.endGroup();
@@ -1885,27 +1864,33 @@ void GUI::readSettings()
 	  PRINT_ITEM_COUNT_DEFAULT).toBool();
 	_options.separateGraphPage = settings.value(SEPARATE_GRAPH_PAGE_SETTING,
 	  SEPARATE_GRAPH_PAGE_DEFAULT).toBool();
+	_options.sliderColor = settings.value(SLIDER_COLOR_SETTING,
+	  SLIDER_COLOR_DEFAULT).value<QColor>();
+	_options.alwaysShowMap = settings.value(ALWAYS_SHOW_MAP_SETTING,
+	  ALWAYS_SHOW_MAP_DEFAULT).toBool();
 
-	_pathView->setPalette(_options.palette);
-	_pathView->setMapOpacity(_options.mapOpacity);
-	_pathView->setBackgroundColor(_options.backgroundColor);
-	_pathView->setTrackWidth(_options.trackWidth);
-	_pathView->setRouteWidth(_options.routeWidth);
-	_pathView->setTrackStyle(_options.trackStyle);
-	_pathView->setRouteStyle(_options.routeStyle);
-	_pathView->setWaypointSize(_options.waypointSize);
-	_pathView->setWaypointColor(_options.waypointColor);
-	_pathView->setPOISize(_options.poiSize);
-	_pathView->setPOIColor(_options.poiColor);
-	_pathView->setRenderHint(QPainter::Antialiasing, _options.pathAntiAliasing);
+	_mapView->setPalette(_options.palette);
+	_mapView->setMapOpacity(_options.mapOpacity);
+	_mapView->setBackgroundColor(_options.backgroundColor);
+	_mapView->setTrackWidth(_options.trackWidth);
+	_mapView->setRouteWidth(_options.routeWidth);
+	_mapView->setTrackStyle(_options.trackStyle);
+	_mapView->setRouteStyle(_options.routeStyle);
+	_mapView->setWaypointSize(_options.waypointSize);
+	_mapView->setWaypointColor(_options.waypointColor);
+	_mapView->setPOISize(_options.poiSize);
+	_mapView->setPOIColor(_options.poiColor);
+	_mapView->setRenderHint(QPainter::Antialiasing, _options.pathAntiAliasing);
+	_mapView->setMarkerColor(_options.sliderColor);
 	if (_options.useOpenGL)
-		_pathView->useOpenGL(true);
+		_mapView->useOpenGL(true);
 
 	for (int i = 0; i < _tabs.count(); i++) {
 		_tabs.at(i)->setPalette(_options.palette);
 		_tabs.at(i)->setGraphWidth(_options.graphWidth);
 		_tabs.at(i)->setRenderHint(QPainter::Antialiasing,
 		  _options.graphAntiAliasing);
+		_tabs.at(i)->setSliderColor(_options.sliderColor);
 		if (_options.useOpenGL)
 			_tabs.at(i)->useOpenGL(true);
 	}
@@ -1937,7 +1922,8 @@ int GUI::mapIndex(const QString &name)
 
 Units GUI::units() const
 {
-	return _imperialUnitsAction->isChecked() ? Imperial : Metric;
+	return _imperialUnitsAction->isChecked() ? Imperial
+	  : _nauticalUnitsAction->isChecked() ? Nautical : Metric;
 }
 
 qreal GUI::distance() const

src/GUI/gui.h

@@ -6,14 +6,14 @@
 #include <QList>
 #include <QDate>
 #include <QPrinter>
+#include "data/graph.h"
+#include "data/poi.h"
 #include "units.h"
 #include "timetype.h"
-#include "graph.h"
-#include "poi.h"
+#include "format.h"
 #include "exportdialog.h"
 #include "optionsdialog.h"
 
-
 class QMenu;
 class QToolBar;
 class QTabWidget;
@@ -24,7 +24,7 @@ class QSignalMapper;
 class QPrinter;
 class FileBrowser;
 class GraphTab;
-class PathView;
+class MapView;
 class Map;
 class MapList;
 
@@ -41,7 +41,7 @@ public:
 private slots:
 	void about();
 	void keys();
-	void dataSources();
+	void paths();
 	void printFile();
 	void exportFile();
 	void openFile();
@@ -74,15 +74,18 @@ private slots:
 	void setMovingTime() {setTimeType(Moving);}
 	void setMetricUnits() {setUnits(Metric);}
 	void setImperialUnits() {setUnits(Imperial);}
+	void setNauticalUnits() {setUnits(Nautical);}
 	void setDistanceGraph() {setGraphType(Distance);}
 	void setTimeGraph() {setGraphType(Time);}
+	void setDecimalDegrees() {setCoordinatesFormat(DecimalDegrees);}
+	void setDegreesMinutes() {setCoordinatesFormat(DegreesMinutes);}
+	void setDMS() {setCoordinatesFormat(DMS);}
 
 	void sliderPositionChanged(qreal pos);
 
 private:
 	typedef QPair<QDate, QDate> DateRange;
 
-	void loadDatums();
 	void loadMaps();
 	void loadPOIs();
 	void closeFiles();
@@ -95,23 +98,25 @@ private:
 	void createMenus();
 	void createToolBars();
 	void createStatusBar();
-	void createPathView();
+	void createMapView();
 	void createGraphTabs();
 	void createBrowser();
 
 	bool openPOIFile(const QString &fileName);
 	bool loadFile(const QString &fileName);
+	bool loadMap(const QString &fileName);
 	void exportFile(const QString &fileName);
 	void updateStatusBarInfo();
 	void updateWindowTitle();
 	void updateNavigationActions();
 	void updateGraphTabs();
-	void updatePathView();
+	void updateMapView();
 
 	TimeType timeType() const;
 	Units units() const;
 	void setTimeType(TimeType type);
 	void setUnits(Units units);
+	void setCoordinatesFormat(CoordinatesFormat format);
 	void setGraphType(GraphType type);
 
 	qreal distance() const;
@@ -137,7 +142,7 @@ private:
 	QActionGroup *_mapsActionGroup;
 	QAction *_exitAction;
 	QAction *_keysAction;
-	QAction *_dataSourcesAction;
+	QAction *_pathsAction;
 	QAction *_aboutAction;
 	QAction *_aboutQtAction;
 	QAction *_printFileAction;
@@ -166,6 +171,10 @@ private:
 	QAction *_firstAction;
 	QAction *_metricUnitsAction;
 	QAction *_imperialUnitsAction;
+	QAction *_nauticalUnitsAction;
+	QAction *_decimalDegreesAction;
+	QAction *_degreesMinutesAction;
+	QAction *_DMSAction;
 	QAction *_totalTimeAction;
 	QAction *_movingTimeAction;
 	QAction *_nextMapAction;
@@ -187,17 +196,17 @@ private:
 	QLabel *_distanceLabel;
 	QLabel *_timeLabel;
 
-	PathView *_pathView;
+	MapView *_mapView;
 	QTabWidget *_graphTabWidget;
 	QList<GraphTab*> _tabs;
 
 	POI *_poi;
 	MapList *_ml;
+	Map *_map;
 
 	FileBrowser *_browser;
 	QList<QString> _files;
 
-	Map *_map;
 	int _trackCount;
 	int _routeCount;
 	int _waypointCount;
@@ -215,6 +224,8 @@ private:
 
 	Export _export;
 	Options _options;
+
+	QString _dataDir, _mapDir, _poiDir;
 };
 
 #endif // GUI_H

src/GUI/heartrategraph.cpp

@@ -1,4 +1,4 @@
-#include "data.h"
+#include "data/data.h"
 #include "heartrategraphitem.h"
 #include "heartrategraph.h"
 

src/GUI/infoitem.cpp

@@ -23,7 +23,7 @@ void InfoItem::updateBoundingRect()
 
 	for (i = _list.constBegin(); i != _list.constEnd(); i++) {
 		width += fm.width(i->key + ": ");
-		width += fm.width(i->value) + ((i == _list.end() - 1) ? 0 : PADDING);
+		width += fm.width(i->value) + ((i == _list.constEnd() - 1) ? 0 : PADDING);
 	}
 
 	_boundingRect = QRectF(0, 0, width, _list.isEmpty() ? 0 : fm.height());
@@ -49,8 +49,8 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 		painter->drawText(width, fm.height() - fm.descent(), i->key + ": ");
 		width += fm.width(i->key + ": ");
 		painter->drawText(width, fm.height() - fm.descent(), i->value);
-		width += fm.width(i->value) + ((i == _list.end() - 1) ? 0 : PADDING);
-		if (i != _list.end() - 1) {
+		width += fm.width(i->value) + ((i == _list.constEnd() - 1) ? 0 : PADDING);
+		if (i != _list.constEnd() - 1) {
 			painter->save();
 			painter->setPen(Qt::gray);
 			painter->drawLine(width - PADDING/2, fm.descent(),

src/GUI/mapview.cpp

@@ -4,17 +4,16 @@
 #include <QApplication>
 #include <QPixmapCache>
 #include <QScrollBar>
+#include "data/poi.h"
+#include "data/data.h"
+#include "map/map.h"
 #include "opengl.h"
-#include "misc.h"
-#include "poi.h"
-#include "data.h"
-#include "map.h"
 #include "trackitem.h"
 #include "routeitem.h"
 #include "waypointitem.h"
 #include "scaleitem.h"
 #include "keys.h"
-#include "pathview.h"
+#include "mapview.h"
 
 
 #define MAX_DIGITAL_ZOOM 2
@@ -22,7 +21,7 @@
 #define MARGIN           10.0
 #define SCALE_OFFSET     7
 
-PathView::PathView(Map *map, POI *poi, QWidget *parent)
+MapView::MapView(Map *map, POI *poi, QWidget *parent)
   : QGraphicsView(parent)
 {
 	Q_ASSERT(map != 0);
@@ -50,8 +49,10 @@ PathView::PathView(Map *map, POI *poi, QWidget *parent)
 	connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
 
 	_units = Metric;
+	_coordinatesFormat = DecimalDegrees;
 	_opacity = 1.0;
 	_backgroundColor = Qt::white;
+	_markerColor = Qt::red;
 
 	_showMap = true;
 	_showTracks = true;
@@ -75,30 +76,21 @@ PathView::PathView(Map *map, POI *poi, QWidget *parent)
 	_digitalZoom = 0;
 
 	_map->setBackgroundColor(_backgroundColor);
+	_res = _map->resolution(_map->bounds());
 	_scene->setSceneRect(_map->bounds());
 
 	centerOn(_scene->sceneRect().center());
 }
 
-void PathView::centerOn(const QPointF &pos)
+void MapView::centerOn(const QPointF &pos)
 {
 	QGraphicsView::centerOn(pos);
-
-	/* Fix the offset caused by QGraphicsView::centerOn() approximation */
-	QPointF center = mapToScene(viewport()->rect().center());
-	QPoint offset((int)(pos.x() - center.x()), (int)(pos.y() - center.y()));
-	if (qAbs(offset.x()) == 1)
-		horizontalScrollBar()->setValue(horizontalScrollBar()->value()
-		  + offset.x());
-	if (qAbs(offset.y()) == 1)
-		verticalScrollBar()->setValue(verticalScrollBar()->value()
-		  + offset.y());
-
-	_res = _map->resolution(pos);
+	QRectF vr(mapToScene(viewport()->rect()).boundingRect());
+	_res = _map->resolution(vr);
 	_mapScale->setResolution(_res);
 }
 
-PathItem *PathView::addTrack(const Track &track)
+PathItem *MapView::addTrack(const Track &track)
 {
 	if (track.isNull()) {
 		_palette.nextColor();
@@ -114,14 +106,16 @@ PathItem *PathView::addTrack(const Track &track)
 	ti->setUnits(_units);
 	ti->setVisible(_showTracks);
 	ti->setDigitalZoom(_digitalZoom);
+	ti->setMarkerColor(_markerColor);
 	_scene->addItem(ti);
 
-	addPOI(_poi->points(ti->path()));
+	if (_showTracks)
+		addPOI(_poi->points(ti->path()));
 
 	return ti;
 }
 
-PathItem *PathView::addRoute(const Route &route)
+PathItem *MapView::addRoute(const Route &route)
 {
 	if (route.isNull()) {
 		_palette.nextColor();
@@ -135,42 +129,46 @@ PathItem *PathView::addRoute(const Route &route)
 	ri->setWidth(_routeWidth);
 	ri->setStyle(_routeStyle);
 	ri->setUnits(_units);
+	ri->setCoordinatesFormat(_coordinatesFormat);
 	ri->setVisible(_showRoutes);
 	ri->showWaypoints(_showRouteWaypoints);
 	ri->showWaypointLabels(_showWaypointLabels);
 	ri->setDigitalZoom(_digitalZoom);
+	ri->setMarkerColor(_markerColor);
 	_scene->addItem(ri);
 
-	addPOI(_poi->points(ri->path()));
+	if (_showRoutes)
+		addPOI(_poi->points(ri->path()));
 
 	return ri;
 }
 
-void PathView::addWaypoints(const QList<Waypoint> &waypoints)
+void MapView::addWaypoints(const QList<Waypoint> &waypoints)
 {
 	for (int i = 0; i < waypoints.count(); i++) {
 		const Waypoint &w = waypoints.at(i);
 
 		WaypointItem *wi = new WaypointItem(w, _map);
 		_waypoints.append(wi);
-		updateWaypointsBoundingRect(wi->waypoint().coordinates());
+		_wr = _wr.united(wi->waypoint().coordinates());
 		wi->setZValue(1);
 		wi->setSize(_waypointSize);
 		wi->setColor(_waypointColor);
 		wi->showLabel(_showWaypointLabels);
-		wi->setUnits(_units);
+		wi->setToolTipFormat(_units, _coordinatesFormat);
 		wi->setVisible(_showWaypoints);
 		wi->setDigitalZoom(_digitalZoom);
 		_scene->addItem(wi);
-	}
 
-	addPOI(_poi->points(waypoints));
+		if (_showWaypoints)
+			addPOI(_poi->points(w));
+	}
 }
 
-QList<PathItem *> PathView::loadData(const Data &data)
+QList<PathItem *> MapView::loadData(const Data &data)
 {
 	QList<PathItem *> paths;
-	qreal zoom = _map->zoom();
+	int zoom = _map->zoom();
 
 	for (int i = 0; i < data.tracks().count(); i++)
 		paths.append(addTrack(*(data.tracks().at(i))));
@@ -181,7 +179,7 @@ QList<PathItem *> PathView::loadData(const Data &data)
 	if (_tracks.empty() && _routes.empty() && _waypoints.empty())
 		return paths;
 
-	if (mapZoom() != zoom)
+	if (fitMapZoom() != zoom)
 		rescale();
 	else
 		updatePOIVisibility();
@@ -191,29 +189,23 @@ QList<PathItem *> PathView::loadData(const Data &data)
 	return paths;
 }
 
-void PathView::updateWaypointsBoundingRect(const Coordinates &wp)
-{
-	if (_wr.isNull())
-		_wr = RectC(wp, wp);
-	else
-		_wr.unite(wp);
-}
-
-qreal PathView::mapZoom() const
+int MapView::fitMapZoom() const
 {
 	RectC br = _tr | _rr | _wr;
 
-	return _map->zoomFit(viewport()->size() - QSize(2*MARGIN, 2*MARGIN), br);
+	return _map->zoomFit(viewport()->size() - QSize(2*MARGIN, 2*MARGIN),
+	  br.isNull() ? RectC(_map->xy2ll(_map->bounds().topLeft()),
+	  _map->xy2ll(_map->bounds().bottomRight())) : br);
 }
 
-QPointF PathView::contentCenter() const
+QPointF MapView::contentCenter() const
 {
 	RectC br = _tr | _rr | _wr;
 
-	return _map->ll2xy(br.center());
+	return br.isNull() ? sceneRect().center() : _map->ll2xy(br.center());
 }
 
-void PathView::updatePOIVisibility()
+void MapView::updatePOIVisibility()
 {
 	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it, jt;
 
@@ -234,7 +226,7 @@ void PathView::updatePOIVisibility()
 	}
 }
 
-void PathView::rescale()
+void MapView::rescale()
 {
 	_scene->setSceneRect(_map->bounds());
 	resetCachedContent();
@@ -253,7 +245,7 @@ void PathView::rescale()
 	updatePOIVisibility();
 }
 
-void PathView::setPalette(const Palette &palette)
+void MapView::setPalette(const Palette &palette)
 {
 	_palette = palette;
 	_palette.reset();
@@ -264,22 +256,23 @@ void PathView::setPalette(const Palette &palette)
 		_routes.at(i)->setColor(_palette.nextColor());
 }
 
-void PathView::setMap(Map *map)
+void MapView::setMap(Map *map)
 {
-	QPointF pos = mapToScene(viewport()->rect().center());
-	Coordinates center = _map->xy2ll(pos);
-	qreal resolution = _map->resolution(pos);
+	QRectF vr(mapToScene(viewport()->rect()).boundingRect()
+	  .intersected(_map->bounds()));
+	RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
 
 	_map->unload();
 	disconnect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
 
 	_map = map;
 	_map->load();
+	_map->setBackgroundColor(_backgroundColor);
 	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
 
-	resetDigitalZoom();
+	digitalZoom(0);
 
-	_map->zoomFit(resolution, center);
+	_map->zoomFit(viewport()->rect().size(), cr);
 	_scene->setSceneRect(_map->bounds());
 
 	for (int i = 0; i < _tracks.size(); i++)
@@ -294,13 +287,15 @@ void PathView::setMap(Map *map)
 		it.value()->setMap(_map);
 	updatePOIVisibility();
 
-	centerOn(_map->ll2xy(center));
+	QPointF nc = QRectF(_map->ll2xy(cr.topLeft()),
+	  _map->ll2xy(cr.bottomRight())).center();
+	centerOn(nc);
 
 	resetCachedContent();
 	QPixmapCache::clear();
 }
 
-void PathView::setPOI(POI *poi)
+void MapView::setPOI(POI *poi)
 {
 	disconnect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
 	connect(poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
@@ -310,7 +305,7 @@ void PathView::setPOI(POI *poi)
 	updatePOI();
 }
 
-void PathView::updatePOI()
+void MapView::updatePOI()
 {
 	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
 
@@ -320,16 +315,20 @@ void PathView::updatePOI()
 	}
 	_pois.clear();
 
-	for (int i = 0; i < _tracks.size(); i++)
-		addPOI(_poi->points(_tracks.at(i)->path()));
-	for (int i = 0; i < _routes.size(); i++)
-		addPOI(_poi->points(_routes.at(i)->path()));
-	addPOI(_poi->points(_waypoints));
+	if (_showTracks)
+		for (int i = 0; i < _tracks.size(); i++)
+			addPOI(_poi->points(_tracks.at(i)->path()));
+	if (_showRoutes)
+		for (int i = 0; i < _routes.size(); i++)
+			addPOI(_poi->points(_routes.at(i)->path()));
+	if (_showWaypoints)
+		for (int i = 0; i< _waypoints.size(); i++)
+			addPOI(_poi->points(_waypoints.at(i)->waypoint()));
 
 	updatePOIVisibility();
 }
 
-void PathView::addPOI(const QVector<Waypoint> &waypoints)
+void MapView::addPOI(const QList<Waypoint> &waypoints)
 {
 	for (int i = 0; i < waypoints.size(); i++) {
 		const Waypoint &w = waypoints.at(i);
@@ -344,61 +343,71 @@ void PathView::addPOI(const QVector<Waypoint> &waypoints)
 		pi->showLabel(_showPOILabels);
 		pi->setVisible(_showPOI);
 		pi->setDigitalZoom(_digitalZoom);
+		pi->setToolTipFormat(_units, _coordinatesFormat);
 		_scene->addItem(pi);
 
 		_pois.insert(SearchPointer<Waypoint>(&(pi->waypoint())), pi);
 	}
 }
 
-void PathView::setUnits(enum Units units)
+void MapView::setUnits(Units units)
 {
+	if (_units == units)
+		return;
+
 	_units = units;
 
-	_mapScale->setUnits(units);
+	_mapScale->setUnits(_units);
 
 	for (int i = 0; i < _tracks.count(); i++)
-		_tracks[i]->setUnits(units);
+		_tracks[i]->setUnits(_units);
 	for (int i = 0; i < _routes.count(); i++)
-		_routes[i]->setUnits(units);
+		_routes[i]->setUnits(_units);
 	for (int i = 0; i < _waypoints.size(); i++)
-		_waypoints.at(i)->setUnits(units);
+		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
 
 	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
 	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
-		it.value()->setUnits(units);
+		it.value()->setToolTipFormat(_units, _coordinatesFormat);
 }
 
-void PathView::clearMapCache()
+void MapView::setCoordinatesFormat(CoordinatesFormat format)
+{
+	if (_coordinatesFormat == format)
+		return;
+
+	_coordinatesFormat = format;
+
+	for (int i = 0; i < _waypoints.count(); i++)
+		_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
+	for (int i = 0; i < _routes.count(); i++)
+		_routes[i]->setCoordinatesFormat(_coordinatesFormat);
+
+	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
+	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+		it.value()->setToolTipFormat(_units, _coordinatesFormat);
+}
+
+void MapView::clearMapCache()
 {
 	_map->clearCache();
-	resetCachedContent();
+
+	fitMapZoom();
+	rescale();
+	centerOn(contentCenter());
 }
 
-void PathView::resetDigitalZoom()
+void MapView::digitalZoom(int zoom)
 {
 	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
 
-	_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::digitalZoom(int zoom)
-{
-	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
-
-	_digitalZoom += zoom;
-	scale(pow(2, zoom), pow(2, zoom));
+	if (zoom) {
+		_digitalZoom += zoom;
+		scale(pow(2, zoom), pow(2, zoom));
+	} else {
+		_digitalZoom = 0;
+		resetTransform();
+	}
 
 	for (int i = 0; i < _tracks.size(); i++)
 		_tracks.at(i)->setDigitalZoom(_digitalZoom);
@@ -412,7 +421,7 @@ void PathView::digitalZoom(int zoom)
 	_mapScale->setDigitalZoom(_digitalZoom);
 }
 
-void PathView::zoom(int zoom, const QPoint &pos, const Coordinates &c)
+void MapView::zoom(int zoom, const QPoint &pos, const Coordinates &c)
 {
 	bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier;
 
@@ -438,7 +447,7 @@ void PathView::zoom(int zoom, const QPoint &pos, const Coordinates &c)
 	}
 }
 
-void PathView::wheelEvent(QWheelEvent *event)
+void MapView::wheelEvent(QWheelEvent *event)
 {
 	static int deg = 0;
 
@@ -451,7 +460,7 @@ void PathView::wheelEvent(QWheelEvent *event)
 	zoom((event->delta() > 0) ? 1 : -1, event->pos(), c);
 }
 
-void PathView::mouseDoubleClickEvent(QMouseEvent *event)
+void MapView::mouseDoubleClickEvent(QMouseEvent *event)
 {
 	if (event->button() != Qt::LeftButton && event->button() != Qt::RightButton)
 		return;
@@ -460,7 +469,7 @@ void PathView::mouseDoubleClickEvent(QMouseEvent *event)
 	zoom((event->button() == Qt::LeftButton) ? 1 : -1, event->pos(), c);
 }
 
-void PathView::keyPressEvent(QKeyEvent *event)
+void MapView::keyPressEvent(QKeyEvent *event)
 {
 	int z;
 
@@ -472,7 +481,7 @@ void PathView::keyPressEvent(QKeyEvent *event)
 	else if (event->matches(ZOOM_OUT))
 		z = -1;
 	else if (_digitalZoom && event->key() == Qt::Key_Escape) {
-		resetDigitalZoom();
+		digitalZoom(0);
 		return;
 	} else {
 		QGraphicsView::keyPressEvent(event);
@@ -482,13 +491,13 @@ void PathView::keyPressEvent(QKeyEvent *event)
 	zoom(z, pos, c);
 }
 
-void PathView::plot(QPainter *painter, const QRectF &target, qreal scale,
+void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
   bool hires)
 {
 	QRect orig, adj;
-	qreal ratio, diff, origRes, q;
+	qreal ratio, diff, q;
 	QPointF origScene, origPos;
-	Coordinates origLL;
+	RectC origC;
 
 
 	// Enter plot mode
@@ -513,9 +522,9 @@ void PathView::plot(QPainter *painter, const QRectF &target, qreal scale,
 
 	// Adjust the view for printing
 	if (hires) {
-		origScene = mapToScene(orig.center());
-		origLL = _map->xy2ll(origScene);
-		origRes = _map->resolution(origScene);
+		QRectF vr(mapToScene(orig).boundingRect());
+		origC = RectC(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
+		origScene = vr.center();
 
 		QPointF s(painter->device()->logicalDpiX()
 		  / (qreal)metric(QPaintDevice::PdmDpiX),
@@ -545,7 +554,7 @@ void PathView::plot(QPainter *painter, const QRectF &target, qreal scale,
 
 	// Revert view changes to display mode
 	if (hires) {
-		_map->zoomFit(origRes, origLL);
+		_map->zoomFit(orig.size(), origC);
 		rescale();
 		centerOn(origScene);
 	}
@@ -558,7 +567,7 @@ void PathView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	setUpdatesEnabled(true);
 }
 
-void PathView::clear()
+void MapView::clear()
 {
 	_pois.clear();
 	_tracks.clear();
@@ -575,36 +584,43 @@ void PathView::clear()
 	_rr = RectC();
 	_wr = RectC();
 
-	resetDigitalZoom();
+	digitalZoom(0);
+
+	// If not reset, causes huge redraw areas (and system memory exhaustion)
 	resetCachedContent();
-	QPixmapCache::clear();
 }
 
-void PathView::showTracks(bool show)
+void MapView::showTracks(bool show)
 {
 	_showTracks = show;
 
 	for (int i = 0; i < _tracks.count(); i++)
 		_tracks.at(i)->setVisible(show);
+
+	updatePOI();
 }
 
-void PathView::showRoutes(bool show)
+void MapView::showRoutes(bool show)
 {
 	_showRoutes = show;
 
 	for (int i = 0; i < _routes.count(); i++)
 		_routes.at(i)->setVisible(show);
+
+	updatePOI();
 }
 
-void PathView::showWaypoints(bool show)
+void MapView::showWaypoints(bool show)
 {
 	_showWaypoints = show;
 
 	for (int i = 0; i < _waypoints.count(); i++)
 		_waypoints.at(i)->setVisible(show);
+
+	updatePOI();
 }
 
-void PathView::showWaypointLabels(bool show)
+void MapView::showWaypointLabels(bool show)
 {
 	_showWaypointLabels = show;
 
@@ -615,7 +631,7 @@ void PathView::showWaypointLabels(bool show)
 		_routes.at(i)->showWaypointLabels(show);
 }
 
-void PathView::showRouteWaypoints(bool show)
+void MapView::showRouteWaypoints(bool show)
 {
 	_showRouteWaypoints = show;
 
@@ -623,13 +639,13 @@ void PathView::showRouteWaypoints(bool show)
 		_routes.at(i)->showWaypoints(show);
 }
 
-void PathView::showMap(bool show)
+void MapView::showMap(bool show)
 {
 	_showMap = show;
 	resetCachedContent();
 }
 
-void PathView::showPOI(bool show)
+void MapView::showPOI(bool show)
 {
 	_showPOI = show;
 
@@ -640,7 +656,7 @@ void PathView::showPOI(bool show)
 	updatePOIVisibility();
 }
 
-void PathView::showPOILabels(bool show)
+void MapView::showPOILabels(bool show)
 {
 	_showPOILabels = show;
 
@@ -651,14 +667,14 @@ void PathView::showPOILabels(bool show)
 	updatePOIVisibility();
 }
 
-void PathView::setPOIOverlap(bool overlap)
+void MapView::setPOIOverlap(bool overlap)
 {
 	_overlapPOIs = overlap;
 
 	updatePOIVisibility();
 }
 
-void PathView::setTrackWidth(int width)
+void MapView::setTrackWidth(int width)
 {
 	_trackWidth = width;
 
@@ -666,7 +682,7 @@ void PathView::setTrackWidth(int width)
 		_tracks.at(i)->setWidth(width);
 }
 
-void PathView::setRouteWidth(int width)
+void MapView::setRouteWidth(int width)
 {
 	_routeWidth = width;
 
@@ -674,7 +690,7 @@ void PathView::setRouteWidth(int width)
 		_routes.at(i)->setWidth(width);
 }
 
-void PathView::setTrackStyle(Qt::PenStyle style)
+void MapView::setTrackStyle(Qt::PenStyle style)
 {
 	_trackStyle = style;
 
@@ -682,7 +698,7 @@ void PathView::setTrackStyle(Qt::PenStyle style)
 		_tracks.at(i)->setStyle(style);
 }
 
-void PathView::setRouteStyle(Qt::PenStyle style)
+void MapView::setRouteStyle(Qt::PenStyle style)
 {
 	_routeStyle = style;
 
@@ -690,7 +706,7 @@ void PathView::setRouteStyle(Qt::PenStyle style)
 		_routes.at(i)->setStyle(style);
 }
 
-void PathView::setWaypointSize(int size)
+void MapView::setWaypointSize(int size)
 {
 	_waypointSize = size;
 
@@ -698,7 +714,7 @@ void PathView::setWaypointSize(int size)
 		_waypoints.at(i)->setSize(size);
 }
 
-void PathView::setWaypointColor(const QColor &color)
+void MapView::setWaypointColor(const QColor &color)
 {
 	_waypointColor = color;
 
@@ -706,7 +722,7 @@ void PathView::setWaypointColor(const QColor &color)
 		_waypoints.at(i)->setColor(color);
 }
 
-void PathView::setPOISize(int size)
+void MapView::setPOISize(int size)
 {
 	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
 
@@ -716,7 +732,7 @@ void PathView::setPOISize(int size)
 		it.value()->setSize(size);
 }
 
-void PathView::setPOIColor(const QColor &color)
+void MapView::setPOIColor(const QColor &color)
 {
 	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
 
@@ -726,43 +742,43 @@ void PathView::setPOIColor(const QColor &color)
 		it.value()->setColor(color);
 }
 
-void PathView::setMapOpacity(int opacity)
+void MapView::setMapOpacity(int opacity)
 {
 	_opacity = opacity / 100.0;
 	resetCachedContent();
 }
 
-void PathView::setBackgroundColor(const QColor &color)
+void MapView::setBackgroundColor(const QColor &color)
 {
 	_backgroundColor = color;
 	_map->setBackgroundColor(color);
 	resetCachedContent();
 }
 
-void PathView::drawBackground(QPainter *painter, const QRectF &rect)
+void MapView::drawBackground(QPainter *painter, const QRectF &rect)
 {
+	painter->fillRect(rect, _backgroundColor);
+
 	if (_showMap) {
-		if (_opacity < 1.0) {
-			painter->fillRect(rect, _backgroundColor);
+		QRectF ir = rect.intersected(_map->bounds());
+		if (_opacity < 1.0)
 			painter->setOpacity(_opacity);
-		}
-		_map->draw(painter, rect);
-	} else
-		painter->fillRect(rect, _backgroundColor);
+		_map->draw(painter, ir);
+	}
 }
 
-void PathView::resizeEvent(QResizeEvent *event)
+void MapView::resizeEvent(QResizeEvent *event)
 {
-	qreal zoom = _map->zoom();
-	if (mapZoom() != zoom)
+	QGraphicsView::resizeEvent(event);
+
+	int zoom = _map->zoom();
+	if (fitMapZoom() != zoom)
 		rescale();
 
 	centerOn(contentCenter());
-
-	QGraphicsView::resizeEvent(event);
 }
 
-void PathView::paintEvent(QPaintEvent *event)
+void MapView::paintEvent(QPaintEvent *event)
 {
 	QPointF scenePos = mapToScene(rect().bottomRight() + QPoint(
 	  -(SCALE_OFFSET + _mapScale->boundingRect().width()),
@@ -773,12 +789,12 @@ void PathView::paintEvent(QPaintEvent *event)
 	QGraphicsView::paintEvent(event);
 }
 
-void PathView::scrollContentsBy(int dx, int dy)
+void MapView::scrollContentsBy(int dx, int dy)
 {
 	QGraphicsView::scrollContentsBy(dx, dy);
 
-	QPointF center = mapToScene(viewport()->rect().center());
-	qreal res = _map->resolution(center);
+	QRectF sr(mapToScene(viewport()->rect()).boundingRect());
+	qreal res = _map->resolution(sr);
 
 	if (qMax(res, _res) / qMin(res, _res) > 1.1) {
 		_mapScale->setResolution(res);
@@ -786,7 +802,7 @@ void PathView::scrollContentsBy(int dx, int dy)
 	}
 }
 
-void PathView::useOpenGL(bool use)
+void MapView::useOpenGL(bool use)
 {
 	if (use)
 		setViewport(new OPENGL_WIDGET);
@@ -794,12 +810,22 @@ void PathView::useOpenGL(bool use)
 		setViewport(new QWidget);
 }
 
-void PathView::useAntiAliasing(bool use)
+void MapView::useAntiAliasing(bool use)
 {
 	setRenderHint(QPainter::Antialiasing, use);
 }
 
-void PathView::reloadMap()
+void MapView::setMarkerColor(const QColor &color)
+{
+	_markerColor = color;
+
+	for (int i = 0; i < _tracks.size(); i++)
+		_tracks.at(i)->setMarkerColor(color);
+	for (int i = 0; i < _routes.size(); i++)
+		_routes.at(i)->setMarkerColor(color);
+}
+
+void MapView::reloadMap()
 {
 	resetCachedContent();
 }

src/GUI/mapview.h

@@ -1,15 +1,16 @@
-#ifndef TRACKVIEW_H
-#define TRACKVIEW_H
+#ifndef MAPVIEW_H
+#define MAPVIEW_H
 
 #include <QGraphicsView>
 #include <QVector>
 #include <QHash>
 #include <QList>
-#include "units.h"
-#include "palette.h"
-#include "waypoint.h"
-#include "rectc.h"
+#include "common/rectc.h"
+#include "data/waypoint.h"
 #include "searchpointer.h"
+#include "units.h"
+#include "format.h"
+#include "palette.h"
 
 class Data;
 class POI;
@@ -22,28 +23,25 @@ class WaypointItem;
 class ScaleItem;
 class PathItem;
 
-class PathView : public QGraphicsView
+class MapView : public QGraphicsView
 {
 	Q_OBJECT
 
 public:
-	PathView(Map *map, POI *poi, QWidget *parent = 0);
+	MapView(Map *map, POI *poi, QWidget *parent = 0);
 
 	QList<PathItem*> loadData(const Data &data);
 
 	void setPalette(const Palette &palette);
 	void setPOI(POI *poi);
 	void setMap(Map *map);
-	void setUnits(enum Units units);
 
 	void plot(QPainter *painter, const QRectF &target, qreal scale, bool hires);
 
-	int trackCount() const {return _tracks.count();}
-	int routeCount() const {return _routes.count();}
-	int waypointCount() const {return _waypoints.count();}
-
 	void clear();
 
+	void setUnits(Units units);
+	void setMarkerColor(const QColor &color);
 	void setTrackWidth(int width);
 	void setRouteWidth(int width);
 	void setTrackStyle(Qt::PenStyle style);
@@ -68,6 +66,7 @@ public slots:
 	void showWaypoints(bool show);
 	void showRouteWaypoints(bool show);
 	void clearMapCache();
+	void setCoordinatesFormat(CoordinatesFormat format);
 
 private slots:
 	void updatePOI();
@@ -77,19 +76,17 @@ private:
 	PathItem *addTrack(const Track &track);
 	PathItem *addRoute(const Route &route);
 	void addWaypoints(const QList<Waypoint> &waypoints);
-	void addPOI(const QVector<Waypoint> &waypoints);
+	void addPOI(const QList<Waypoint> &waypoints);
 	void loadPOI();
 	void clearPOI();
 
-	qreal mapZoom() const;
+	int fitMapZoom() const;
 	QPointF contentCenter() const;
 	void rescale();
 	void centerOn(const QPointF &pos);
 	void zoom(int zoom, const QPoint &pos, const Coordinates &c);
 	void digitalZoom(int zoom);
-	void resetDigitalZoom();
 	void updatePOIVisibility();
-	void updateWaypointsBoundingRect(const Coordinates &wp);
 
 	void mouseDoubleClickEvent(QMouseEvent *event);
 	void wheelEvent(QWheelEvent *event);
@@ -113,6 +110,7 @@ private:
 	POI *_poi;
 	Palette _palette;
 	Units _units;
+	CoordinatesFormat _coordinatesFormat;
 
 	qreal _opacity;
 	QColor _backgroundColor;
@@ -133,9 +131,10 @@ private:
 	int _poiSize;
 	QColor _waypointColor;
 	QColor _poiColor;
+	QColor _markerColor;
 
 	int _digitalZoom;
 	bool _plot;
 };
 
-#endif // TRACKVIEW_H
+#endif // MAPVIEW_H