Version++

translated new string

.appveyor.yml

@@ -1,14 +1,14 @@
-version: 5.0.{build}
+version: 7.1.{build}
 configuration: Release
 platform: Any CPU
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
   matrix:
-  - QTDIR: C:\Qt\5.9\msvc2015
+  - QTDIR: C:\Qt\5.11\msvc2015
     PLATFORM: x86
     NSI: gpxsee.nsi
     OPENSSLDIR: C:\OpenSSL-Win32\bin
-  - QTDIR: C:\Qt\5.9\msvc2015_64
+  - QTDIR: C:\Qt\5.11\msvc2015_64
     PLATFORM: x86_amd64
     NSI: gpxsee64.nsi
     OPENSSLDIR: C:\OpenSSL-Win64\bin
@@ -34,6 +34,8 @@ build_script:
 
     copy pkg\%NSI% installer
 
+    copy pkg\macros.nsh installer
+
     xcopy pkg\csv installer\csv /i
 
     xcopy pkg\maps installer\maps /i

README.md

@@ -1,25 +1,31 @@
 # 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, SLF, LOC and OziExplorer files.
 
 ## Features
-* User-definable online maps.
-* Offline maps (OziExplorer maps and TrekBuddy maps/atlases).
-* Elevation, speed, heart rate, cadence, power and temperature graphs.
+* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
+* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for multiple tracks in one view.
 * Support for POI files.
 * Print/export to PDF.
 * Full-screen mode.
+* HiDPI/Retina displays & maps support.
 * 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, SLF, LOC, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.
 
 ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
 
 ## Build
+Build requirements:
+* Qt 4.8 or QT 5.x (Qt >= 5.10.1 recommended for all features)
+* C++03 compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)
+
+Build steps:
 ```shell
 lrelease gpxsee.pro
 qmake gpxsee.pro
-make
+make # nmake on windows
 ```
 
 ## Download
@@ -31,3 +37,9 @@ make
 
 ## Homepage
 http://www.gpxsee.org
+
+## Maps
+[GPXSee maps repository](https://github.com/tumic0/GPXSee-maps)
+
+## Translations
+GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee/translations/) for translations.

gpxsee.pro

@@ -1,20 +1,30 @@
 TARGET = GPXSee
-VERSION = 5.0
+VERSION = 7.1
+
 QT += core \
     gui \
-    network
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
-lessThan(QT_VERSION, 5.4): QT += opengl
-macx: QT += opengl
+    network \
+    sql \
+    concurrent
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += widgets
+    QT += printsupport
+}
+lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
+equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
+
 INCLUDEPATH += ./src
-HEADERS += src/config.h \
+HEADERS += src/common/config.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/common/util.h \
+    src/common/rtree.h \
+    src/common/kv.h \
+    src/common/greatcircle.h \
+    src/common/programpaths.h \
     src/GUI/app.h \
     src/GUI/icons.h \
     src/GUI/gui.h \
@@ -48,6 +58,7 @@ HEADERS += src/config.h \
     src/GUI/format.h \
     src/GUI/cadencegraph.h \
     src/GUI/powergraph.h \
+    src/GUI/gearratiograph.h \
     src/GUI/optionsdialog.h \
     src/GUI/colorbox.h \
     src/GUI/stylecombobox.h \
@@ -60,16 +71,17 @@ HEADERS += src/config.h \
     src/GUI/temperaturegraphitem.h \
     src/GUI/cadencegraphitem.h \
     src/GUI/powergraphitem.h \
+    src/GUI/gearratiographitem.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/GUI/font.h \
     src/map/projection.h \
     src/map/ellipsoid.h \
     src/map/datum.h \
-    src/map/mercator.h \
+    src/map/webmercator.h \
     src/map/transversemercator.h \
     src/map/latlon.h \
     src/map/utm.h \
@@ -82,7 +94,7 @@ HEADERS += src/config.h \
     src/map/downloader.h \
     src/map/tile.h \
     src/map/emptymap.h \
-    src/map/offlinemap.h \
+    src/map/ozimap.h \
     src/map/tar.h \
     src/map/ozf.h \
     src/map/atlas.h \
@@ -92,6 +104,29 @@ HEADERS += src/config.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/map/rectd.h \
+    src/map/geocentric.h \
+    src/map/mercator.h \
+    src/map/jnxmap.h \
+    src/map/krovak.h \
+    src/map/geotiffmap.h \
+    src/map/image.h \
+    src/map/mbtilesmap.h \
+    src/map/osm.h \
     src/data/graph.h \
     src/data/poi.h \
     src/data/waypoint.h \
@@ -103,7 +138,6 @@ HEADERS += src/config.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 \
@@ -111,17 +145,16 @@ HEADERS += src/config.h \
     src/data/fitparser.h \
     src/data/igcparser.h \
     src/data/nmeaparser.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/data/oziparsers.h \
+    src/data/locparser.h \
+    src/data/slfparser.h
 SOURCES += src/main.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
-    src/common/str2int.cpp \
+    src/common/util.cpp \
+    src/common/greatcircle.cpp \
+    src/common/programpaths.cpp \
     src/GUI/app.cpp \
     src/GUI/gui.cpp \
     src/GUI/axisitem.cpp \
@@ -150,6 +183,7 @@ SOURCES += src/main.cpp \
     src/GUI/format.cpp \
     src/GUI/cadencegraph.cpp \
     src/GUI/powergraph.cpp \
+    src/GUI/gearratiograph.cpp \
     src/GUI/optionsdialog.cpp \
     src/GUI/colorbox.cpp \
     src/GUI/stylecombobox.cpp \
@@ -161,20 +195,20 @@ SOURCES += src/main.cpp \
     src/GUI/temperaturegraphitem.cpp \
     src/GUI/cadencegraphitem.cpp \
     src/GUI/powergraphitem.cpp \
-    src/GUI/nicenum.cpp \
+    src/GUI/gearratiographitem.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/ozimap.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/webmercator.cpp \
     src/map/transversemercator.cpp \
     src/map/utm.cpp \
     src/map/lambertconic.cpp \
@@ -185,6 +219,28 @@ SOURCES += src/main.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/map/geocentric.cpp \
+    src/map/mercator.cpp \
+    src/map/jnxmap.cpp \
+    src/map/krovak.cpp \
+    src/map/map.cpp \
+    src/map/geotiffmap.cpp \
+    src/map/image.cpp \
+    src/map/mbtilesmap.cpp \
+    src/map/osm.cpp \
     src/data/data.cpp \
     src/data/poi.cpp \
     src/data/track.cpp \
@@ -197,39 +253,53 @@ SOURCES += src/main.cpp \
     src/data/fitparser.cpp \
     src/data/igcparser.cpp \
     src/data/nmeaparser.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/data/oziparsers.cpp \
+    src/data/locparser.cpp \
+    src/data/slfparser.cpp
 RESOURCES += gpxsee.qrc
-TRANSLATIONS = lang/gpxsee_cs.ts \
+TRANSLATIONS = lang/gpxsee_en.ts \
+    lang/gpxsee_cs.ts \
     lang/gpxsee_sv.ts \
     lang/gpxsee_de.ts \
     lang/gpxsee_ru.ts \
     lang/gpxsee_fi.ts \
-    lang/gpxsee_fr.ts
+    lang/gpxsee_fr.ts \
+    lang/gpxsee_pl.ts \
+    lang/gpxsee_nb.ts \
+    lang/gpxsee_da.ts \
+    lang/gpxsee_tr.ts
+
 macx {
     ICON = icons/gpxsee.icns
     QMAKE_INFO_PLIST = pkg/Info.plist
     LOCALE.path = Contents/Resources/translations
-    LOCALE.files = lang/gpxsee_cs.qm \
+    LOCALE.files = lang/gpxsee_en.qm \
+        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_sv.qm \
+        lang/gpxsee_pl.qm \
+        lang/gpxsee_nb.qm \
+        lang/gpxsee_da.qm \
+        lang/gpxsee_tr.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/tcx.icns \
+    ICONS.files = icons/gpx.icns \
+        icons/tcx.icns \
         icons/kml.icns \
         icons/fit.icns \
         icons/igc.icns \
-        icons/nmea.icns
+        icons/nmea.icns \
+        icons/plt.icns \
+        icons/rte.icns \
+        icons/wpt.icns \
+        icons/loc.icns \
+        icons/slf.icns
     QMAKE_BUNDLE_DATA += LOCALE MAPS ICONS CSV
 }
 win32 {
@@ -239,6 +309,14 @@ 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 \
+        icons/loc.ico \
+        icons/slf.ico
+    DEFINES += _USE_MATH_DEFINES
 }
+
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+DEFINES *= QT_USE_QSTRINGBUILDER

gpxsee.qrc

@@ -1,24 +1,46 @@
 <RCC>
