Localization files update

add german translation

README.md

@@ -4,7 +4,7 @@ KML, FIT, IGC and NMEA files.
 
 ## Features
 * User-definable online maps.
-* Offline maps (image-based OziExplorer maps and tiled TrekBuddy maps/atlases).
+* Offline maps (OziExplorer maps and TrekBuddy maps/atlases).
 * Elevation, speed, heart rate, cadence, power and temperature graphs.
 * Support for multiple tracks in one view.
 * Support for POI files.

gpxsee.pro

@@ -1,5 +1,5 @@
 TARGET = GPXSee
-VERSION = 4.3
+VERSION = 4.4
 QT += core \
     gui \
     network
@@ -91,7 +91,9 @@ HEADERS += src/config.h \
     src/latlon.h \
     src/utm.h \
     src/lambertconic.h \
-    src/ellipsoid.h
+    src/ellipsoid.h \
+    src/ozf.h \
+    src/datum.h
 SOURCES += src/main.cpp \
     src/gui.cpp \
     src/poi.cpp \
@@ -156,10 +158,13 @@ SOURCES += src/main.cpp \
     src/transversemercator.cpp \
     src/utm.cpp \
     src/lambertconic.cpp \
-    src/ellipsoid.cpp
+    src/ellipsoid.cpp \
+    src/ozf.cpp \
+    src/datum.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts \
-    lang/gpxsee_sv.ts
+    lang/gpxsee_sv.ts \
+    lang/gpxsee_de.ts
 macx {
     ICON = icons/gpxsee.icns
     QMAKE_INFO_PLIST = Info.plist
@@ -169,7 +174,9 @@ macx {
         icons/fit.icns \
         icons/igc.icns \
         icons/nmea.icns \
-        pkg/maps.txt
+        pkg/maps.txt \
+        pkg/ellipsoids.csv \
+        pkg/datums.csv
     APP_RESOURCES.path = Contents/Resources
     QMAKE_BUNDLE_DATA += APP_RESOURCES
 }

gpxsee.qrc

@@ -21,5 +21,6 @@
         <file>icons/document-print-preview.png</file>
         <file>lang/gpxsee_cs.qm</file>
         <file>lang/gpxsee_sv.qm</file>
+        <file>lang/gpxsee_de.qm</file>
     </qresource>
 </RCC>

lang/gpxsee_cs.ts

@@ -190,351 +190,351 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/gui.cpp" line="578"/>
+        <location filename="../src/gui.cpp" line="625"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
         <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="656"/>
+        <location filename="../src/gui.cpp" line="703"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="746"/>
+        <location filename="../src/gui.cpp" line="793"/>
         <source>Open POI file</source>
         <translation>Otevřít POI soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="237"/>
+        <location filename="../src/gui.cpp" line="284"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="221"/>
+        <location filename="../src/gui.cpp" line="268"/>
         <source>Quit</source>
         <translation>Ukončit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="229"/>
+        <location filename="../src/gui.cpp" line="276"/>
-        <location filename="../src/gui.cpp" line="594"/>
+        <location filename="../src/gui.cpp" line="641"/>
-        <location filename="../src/gui.cpp" line="595"/>
+        <location filename="../src/gui.cpp" line="642"/>
         <source>Keyboard controls</source>
         <translation>Ovládací klávesy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="253"/>
+        <location filename="../src/gui.cpp" line="300"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="259"/>
+        <location filename="../src/gui.cpp" line="306"/>
         <source>Reload</source>
         <translation>Znovu načíst</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="508"/>
+        <location filename="../src/gui.cpp" line="555"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="426"/>
+        <location filename="../src/gui.cpp" line="473"/>
-        <location filename="../src/gui.cpp" line="502"/>
+        <location filename="../src/gui.cpp" line="549"/>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="105"/>
+        <location filename="../src/gui.cpp" line="108"/>
         <source>FIT files (*.fit)</source>
         <translation>Soubory FIT (*.fit)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="106"/>
+        <location filename="../src/gui.cpp" line="109"/>
         <source>IGC files (*.igc)</source>
         <translation>Soubory IGC (*.igc)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="107"/>
+        <location filename="../src/gui.cpp" line="110"/>
         <source>NMEA files (*.nmea)</source>
         <translation>Soubory NMEA (*.nmea)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="227"/>
+        <location filename="../src/gui.cpp" line="274"/>
-        <location filename="../src/gui.cpp" line="623"/>
+        <location filename="../src/gui.cpp" line="670"/>
-        <location filename="../src/gui.cpp" line="624"/>
+        <location filename="../src/gui.cpp" line="671"/>
         <source>Data sources</source>
         <translation>Zdroje dat</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="267"/>
+        <location filename="../src/gui.cpp" line="314"/>
         <source>Load POI file</source>
         <translation>Nahrát POI soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="270"/>
+        <location filename="../src/gui.cpp" line="317"/>
         <source>Close POI files</source>
         <translation>Zavřit POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="272"/>
+        <location filename="../src/gui.cpp" line="319"/>
         <source>Overlap POIs</source>
         <translation>Překrývat POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="276"/>
+        <location filename="../src/gui.cpp" line="323"/>
         <source>Show POI labels</source>
         <translation>Zobrazit názvy POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="281"/>
+        <location filename="../src/gui.cpp" line="328"/>
         <source>Show POIs</source>
         <translation>Zobrazit POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="290"/>
+        <location filename="../src/gui.cpp" line="337"/>
         <source>Show map</source>
         <translation>Zobrazit mapu</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="297"/>
+        <location filename="../src/gui.cpp" line="344"/>
         <source>Clear tile cache</source>
         <translation>Vymazat mezipaměť dlaždic</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="306"/>
+        <location filename="../src/gui.cpp" line="353"/>
-        <location filename="../src/gui.cpp" line="310"/>
+        <location filename="../src/gui.cpp" line="357"/>
-        <location filename="../src/gui.cpp" line="606"/>
+        <location filename="../src/gui.cpp" line="653"/>
         <source>Next map</source>
         <translation>Následující mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="317"/>
+        <location filename="../src/gui.cpp" line="364"/>
         <source>Show tracks</source>
         <translation>Zobrazit cesty</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="321"/>
+        <location filename="../src/gui.cpp" line="368"/>
         <source>Show routes</source>
         <translation>Zobrazit trasy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="325"/>
+        <location filename="../src/gui.cpp" line="372"/>
         <source>Show waypoints</source>
         <translation>Zobrazit navigační body</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="329"/>
+        <location filename="../src/gui.cpp" line="376"/>
         <source>Waypoint labels</source>
         <translation>Názvy navigačních bodů</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="340"/>
+        <location filename="../src/gui.cpp" line="387"/>
         <source>Show graphs</source>
         <translation>Zobrazit grafy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="362"/>
+        <location filename="../src/gui.cpp" line="409"/>
         <source>Show grid</source>
         <translation>Zobrazit mřížku</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="368"/>
+        <location filename="../src/gui.cpp" line="415"/>
         <source>Show toolbars</source>
         <translation>Zobrazovat nástrojové lišty</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="374"/>
+        <location filename="../src/gui.cpp" line="421"/>
         <source>Total time</source>
         <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="379"/>
+        <location filename="../src/gui.cpp" line="426"/>
-        <location filename="../src/gui.cpp" line="899"/>
+        <location filename="../src/gui.cpp" line="946"/>
         <source>Moving time</source>
         <translation>Čistý čas</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="386"/>
+        <location filename="../src/gui.cpp" line="433"/>
         <source>Metric</source>
         <translation>Metrické</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="391"/>
+        <location filename="../src/gui.cpp" line="438"/>
         <source>Imperial</source>
         <translation>Imperiální</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="397"/>
+        <location filename="../src/gui.cpp" line="444"/>
         <source>Fullscreen mode</source>
         <translation>Celoobrazovkový režim</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="403"/>
+        <location filename="../src/gui.cpp" line="450"/>
         <source>Options...</source>
         <translation>Nastavení...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="408"/>
+        <location filename="../src/gui.cpp" line="455"/>
         <source>Next</source>
         <translation>Následující</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="411"/>
+        <location filename="../src/gui.cpp" line="458"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="415"/>
+        <location filename="../src/gui.cpp" line="462"/>
         <source>Last</source>
         <translation>Poslední</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="418"/>
+        <location filename="../src/gui.cpp" line="465"/>
         <source>First</source>
         <translation>První</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="440"/>
+        <location filename="../src/gui.cpp" line="487"/>
         <source>Map</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="447"/>
+        <location filename="../src/gui.cpp" line="494"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="455"/>
+        <location filename="../src/gui.cpp" line="502"/>
         <source>POI</source>
         <translation>POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="456"/>
+        <location filename="../src/gui.cpp" line="503"/>
         <source>POI files</source>
         <translation>POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="467"/>
+        <location filename="../src/gui.cpp" line="514"/>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="468"/>
+        <location filename="../src/gui.cpp" line="515"/>
         <source>Display</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="476"/>
+        <location filename="../src/gui.cpp" line="523"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="480"/>
+        <location filename="../src/gui.cpp" line="527"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="489"/>
+        <location filename="../src/gui.cpp" line="536"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="604"/>
+        <location filename="../src/gui.cpp" line="651"/>
         <source>Append file</source>
         <translation>Přidat soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="605"/>
+        <location filename="../src/gui.cpp" line="652"/>
         <source>Next/Previous</source>
         <translation>Následující/Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="608"/>
+        <location filename="../src/gui.cpp" line="655"/>
         <source>Previous map</source>
         <translation>Předchozí mapa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="609"/>
+        <location filename="../src/gui.cpp" line="656"/>
         <source>Zoom in</source>
         <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="611"/>
+        <location filename="../src/gui.cpp" line="658"/>
         <source>Zoom out</source>
         <translation>Oddálit</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="613"/>
+        <location filename="../src/gui.cpp" line="660"/>
         <source>Digital zoom</source>
         <translation>Digitální zoom</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="614"/>
+        <location filename="../src/gui.cpp" line="661"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="626"/>
+        <location filename="../src/gui.cpp" line="673"/>
         <source>Online maps</source>
         <translation>Online mapy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="627"/>
+        <location filename="../src/gui.cpp" line="674"/>
         <source>Online map URLs are read on program startup from the following file:</source>
         <translation>URL online map jsou načteny při startu programu z následujícího souboru:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="638"/>
+        <location filename="../src/gui.cpp" line="685"/>
         <source>Offline maps are loaded on program startup from the following directory:</source>
         <translation>Offline mapy jsou načítány při startu aplikace z následujícího adresáře:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="641"/>
+        <location filename="../src/gui.cpp" line="688"/>
         <source>The expected structure is one map/atlas in a separate subdirectory. Supported map formats are OziExplorer image-based maps and tiled TrekBuddy maps/atlases (tared and non-tared).</source>
         <translation>Očekávaná struktura je jedna mapa/atlas v samostatném podadresáři. Podporované mapové formáty jsou OziExplorer mapy a TrekBuddy mapy/atlasy (včetně tar varianty).</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="1097"/>
+        <location filename="../src/gui.cpp" line="1144"/>
         <source>No files loaded</source>
         <translation>Nejsou načteny žádné soubory</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="106"/>
+        <location filename="../src/gui.cpp" line="109"/>
         <source>GPX files (*.gpx)</source>
         <translation>Soubory GPX (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="108"/>
+        <location filename="../src/gui.cpp" line="111"/>
         <source>TCX files (*.tcx)</source>
         <translation>Soubory TCX (*.tcx)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="107"/>
+        <location filename="../src/gui.cpp" line="110"/>
         <source>KML files (*.kml)</source>
         <translation>Soubory KML (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="105"/>
+        <location filename="../src/gui.cpp" line="108"/>
         <source>CSV files (*.csv)</source>
         <translation>Soubory CSV (*.csv)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="108"/>
+        <location filename="../src/gui.cpp" line="111"/>
         <source>All files (*)</source>
         <translation>Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="885"/>
+        <location filename="../src/gui.cpp" line="932"/>
-        <location filename="../src/gui.cpp" line="888"/>
+        <location filename="../src/gui.cpp" line="935"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="877"/>
+        <location filename="../src/gui.cpp" line="924"/>
         <source>Routes</source>
         <translation>Trasy</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/gui.cpp" line="1101"/>
+        <location filename="../src/gui.cpp" line="1148"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n soubor</numerusform>
@@ -543,122 +543,122 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="598"/>
+        <location filename="../src/gui.cpp" line="645"/>
         <source>Next file</source>
         <translation>Následující soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="575"/>
+        <location filename="../src/gui.cpp" line="622"/>
         <source>Version </source>
         <translation>Verze </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="242"/>
+        <location filename="../src/gui.cpp" line="289"/>
         <source>Print...</source>
         <translation>Tisknout...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="247"/>
+        <location filename="../src/gui.cpp" line="294"/>
         <source>Export to PDF...</source>
         <translation>Exportovat do PDF...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="879"/>
+        <location filename="../src/gui.cpp" line="926"/>
         <source>Waypoints</source>
         <translation>Navigační body</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="599"/>
+        <location filename="../src/gui.cpp" line="646"/>
         <source>Previous file</source>
         <translation>Předchozí soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="104"/>
+        <location filename="../src/gui.cpp" line="107"/>
         <source>Supported files (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</source>
         <translation>Podporované soubory (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="333"/>
+        <location filename="../src/gui.cpp" line="380"/>
         <source>Route waypoints</source>
         <translation>Body tras</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="601"/>
+        <location filename="../src/gui.cpp" line="648"/>
         <source>First file</source>
         <translation>První soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="603"/>
+        <location filename="../src/gui.cpp" line="650"/>
         <source>Last file</source>
         <translation>Poslední soubor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="630"/>
+        <location filename="../src/gui.cpp" line="677"/>
         <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
         <translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="637"/>
+        <location filename="../src/gui.cpp" line="684"/>
         <source>Offline maps</source>
         <translation>Offline mapy</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="646"/>
+        <location filename="../src/gui.cpp" line="693"/>
         <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
         <translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="735"/>
+        <location filename="../src/gui.cpp" line="782"/>
         <source>Error loading data file:</source>
         <translation>Datový soubor nelze načíst:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="738"/>
+        <location filename="../src/gui.cpp" line="785"/>
-        <location filename="../src/gui.cpp" line="763"/>
+        <location filename="../src/gui.cpp" line="810"/>
         <source>Line: %1</source>
         <translation>Řádka: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="760"/>
+        <location filename="../src/gui.cpp" line="807"/>
         <source>Error loading POI file:</source>
         <translation>Soubor POI nelze načíst:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="871"/>
+        <location filename="../src/gui.cpp" line="918"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="875"/>
+        <location filename="../src/gui.cpp" line="922"/>
         <source>Tracks</source>
         <translation>Cesty</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="232"/>
+        <location filename="../src/gui.cpp" line="279"/>
-        <location filename="../src/gui.cpp" line="574"/>
+        <location filename="../src/gui.cpp" line="621"/>
         <source>About GPXSee</source>
         <translation>O aplikaci GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="513"/>
+        <location filename="../src/gui.cpp" line="560"/>
         <source>Navigation</source>
         <translation>Navigace</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="645"/>
+        <location filename="../src/gui.cpp" line="692"/>
         <source>POIs</source>
         <translation>POI body</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="348"/>
+        <location filename="../src/gui.cpp" line="395"/>
-        <location filename="../src/gui.cpp" line="895"/>
+        <location filename="../src/gui.cpp" line="942"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="355"/>
+        <location filename="../src/gui.cpp" line="402"/>
-        <location filename="../src/gui.cpp" line="477"/>
+        <location filename="../src/gui.cpp" line="524"/>
-        <location filename="../src/gui.cpp" line="897"/>
+        <location filename="../src/gui.cpp" line="944"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>

lang/gpxsee_sv.ts

@@ -190,320 +190,320 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/gui.cpp" line="578"/>
+        <location filename="../src/gui.cpp" line="625"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
         <translation>GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan på </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="656"/>
+        <location filename="../src/gui.cpp" line="703"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="746"/>
+        <location filename="../src/gui.cpp" line="793"/>
         <source>Open POI file</source>
         <translation>Öppna POI-fil</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="237"/>
+        <location filename="../src/gui.cpp" line="284"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="221"/>
+        <location filename="../src/gui.cpp" line="268"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="229"/>
+        <location filename="../src/gui.cpp" line="276"/>
-        <location filename="../src/gui.cpp" line="594"/>
+        <location filename="../src/gui.cpp" line="641"/>
-        <location filename="../src/gui.cpp" line="595"/>
+        <location filename="../src/gui.cpp" line="642"/>
         <source>Keyboard controls</source>
         <translation>Snabbtangenter</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="253"/>
+        <location filename="../src/gui.cpp" line="300"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="259"/>
+        <location filename="../src/gui.cpp" line="306"/>
         <source>Reload</source>
         <translation>Uppdatera</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="508"/>
+        <location filename="../src/gui.cpp" line="555"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="426"/>
+        <location filename="../src/gui.cpp" line="473"/>
-        <location filename="../src/gui.cpp" line="502"/>
+        <location filename="../src/gui.cpp" line="549"/>
         <source>File</source>
         <translation>Arkiv</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="105"/>
+        <location filename="../src/gui.cpp" line="108"/>
         <source>FIT files (*.fit)</source>
         <translation>FIT-filer (*.fit)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="106"/>
+        <location filename="../src/gui.cpp" line="109"/>
         <source>IGC files (*.igc)</source>
         <translation>IGC-filer (*.igc)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="107"/>
+        <location filename="../src/gui.cpp" line="110"/>
         <source>NMEA files (*.nmea)</source>
         <translation>NMEA-filer (*.nmea)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="227"/>
+        <location filename="../src/gui.cpp" line="274"/>
-        <location filename="../src/gui.cpp" line="623"/>
+        <location filename="../src/gui.cpp" line="670"/>
-        <location filename="../src/gui.cpp" line="624"/>
+        <location filename="../src/gui.cpp" line="671"/>
         <source>Data sources</source>
         <translation>Datakällor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="267"/>
+        <location filename="../src/gui.cpp" line="314"/>
         <source>Load POI file</source>
         <translation>Läs in POI-fil</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="270"/>
+        <location filename="../src/gui.cpp" line="317"/>
         <source>Close POI files</source>
         <translation>Stäng POI-filer</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="272"/>
+        <location filename="../src/gui.cpp" line="319"/>
         <source>Overlap POIs</source>
         <translation>Överlappa POI:er</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="276"/>
+        <location filename="../src/gui.cpp" line="323"/>
         <source>Show POI labels</source>
         <translation>Visa POI-namn</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="281"/>
+        <location filename="../src/gui.cpp" line="328"/>
         <source>Show POIs</source>
         <translation>Visa POI:er</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="290"/>
+        <location filename="../src/gui.cpp" line="337"/>
         <source>Show map</source>
         <translation>Visa karta</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="297"/>
+        <location filename="../src/gui.cpp" line="344"/>
         <source>Clear tile cache</source>
         <translation>Rensa kart-cache</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="306"/>
+        <location filename="../src/gui.cpp" line="353"/>
-        <location filename="../src/gui.cpp" line="310"/>
+        <location filename="../src/gui.cpp" line="357"/>
-        <location filename="../src/gui.cpp" line="606"/>
+        <location filename="../src/gui.cpp" line="653"/>
         <source>Next map</source>
         <translation>Nästa karta</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="317"/>
+        <location filename="../src/gui.cpp" line="364"/>
         <source>Show tracks</source>
         <translation>Visa spår</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="321"/>
+        <location filename="../src/gui.cpp" line="368"/>
         <source>Show routes</source>
         <translation>Visa rutter</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="325"/>
+        <location filename="../src/gui.cpp" line="372"/>
         <source>Show waypoints</source>
         <translation>Visa vägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="329"/>
+        <location filename="../src/gui.cpp" line="376"/>
         <source>Waypoint labels</source>
         <translation>Vägpunktsnamn</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="340"/>
+        <location filename="../src/gui.cpp" line="387"/>
         <source>Show graphs</source>
         <translation>Visa diagram</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="362"/>
+        <location filename="../src/gui.cpp" line="409"/>
         <source>Show grid</source>
         <translation>Visa stödlinjer</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="368"/>
+        <location filename="../src/gui.cpp" line="415"/>
         <source>Show toolbars</source>
         <translation>Visa verktygsfält</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="374"/>
+        <location filename="../src/gui.cpp" line="421"/>
         <source>Total time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="379"/>
+        <location filename="../src/gui.cpp" line="426"/>
-        <location filename="../src/gui.cpp" line="899"/>
+        <location filename="../src/gui.cpp" line="946"/>
         <source>Moving time</source>
         <translation>Förflyttningstid</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="386"/>
+        <location filename="../src/gui.cpp" line="433"/>
         <source>Metric</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="391"/>
+        <location filename="../src/gui.cpp" line="438"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="397"/>
+        <location filename="../src/gui.cpp" line="444"/>
         <source>Fullscreen mode</source>
         <translation>Helskärmsläge</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="403"/>
+        <location filename="../src/gui.cpp" line="450"/>
         <source>Options...</source>
         <translation>Alternativ...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="408"/>
+        <location filename="../src/gui.cpp" line="455"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="411"/>
+        <location filename="../src/gui.cpp" line="458"/>
         <source>Previous</source>
         <translation>Föregående</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="415"/>
+        <location filename="../src/gui.cpp" line="462"/>
         <source>Last</source>
         <translation>Sista</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="418"/>
+        <location filename="../src/gui.cpp" line="465"/>
         <source>First</source>
         <translation>Första</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="440"/>
+        <location filename="../src/gui.cpp" line="487"/>
         <source>Map</source>
         <translation>Karta</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="447"/>
+        <location filename="../src/gui.cpp" line="494"/>
         <source>Graph</source>
         <translation>Diagram</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="455"/>
+        <location filename="../src/gui.cpp" line="502"/>
         <source>POI</source>
         <translation>POI</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="456"/>
+        <location filename="../src/gui.cpp" line="503"/>
         <source>POI files</source>
         <translation>POI-filer</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="467"/>
+        <location filename="../src/gui.cpp" line="514"/>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="468"/>
+        <location filename="../src/gui.cpp" line="515"/>
         <source>Display</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="476"/>
+        <location filename="../src/gui.cpp" line="523"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="480"/>
+        <location filename="../src/gui.cpp" line="527"/>
         <source>Units</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="489"/>
+        <location filename="../src/gui.cpp" line="536"/>
         <source>Help</source>
         <translation>Hjälp</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="604"/>
+        <location filename="../src/gui.cpp" line="651"/>
         <source>Append file</source>
         <translation>Lägg till fil</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="605"/>
+        <location filename="../src/gui.cpp" line="652"/>
         <source>Next/Previous</source>
         <translation>Nästa/Föregående</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="608"/>
+        <location filename="../src/gui.cpp" line="655"/>
         <source>Previous map</source>
         <translation>Föregående karta</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="609"/>
+        <location filename="../src/gui.cpp" line="656"/>
         <source>Zoom in</source>
         <translation>Zooma in</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="611"/>
+        <location filename="../src/gui.cpp" line="658"/>
         <source>Zoom out</source>
         <translation>Zooma ut</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="613"/>
+        <location filename="../src/gui.cpp" line="660"/>
         <source>Digital zoom</source>
         <translation>Digital zoom</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="614"/>
+        <location filename="../src/gui.cpp" line="661"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="626"/>
+        <location filename="../src/gui.cpp" line="673"/>
         <source>Online maps</source>
         <translation>Online-kartor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="627"/>
+        <location filename="../src/gui.cpp" line="674"/>
         <source>Online map URLs are read on program startup from the following file:</source>
         <translation>Online-kartors URL:er, läses från följande fil vid programstart:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="637"/>
+        <location filename="../src/gui.cpp" line="684"/>
         <source>Offline maps</source>
         <translation>Offline-kartor</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="638"/>
+        <location filename="../src/gui.cpp" line="685"/>
         <source>Offline maps are loaded on program startup from the following directory:</source>
         <translation>Offline-kartor läses in från följande mapp vid programstart:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="641"/>
+        <location filename="../src/gui.cpp" line="688"/>
         <source>The expected structure is one map/atlas in a separate subdirectory. Supported map formats are OziExplorer image-based maps and tiled TrekBuddy maps/atlases (tared and non-tared).</source>
         <translation>Den förväntade strukturen är en karta/atlas i en separat undermapp. Kartformat som stöds är OziExplorer bildbaserade kartor och rutindelade TrekBuddy-kartor/-kartsamlingar (tarerade och icke tarerade).</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="1097"/>
+        <location filename="../src/gui.cpp" line="1144"/>
         <source>No files loaded</source>
         <translation>Inga filer inlästa</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/gui.cpp" line="1101"/>
+        <location filename="../src/gui.cpp" line="1148"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n filer</numerusform>
@@ -511,153 +511,153 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="106"/>
+        <location filename="../src/gui.cpp" line="109"/>
         <source>GPX files (*.gpx)</source>
         <translation>GPX-filer (*.gpx)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="108"/>
+        <location filename="../src/gui.cpp" line="111"/>
         <source>TCX files (*.tcx)</source>
         <translation>TCX-filer (*.tcx)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="107"/>
+        <location filename="../src/gui.cpp" line="110"/>
         <source>KML files (*.kml)</source>
         <translation>KML-filer (*.kml)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="105"/>
+        <location filename="../src/gui.cpp" line="108"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV-filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="108"/>
+        <location filename="../src/gui.cpp" line="111"/>
         <source>All files (*)</source>
         <translation>Alla filer (*)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="885"/>
+        <location filename="../src/gui.cpp" line="932"/>
-        <location filename="../src/gui.cpp" line="888"/>
+        <location filename="../src/gui.cpp" line="935"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="877"/>
+        <location filename="../src/gui.cpp" line="924"/>
         <source>Routes</source>
         <translation>Rutter</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="598"/>
+        <location filename="../src/gui.cpp" line="645"/>
         <source>Next file</source>
         <translation>Nästa fil</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="575"/>
+        <location filename="../src/gui.cpp" line="622"/>
         <source>Version </source>
         <translation>Version </translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="242"/>
+        <location filename="../src/gui.cpp" line="289"/>
         <source>Print...</source>
         <translation>Skriv ut...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="247"/>
+        <location filename="../src/gui.cpp" line="294"/>
         <source>Export to PDF...</source>
         <translation>Exportera till PDF...</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="879"/>
+        <location filename="../src/gui.cpp" line="926"/>
         <source>Waypoints</source>
         <translation>Vägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="599"/>
+        <location filename="../src/gui.cpp" line="646"/>
         <source>Previous file</source>
         <translation>Föregående fil</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="104"/>
+        <location filename="../src/gui.cpp" line="107"/>
         <source>Supported files (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</source>
         <translation>Filer som stöds (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="333"/>
+        <location filename="../src/gui.cpp" line="380"/>
         <source>Route waypoints</source>
         <translation>Ruttvägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="601"/>
+        <location filename="../src/gui.cpp" line="648"/>
         <source>First file</source>
         <translation>Första filen</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="603"/>
+        <location filename="../src/gui.cpp" line="650"/>
         <source>Last file</source>
         <translation>Sista filen</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="630"/>
+        <location filename="../src/gui.cpp" line="677"/>
         <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
         <translation>Filformatet är en kartpost per rad, bestående av kartnamn och kartrutans URL, avgränsade med ett TAB-tecken. Kartrutans X- och Y-koordinater ersätts med $x och $y i URL:en och zoomnivån ersätts med $z. Exempel på en kartfil kan se ut så här:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="646"/>
+        <location filename="../src/gui.cpp" line="693"/>
         <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
         <translation>För att GPXSee skall läsa in en POI-fil automatiskt vid programstart, läggs filen i följande mapp:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="735"/>
+        <location filename="../src/gui.cpp" line="782"/>
         <source>Error loading data file:</source>
         <translation>Fel vid inläsning av datafil:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="738"/>
+        <location filename="../src/gui.cpp" line="785"/>
-        <location filename="../src/gui.cpp" line="763"/>
+        <location filename="../src/gui.cpp" line="810"/>
         <source>Line: %1</source>
         <translation>Rad: %1</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="760"/>
+        <location filename="../src/gui.cpp" line="807"/>
         <source>Error loading POI file:</source>
         <translation>Fel vid inläsning av POI-fil:</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="871"/>
+        <location filename="../src/gui.cpp" line="918"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="875"/>
+        <location filename="../src/gui.cpp" line="922"/>
         <source>Tracks</source>
         <translation>Spår</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="232"/>
+        <location filename="../src/gui.cpp" line="279"/>
-        <location filename="../src/gui.cpp" line="574"/>
+        <location filename="../src/gui.cpp" line="621"/>
         <source>About GPXSee</source>
         <translation>Om GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="513"/>
+        <location filename="../src/gui.cpp" line="560"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="645"/>
+        <location filename="../src/gui.cpp" line="692"/>
         <source>POIs</source>
         <translation>POI:er</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="348"/>
+        <location filename="../src/gui.cpp" line="395"/>
-        <location filename="../src/gui.cpp" line="895"/>
+        <location filename="../src/gui.cpp" line="942"/>
         <source>Distance</source>
         <translation>Avstånd</translation>
     </message>
     <message>
-        <location filename="../src/gui.cpp" line="355"/>
+        <location filename="../src/gui.cpp" line="402"/>
-        <location filename="../src/gui.cpp" line="477"/>
+        <location filename="../src/gui.cpp" line="524"/>
-        <location filename="../src/gui.cpp" line="897"/>
+        <location filename="../src/gui.cpp" line="944"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>

pkg/datums.csv

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

pkg/ellipsoids.csv

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

pkg/gpxsee.nsi

@@ -5,7 +5,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "4.3"
+!define VERSION "4.4"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -82,6 +82,8 @@ Section "GPXSee" SEC_APP
   ; Put the files there
   File "gpxsee.exe"
   File "maps.txt"
+  File "ellipsoids.csv"
+  File "datums.csv"
 
   ; Create start menu entry and add links
   SetShellVarContext all

pkg/gpxsee64.nsi

@@ -5,7 +5,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "4.3"
+!define VERSION "4.4"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -89,6 +89,8 @@ Section "GPXSee" SEC_APP
   ; Put the files there
   File "gpxsee.exe"
   File "maps.txt"
+  File "ellipsoids.csv"
+  File "datums.csv"
   
   ; Create start menu entry and add links
   SetShellVarContext all

src/config.h

@@ -13,6 +13,8 @@
 #define FONT_SIZE       12
 #define SCREEN_DPI      96.0
 
+#define ELLIPSOID_FILE  QString("ellipsoids.csv")
+#define DATUM_FILE      QString("datums.csv")
 #define MAP_FILE        QString("maps.txt")
 #define MAP_DIR         QString("maps")
 #define POI_DIR         QString("POI")
@@ -29,9 +31,13 @@
 #define GLOBAL_DIR      QString("/usr/share/gpxsee")
 #endif
 
+#define USER_ELLIPSOID_FILE    USER_DIR + QString("/") + ELLIPSOID_FILE
+#define USER_DATUM_FILE        USER_DIR + QString("/") + DATUM_FILE
 #define USER_MAP_DIR           USER_DIR + QString("/") + MAP_DIR
 #define USER_MAP_FILE          USER_DIR + QString("/") + MAP_FILE
 #define USER_POI_DIR           USER_DIR + QString("/") + POI_DIR
+#define GLOBAL_ELLIPSOID_FILE  GLOBAL_DIR + QString("/") + ELLIPSOID_FILE
+#define GLOBAL_DATUM_FILE      GLOBAL_DIR + QString("/") + DATUM_FILE
 #define GLOBAL_MAP_DIR         GLOBAL_DIR + QString("/") + MAP_DIR
 #define GLOBAL_MAP_FILE        GLOBAL_DIR + QString("/") + MAP_FILE
 #define GLOBAL_POI_DIR         GLOBAL_DIR + QString("/") + POI_DIR

src/datum.cpp

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

src/datum.h

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

src/ellipsoid.cpp

@@ -1,42 +1,62 @@
-#include <cmath>
+#include <QFile>
-#include <QString>
-#include "wgs84.h"
 #include "ellipsoid.h"
 
+QMap<int, Ellipsoid> Ellipsoid::_ellipsoids;
+QString Ellipsoid::_errorString;
+int Ellipsoid::_errorLine = 0;
 
-#define INTERNATIONAL_RADIUS     6378388.0
+Ellipsoid Ellipsoid::ellipsoid(int id)
-#define INTERNATIONAL_FLATTENING (1.0/297.0)
-#define KRASSOVSKY_RADIUS        6378245.0
-#define KRASSOVSKY_FLATTENING    (1.0/298.3)
-#define CLARKE1866_RADIUS        6378206.4
-#define CLARKE1866_FLATTENING    (1.0/294.9786982)
-#define GRS80_RADIUS             6378137.0
-#define GRS80_FLATTENING         (1.0/298.257222101)
-#define WGS72_RADIUS             6378135.0
-#define WGS72_FLATTENING         (1.0/298.26)
-#define GRS67_RADIUS             6378160.0
-#define GRS67_FLATTENING         (1.0/298.25)
-
-
-// Must be in Ellipsoid::Name order!
-struct {double radius; double flattening;} static ellipsoids[] = {
-	{CLARKE1866_RADIUS, CLARKE1866_FLATTENING},
-	{GRS80_RADIUS, GRS80_FLATTENING},
-	{INTERNATIONAL_RADIUS, INTERNATIONAL_FLATTENING},
-	{KRASSOVSKY_RADIUS, KRASSOVSKY_FLATTENING},
-	{WGS84_RADIUS, WGS84_FLATTENING},
-	{WGS72_RADIUS, WGS72_FLATTENING},
-	{GRS67_RADIUS, GRS67_FLATTENING}
-};
-
-Ellipsoid::Ellipsoid()
 {
-	_radius = WGS84_RADIUS;
+	QMap<int, Ellipsoid>::const_iterator it = _ellipsoids.find(id);
-	_flattening = WGS84_FLATTENING;
+
+	if (it == _ellipsoids.end())
+		return Ellipsoid();
+
+	return it.value();
 }
 
-Ellipsoid::Ellipsoid(Name name)
+bool Ellipsoid::loadList(const QString &path)
 {
-	_radius = ellipsoids[name].radius;
+	QFile file(path);
-	_flattening = ellipsoids[name].flattening;
+	bool res;
+
+	if (!file.open(QFile::ReadOnly)) {
+		_errorString = qPrintable(file.errorString());
+		return false;
+	}
+
+	_errorLine = 1;
+	_errorString.clear();
+
+	while (!file.atEnd()) {
+		QByteArray line = file.readLine();
+		QList<QByteArray> list = line.split(',');
+		if (list.size() != 4) {
+			_errorString = "Format error";
+			return false;
+		}
+
+		int id = list[0].trimmed().toInt(&res);
+		if (!res) {
+			_errorString = "Invalid ellipsoid id";
+			return false;
+		}
+		double radius = list[2].trimmed().toDouble(&res);
+		if (!res) {
+			_errorString = "Invalid ellipsoid radius";
+			return false;
+		}
+		double flattening = list[3].trimmed().toDouble(&res);
+		if (!res) {
+			_errorString = "Invalid ellipsoid flattening";
+			return false;
+		}
+
+		Ellipsoid e(radius, 1.0/flattening);
+		_ellipsoids.insert(id, e);
+
+		_errorLine++;
+	}
+
+	return true;
 }

src/ellipsoid.h

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

src/gui.cpp

@@ -26,6 +26,8 @@
 #include "keys.h"
 #include "settings.h"
 #include "data.h"
+#include "ellipsoid.h"
+#include "datum.h"
 #include "map.h"
 #include "maplist.h"
 #include "mapdir.h"
@@ -47,6 +49,7 @@
 
 GUI::GUI()
 {
+	loadDatums();
 	loadMaps();
 	loadPOIs();
 
@@ -117,6 +120,50 @@ void GUI::createBrowser()
 	_browser->setFilter(filter);
 }
 
+void GUI::loadDatums()
+{
+	QString ef, df;
+	bool ok = false;
+
+	if (QFile::exists(USER_ELLIPSOID_FILE))
+		ef = USER_ELLIPSOID_FILE;
+	else if (QFile::exists(GLOBAL_ELLIPSOID_FILE))
+		ef = GLOBAL_ELLIPSOID_FILE;
+	else
+		qWarning("No ellipsoids file found.");
+
+	if (QFile::exists(USER_DATUM_FILE))
+		df = USER_DATUM_FILE;
+	else if (QFile::exists(GLOBAL_DATUM_FILE))
+		df = GLOBAL_DATUM_FILE;
+	else
+		qWarning("No datums file found.");
+
+	if (!ef.isNull() && !df.isNull()) {
+		if (!Ellipsoid::loadList(ef)) {
+			if (Ellipsoid::errorLine())
+				qWarning("%s: parse error on line %d: %s", qPrintable(ef),
+				  Ellipsoid::errorLine(), qPrintable(Ellipsoid::errorString()));
+			else
+				qWarning("%s: %s", qPrintable(ef), qPrintable(
+				  Ellipsoid::errorString()));
+		} else {
+			if (!Datum::loadList(df)) {
+				if (Datum::errorLine())
+					qWarning("%s: parse error on line %d: %s", qPrintable(ef),
+					  Datum::errorLine(), qPrintable(Datum::errorString()));
+				else
+					qWarning("%s: %s", qPrintable(ef), qPrintable(
+					  Datum::errorString()));
+			} else
+				ok = true;
+		}
+	}
+
+	if (!ok)
+		qWarning("Maps based on a datum different from WGS84 won't work.");
+}
+
 void GUI::loadMaps()
 {
 	QList<Map*> online, offline;

src/gui.h

@@ -79,6 +79,7 @@ private slots:
 private:
 	typedef QPair<QDate, QDate> DateRange;
 
+	void loadDatums();
 	void loadMaps();
 	void loadPOIs();
 	void closeFiles();

src/offlinemap.cpp

@@ -12,26 +12,49 @@
 #include "wgs84.h"
 #include "coordinates.h"
 #include "matrix.h"
-#include "ellipsoid.h"
+#include "datum.h"
 #include "latlon.h"
 #include "mercator.h"
 #include "transversemercator.h"
 #include "utm.h"
 #include "lambertconic.h"
+#include "ozf.h"
 #include "offlinemap.h"
 
 
-struct {const char *name; Ellipsoid::Name ellipsoid;} static datums[] = {
+// Abridged Molodensky transformation
-	{"S42", Ellipsoid::Krassowsky1940},
+static Coordinates toWGS84(Coordinates c, const Datum &datum)
-	{"Pulkovo 1942", Ellipsoid::Krassowsky1940},
+{
-	{"European 1950", Ellipsoid::International1924},
+	Ellipsoid WGS84(WGS84_RADIUS, WGS84_FLATTENING);
-	{"European 1979", Ellipsoid::International1924},
+
-	{"NZGD1949", Ellipsoid::International1924},
+	double dX = datum.dx();
-	{"NAD27", Ellipsoid::Clarke1866},
+	double dY = datum.dy();
-	{"NAD83", Ellipsoid::GRS80},
+	double dZ = datum.dz();
-	{"WGS 72", Ellipsoid::WGS72},
+
-	{"South American 1969", Ellipsoid::GRS67}
+	double slat = sin(deg2rad(c.lat()));
-};
+	double clat = cos(deg2rad(c.lat()));
+	double slon = sin(deg2rad(c.lon()));
+	double clon = cos(deg2rad(c.lon()));
+	double ssqlat = slat * slat;
+
+	double from_f = datum.ellipsoid().flattening();
+	double df = WGS84.flattening() - from_f;
+	double from_a = datum.ellipsoid().radius();
+	double da = WGS84.radius() - from_a;
+	double from_esq = datum.ellipsoid().flattening()
+	  * (2.0 - datum.ellipsoid().flattening());
+	double adb = 1.0 / (1.0 - from_f);
+	double rn = from_a / sqrt(1 - from_esq * ssqlat);
+	double rm = from_a * (1 - from_esq) / pow((1 - from_esq * ssqlat), 1.5);
+	double from_h = 0.0; // we're flat!
+
+	double dlat = (-dX * slat * clon - dY * slat * slon + dZ * clat + da * rn
+	  * from_esq * slat * clat / from_a + +df * (rm * adb + rn / adb) * slat
+	  * clat) / (rm + from_h);
+	double dlon = (-dX * slon + dY * clon) / ((rn + from_h) * clat);
+
+	return Coordinates(c.lon() + rad2deg(dlon), c.lat() + rad2deg(dlat));
+}
 
 int OfflineMap::parseMapFile(QIODevice &device, QList<ReferencePoint> &points,
   QString &projection, ProjectionSetup &setup, QString &datum)
@@ -154,39 +177,36 @@ bool OfflineMap::createProjection(const QString &datum,
   const QString &projection, const ProjectionSetup &setup,
   QList<ReferencePoint> &points)
 {
-	Ellipsoid::Name ellipsoid = Ellipsoid::WGS84;
-
 	if (points.count() < 2) {
 		qWarning("%s: insufficient number of reference points",
 		  qPrintable(_name));
 		return false;
 	}
 
-	for (size_t i = 0; i < ARRAY_SIZE(datums); i++) {
+	Datum d = Datum::datum(datum);
-		if (datum.startsWith(datums[i].name)) {
+	if (d.isNull()) {
-			ellipsoid = datums[i].ellipsoid;
+		qWarning("%s: %s: unknown datum", qPrintable(_name), qPrintable(datum));
-			break;
+		return false;
-		}
 	}
 
 	if (projection == "Mercator")
 		_projection = new Mercator();
 	else if (projection == "Transverse Mercator")
-		_projection = new TransverseMercator(Ellipsoid(ellipsoid),
+		_projection = new TransverseMercator(d.ellipsoid(),
 		  setup.longitudeOrigin, setup.scale, setup.falseEasting,
 		  setup.falseNorthing);
 	else if (projection == "Latitude/Longitude")
 		_projection = new LatLon();
 	else if (projection == "Lambert Conformal Conic")
-		_projection = new LambertConic(Ellipsoid(ellipsoid),
+		_projection = new LambertConic(d.ellipsoid(),
 		  setup.standardParallel1, setup.standardParallel2,
 		  setup.latitudeOrigin, setup.longitudeOrigin, setup.scale,
 		  setup.falseEasting, setup.falseNorthing);
 	else if (projection == "(UTM) Universal Transverse Mercator") {
 		if (setup.zone)
-			_projection = new UTM(Ellipsoid(ellipsoid), setup.zone);
+			_projection = new UTM(d.ellipsoid(), setup.zone);
 		else if (!points.first().ll.isNull())
-			_projection = new UTM(Ellipsoid(ellipsoid), points.first().ll);
+			_projection = new UTM(d.ellipsoid(), points.first().ll);
 		else {
 			qWarning("%s: Can not determine UTM zone", qPrintable(_name));
 			return false;
@@ -197,9 +217,17 @@ bool OfflineMap::createProjection(const QString &datum,
 		return false;
 	}
 
-	for (int i = 0; i < points.size(); i++)
+	for (int i = 0; i < points.size(); i++) {
-		if (points.at(i).ll.isNull())
+		if (points.at(i).ll.isNull()) {
+			if (d.isWGS84())
 				points[i].ll = _projection->xy2ll(points.at(i).pp);
+			else
+				points[i].ll = toWGS84(_projection->xy2ll(points.at(i).pp), d);
+		} else {
+			if (!d.isWGS84())
+				points[i].ll = toWGS84(points[i].ll, d);
+		}
+	}
 
 	return true;
 }
@@ -284,14 +312,41 @@ bool OfflineMap::computeResolution(QList<ReferencePoint> &points)
 bool OfflineMap::getImageInfo(const QString &path)
 {
 	QFileInfo ii(_imgPath);
-	if (ii.isRelative())
-		_imgPath = path + "/" + _imgPath;
 
+	if (ii.isRelative())
+		ii.setFile(path + "/" + _imgPath);
+
+	if (!ii.exists()) {
+		int last = _imgPath.lastIndexOf('\\');
+		if (last >= 0 && last < _imgPath.length() - 1) {
+			QStringRef fn(&_imgPath, last + 1, _imgPath.length() - last - 1);
+			ii.setFile(path + "/" + fn.toString());
+		}
+	}
+
+	if (ii.exists())
+		_imgPath = ii.absoluteFilePath();
+	else {
+		qWarning("%s: %s: No such image file", qPrintable(_name),
+		  qPrintable(_imgPath));
+		return false;
+	}
+
+	if (_imgPath.endsWith("ozf3", Qt::CaseInsensitive)
+	  || _imgPath.endsWith("ozf4", Qt::CaseInsensitive)) {
+		qWarning("%s: %s: obfuscated image files are not supported",
+		  qPrintable(_name), qPrintable(_imgPath));
+		return false;
+	} else if (_imgPath.endsWith("ozf2", Qt::CaseInsensitive)) {
+		_ozf.load(_imgPath);
+		_size = _ozf.size();
+	} else {
 		QImageReader img(_imgPath);
 		_size = img.size();
+	}
 	if (!_size.isValid()) {
 		qWarning("%s: %s: error reading map image", qPrintable(_name),
-		  qPrintable(ii.absoluteFilePath()));
+		  qPrintable(_imgPath));
 		return false;
 	}
 
@@ -503,7 +558,7 @@ void OfflineMap::load()
 		return;
 	}
 
-	if (!_img && !_imgPath.isNull()) {
+	if (!_img && !_imgPath.isNull() && !_ozf.isOpen()) {
 		_img = new QImage(_imgPath);
 		if (_img->isNull())
 			qWarning("%s: error loading map image", qPrintable(_imgPath));
@@ -518,9 +573,8 @@ void OfflineMap::unload()
 	}
 }
 
-void OfflineMap::draw(QPainter *painter, const QRectF &rect)
+void OfflineMap::drawTiled(QPainter *painter, const QRectF &rect)
 {
-	if (_tileSize.isValid()) {
 	QPoint tl = QPoint((int)floor(rect.left() / (qreal)_tileSize.width())
 	  * _tileSize.width(), (int)floor(rect.top() / _tileSize.height())
 	  * _tileSize.height());
@@ -530,6 +584,12 @@ void OfflineMap::draw(QPainter *painter, const QRectF &rect)
 		for (int j = 0; j < ceil(s.height() / _tileSize.height()); j++) {
 			int x = tl.x() + i * _tileSize.width();
 			int y = tl.y() + j * _tileSize.height();
+
+			if (!QRectF(QPointF(x, y), _ozf.tileSize()).intersects(bounds())) {
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
+				continue;
+			}
+
 			QString tileName(_tileName.arg(QString::number(x),
 			  QString::number(y)));
 			QPixmap pixmap;
@@ -548,13 +608,50 @@ void OfflineMap::draw(QPainter *painter, const QRectF &rect)
 			if (pixmap.isNull()) {
 				qWarning("%s: error loading tile image", qPrintable(
 				  _tileName.arg(QString::number(x), QString::number(y))));
-					painter->fillRect(QRectF(QPoint(x, y), _tileSize),
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
-					  Qt::white);
 			} else
 				painter->drawPixmap(QPoint(x, y), pixmap);
 		}
 	}
-	} else {
+}
+
+void OfflineMap::drawOZF(QPainter *painter, const QRectF &rect)
+{
+	QPoint tl = QPoint((int)floor(rect.left() / _ozf.tileSize().width())
+	  * _ozf.tileSize().width(), (int)floor(rect.top()
+	  / _ozf.tileSize().height()) * _ozf.tileSize().height());
+
+	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	for (int i = 0; i < ceil(s.width() / _ozf.tileSize().width()); i++) {
+		for (int j = 0; j < ceil(s.height() / _ozf.tileSize().height()); j++) {
+			int x = tl.x() + i * _ozf.tileSize().width();
+			int y = tl.y() + j * _ozf.tileSize().height();
+
+			if (!QRectF(QPointF(x, y), _ozf.tileSize()).intersects(bounds())) {
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
+				continue;
+			}
+
+			QPixmap pixmap;
+			QString key = _ozf.fileName() + "/" + QString::number(x)
+			  + "_" + QString::number(y);
+			if (!QPixmapCache::find(key, &pixmap)) {
+				pixmap = _ozf.tile(x, y);
+				if (!pixmap.isNull())
+					QPixmapCache::insert(key, pixmap);
+			}
+
+			if (pixmap.isNull()) {
+				qWarning("%s: error loading tile image", qPrintable(key));
+				painter->fillRect(QRectF(QPoint(x, y), _tileSize), Qt::white);
+			} else
+				painter->drawPixmap(QPoint(x, y), pixmap);
+		}
+	}
+}
+
+void OfflineMap::drawImage(QPainter *painter, const QRectF &rect)
+{
 	if (!_img || _img->isNull())
 		painter->fillRect(rect, Qt::white);
 	else {
@@ -562,5 +659,14 @@ void OfflineMap::draw(QPainter *painter, const QRectF &rect)
 		QImage crop = _img->copy(QRect(p, rect.size().toSize()));
 		painter->drawImage(rect.topLeft(), crop);
 	}
-	}
+}
+
+void OfflineMap::draw(QPainter *painter, const QRectF &rect)
+{
+	if (_ozf.isOpen())
+		drawOZF(painter, rect);
+	else if (_tileSize.isValid())
+		drawTiled(painter, rect);
+	else
+		drawImage(painter, rect);
 }

src/offlinemap.h

@@ -4,6 +4,7 @@
 #include <QTransform>
 #include "map.h"
 #include "tar.h"
+#include "ozf.h"
 #include "coordinates.h"
 #include "projection.h"
 
@@ -78,12 +79,17 @@ private:
 	bool getTileInfo(const QStringList &tiles, const QString &path = QString());
 	bool getImageInfo(const QString &path);
 
+	void drawTiled(QPainter *painter, const QRectF &rect);
+	void drawOZF(QPainter *painter, const QRectF &rect);
+	void drawImage(QPainter *painter, const QRectF &rect);
+
 	QString _name;
 	QSize _size;
 	Projection *_projection;
 	QTransform _transform, _inverted;
 	qreal _resolution;
 
+	OZF _ozf;
 	Tar _tar;
 	QString _tarPath;
 	QImage *_img;

src/ozf.cpp

@@ -0,0 +1,142 @@
+#include <QtEndian>
+#include <QFile>
+#include "ozf.h"
+
+
+#define OZF2_MAGIC     0x7778
+#define OZF2_SEPARATOR 0x77777777
+
+template<class T> bool OZF::readValue(T &val)
+{
+	T data;
+
+	if (_file.read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
+		return false;
+
+	if (sizeof(T) > 1)
+		val = qFromLittleEndian(data);
+	else
+		val = data;
+
+	return true;
+}
+
+bool OZF::readHeaders()
+{
+	quint16 magic;
+	quint32 separator;
+
+	if (!readValue(magic) || magic != OZF2_MAGIC)
+		return false;
+
+	if (!_file.seek(_file.pos() + 52))
+		return false;
+	if (!readValue(separator) || separator != OZF2_SEPARATOR)
+		return false;
+
+	return true;
+}
+
+bool OZF::readTileTable()
+{
+	quint32 offset, bgr0, w, h;
+	quint16 x, y;
+
+
+	if (!_file.seek(_file.size() - 4))
+		return false;
+	// table offset
+	if (!readValue(offset))
+		return false;
+	if (!_file.seek(offset))
+		return false;
+	// tiles offset (zoom level 0)
+	if (!readValue(offset))
+		return false;
+	if (!_file.seek(offset))
+		return false;
+
+	if (!readValue(w))
+		return false;
+	if (!readValue(h))
+		return false;
+	if (!readValue(x))
+		return false;
+	if (!readValue(y))
+		return false;
+
+	_size = QSize(w, h);
+	_dim = QSize(x, y);
+
+	_palette = QVector<quint32>(256);
+	for (int i = 0; i < _palette.size(); i++) {
+		if (!readValue(bgr0))
+			return false;
+
+		quint32 b = (bgr0 & 0x000000FF);
+		quint32 g = (bgr0 & 0x0000FF00) >> 8;
+		quint32 r = (bgr0 & 0x00FF0000) >> 16;
+
+		_palette[i] = 0xFF000000 | r << 16 | g << 8 | b;
+	}
+
+	_tiles = QVector<quint32>(_dim.width() * _dim.height() + 1);
+	for (int i = 0; i < _tiles.size(); i++)
+		if (!readValue(_tiles[i]))
+			return false;
+
+	return true;
+}
+
+bool OZF::load(const QString &path)
+{
+	if (_file.isOpen())
+		_file.close();
+
+	_file.setFileName(path);
+	if (!_file.open(QIODevice::ReadOnly))
+		return false;
+
+	if (!readHeaders()) {
+		qWarning("%s: not a OZF2 file", qPrintable(_file.fileName()));
+		_file.close();
+		return false;
+	}
+
+	if (!readTileTable()) {
+		qWarning("%s: file format error", qPrintable(_file.fileName()));
+		_file.close();
+		_size = QSize();
+		return false;
+	}
+
+	return true;
+}
+
+QPixmap OZF::tile(int x, int y)
+{
+	Q_ASSERT(_file.isOpen());
+
+	int i = (y/tileSize().height()) * _dim.width() + (x/tileSize().width());
+	if (i >= _tiles.size() - 1 || i < 0)
+		return QPixmap();
+
+	int size = _tiles.at(i+1) - _tiles.at(i);
+	if (!_file.seek(_tiles.at(i)))
+		return QPixmap();
+
+	QByteArray ba = _file.read(size);
+	if (ba.size() != size)
+		return QPixmap();
+	quint32 bes = qToBigEndian(tileSize().width() * tileSize().height());
+	ba.prepend(QByteArray((char*)&bes, sizeof(bes)));
+	QByteArray uba = qUncompress(ba);
+	if (uba.size() != tileSize().width() * tileSize().height())
+		return QPixmap();
+
+	QImage img((const uchar*)uba.constData(), tileSize().width(),
+	  tileSize().height(), QImage::Format_Indexed8);
+	img.setColorTable(_palette);
+
+	return QPixmap::fromImage(img.mirrored());
+}

src/ozf.h

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

src/tar.cpp

@@ -50,19 +50,27 @@ bool Tar::load(const QString &path)
 	quint64 size;
 	qint64 ret;
 
+	if (_file.isOpen())
+		_file.close();
+	_index.clear();
+
 	_file.setFileName(path);
 	if (!_file.open(QIODevice::ReadOnly))
 		return false;
 
 	while ((ret = _file.read(buffer, BLOCKSIZE)) > 0) {
-		if (ret < BLOCKSIZE)
+		if (ret < BLOCKSIZE) {
+			_file.close();
 			return false;
+		}
 		size = number(hdr->size, sizeof(hdr->size));
 		if (size)
 			_index.insert(hdr->name, Info(size, _file.pos()));
-		if (!_file.seek(_file.pos() + BLOCKCOUNT(size) * BLOCKSIZE))
+		if (!_file.seek(_file.pos() + BLOCKCOUNT(size) * BLOCKSIZE)) {
+			_file.close();
 			return false;
 		}
+	}
 
 	return true;
 }
@@ -73,6 +81,7 @@ QByteArray Tar::file(const QString &name)
 	if (it == _index.end())
 		return QByteArray();
 
+	Q_ASSERT(_file.isOpen());
 	if (_file.seek(it.value().offset()))
 		return _file.read(it.value().size());
 	else