-    <qresource prefix="/">
-        <file>icons/dialog-close.png</file>
-        <file>icons/document-open.png</file>
-        <file>icons/document-print.png</file>
-        <file>icons/document-export.png</file>
-        <file>icons/flag.png</file>
-        <file>icons/gpxsee.png</file>
-        <file>icons/application-exit.png</file>
-        <file>icons/applications-internet.png</file>
-        <file>icons/view-refresh.png</file>
-        <file>icons/arrow-left.png</file>
-        <file>icons/arrow-right.png</file>
-        <file>icons/arrow-left-double.png</file>
-        <file>icons/arrow-right-double.png</file>
-        <file>icons/view-fullscreen.png</file>
-        <file>icons/office-chart-line.png</file>
-        <file>icons/preferences-desktop-display.png</file>
-        <file>icons/flag_48.png</file>
-        <file>icons/system-run.png</file>
-        <file>icons/document-print-preview.png</file>
-        <file>icons/view-filter.png</file>
-    </qresource>
+	<qresource prefix="/">
+		<file>icons/dialog-close.png</file>
+		<file>icons/dialog-close@2x.png</file>
+		<file>icons/document-open.png</file>
+		<file>icons/document-open@2x.png</file>
+		<file>icons/document-print.png</file>
+		<file>icons/document-print@2x.png</file>
+		<file>icons/document-export.png</file>
+		<file>icons/document-export@2x.png</file>
+		<file>icons/flag.png</file>
+		<file>icons/flag@2x.png</file>
+		<file>icons/gpxsee.png</file>
+		<file>icons/gpxsee@2x.png</file>
+		<file>icons/application-exit.png</file>
+		<file>icons/application-exit@2x.png</file>
+		<file>icons/applications-internet.png</file>
+		<file>icons/applications-internet@2x.png</file>
+		<file>icons/view-refresh.png</file>
+		<file>icons/view-refresh@2x.png</file>
+		<file>icons/arrow-left.png</file>
+		<file>icons/arrow-left@2x.png</file>
+		<file>icons/arrow-right.png</file>
+		<file>icons/arrow-right@2x.png</file>
+		<file>icons/arrow-left-double.png</file>
+		<file>icons/arrow-left-double@2x.png</file>
+		<file>icons/arrow-right-double.png</file>
+		<file>icons/arrow-right-double@2x.png</file>
+		<file>icons/view-fullscreen.png</file>
+		<file>icons/view-fullscreen@2x.png</file>
+		<file>icons/office-chart-line.png</file>
+		<file>icons/office-chart-line@2x.png</file>
+		<file>icons/format-stroke-color.png</file>
+		<file>icons/format-stroke-color@2x.png</file>
+		<file>icons/flag_32.png</file>
+		<file>icons/flag_32@2x.png</file>
+		<file>icons/preferences-system.png</file>
+		<file>icons/preferences-system@2x.png</file>
+		<file>icons/document-print_32.png</file>
+		<file>icons/document-print_32@2x.png</file>
+		<file>icons/view-filter.png</file>
+		<file>icons/view-filter@2x.png</file>
+		<file>icons/applications-internet_32.png</file>
+		<file>icons/applications-internet_32@2x.png</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/extensions

@@ -0,0 +1,11 @@
+fit:#006600
+gpx:#003399
+igc:#ff3300
+kml:#990000
+nmea:#0083d7
+plt:#66ff00
+rte:#66ff00
+tcx:#ffcc00
+wpt:#66ff00
+loc:#556677
+slf:#881199

icons/scripts/icns.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+while read e; 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 < extensions

icons/scripts/ico.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read e; 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 < extensions

icons/scripts/icon-template.svg

@@ -0,0 +1,20 @@
+<?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:Helvetica;font-weight:bold;">$EXTENSION</text>
+-->
+    <text y="25" x="60" dy="0.36em" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;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>

lang/gpxsee_en.ts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+</TS>

pkg/Info.plist

@@ -67,6 +67,38 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>loc</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/loc+xml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/loc.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Geocaching.com Waypoint File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>slf</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/slf+xml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/slf.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Sigma Log Format</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -115,6 +147,54 @@
 			<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>
@@ -182,6 +262,48 @@
 				<string>application/vnd.google-earth.kml+xml</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.geocaching.loc</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.geocaching.com</string>
+			<key>UTTypeDescription</key>
+			<string>Geocaching.com Waypoint File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>loc</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/loc+xml</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.sigmasport.slf</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.sigmasport.com</string>
+			<key>UTTypeDescription</key>
+			<string>Sigma Log Format</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>slf</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/slf+xml</string>
+			</dict>
+		</dict>
 		<dict>
 			<key>UTTypeIdentifier</key>
 			<string>com.thisisant.fit</string>
@@ -245,6 +367,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,70 @@
+<?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, SLF, LOC and OziExplorer files.</p>
+
+		<p>Features:</p>
+		<ul>
+			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
+				WMS, TMS).</li>
+			<li>Offline maps (MBTiles, 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>HiDPI/Retina displays &amp; maps support.</li>
+			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, 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>
+		<category>Maps</category>
+		<category>Geoscience</category>
+		<category>Geography</category>
+		<category>DataVisualization</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>
+		<mimetype>application/loc+xml</mimetype>
+		<mimetype>application/slf+xml</mimetype>
+	</mimetypes>
+</component>

pkg/csv/ellipsoids.csv

@@ -3,6 +3,7 @@ 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 1858,7007,6378293.645,294.26
 Clarke 1866,7008,6378206.4,294.9786982
 Clarke 1880 (Palestine),7010,6378300.789,293.466
 Clarke 1880 (IGN),7011,6378249.2,293.466021
@@ -11,9 +12,17 @@ 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
+Indonesian National Spheroid,7021,6378160.0,298.247
 International 1924,7022,6378388.0,297.0
 Krassovsky 1940,7024,6378245.0,298.3
+War Office,7029,6378300.0,296.0
 South American 1969,7036,6378160.0,298.25
 WGS 72,7043,6378135.0,298.26
+Everest 1830 (1962 Definition),7044,6377301.243,300.8017255
+Everest 1830 (1975 Definition),7045,6377299.151,300.8017255
 Bessel 1841 (Namibia),7046,6377483.865,299.1528128
+GRS 1967 Modified,7050,6378160.0,298.25
+Danish 1876,7051,6377019.27,300.0
 Hough 1960,7053,6378270.0,297.0
+Clarke 1880 (international foot),7055,6378306.370,293.4663077
+PZ-90,7054,6378136.0,298.257839303

pkg/csv/gcs.csv

@@ -1,121 +1,374 @@
-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,15,405
-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
-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
-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
+HD1909,3819,1024,9122,7004,8901,9607,595.48,121.69,515.35,-4.115,2.9383,-0.853,-3.408
+TWD97,3824,1026,9122,7019,8901,9603,0,0,0,,,,
+IGRS,3889,1029,9122,7019,8901,9603,0,0,0,,,,
+Hermannskogel,3906,1031,9122,7004,8901,9603,653,-212,449,,,,
+MOLDREF99,4023,1032,9122,7019,8901,9603,0,0,0,,,,
+RGRDC 2005,4046,1033,9122,7019,8901,9603,0,0,0,,,,
+SREF98,4075,1034,9122,7019,8901,9603,0,0,0,,,,
+REGCAN95,4081,1035,9122,7019,8901,9603,0,0,0,,,,
+GGRS 87,4121,6121,9122,7019,8901,9603,-199.87,74.79,246.62,,,,
+Finland Hayford,4123,6123,9122,7022,8901,9603,-78,-231,-97,,,,
+RT 90,4124,6124,9122,7004,8901,9603,498,-36,568,,,,
+Samboja,4125,6125,9108,7004,8901,9603,-404.78,685.68,45.47,,,,
+Tete,4127,6127,9122,7008,8901,9603,-80,-100,-228,,,,
+Observatario,4129,6129,9122,7008,8901,9603,-132,-110,-335,,,,
+Moznet,4130,6130,9122,7030,8901,9607,0,0,0,0,0,0,0
+Indian 1960,4131,6131,9122,7015,8901,9603,198,881,317,,,,
+FD58,4132,6132,9122,7012,8901,9603,-241.54,-163.64,396.06,,,,
+EST92,4133,6133,9122,7019,8901,9607,0.055,-0.541,-0.185,-0.0183,0.0003,0.007,-0.014
+PSD93,4134,6134,9122,7012,8901,9606,-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006
+Old Hawaiian,4135,6135,9122,7008,8901,9603,61,-285,-181,,,,
+Puerto Rico,4139,6139,9122,7008,8901,9603,11,72,-101,,,,
+NAD83(CSRS98),4140,6140,9108,7019,8901,9603,0,0,0,,,,
+Israel 1993,4141,6141,9122,7019,8901,9603,-48,55,52,,,,
+Locodjo 1965,4142,6142,9122,7012,8901,9603,-125,53,467,,,,
+Abidjan 1987,4143,6143,9122,7012,8901,9603,-124.76,53,466.79,,,,
+Kalianpur 1937,4144,6144,9122,7015,8901,9603,214,804,268,,,,
+Kalianpur 1962,4145,6145,9122,7044,8901,9603,283,682,231,,,,
+Kalianpur 1975,4146,6146,9122,7045,8901,9603,295,736,257,,,,
+Hanoi 1972,4147,6147,9122,7024,8901,9603,-17.51,-108.32,-62.39,,,,
+Hartebeeshoek94,4148,6148,9122,7030,8901,9603,0,0,0,,,,
+CH-1903,4149,6149,9122,7004,8901,9603,674.374,15.056,405.343,,,,
+CH1903+,4150,6150,9122,7004,8901,9603,674.374,15.056,405.346,,,,
+CHTRF95,4151,6151,9122,7019,8901,9603,0,0,0,,,,
+NAD83(HARN),4152,6152,9122,7019,8901,9603,0,0,0,,,,
+Rassadiran,4153,6153,9122,7022,8901,9603,-133.63,-157.5,-158.62,,,,
+ED50(ED77),4154,6154,9122,7022,8901,9603,-117,-132,-164,,,,
+Dabola 1981,4155,6155,9122,7011,8901,9603,-83,37,124,,,,
+S-JTSK,4156,6156,9122,7004,8901,9603,589,76,480,,,,
+Naparima 1955,4158,6158,9122,7022,8901,9603,-0.465,372.095,171.736,,,,
+ELD79,4159,6159,9122,7022,8901,9603,-115.8543,-99.0583,-152.4616,,,,
+Pampa del Castillo,4161,6161,9122,7022,8901,9603,27.5,14,186.4,,,,
+Yemen NGN96,4163,6163,9122,7030,8901,9603,0,0,0,,,,
+South Yemen,4164,6164,9122,7024,8901,9603,-76,-138,67,,,,
+Bissau,4165,6165,9122,7022,8901,9603,-173,253,27,,,,
+Korean 1995,4166,6166,9122,7030,8901,9603,0,0,0,,,,
+NZGD2000,4167,6167,9122,7030,8901,9603,0,0,0,,,,
+Accra,4168,6168,9122,7029,8901,9603,-199,32,322,,,,
+American Samoa 1962,4169,6169,9122,7008,8901,9603,-115,118,426,,,,
+SIRGAS 1995,4170,6170,9122,7019,8901,9603,0,0,0,,,,
+RGF93,4171,6171,9122,7019,8901,9603,0,0,0,,,,
+POSGAR,4172,6172,9108,7019,8901,9603,0,0,0,,,,
+IRENET95,4173,6173,9122,7019,8901,9603,0,0,0,,,,
+Sierra Leone 1968,4175,6175,9122,7012,8901,9603,-88,4,101,,,,
+Australian Antarctic,4176,6176,9122,7019,8901,9603,0,0,0,,,,
+S42 (83),4178,6178,9122,7024,8901,9603,26,-121,-78,,,,
+S42,4179,6179,9122,7024,8901,9603,28,-121,-77,,,,
+EST97,4180,6180,9122,7019,8901,9603,0,0,0,,,,
+Luxembourg 1930,4181,6181,9122,7022,8901,9607,-189.6806,18.3463,-42.7695,0.33746,3.09264,-2.53861,0.4598
+Observatorio 1966,4182,6182,9122,7022,8901,9603,-425,-169,81,,,,
+Southwest Base,4183,6183,9122,7022,8901,9603,-104,167,-38,,,,
+Sao Braz,4184,6184,9122,7022,8901,9603,-203,141,53,,,,
+OSNI 1952,4188,6188,9122,7001,8901,9606,482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15
+REGVEN,4189,6189,9122,7019,8901,9603,0,0,0,,,,
+POSGAR 98,4190,6190,9122,7019,8901,9603,0,0,0,,,,
+Albanian 1987,4191,6191,9122,7024,8901,9607,-44.183,-0.58,-38.489,-2.3867,-2.7072,3.5196,-8.2703
+Douala 1948,4192,6192,9122,7022,8901,9603,-206.1,-174.7,-87.7,,,,
+Manoca 1962,4193,6193,9122,7011,8901,9603,-70.9,-151.8,-41.4,,,,
+Qornoq 1927,4194,6194,9122,7022,8901,9603,164,138,-189,,,,
+Scoresbysund 1952,4195,6195,9122,7022,8901,9606,105,326,-102.5,0,0,0.814,-0.6
+Ammassalik 1958,4196,6196,9122,7022,8901,9606,-45,417,-3.5,0,0,0.814,-0.6
+Egypt,4199,6199,9122,7022,8901,9603,-130,-117,-151,,,,
+Pulkovo 1995,4200,6200,9122,7024,8901,9607,24.47,-130.89,-81.56,0,0,-0.13,-0.22
+Adindan,4201,6201,9122,7012,8901,9603,-162,-12,206,,,,
+Australian Geodetic 1966,4202,6202,9122,7003,8901,9603,-133,-48,148,,,,
+Australian Geodetic 1984,4203,6203,9122,7003,8901,9603,-134,-48,149,,,,
+Ain el Abd 1970,4204,6204,9122,7022,8901,9603,-150,-251,-2,,,,
+Afgooye,4205,6205,9122,7024,8901,9603,-43,-163,45,,,,
+Lisbon,4207,6207,9122,7022,8901,9603,-304.046,-60.576,103.64,,,,
+Aratu,4208,6208,9122,7022,8901,9603,-151.99,287.04,-147.45,,,,
+Arc 1950,4209,6209,9122,7012,8901,9603,-143,-90,-294,,,,
+Arc 1960,4210,6210,9122,7012,8901,9603,-160,-8,-300,,,,
+Djakarta (Batavia),4211,6211,9122,7004,8901,9603,-377,681,-50,,,,
+Barbados 1938,4212,6212,9122,7012,8901,9603,31.95,300.99,419.19,,,,
+Beduaram,4213,6213,9122,7011,8901,9603,-106,-87,188,,,,
+Beijing 1954,4214,6214,9122,7024,8901,9603,15.8,-154.4,-82.3,,,,
+Bermuda 1957,4216,6216,9122,7008,8901,9603,-73,213,296,,,,
+Bogota Observatory,4218,6218,9122,7022,8901,9603,307,304,-318,,,,
+Bukit Rimpah,4219,6219,9122,7004,8901,9603,-384,664,-48,,,,
+Camacupa,4220,6220,9122,7012,8901,9603,-50.9,-347.6,-231,,,,
+Campo Inchauspe,4221,6221,9122,7022,8901,9603,-148,136,90,,,,
+Cape,4222,6222,9122,7012,8901,9603,-136,-108,-292,,,,
+Carthage,4223,6223,9122,7012,8901,9603,-263,6,431,,,,
+Chua Astro,4224,6224,9122,7022,8901,9603,-134,229,-29,,,,
+Corrego Alegre,4225,6225,9122,7022,8901,9603,-206,172,-6,,,,
+Deir ez Zor,4227,6227,9122,7011,8901,9603,-190.421,8.532,238.69,,,,
+Old Egyptian,4229,6229,9122,7020,8901,9603,-130,110,-13,,,,
+European 1950,4230,6230,9122,7022,8901,9603,-87,-98,-121,,,,
+ED87,4231,6231,9122,7022,8901,9606,-83.11,-97.38,-117.22,0.005693,-0.044698,0.044285,0.1218
+Oman,4232,6232,9122,7012,8901,9603,-346,-1,224,,,,
+Gandajika Base,4233,6233,9122,7022,8901,9603,-133,-321,50,,,,
+Hu-Tzu-Shan,4236,6236,9122,7022,8901,9603,-634,-549,-201,,,,
+HD72,4237,6237,9122,7036,8901,9603,52.17,-71.82,-14.9,,,,
+ID74,4238,6238,9122,7021,8901,9603,-24,-15,5,,,,
+Indian 1954,4239,6239,9122,7015,8901,9603,217,823,299,,,,
+Indian Thailand,4240,6240,9122,7015,8901,9603,214,836,303,,,,
+JAD69,4242,6242,9122,7008,8901,9603,70,207,389.5,,,,
+Kandawala,4244,6244,9122,7015,8901,9603,-97,787,86,,,,
+Kertau 1948,4245,6245,9122,7018,8901,9603,-11,851,5,,,,
+KOC,4246,6246,9122,7012,8901,9603,-294.7,-200.1,525.5,,,,
+La Canoa,4247,6247,9122,7022,8901,9603,-273.5,110.6,-357.9,,,,
+Prov So Amrican 1956,4248,6248,9122,7022,8901,9603,-288,175,-376,,,,
+Leigon,4250,6250,9122,7012,8901,9603,-130,29,364,,,,
+Liberia 1964,4251,6251,9122,7012,8901,9603,-90,40,88,,,,
+Luzon Philippines,4253,6253,9122,7008,8901,9603,-133,-77,-51,,,,
+Prov So Chilean 1963,4254,6254,9122,7022,8901,9603,16,196,93,,,,
+Herat North,4255,6255,9122,7022,8901,9603,-333,-222,114,,,,
+Mahe 1971,4256,6256,9122,7012,8901,9603,41,-220,-134,,,,
+Makassar,4257,6257,9122,7004,8901,9603,-587.8,519.75,145.76,,,,
+ETRS 89,4258,6258,9122,7019,8901,9603,0,0,0,,,,
+Malongo 1987,4259,6259,9122,7022,8901,9603,-254.1,-5.36,-100.29,,,,
+Manoca,4260,6260,9108,7012,8901,9603,-70.9,-151.8,-41.4,,,,
+Merchich,4261,6261,9122,7012,8901,9603,31,146,47,,,,
+Massawa,4262,6262,9122,7004,8901,9603,639,405,60,,,,
+Minna,4263,6263,9122,7012,8901,9603,-92,-93,122,,,,
+Mhast,4264,6264,9122,7022,8901,9603,-252.95,-4.11,-96.38,,,,
+Monte Mario,4265,6265,9122,7022,8901,9606,-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68
+M'poraloko,4266,6266,9122,7011,8901,9603,-74,-130,42,,,,
+NAD27 CONUS,4267,6267,9122,7008,8901,9603,-8,160,176,,,,
+NAD83,4269,6269,9122,7019,8901,9603,0,0,0,,,,
+Nahrwn United Arab,4270,6270,9122,7012,8901,9603,-249,-156,381,,,,
+Naparima BWI,4271,6271,9122,7022,8901,9603,-2,374,172,,,,
+Geodetic Datum 1949,4272,6272,9122,7022,8901,9603,84,-22,209,,,,
+NZGD1949,4272,6272,9122,7022,8901,9603,84,-22,209,,,,
+NGO1948,4273,6273,9122,7005,8901,9603,315,-217,528,,,,
+Datum 73,4274,6274,9122,7022,8901,9603,-223.237,110.193,36.649,,,,
+NTF France,4275,6275,9122,7011,8901,9603,-168,-60,320,,,,
+Ord Srvy Grt Britn,4277,6277,9122,7001,8901,9603,375,-111,431,,,,
+Israeli,4281,6281,9122,7010,8901,9603,-235,-85,264,,,,
+Pointe Noire,4282,6282,9122,7011,8901,9603,-148,51,-291,,,,
+Australian Geocentric 1994 (GDA94),4283,6283,9122,7019,8901,9603,0,0,0,,,,
+Pulkovo 1942 (1),4284,6284,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,,,,
+Rijksdriehoeksmeting,4289,6289,9122,7004,8901,9603,593,26,478,,,,
+South American 1969,4291,6291,9108,7036,8901,9603,-57,1,-41,,,,
+Sapper Hill 1943,4292,6292,9122,7022,8901,9603,-355,16,74,,,,
+Schwarzeck,4293,6293,9122,7046,8901,9603,616,97,-251,,,,
+Segora,4294,6294,9108,7004,8901,9603,-403,684,41,,,,
+Tananarive,4297,6297,9122,7022,8901,9603,-189,-242,-91,,,,
+Timbalai 1948,4298,6298,9122,7015,8901,9603,-689,691,-46,,,,
+Ireland 1965,4299,6299,9122,7002,8901,9603,506,-122,611,,,,
+TM75,4300,6300,9122,7002,8901,9606,482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15
+Tokyo,4301,6301,9122,7004,8901,9603,-128,481,664,,,,
+Trinidad 1903,4302,6302,9122,7007,8901,9603,-61.702,284.488,472.052,,,,
+Voirol 1875,4304,6304,9122,7011,8901,9603,-73,-247,227,,,,
+Nord Sahara 1959,4307,6307,9122,7012,8901,9606,-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547
+Yacare,4309,6309,9122,7022,8901,9603,-155,171,37,,,,
+Yoff,4310,6310,9122,7011,8901,9603,-30,190,89,,,,
+Zanderij,4311,6311,9122,7022,8901,9603,-265,120,-358,,,,
+Austrian,4312,6312,9122,7004,8901,9603,594,84,471,,,,
+Belge 1972,4313,6313,9122,7022,8901,9607,-106.8686,52.2978,-103.7239,-0.3366,0.457,-1.8422,-1.2747
+Potsdam Rauenberg DHDN,4314,6314,9122,7004,8901,9603,606,23,413,,,,
+Conakry 1905,4315,6315,9122,7011,8901,9603,-23,259,-9,,,,
+Dealul Piscului 1930,4316,6316,9122,7022,8901,9603,103.25,-100.4,-307.19,,,,
+Dealul Piscului 1970,4317,6317,9122,7024,8901,9603,28,-121,-77,,,,
+NGN,4318,6318,9122,7030,8901,9603,-3.2,-5.7,2.8,,,,
+KUDAMS,4319,6319,9122,7019,8901,9603,-20.8,11.3,2.4,,,,
+WGS 72,4322,6322,9122,7043,8901,9603,0,0,5,,,,
+WGS 72BE,4324,6324,9122,7043,8901,9606,0,0,1.9,0,0,0.814,-0.38
+RGSPM06,4463,1038,9122,7019,8901,9603,0,0,0,,,,
+RGM04,4470,1036,9122,7019,8901,9603,0,0,0,,,,
+Cadastre 1997,4475,1037,9122,7022,8901,9603,-381.788,-57.501,-256.673,,,,
+Mexico ITRF92,4483,1042,9122,7019,8901,9603,0,0,0,,,,
+RRAF 1991,4558,1047,9122,7019,8901,9603,0,0,0,,,,
+Antigua 1943,4601,6601,9122,7012,8901,9603,-255,-15,71,,,,
+Dominica 1945,4602,6602,9122,7012,8901,9603,725,685,536,,,,
+Grenada 1953,4603,6603,9122,7012,8901,9603,72,213.7,93,,,,
+Montserrat 1958,4604,6604,9122,7012,8901,9603,174,359,365,,,,
+St. Kitts 1955,4605,6605,9122,7012,8901,9603,9,183,236,,,,
+St. Lucia 1955,4606,6606,9122,7012,8901,9603,-149,128,296,,,,
+St. Vincent 1945,4607,6607,9122,7012,8901,9603,195.671,332.517,274.607,,,,
+Hong Kong 1980,4611,6611,9122,7022,8901,9606,-162.619,-276.959,-161.764,0.067753,-2.243649,-1.158827,-1.094246
+JGD2000,4612,6612,9122,7019,8901,9603,0,0,0,,,,
+Segara,4613,6613,9122,7004,8901,9603,-403,684,41,,,,
+QND95,4614,6614,9122,7022,8901,9606,-119.4248,-303.65872,-11.00061,1.164298,0.174458,1.096259,3.657065
+Southeast Base,4615,6615,9122,7022,8901,9603,-499,-249,314,,,,
+Marco Astro,4616,6616,9122,7022,8901,9603,-289,-124,60,,,,
+NAD83(CSRS),4617,6140,9122,7019,8901,9603,0,0,0,,,,
+SAD69,4618,6618,9122,7050,8901,9603,-66.87,4.37,-38.52,,,,
+SWEREF99,4619,6619,9122,7019,8901,9603,0,0,0,,,,
+Point 58,4620,6620,9122,7012,8901,9603,-106,-129,165,,,,
+Fort Marigot,4621,6621,9122,7022,8901,9603,137,248,-430,,,,
+Guadeloupe 1948,4622,6622,9122,7022,8901,9603,-467,-16,-300,,,,
+CSG67,4623,6623,9122,7022,8901,9603,-186,230,110,,,,
+RGFG95,4624,6624,9122,7019,8901,9603,0,0,0,,,,
+Martinique 1938,4625,6625,9122,7022,8901,9603,186,482,151,,,,
+Reunion,4626,6626,9122,7022,8901,9603,94,-948,-1262,,,,
+RGR92,4627,6627,9122,7019,8901,9603,0,0,0,,,,
+Tahiti 52,4628,6628,9122,7022,8901,9603,162,117,154,,,,
+Tahaa 54,4629,6629,9122,7022,8901,9607,72.438,345.918,79.486,-1.6045,-0.8823,-0.5565,1.3746
+IGN72 Nuku Hiva,4630,6630,9122,7022,8901,9603,84,274,65,,,,
+K0 1949,4631,6631,9122,7022,8901,9603,145,-187,103,,,,
+Combani 1950,4632,6632,9122,7022,8901,9603,-382,-59,-262,,,,
+IGN56 Lifou,4633,6633,9122,7022,8901,9603,335.47,222.58,-230.94,,,,
+IGN72 Grand Terre,4634,6634,9108,7022,8901,9603,-13,-348,292,,,,
+ST87 Ouvea,4635,6635,9122,7022,8901,9606,-122.383,-188.696,103.344,3.5107,-4.9668,-5.7047,4.4798
+Petrels 1972,4636,6636,9122,7022,8901,9603,365,194,166,,,,
+Perroud 1950,4637,6637,9122,7022,8901,9603,325,154,172,,,,
+Saint Pierre et Miquelon 1950,4638,6638,9122,7008,8901,9603,30,430,368,,,,
+MOP78,4639,6639,9122,7022,8901,9603,253,-132,-127,,,,
+RRAF 1991,4640,6640,9122,7030,8901,9603,0,0,0,,,,
+IGN53 Mare,4641,6641,9122,7022,8901,9603,287.58,177.78,-135.41,,,,
+ST84 Ile des Pins,4642,6642,9122,7022,8901,9603,-13,-348,292,,,,
+ST71 Belep,4643,6643,9122,7022,8901,9606,-480.26,-438.32,-643.429,16.3119,20.1721,-4.0349,-111.7002
+NEA74 Noumea,4644,6644,9122,7022,8901,9603,-10.18,-350.43,291.37,,,,
+RGNC 1991,4645,6645,9122,7022,8901,9603,0,0,0,,,,
+Grand Comoros,4646,6646,9122,7022,8901,9603,-963,510,-359,,,,
+Reykjavik 1900,4657,6657,9122,7051,8901,9603,-28,199,5,,,,
+Hjorsey 1955,4658,6658,9122,7022,8901,9603,-73,46,-86,,,,
+ISN93,4659,6659,9122,7019,8901,9603,0,0,0,,,,
+Helle 1954,4660,6660,9122,7022,8901,9606,982.6087,552.753,-540.873,6.6816266,-31.6114924,-19.84816,16.805
+LKS92,4661,6661,9122,7019,8901,9603,0,0,0,,,,
+IGN72 Grande Terre,4662,6634,9122,7022,8901,9603,-11.64,-348.6,291.98,,,,
+Porto Santo 1995,4663,6663,9122,7022,8901,9603,-502.862,-247.438,312.724,,,,
+Azores Oriental 1995,4664,6664,9122,7022,8901,9603,-204.619,140.176,55.226,,,,
+Azores Central 1995,4665,6665,9122,7022,8901,9603,-106.226,166.366,-37.893,,,,
+Lisbon 1890,4666,6666,9122,7004,8901,9603,508.088,-191.042,565.223,,,,
+IKBD-92,4667,6667,9122,7030,8901,9603,0,0,0,,,,
+European 1979,4668,6668,9122,7022,8901,9603,-86,-98,-119,,,,
+LKS94,4669,6126,9122,7019,8901,9603,0,0,0,,,,
+IGM95,4670,6670,9122,7030,8901,9603,0,0,0,,,,
+Chatham 1971,4672,6672,9122,7022,8901,9603,175,-38,113,,,,
+Chatham Islands 1979,4673,6673,9122,7022,8901,9607,174.05,-25.49,112.57,0,0,-0.554,0.2263
+SIRGAS 2000,4674,6674,9122,7019,8901,9603,0,0,0,,,,
+Guam 1963,4675,6675,9122,7008,8901,9603,-100,-248,259,,,,
+Lao 1997,4678,6678,9122,7024,8901,9603,44.585,-131.212,-39.544,,,,
+Jouik 1961,4679,6679,9122,7012,8901,9603,-80.01,253.26,291.19,,,,
+Nouakchott 1965,4680,6680,9122,7012,8901,9603,124.5,-63.5,-281,,,,
+Indian Bangladesh,4682,6682,9122,7015,8901,9603,289,734,257,,,,
+PRS92,4683,6683,9122,7008,8901,9607,-127.62,-67.24,-47.04,3.068,-4.903,-1.578,-1.06
+Gan 1970,4684,6684,9122,7022,8901,9603,-133,-321,50,,,,
+MAGNA-SIRGAS,4686,6686,9122,7019,8901,9603,0,0,0,,,,
+RGPF,4687,6687,9122,7019,8901,9607,0.072,-0.507,-0.245,0.0183,-0.0003,0.007,-0.0093
+Fatu Iva 72,4688,6688,9122,7022,8901,9607,347.103,1078.125,2623.922,33.8875,-70.6773,9.3943,186.074
+IGN63 Hiva Oa,4689,6689,9122,7022,8901,9607,410.721,55.049,80.746,-2.5779,-2.3514,-0.6664,17.3311
+Tahiti 79,4690,6690,9122,7022,8901,9607,221.525,152.948,176.768,2.3847,1.3896,0.877,11.4741
+Moorea 87,4691,6691,9122,7022,8901,9607,215.525,149.593,176.229,3.2624,1.692,1.1571,10.4773
+Maupiti 83,4692,6692,9122,7022,8901,9603,217.037,86.959,23.956,,,,
+Nakhl-e Ghanem,4693,6693,9122,7030,8901,9603,0,-0.15,0.68,,,,
+POSGAR 94,4694,6694,9122,7030,8901,9603,0,0,0,,,,
+Katanga 1955,4695,6695,9122,7008,8901,9603,-103.746,-9.614,-255.95,,,,
+Kerguelen Island,4698,6698,9122,7022,8901,9603,145,-187,103,,,,
+Le Pouce 1934,4699,6699,9122,7012,8901,9603,-770.1,158.4,-498.2,,,,
+IGCB 1955,4701,6701,9122,7012,8901,9603,-79.9,-158,-168.9,,,,
+Mauritania 1999,4702,6702,9122,7019,8901,9603,0,0,0,,,,
+Egypt Gulf of Suez S-650 TL,4706,6706,9122,7020,8901,9603,-146.21,112.63,4.05,,,,
+Astro B4 Sorol Atoll,4707,6707,9122,7022,8901,9603,114,-116,-333,,,,
+Anna 1 Astro 1965,4708,6708,9122,7003,8901,9603,-491,-22,435,,,,
+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,,,,
+Ascension Island 1958,4712,6712,9122,7022,8901,9603,-207,107,52,,,,
+Ayabelle Lighthouse,4713,6713,9122,7012,8901,9603,-77,-128,142,,,,
+Bellevue (IGN),4714,6714,9122,7022,8901,9603,-127,-769,472,,,,
+Camp Area Astro,4715,6715,9122,7022,8901,9603,-104,-129,239,,,,
+Canton Astro 1966,4716,6716,9122,7022,8901,9603,298,-304,-375,,,,
+Cape Canaveral,4717,6717,9122,7008,8901,9603,-2,150,181,,,,
+GUX 1 Astro,4718,6718,9122,7022,8901,9603,252,-209,-751,,,,
+Easter Island 1967,4719,6719,9122,7022,8901,9603,211,147,111,,,,
+Fiji 1986,4720,6720,9122,7043,8901,9606,0,0,4.5,0,0,0.554,0.2263
+Fiji 1956,4721,6721,9122,7022,8901,9603,265.025,384.929,-194.046,,,,
+South Georgia 1968,4722,6722,9122,7022,8901,9603,-794,119,-298,,,,
+GCGD59,4723,6723,9122,7008,8901,9607,-179.483,-69.379,-27.584,7.862,-8.163,-6.042,-13.925
+ISTS 073 Astro 1969,4724,6724,9122,7022,8901,9603,208,-435,-229,,,,
+Johnston Island,4725,6725,9122,7022,8901,9603,191,-77,-204,,,,
+L.C. 5 Astro,4726,6726,9122,7008,8901,9603,42,124,147,,,,
+Midway Astro 1961,4727,6727,9122,7022,8901,9603,912,-58,1227,,,,
+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,,,,
+Santo (DOS),4730,6730,9122,7022,8901,9603,170,42,84,,,,
+Viti Levu 1916,4731,6731,9122,7012,8901,9603,51,391,-36,,,,
+Wake-Eniwetok 1960,4732,6732,9122,7053,8901,9603,101,52,-39,,,,
+Wake Island 1952,4733,6733,9122,7022,8901,9603,276,-57,149,,,,
+Tristan Astro 1968,4734,6734,9122,7022,8901,9603,-632,438,-609,,,,
+Kusaie 1951,4735,6735,9122,7022,8901,9603,647,1777,-1124,,,,
+Deception Island,4736,6736,9122,7012,8901,9603,260,12,-147,,,,
+Korea 2000,4737,6737,9122,7019,8901,9603,0,0,0,,,,
+Hong Kong 1963,4739,6739,9122,7022,8901,9603,-156,-271,-189,,,,
+PZ-90,4740,6740,9122,7054,8901,9607,0,0,1.5,0,0,-0.076,0
+Karbala 1979,4743,6743,9122,7012,8901,9603,70.995,-335.916,262.898,,,,
+Nahrwan 1934,4744,6744,9122,7012,8901,9603,-242.2,-144.9,370.3,,,,
+GR96,4747,6747,9122,7019,8901,9603,0,0,0,,,,
+Vanua Levu 1915,4748,6748,9122,7055,8901,9603,51,391,-36,,,,
+RGNC91-93,4749,6749,9122,7019,8901,9603,0,0,0,,,,
+ST87 Ouvea,4750,6750,9122,7030,8901,9603,-56.263,16.136,-22.856,,,,
+Viti Levu 1912,4752,6752,9122,7055,8901,9603,98,390,-22,,,,
+LGD2006,4754,6754,9122,7022,8901,9603,-208.4058,-109.8777,-2.5764,,,,
+DGN95,4755,6755,9122,7030,8901,9603,0,0,0,,,,
+VN-2000,4756,6756,9122,7030,8901,9607,-191.90441429,-39.30318279,-111.45032835,-0.00928836,0.01975479,-0.00427372,0.252906278
+JAD2001,4758,6758,9122,7030,8901,9603,0,0,0,,,,
+NAD83(NSRS2007),4759,6759,9122,7019,8901,9603,0,0,0,,,,
+HTRS96,4761,6761,9122,7019,8901,9603,0,0,0,,,,
+BDA2000,4762,6762,9122,7030,8901,9603,0,0,0,,,,
+Pitcairn 2006,4763,6763,9122,7030,8901,9603,0,0,0,,,,
+RSRGD2000,4764,6764,9122,7019,8901,9603,0,0,0,,,,
+Slovenia 1996,4765,6765,9122,7019,8901,9603,0,0,0,,,,
+Bern 1898 (Bern),4801,6801,9122,7004,8907,9603,674.374,15.056,405.346,,,,
+Bogota 1975 (Bogota),4802,6802,9122,7022,8904,9603,307,304,-318,,,,
+Lisbon (Lisbon),4803,6803,9122,7022,8902,9603,-304.046,-60.576,103.64,,,,
+Makassar (Jakarta),4804,6804,9122,7004,8908,9603,-587.8,519.75,145.76,,,,
+MGI (Ferro),4805,6805,9122,7004,8909,9603,682,-203,480,,,,
+Rome 1940,4806,6806,9122,7022,8906,9603,-225,-65,9,,,,
+NTF (Paris),4807,6807,9105,7011,8903,9603,-168,-60,320,,,,
+Tananarive (Paris),4810,6810,9105,7022,8903,9603,-189,-242,-91,,,,
+Voirol 1875 (Paris),4811,6811,9105,7011,8903,9603,-73,-247,227,,,,
+Batavia (Jakarta),4813,6813,9122,7004,8908,9603,-377,681,-50,,,,
+Carthage (Paris),4816,6816,9105,7011,8903,9603,-263,6,431,,,,
+Norsk,4817,6817,9122,7005,8913,9603,278,93,474,,,,
+S-JTSK (Ferro),4818,6818,9122,7004,8909,9603,589,76,480,,,,
+Nord Sahara 1959 (Paris),4819,6819,9105,7012,8903,9606,-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547
+Segara (Jakarta),4820,6820,9122,7004,8908,9603,-403,684,41,,,,
+Lisbon 1890 (Lisbon),4904,6904,9122,7004,8902,9603,508.088,-191.042,565.223,,,,
+PTRA08,5013,1041,9122,7019,8901,9603,0,0,0,,,,
+S-JTSK/05,5228,1052,9122,7004,8901,9607,572.213,85.334,461.94,-4.9732,-1.529,-5.2484,3.5378
+S-JTSK/05 (Ferro),5229,1055,9122,7004,8909,9607,572.213,85.334,461.94,-4.9732,-1.529,-5.2484,3.5378
+SLD99,5233,1053,9122,7015,8901,9607,-0.293,766.95,87.713,-0.195704,-1.695068,-3.473016,-0.039338
+GDBD2009,5246,1056,9122,7019,8901,9603,0,0,0,,,,
+TUREF,5252,1057,9122,7019,8901,9603,0,0,0,,,,
+DRUKREF 03,5264,1058,9122,7019,8901,9603,0,0,0,,,,
+ISN2004,5324,1060,9122,7019,8901,9603,0,0,0,,,,
+POSGAR 2007,5340,1062,9122,7019,8901,9603,0,0,0,,,,
+MARGEN,5354,1063,9122,7019,8901,9603,0,0,0,,,,
+SIRGAS-Chile,5360,1064,9122,7019,8901,9603,0,0,0,,,,
+CR05,5365,1065,9122,7030,8901,9603,0,0,0,,,,
+MACARIO SOLIS,5371,1066,9122,7019,8901,9603,0,0,0,,,,
+Peru96,5373,1067,9122,7019,8901,9603,0,0,0,,,,
+SIRGAS-ROU98,5381,1068,9122,7030,8901,9603,0,0,0,,,,
+SIRGAS_ES2007.8,5393,1069,9122,7019,8901,9603,0,0,0,,,,
+Ocotepeque 1935,5451,1070,9122,7008,8901,9603,205,96,-98,,,,
+RGAF09,5489,1073,9122,7019,8901,9603,0,0,0,,,,
+SAD69(96),5527,1075,9122,7050,8901,9603,-67.35,3.88,-38.22,,,,
+PNG94,5546,1076,9122,7019,8901,9603,0,0,0,,,,
+UCS-2000,5561,1077,9122,7024,8901,9607,25,-141,-78.5,0,-0.35,-0.736,0
+FEH2010,5593,1078,9122,7019,8901,9603,0,0,0,,,,
+CIGD11,6135,1100,9122,7019,8901,9603,0,0,0,,,,
+Nepal 1981,6207,1111,9122,7015,8901,9603,293.17,726.18,245.36,,,,
+CGRS93,6311,1112,9122,7030,8901,9607,8.846,-4.394,-1.122,0.00237,0.146528,-0.130428,0.783926
+Mexico ITRF2008,6365,1120,9122,7019,8901,9603,0,0,0,,,,
+RDN2008,6706,1132,9122,7019,8901,9603,0,0,0,,,,
+Aden 1925,6881,1135,9122,7012,8901,9603,-24,-203,268,,,,
+Bekaa Valley 1920,6882,1137,9122,7012,8901,9603,-183,-15,273,,,,
+Bioko,6883,1136,9122,7022,8901,9603,-235,-110,393,,,,
+South East Island 1943,6892,1138,9122,7012,8901,9603,-43.685,-179.785,-267.721,,,,
+Gambia,6894,1139,9122,7012,8901,9603,-63,176,185,,,,
+ONGD14,7373,1147,9122,7019,8901,9603,0,0,0,,,,
+St. Helena Tritan,7881,1173,9122,7030,8901,9603,-0.077,0.079,0.086,,,,
+SHGD2015,7886,1174,9122,7019,8901,9603,0,0,0,,,,
+DOS 1968,,,9122,7022,8901,9603,230,-199,-752,,,,
+European 1950 (Mean France),,,9122,7022,8901,9603,-87,-96,-120,,,,
+European 1950 (Spain and Portugal),,,9122,7022,8901,9603,-84,-107,-120,,,,
+Luzon Mindanao,,,9122,7008,8901,9603,-133,-79,-72,,,,
+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 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,,,,
+Nahrwn Masirah Ilnd,,,9122,7012,8901,9603,-247,-148,369,,,,
+Nahrwn Saudi Arbia,,,9122,7012,8901,9603,-231,-196,482,,,,
+Pulkovo 1942 (2),,,9122,7024,8901,9603,28,-130,-95,,,,

pkg/gpxsee.desktop

@@ -3,10 +3,12 @@ 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[pl]=Przeglądarka i analizator plików dziennika GPS
 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;
+Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt;
+MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;

pkg/gpxsee.nsi

@@ -1,18 +1,20 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
 !include "WinVer.nsh"
+!include "macros.nsh"
+
 
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "5.0"
+!define VERSION "7.1"
 
 ; 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,24 +28,17 @@ 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"
 
 ; Registry key for uninstaller
 !define REGENTRY "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPXSee"
-; File types registry entries
-!define REGGPX "GPXSee.gpx"
-!define REGTCX "GPXSee.tcx"
-!define REGKML "GPXSee.kml"
-!define REGFIT "GPXSee.fit"
-!define REGIGC "GPXSee.igc"
-!define REGNMEA "GPXSee.nmea"
 
 ; 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,10 +72,10 @@ 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 /r "maps"
@@ -88,14 +83,14 @@ Section "GPXSee" SEC_APP
 
   ; 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..."
@@ -111,31 +106,17 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   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}\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}\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}\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}\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}\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}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 4
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 5
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 6
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 7
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 8
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 9
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 10
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 11
+  !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
+  !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
+  !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -149,10 +130,14 @@ Section "QT framework" SEC_QT
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
+  File "Qt5Sql.dll"
+  File "Qt5Concurrent.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
- 
+  File /r "styles"
+  File /r "sqldrivers"
+
 SectionEnd
 
 Section "MSVC runtime" SEC_MSVC
@@ -195,35 +180,16 @@ 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 "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
+  !insertmacro LOCALIZATION "Czech" "cs"
+  !insertmacro LOCALIZATION "Danish" "da"
+  !insertmacro LOCALIZATION "Finnish" "fi"
+  !insertmacro LOCALIZATION "French" "fr"
+  !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Norwegian" "nb"
+  !insertmacro LOCALIZATION "Polish" "pl"
+  !insertmacro LOCALIZATION "Russian" "ru"
+  !insertmacro LOCALIZATION "Swedish" "sv"
+  !insertmacro LOCALIZATION "Turkish" "tr"
 SectionGroupEnd
 
 ;--------------------------------
@@ -231,7 +197,7 @@ SectionGroupEnd
 ; Uninstaller
 
 Section "Uninstall"
-  
+
   ; Remove registry keys
   DeleteRegKey HKLM "${REGENTRY}"
   DeleteRegKey HKLM SOFTWARE\GPXSee
@@ -246,19 +212,18 @@ Section "Uninstall"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
 
   ; Remove GPX file association
-  DeleteRegKey HKCR "${REGGPX}"
-  DeleteRegKey HKCR ".gpx"
-  DeleteRegKey HKCR "${REGTCX}"
-  DeleteRegKey HKCR ".tcx"
-  DeleteRegKey HKCR "${REGKML}"
-  DeleteRegKey HKCR ".kml"
-  DeleteRegKey HKCR "${REGFIT}"
-  DeleteRegKey HKCR ".fit"
-  DeleteRegKey HKCR "${REGIGC}"
-  DeleteRegKey HKCR ".igc"
-  DeleteRegKey HKCR "${REGNMEA}"
-  DeleteRegKey HKCR ".nmea"
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'  
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "fit"
+  !insertmacro FILE_ASSOCIATION_REMOVE "igc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "nmea"
+  !insertmacro FILE_ASSOCIATION_REMOVE "plt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rte"
+  !insertmacro FILE_ASSOCIATION_REMOVE "wpt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
+  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
 

pkg/gpxsee.xml

@@ -22,6 +22,20 @@
 		<glob pattern="*.kml"/>
 	</mime-type>
 
+	<mime-type type="application/loc+xml">
+		<comment>Geocaching.com Waypoint File</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.loc"/>
+	</mime-type>
+
+	<mime-type type="application/slf+xml">
+		<comment>Sigma Log Format</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.slf"/>
+	</mime-type>
+
 	<mime-type type="application/vnd.ant.fit">
 		<comment>Flexible and Interoperable Data Transfer</comment>
 		<sub-class-of type="application/octet-stream"/>
@@ -43,4 +57,24 @@
 		<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

@@ -1,18 +1,20 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
 !include "WinVer.nsh"
+!include "macros.nsh"
+
 
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "5.0"
+!define VERSION "7.1"
 
 ; 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,24 +28,17 @@ 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"
 
 ; Registry key for uninstaller
 !define REGENTRY "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPXSee"
-; File types registry entries
-!define REGGPX "GPXSee.gpx"
-!define REGTCX "GPXSee.tcx"
-!define REGKML "GPXSee.kml"
-!define REGFIT "GPXSee.fit"
-!define REGIGC "GPXSee.igc"
-!define REGNMEA "GPXSee.nmea"
 
 ; 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,31 +66,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 /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"
@@ -103,7 +98,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"
@@ -118,31 +113,17 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   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}\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}\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}\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}\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}\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}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 4
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 5
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 6
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 7
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 8
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 9
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 10
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 11
+  !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
+  !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
+  !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -156,10 +137,14 @@ Section "QT framework" SEC_QT
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
+  File "Qt5Sql.dll"
+  File "Qt5Concurrent.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
- 
+  File /r "styles"
+  File /r "sqldrivers"
+
 SectionEnd
 
 Section "MSVC runtime" SEC_MSVC
@@ -197,35 +182,16 @@ 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 "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
+  !insertmacro LOCALIZATION "Czech" "cs"
+  !insertmacro LOCALIZATION "Danish" "da"
+  !insertmacro LOCALIZATION "Finnish" "fi"
+  !insertmacro LOCALIZATION "French" "fr"
+  !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Norwegian" "nb"
+  !insertmacro LOCALIZATION "Polish" "pl"
+  !insertmacro LOCALIZATION "Russian" "ru"
+  !insertmacro LOCALIZATION "Swedish" "sv"
+  !insertmacro LOCALIZATION "Turkish" "tr"
 SectionGroupEnd
 
 ;--------------------------------
@@ -233,7 +199,7 @@ SectionGroupEnd
 ; Uninstaller
 
 Section "Uninstall"
-  
+
   ; Remove registry keys
   SetRegView 64
   DeleteRegKey HKLM "${REGENTRY}"
@@ -247,20 +213,19 @@ Section "Uninstall"
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
   Delete "$SMPROGRAMS\$StartMenuFolder\*.*"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
-  
+
   ; Remove File associations
-  DeleteRegKey HKCR "${REGGPX}"
-  DeleteRegKey HKCR ".gpx"
-  DeleteRegKey HKCR "${REGTCX}"
-  DeleteRegKey HKCR ".tcx"
-  DeleteRegKey HKCR "${REGKML}"
-  DeleteRegKey HKCR ".kml"
-  DeleteRegKey HKCR "${REGFIT}"
-  DeleteRegKey HKCR ".fit"
-  DeleteRegKey HKCR "${REGIGC}"
-  DeleteRegKey HKCR ".igc"
-  DeleteRegKey HKCR "${REGNMEA}"
-  DeleteRegKey HKCR ".nmea"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "fit"
+  !insertmacro FILE_ASSOCIATION_REMOVE "igc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "nmea"
+  !insertmacro FILE_ASSOCIATION_REMOVE "plt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rte"
+  !insertmacro FILE_ASSOCIATION_REMOVE "wpt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd

pkg/macros.nsh

@@ -0,0 +1,23 @@
+; File association
+!macro FILE_ASSOCIATION_ADD EXT DESC ICON
+  WriteRegStr HKCR ".${EXT}" "" "GPXSee.${EXT}"
+  WriteRegStr HKCR "GPXSee.${EXT}" ""  "${DESC}"
+  WriteRegStr HKCR "GPXSee.${EXT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,${ICON}"
+  WriteRegStr HKCR "GPXSee.${EXT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+!macroend
+
+!macro FILE_ASSOCIATION_REMOVE EXT
+  DeleteRegKey HKCR "GPXSee.${EXT}"
+  DeleteRegKey HKCR ".${EXT}"
+!macroend
+
+; Translations
+!macro LOCALIZATION LANG CODE
+  Section "${LANG}"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_${CODE}.qm translations\gpxsee_${CODE}.qm
+    !if /FileExists translations\qt_${CODE}.qm
+      File /oname=translations\qt_${CODE}.qm translations\qt_${CODE}.qm
+    !endif
+  SectionEnd
+!macroend

pkg/maps/4UMaps.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>4UMaps</name>
-	<url>http://4umaps.eu/$z/$x/$y.png</url>
+	<url>https://4umaps.com/$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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>USGS Imagery</name>
-	<url>https://navigator.er.usgs.gov/tiles/aerial_Imagery.cgi/$z/$x/$y</url>
+	<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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>USGS Topo</name>
-	<url>https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png</url>
+	<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

@@ -3,32 +3,43 @@
 #include <QLocale>
 #include <QFileOpenEvent>
 #include <QNetworkProxyFactory>
+#include <QNetworkAccessManager>
 #include <QLibraryInfo>
-#include "map/onlinemap.h"
+#include <QSettings>
+#include "common/programpaths.h"
+#include "common/config.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 "settings.h"
 #include "app.h"
 
 
 App::App(int &argc, char **argv) : QApplication(argc, argv),
   _argc(argc), _argv(argv)
 {
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+	setApplicationName(APP_NAME);
+#else
+	setApplicationName(QString(APP_NAME).toLower());
+#endif
+	setApplicationVersion(APP_VERSION);
+
 	QTranslator *gpxsee = new QTranslator(this);
-	gpxsee->load(QLocale::system(), "gpxsee", "_", TRANSLATIONS_DIR);
+	gpxsee->load(QLocale::system(), "gpxsee", "_",
+	  ProgramPaths::translationsDir());
 	installTranslator(gpxsee);
 
 	QTranslator *qt = new QTranslator(this);
-#if defined(Q_OS_WINDOWS) || defined(Q_OS_MAC)
-	qt->load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR);
-#else // Q_OS_WINDOWS || Q_OS_MAC
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+	qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir());
+#else // Q_OS_WIN32 || Q_OS_MAC
 	qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
 	  QLibraryInfo::TranslationsPath));
-#endif // Q_OS_WINDOWS || Q_OS_MAC
+#endif // Q_OS_WIN32 || Q_OS_MAC
 	installTranslator(qt);
 
 #ifdef Q_OS_MAC
@@ -36,7 +47,21 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),
 #endif // Q_OS_MAC
 
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
-	OnlineMap::setDownloader(new Downloader(this));
+	QSettings settings(APP_NAME, APP_NAME);
+	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
+
+	/* The QNetworkAccessManager must be a child of QApplication, otherwise it
+	   triggers the following warning on exit (and may probably crash):
+	   "QThreadStorage: Thread X exited after QThreadStorage Y destroyed" */
+	Downloader::setNetworkManager(new QNetworkAccessManager(this));
+#ifdef ENABLE_HTTP2
+	Downloader::enableHTTP2(settings.value(ENABLE_HTTP2_SETTING,
+	  ENABLE_HTTP2_DEFAULT).toBool());
+#endif // ENABLE_HTTP2
+	Downloader::setTimeout(settings.value(CONNECTION_TIMEOUT_SETTING,
+	  CONNECTION_TIMEOUT_DEFAULT).toInt());
+	settings.endGroup();
+
 	OPENGL_SET_SAMPLES(4);
 	loadDatums();
 	loadPCSs();
@@ -49,14 +74,15 @@ App::~App()
 	delete _gui;
 }
 
-void App::run()
+int App::run()
 {
 	_gui->show();
 
-	for (int i = 1; i < _argc; i++)
-		_gui->openFile(QString::fromLocal8Bit(_argv[i]));
+	QStringList args(arguments());
+	for (int i = 1; i < args.count(); i++)
+		_gui->openFile(args.at(i));
 
-	exec();
+	return exec();
 }
 
 bool App::event(QEvent *event)
@@ -71,41 +97,27 @@ bool App::event(QEvent *event)
 
 void App::loadDatums()
 {
-	QString ef, df;
+	QString ellipsoidsFile(ProgramPaths::ellipsoidsFile());
+	QString gcsFile(ProgramPaths::gcsFile());
 
-	if (QFile::exists(USER_ELLIPSOID_FILE))
-		ef = USER_ELLIPSOID_FILE;
-	else if (QFile::exists(GLOBAL_ELLIPSOID_FILE))
-		ef = GLOBAL_ELLIPSOID_FILE;
-	else
+	if (ellipsoidsFile.isNull())
 		qWarning("No ellipsoids file found.");
+	if (gcsFile.isNull())
+		qWarning("No GCS 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);
+	if (!ellipsoidsFile.isNull() && !gcsFile.isNull()) {
+		Ellipsoid::loadList(ellipsoidsFile);
+		GCS::loadList(gcsFile);
 	} else
 		qWarning("Maps based on a datum different from WGS84 won't work.");
 }
 
 void App::loadPCSs()
 {
-	QString file;
+	QString pcsFile(ProgramPaths::pcsFile());
 
-	if (QFile::exists(USER_PCS_FILE))
-		file = USER_PCS_FILE;
-	else if (QFile::exists(GLOBAL_PCS_FILE))
-		file = GLOBAL_PCS_FILE;
-	else {
+	if (pcsFile.isNull())
 		qWarning("No PCS file found.");
-		return;
-	}
-
-	PCS::loadList(file);
+	else
+		PCS::loadList(pcsFile);
 }

src/GUI/app.h

@@ -12,7 +12,7 @@ class App : QApplication
 public:
 	App(int &argc, char **argv);
 	~App();
-	void run();
+	int run();
 
 protected:
 	bool event(QEvent *event);

src/GUI/axisitem.cpp

@@ -1,7 +1,7 @@
 #include <cmath>
 #include <QPainter>
-#include "config.h"
-#include "nicenum.h"
+#include "common/util.h"
+#include "font.h"
 #include "axisitem.h"
 
 
@@ -11,40 +11,55 @@
 #define XTICKS      15
 #define YTICKS      10
 
-struct Label {
-	double min;
-	double max;
-	double d;
+class Ticks
+{
+public:
+	Ticks(double minValue, double maxValue, int maxCount);
+
+	int count() const {return ((int)((_max - _min) / _d)) + 1;}
+	double val(int i) const {return _min + i * _d;}
+	double min() const {return _min;}
+	double max() const {return _max;}
+
+private:
+	double _min;
+	double _max;
+	double _d;
 };
 
-static struct Label label(double min, double max, int ticks)
+Ticks::Ticks(double minValue, double maxValue, int maxCount)
 {
-	double range;
-	struct Label l;
-
-	range = niceNum(max - min, 0);
-	l.d = niceNum(range / ticks, 1);
-	l.min = ceil(min / l.d) * l.d;
-	l.max = floor(max / l.d) * l.d;
-
-	return l;
+	double range = niceNum(maxValue - minValue, 0);
+	_d = niceNum(range / maxCount, 1);
+	_min = ceil(minValue / _d) * _d;
+	_max = floor(maxValue / _d) * _d;
 }
 
 
-AxisItem::AxisItem(Type type, QGraphicsItem *parent) : QGraphicsItem(parent)
+AxisItem::AxisItem(Type type, QGraphicsItem *parent)
+  : QGraphicsItem(parent), _locale(QLocale::system())
 {
 	_type = type;
 	_size = 0;
 
-#ifndef Q_OS_MAC
-	setCacheMode(QGraphicsItem::DeviceCoordinateCache);
-#endif // Q_OS_MAC
+	_font.setPixelSize(FONT_SIZE);
+	_font.setFamily(FONT_FAMILY);
 }
 
 void AxisItem::setRange(const RangeF &range)
 {
 	prepareGeometryChange();
 	_range = range;
+
+	QFontMetrics fm(_font);
+	Ticks ticks(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
+	_ticks = QVector<Tick>(ticks.count());
+	for (int i = 0; i < ticks.count(); i++) {
+		Tick &t = _ticks[i];
+		t.value = ticks.val(i);
+		t.boundingBox = fm.tightBoundingRect(_locale.toString(t.value));
+	}
+
 	updateBoundingRect();
 	update();
 }
@@ -60,42 +75,28 @@ void AxisItem::setSize(qreal size)
 void AxisItem::setLabel(const QString& label)
 {
 	prepareGeometryChange();
+	QFontMetrics fm(_font);
 	_label = label;
+	_labelBB = fm.tightBoundingRect(label);
 	updateBoundingRect();
 	update();
 }
 
 void AxisItem::updateBoundingRect()
 {
-	QFont font;
-	font.setPixelSize(FONT_SIZE);
-	font.setFamily(FONT_FAMILY);
-	QFontMetrics fm(font);
-	QRect ss, es, ls;
-	struct Label l;
-
-
-	l = label(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
-	es = fm.tightBoundingRect(QString::number(l.max));
-	ss = fm.tightBoundingRect(QString::number(l.min));
-	ls = fm.tightBoundingRect(_label);
+	QFontMetrics fm(_font);
+	QRect es = _ticks.isEmpty() ? QRect() : _ticks.last().boundingBox;
+	QRect ss = _ticks.isEmpty() ? QRect() : _ticks.first().boundingBox;
+	QRect ls(_labelBB);
 
 	if (_type == X) {
-		_boundingRect = QRectF(-ss.width()/2, -TICK/2,
-		_size + es.width()/2 + ss.width()/2,
-		ls.height() + es.height() - fm.descent() + TICK + 2*PADDING + 1);
+		_boundingRect = QRectF(-ss.width()/2, -TICK/2, _size + es.width()/2
+		  + ss.width()/2, ls.height() + es.height() - fm.descent() + TICK
+		  + 2*PADDING + 1);
 	} else {
 		int mtw = 0;
-		QRect ts;
-		qreal val;
-
-		for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
-			val = l.min + i * l.d;
-			QString str = QString::number(val);
-			ts = fm.tightBoundingRect(str);
-			mtw = qMax(ts.width(), mtw);
-		}
-
+		for (int i = 0; i < _ticks.count(); i++)
+			mtw = qMax(_ticks.at(i).boundingBox.width(), mtw);
 		_boundingRect = QRectF(-(ls.height() + mtw + 2*PADDING + TICK/2),
 		  -(_size + es.height()/2 + fm.descent()), ls.height() + mtw + 2*PADDING
 		  + TICK, _size + es.height()/2 + fm.descent() + ss.height()/2);
@@ -107,60 +108,50 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 {
 	Q_UNUSED(option);
 	Q_UNUSED(widget);
-	QFont font;
-	font.setPixelSize(FONT_SIZE);
-	font.setFamily(FONT_FAMILY);
-	QFontMetrics fm(font);
-	QRect ts, ls;
-	struct Label l;
-	qreal range = _range.size();
-	qreal val;
-	QPen pen = QPen(Qt::black, AXIS_WIDTH);
+	QFontMetrics fm(_font);
+	QRect ts;
 
 
 	painter->setRenderHint(QPainter::Antialiasing, false);
-	painter->setFont(font);
-	painter->setPen(pen);
-
-	ls = fm.tightBoundingRect(_label);
+	painter->setFont(_font);
+	painter->setPen(QPen(Qt::black, AXIS_WIDTH));
 
 	if (_type == X) {
 		painter->drawLine(0, 0, _size, 0);
 
-		l = label(_range.min(), _range.max(), XTICKS);
-		for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
-			val = l.min + i * l.d;
-			QString str = QString::number(val);
+		for (int i = 0; i < _ticks.count(); i++) {
+			qreal val = _ticks.at(i).value;
+			ts = _ticks.at(i).boundingBox;
 
-			painter->drawLine((_size/range) * (val - _range.min()), TICK/2,
-			  (_size/range) * (val - _range.min()), -TICK/2);
-			ts = fm.tightBoundingRect(str);
-			painter->drawText(((_size/range) * (val - _range.min()))
-			  - (ts.width()/2), ts.height() + TICK/2 + PADDING, str);
+			painter->drawLine((_size/_range.size()) * (val - _range.min()),
+			  TICK/2, (_size/_range.size()) * (val - _range.min()), -TICK/2);
+			painter->drawText(((_size/_range.size()) * (val - _range.min()))
+			  - (ts.width()/2), ts.height() + TICK/2 + PADDING,
+			  _locale.toString(val));
 		}
 
-		painter->drawText(_size/2 - ls.width()/2, ls.height() + ts.height()
-		  - 2*fm.descent() + TICK/2 + 2*PADDING, _label);
+		painter->drawText(_size/2 - _labelBB.width()/2, _labelBB.height()
+		  + ts.height() - 2*fm.descent() + TICK/2 + 2*PADDING, _label);
 	} else {
 		painter->drawLine(0, 0, 0, -_size);
 
-		l = label(_range.min(), _range.max(), YTICKS);
 		int mtw = 0;
-		for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
-			val = l.min + i * l.d;
-			QString str = QString::number(val);
-
-			painter->drawLine(TICK/2, -((_size/range) * (val - _range.min())),
-			  -TICK/2, -((_size/range) * (val - _range.min())));
-			ts = fm.tightBoundingRect(str);
+		for (int i = 0; i < _ticks.count(); i++) {
+			qreal val = _ticks.at(i).value;
+			ts = _ticks.at(i).boundingBox;
 			mtw = qMax(ts.width(), mtw);
-			painter->drawText(-(ts.width() + PADDING + TICK/2), -((_size/range)
-			  * (val - _range.min())) + (ts.height()/2), str);
+
+			painter->drawLine(TICK/2, -((_size/_range.size())
+			  * (val - _range.min())), -TICK/2, -((_size/_range.size())
+			  * (val - _range.min())));
+			painter->drawText(-(ts.width() + PADDING + TICK/2),
+			  -((_size/_range.size()) * (val - _range.min())) + (ts.height()/2),
+			  _locale.toString(val));
 		}
 
 		painter->rotate(-90);
-		painter->drawText(_size/2 - ls.width()/2, -(mtw + 2*PADDING + TICK/2),
-		  _label);
+		painter->drawText(_size/2 - _labelBB.width()/2, -(mtw + 2*PADDING
+		  + TICK/2), _label);
 		painter->rotate(90);
 	}
 
@@ -172,46 +163,28 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
 QSizeF AxisItem::margin() const
 {
-	QFont font;
-	font.setPixelSize(FONT_SIZE);
-	QFontMetrics fm(font);
-	QRect ss, es, ls;
-	struct Label l;
-
-
-	l = label(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
-	es = fm.tightBoundingRect(QString::number(l.max));
-	ss = fm.tightBoundingRect(QString::number(l.min));
-	ls = fm.tightBoundingRect(_label);
+	QFontMetrics fm(_font);
+	QRect es = _ticks.isEmpty() ? QRect() : _ticks.last().boundingBox;
 
 	if (_type == X) {
-		return QSizeF(es.width()/2,
-		  ls.height() + es.height() - fm.descent() + TICK/2 + 2*PADDING);
+		return QSizeF(es.width()/2, _labelBB.height() + es.height()
+		  - fm.descent() + TICK/2 + 2*PADDING);
 	} else {
 		int mtw = 0;
-		QRect ts;
-		qreal val;
+		for (int i = 0; i < _ticks.count(); i++)
+			mtw = qMax(_ticks.at(i).boundingBox.width(), mtw);
 
-		for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++) {
-			val = l.min + i * l.d;
-			QString str = QString::number(val);
-			ts = fm.tightBoundingRect(str);
-			mtw = qMax(ts.width(), mtw);
-		}
-
-		return QSizeF(ls.height() -fm.descent() + mtw + 2*PADDING
+		return QSizeF(_labelBB.height() -fm.descent() + mtw + 2*PADDING
 		  + TICK/2, es.height()/2 + fm.descent());
 	}
 }
 
 QList<qreal> AxisItem::ticks() const
 {
-	struct Label l;
 	QList<qreal> list;
 
-	l = label(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
-	for (int i = 0; i < ((l.max - l.min) / l.d) + 1; i++)
-		list.append(((_size/_range.size()) * ((l.min + i * l.d)
+	for (int i = 0; i < _ticks.count(); i++)
+		list.append(((_size/_range.size()) * (_ticks.at(i).value
 		  - _range.min())));
 
 	return list;

src/GUI/axisitem.h

@@ -2,6 +2,8 @@
 #define AXISITEM_H
 
 #include <QGraphicsItem>
+#include <QVector>
+#include <QLocale>
 #include "common/range.h"
 
 class AxisItem : public QGraphicsItem
@@ -23,13 +25,22 @@ public:
 	QList<qreal> ticks() const;
 
 private:
+	struct Tick {
+		double value;
+		QRect boundingBox;
+	};
+
 	void updateBoundingRect();
 
 	Type _type;
 	RangeF _range;
 	qreal _size;
 	QString _label;
+	QRect _labelBB;
+	QVector<Tick> _ticks;
 	QRectF _boundingRect;
+	QFont _font;
+	QLocale _locale;
 };
 
 #endif // AXISITEM_H

src/GUI/cadencegraph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "cadencegraphitem.h"
 #include "cadencegraph.h"
@@ -7,7 +8,7 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 {
 	_showTracks = true;
 
-	GraphView::setYUnits(tr("1/min"));
+	GraphView::setYUnits(tr("rpm"));
 	setYLabel(tr("Cadence"));
 
 	setSliderPrecision(1);
@@ -16,36 +17,43 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 void CadenceGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale()
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Average"), l.toString(avg() * yScale()
 		  + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale()
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();
 }
 
-void CadenceGraph::loadData(const Data &data, const QList<PathItem *> &paths)
+QList<GraphItem*> CadenceGraph::loadData(const Data &data)
 {
+	QList<GraphItem*> graphs;
+
 	for (int i = 0; i < data.tracks().count(); i++) {
 		const Graph &graph = data.tracks().at(i)->cadence();
 
 		if (graph.size() < 2) {
 			skipColor();
-			continue;
+			graphs.append(0);
+		} else {
+			CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType);
+			GraphView::addGraph(gi);
+			_avg.append(QPointF(data.tracks().at(i)->distance(), gi->avg()));
+			graphs.append(gi);
 		}
-
-		CadenceGraphItem *gi = new CadenceGraphItem(graph, _graphType);
-		GraphView::addGraph(gi, paths.at(i));
-
-		_avg.append(QPointF(data.tracks().at(i)->distance(), gi->avg()));
 	}
 
-	for (int i = 0; i < data.routes().count(); i++)
+	for (int i = 0; i < data.routes().count(); i++) {
 		skipColor();
+		graphs.append(0);
+	}
 
 	setInfo();
-
 	redraw();
+
+	return graphs;
 }
 
 qreal CadenceGraph::avg() const